Theodor-Springmann-Stiftung/kgpz_web
1
0
Fork 0
mirror of https://github.com/Theodor-Springmann-Stiftung/kgpz_web.git synced 2025-10-29 09:05:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

BUGFIX: RWLock for Resolver

Browse Source
This commit is contained in:
Simon Martens
2025-01-09 16:00:30 +01:00
parent f998ce61c6
commit b65da464bb
2 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
providers/xmlprovider/resolver.go
View File

@@ -9,7 +9,7 @@ import (
type Resolver[T XMLItem] struct { type Resolver[T XMLItem] struct {
index map[string]map[string][]Resolved[T] // Map[typeName][refID] -> []*T index map[string]map[string][]Resolved[T] // Map[typeName][refID] -> []*T
mu sync.Mutex // Synchronization for thread safety mu sync.RWMutex // Synchronization for thread safety
} }
func NewResolver[T XMLItem]() *Resolver[T] { func NewResolver[T XMLItem]() *Resolver[T] {
@@ -27,6 +27,9 @@ func (r *Resolver[T]) Add(typeName, refID string, item Resolved[T]) {
} }
func (r *Resolver[T]) Get(typeName, refID string) ([]Resolved[T], error) { func (r *Resolver[T]) Get(typeName, refID string) ([]Resolved[T], error) {
r.mu.RLock()
defer r.mu.RUnlock()
if typeIndex, exists := r.index[typeName]; exists { if typeIndex, exists := r.index[typeName]; exists {
if items, ok := typeIndex[refID]; ok { if items, ok := typeIndex[refID]; ok {
return items, nil return items, nil

17
providers/xmlprovider/xmlprovider.go
View File

@@ -44,7 +44,7 @@ type XMLProvider[T XMLItem] struct {
// INFO: Resolver is used to resolve references (back-links) between XML items. // INFO: Resolver is used to resolve references (back-links) between XML items.
Resolver Resolver[T] Resolver Resolver[T]
mu sync.Mutex mu sync.RWMutex
// TODO: This array is meant to be for iteration purposes, since iteration over the sync.Map is slow. // TODO: This array is meant to be for iteration purposes, since iteration over the sync.Map is slow.
// It is best for this array to be sorted by key of the corresponding item. // It is best for this array to be sorted by key of the corresponding item.
Array []T Array []T
@@ -149,7 +149,6 @@ func (p *XMLProvider[T]) ReverseLookup(item XMLItem) []Resolved[T] {
r, err := p.Resolver.Get(item.Name(), key) r, err := p.Resolver.Get(item.Name(), key)
if err == nil { if err == nil {
ret = append(ret, r...) ret = append(ret, r...)
return ret
} }
} }
@@ -158,11 +157,6 @@ func (p *XMLProvider[T]) ReverseLookup(item XMLItem) []Resolved[T] {
func (a *XMLProvider[T]) String() string { func (a *XMLProvider[T]) String() string {
var s string var s string
a.Items.Range(func(key, value interface{}) bool {
v := value.(T)
s += v.String()
return true
})
for _, item := range a.Array { for _, item := range a.Array {
s += item.String() s += item.String()
} }
@@ -188,8 +182,8 @@ func (p *XMLProvider[T]) Item(id string) *T {
} }
func (p *XMLProvider[T]) Find(fn func(*T) bool) []T { func (p *XMLProvider[T]) Find(fn func(*T) bool) []T {
p.mu.Lock() p.mu.RLock()
defer p.mu.Unlock() defer p.mu.RUnlock()
var items []T var items []T
for _, item := range p.Array { for _, item := range p.Array {
if fn(&item) { if fn(&item) {
@@ -199,10 +193,11 @@ func (p *XMLProvider[T]) Find(fn func(*T) bool) []T {
return items return items
} }
// INFO: These are only reading locks.
func (p *XMLProvider[T]) Lock() { func (p *XMLProvider[T]) Lock() {
p.mu.Lock() p.mu.RLock()
} }
func (p *XMLProvider[T]) Unlock() { func (p *XMLProvider[T]) Unlock() {
p.mu.Unlock() p.mu.RUnlock()
} }