From ca038062a7c4190a4193240ea187247085d6e5e8 Mon Sep 17 00:00:00 2001 From: Noah Metz Date: Sun, 18 Jun 2023 19:04:21 -0600 Subject: [PATCH] Exported event and resource fields --- event.go | 28 ++++++++++++++-------------- resource.go | 14 +++++++------- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/event.go b/event.go index 35f3016..de42f2d 100644 --- a/event.go +++ b/event.go @@ -26,9 +26,9 @@ func (event * BaseEvent) update(signal GraphSignal) { } } else { // Parent->Child - event.child_lock.Lock() - defer event.child_lock.Unlock() - for _, child := range(event.children) { + event.ChildrenSliceLock.Lock() + defer event.ChildrenSliceLock.Unlock() + for _, child := range(event.ChildrenSlice) { SendUpdate(child, signal) } } @@ -308,9 +308,9 @@ type BaseEvent struct { done_resource Resource rr_lock sync.Mutex required_resources []Resource - children []Event - child_info map[string]EventInfo - child_lock sync.Mutex + ChildrenSlice []Event + ChildInfoMap map[string]EventInfo + ChildrenSliceLock sync.Mutex actions map[string]func() (string, error) handlers map[string]func(GraphSignal) (string, error) parent Event @@ -349,8 +349,8 @@ func NewBaseEvent(name string, description string, required_resources []Resource event := BaseEvent{ BaseNode: NewBaseNode(name, description, randid()), parent: nil, - children: []Event{}, - child_info: map[string]EventInfo{}, + ChildrenSlice: []Event{}, + ChildInfoMap: map[string]EventInfo{}, done_resource: done_resource, required_resources: required_resources, actions: map[string]func()(string, error){}, @@ -510,11 +510,11 @@ func (event * BaseEvent) DoneResource() Resource { } func (event * BaseEvent) Children() []Event { - return event.children + return event.ChildrenSlice } func (event * BaseEvent) ChildInfo(idx Event) EventInfo { - val, ok := event.child_info[idx.ID()] + val, ok := event.ChildInfoMap[idx.ID()] if ok == false { return nil } @@ -522,11 +522,11 @@ func (event * BaseEvent) ChildInfo(idx Event) EventInfo { } func (event * BaseEvent) LockChildren() { - event.child_lock.Lock() + event.ChildrenSliceLock.Lock() } func (event * BaseEvent) UnlockChildren() { - event.child_lock.Unlock() + event.ChildrenSliceLock.Unlock() } func (event * BaseEvent) LockParent() { @@ -542,8 +542,8 @@ func (event * BaseEvent) setParent(parent Event) { } func (event * BaseEvent) addChild(child Event, info EventInfo) { - event.children = append(event.children, child) - event.child_info[child.ID()] = info + event.ChildrenSlice = append(event.ChildrenSlice, child) + event.ChildInfoMap[child.ID()] = info } type GQLEvent struct { diff --git a/resource.go b/resource.go index f1260ce..df0243c 100644 --- a/resource.go +++ b/resource.go @@ -25,9 +25,9 @@ func (resource * BaseResource) update(signal GraphSignal) { SendUpdate(resource.lock_holder, signal) } - resource.children_lock.Lock() - defer resource.children_lock.Unlock() - for _, child := range(resource.children) { + resource.ChildrenSliceLock.Lock() + defer resource.ChildrenSliceLock.Unlock() + for _, child := range(resource.ChildrenSlice) { SendUpdate(child, signal) } } @@ -150,8 +150,8 @@ type BaseResource struct { BaseNode parents []Resource parents_lock sync.Mutex - children []Resource - children_lock sync.Mutex + ChildrenSlice []Resource + ChildrenSliceLock sync.Mutex lock_holder GraphNode lock_holder_lock sync.Mutex state_lock sync.Mutex @@ -189,7 +189,7 @@ func (resource * BaseResource) unlock(node GraphNode) error { } func (resource * BaseResource) Children() []Resource { - return resource.children + return resource.ChildrenSlice } func (resource * BaseResource) Parents() []Resource { @@ -213,7 +213,7 @@ func NewBaseResource(name string, description string, children []Resource) BaseR resource := BaseResource{ BaseNode: NewBaseNode(name, description, randid()), parents: []Resource{}, - children: children, + ChildrenSlice: children, } return resource