MetzNet
/
graphvent
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Renamed delegation_map to locks_held

graph-rework-2
noah metz 2023-06-26 23:18:54 -06:00
parent 856867fb10
commit 1ce98e2719
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
lockable.go
Unescape Escape View File

@ -32,25 +32,25 @@ type LockableState interface {
} }
type BaseLockHolderState struct { type BaseLockHolderState struct {
delegation_map map[NodeID] GraphNode locks_held map[NodeID] GraphNode
} }
type BaseLockHolderStateJSON struct { type BaseLockHolderStateJSON struct {
Delegations map[NodeID]*NodeID `json:"delegations"` LocksHeld map[NodeID]*NodeID `json:"locks_held"`
} }
func (state * BaseLockHolderState) MarshalJSON() ([]byte, error) { func (state * BaseLockHolderState) MarshalJSON() ([]byte, error) {
delegations := map[NodeID]*NodeID{} locks_held := map[NodeID]*NodeID{}
for lockable_id, node := range(state.delegation_map) { for lockable_id, node := range(state.locks_held) {
if node == nil { if node == nil {
delegations[lockable_id] = nil locks_held[lockable_id] = nil
} else { } else {
str := node.ID() str := node.ID()
delegations[lockable_id] = &str locks_held[lockable_id] = &str
} }
} }
return json.Marshal(&BaseLockHolderStateJSON{ return json.Marshal(&BaseLockHolderStateJSON{
Delegations: delegations, LocksHeld: locks_held,
}) })
} }
@ -105,17 +105,17 @@ func (state * BaseLockableState) Name() string {
// Locks cannot be passed between base lockables, so the answer to // Locks cannot be passed between base lockables, so the answer to
// "who used to own this lock held by a base lockable" is always "nobody" // "who used to own this lock held by a base lockable" is always "nobody"
func (state * BaseLockHolderState) ReturnLock(lockable_id NodeID) GraphNode { func (state * BaseLockHolderState) ReturnLock(lockable_id NodeID) GraphNode {
node, exists := state.delegation_map[lockable_id] node, exists := state.locks_held[lockable_id]
if exists == false { if exists == false {
panic("Attempted to take a get the original lock holder of a lockable we don't own") panic("Attempted to take a get the original lock holder of a lockable we don't own")
} }
delete(state.delegation_map, lockable_id) delete(state.locks_held, lockable_id)
return node return node
} }
// Nothing can take a lock from a base lockable either // Nothing can take a lock from a base lockable either
func (state * BaseLockHolderState) AllowedToTakeLock(node_id NodeID, lockable_id NodeID) bool { func (state * BaseLockHolderState) AllowedToTakeLock(node_id NodeID, lockable_id NodeID) bool {
_, exists := state.delegation_map[lockable_id] _, exists := state.locks_held[lockable_id]
if exists == false { if exists == false {
panic ("Trying to give away lock we don't own") panic ("Trying to give away lock we don't own")
} }
@ -123,12 +123,12 @@ func (state * BaseLockHolderState) AllowedToTakeLock(node_id NodeID, lockable_id
} }
func (state * BaseLockHolderState) RecordLockHolder(lockable_id NodeID, lock_holder GraphNode) { func (state * BaseLockHolderState) RecordLockHolder(lockable_id NodeID, lock_holder GraphNode) {
_, exists := state.delegation_map[lockable_id] _, exists := state.locks_held[lockable_id]
if exists == true { if exists == true {
panic("Attempted to lock a lockable we're already holding(lock cycle)") panic("Attempted to lock a lockable we're already holding(lock cycle)")
} }
state.delegation_map[lockable_id] = lock_holder state.locks_held[lockable_id] = lock_holder
} }
func (state * BaseLockableState) Owner() GraphNode { func (state * BaseLockableState) Owner() GraphNode {
@ -164,7 +164,7 @@ func (state * BaseLockableState) AddDependency(dependency Lockable) {
func NewLockHolderState() BaseLockHolderState { func NewLockHolderState() BaseLockHolderState {
return BaseLockHolderState{ return BaseLockHolderState{
delegation_map: map[NodeID]GraphNode{}, locks_held: map[NodeID]GraphNode{},
} }
} }