Skip to content

Commit

Permalink
Less locking
Browse files Browse the repository at this point in the history
  • Loading branch information
raphaelvigee committed May 13, 2024
1 parent 16d439f commit bfd310b
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 11 deletions.
18 changes: 8 additions & 10 deletions worker2/dag.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import (
"iter"
"strings"
"sync"
"sync/atomic"
)

type nodesTransitive[T any] struct {
Expand Down Expand Up @@ -131,8 +132,8 @@ func newNodesTransitive[T any](transitiveGetter func(d *Node[T]) *nodesTransitiv
type Node[T any] struct {
V T
ID string
frozen bool
m sync.Mutex
frozen atomic.Bool
m sync.RWMutex

Dependencies *nodesTransitive[T]
Dependees *nodesTransitive[T]
Expand All @@ -159,7 +160,7 @@ func (d *Node[T]) AddDependency(deps ...*Node[T]) {
d.m.Lock()
defer d.m.Unlock()

if d.frozen {
if d.frozen.Load() {
panic("add: frozen")
}

Expand Down Expand Up @@ -192,7 +193,7 @@ func (d *Node[T]) RemoveDependency(dep *Node[T]) {
d.m.Lock()
defer d.m.Unlock()

if d.frozen {
if d.IsFrozen() {
panic("remove: deps is frozen")
}

Expand All @@ -214,15 +215,12 @@ func (d *Node[T]) RemoveDependency(dep *Node[T]) {
}

func (d *Node[T]) IsFrozen() bool {
d.m.Lock()
defer d.m.Unlock()

return d.frozen
return d.frozen.Load()
}

// Freeze assumes the lock is already held
func (d *Node[T]) Freeze() {
if d.frozen {
if d.frozen.Load() {
return
}

Expand All @@ -232,7 +230,7 @@ func (d *Node[T]) Freeze() {
}
}

d.frozen = true
d.frozen.Store(true)
}

func (d *Node[T]) DebugString() string {
Expand Down
2 changes: 1 addition & 1 deletion worker2/dep.go
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ func (a *baseDep) AddDep(deps ...Dep) {
}

func (a *baseDep) getNamed() map[string]Dep {
if !a.GetNode().frozen {
if !a.GetNode().IsFrozen() {
panic("not frozen")
}
return a.named
Expand Down

0 comments on commit bfd310b

Please sign in to comment.