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

Added fixes to pass go vet

graph-rework-2
noah metz 2023-07-05 14:50:21 -06:00
parent a7f721e0cd
commit ff46af585d
3 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gql.go
Unescape Escape View File

@ -406,9 +406,8 @@ func LoadGQLThreadInfo(ctx * GraphContext, raw map[string]interface{}) (ThreadIn
} }
func LoadGQLThread(ctx * GraphContext, id NodeID) (GraphNode, error) { func LoadGQLThread(ctx * GraphContext, id NodeID) (GraphNode, error) {
thread := RestoreBaseThread(ctx, id, gql_actions, gql_handlers)
gql_thread := GQLThread{ gql_thread := GQLThread{
BaseThread: thread, BaseThread: RestoreBaseThread(ctx, id, gql_actions, gql_handlers),
http_server: nil, http_server: nil,
http_done: &sync.WaitGroup{}, http_done: &sync.WaitGroup{},
} }

10
graph.go
Unescape Escape View File

@ -450,7 +450,9 @@ func RestoreNode(ctx * GraphContext, id NodeID) BaseNode {
id: id, id: id,
signal: make(chan GraphSignal, NODE_SIGNAL_BUFFER), signal: make(chan GraphSignal, NODE_SIGNAL_BUFFER),
listeners: map[chan GraphSignal]chan GraphSignal{}, listeners: map[chan GraphSignal]chan GraphSignal{},
listeners_lock: &sync.Mutex{},
state: nil, state: nil,
state_lock: &sync.RWMutex{},
} }
ctx.Log.Logf("graph", "RESTORE_NODE: %s", node.id) ctx.Log.Logf("graph", "RESTORE_NODE: %s", node.id)
@ -485,7 +487,9 @@ func NewNode(ctx * GraphContext, state NodeState) (BaseNode, error) {
id: RandID(), id: RandID(),
signal: make(chan GraphSignal, NODE_SIGNAL_BUFFER), signal: make(chan GraphSignal, NODE_SIGNAL_BUFFER),
listeners: map[chan GraphSignal]chan GraphSignal{}, listeners: map[chan GraphSignal]chan GraphSignal{},
listeners_lock: &sync.Mutex{},
state: state, state: state,
state_lock: &sync.RWMutex{},
} }
err := WriteDBState(ctx, node.id, state) err := WriteDBState(ctx, node.id, state)
@ -503,11 +507,11 @@ type BaseNode struct {
id NodeID id NodeID
state NodeState state NodeState
state_lock sync.RWMutex state_lock *sync.RWMutex
signal chan GraphSignal signal chan GraphSignal
listeners_lock sync.Mutex listeners_lock *sync.Mutex
listeners map[chan GraphSignal]chan GraphSignal listeners map[chan GraphSignal]chan GraphSignal
} }
@ -520,7 +524,7 @@ func (node * BaseNode) State() NodeState {
} }
func (node * BaseNode) StateLock() * sync.RWMutex { func (node * BaseNode) StateLock() * sync.RWMutex {
return &node.state_lock return node.state_lock
} }
func ReadDBState(ctx * GraphContext, id NodeID) ([]byte, error) { func ReadDBState(ctx * GraphContext, id NodeID) ([]byte, error) {

7
thread.go
Unescape Escape View File

@ -123,6 +123,7 @@ func RestoreBaseThread(ctx * GraphContext, id NodeID, actions ThreadActions, han
BaseLockable: base_lockable, BaseLockable: base_lockable,
Actions: actions, Actions: actions,
Handlers: handlers, Handlers: handlers,
child_waits: &sync.WaitGroup{},
} }
return thread return thread
@ -540,11 +541,11 @@ type BaseThread struct {
Handlers ThreadHandlers Handlers ThreadHandlers
timeout_chan <-chan time.Time timeout_chan <-chan time.Time
child_waits sync.WaitGroup child_waits *sync.WaitGroup
} }
func (thread * BaseThread) ChildWaits() *sync.WaitGroup { func (thread * BaseThread) ChildWaits() *sync.WaitGroup {
return &thread.child_waits return thread.child_waits
} }
func (thread * BaseThread) CanLock(node GraphNode, state LockableState) error { func (thread * BaseThread) CanLock(node GraphNode, state LockableState) error {
@ -627,7 +628,6 @@ var ThreadWait = func(ctx * GraphContext, thread Thread) (string, error) {
return timeout_action, nil return timeout_action, nil
} }
} }
return "wait", nil
} }
var ThreadAbort = func(ctx * GraphContext, thread Thread, signal GraphSignal) (string, error) { var ThreadAbort = func(ctx * GraphContext, thread Thread, signal GraphSignal) (string, error) {
@ -688,6 +688,7 @@ func NewBaseThread(ctx * GraphContext, actions ThreadActions, handlers ThreadHan
BaseLockable: lockable, BaseLockable: lockable,
Actions: actions, Actions: actions,
Handlers: handlers, Handlers: handlers,
child_waits: &sync.WaitGroup{},
} }
return thread, nil return thread, nil