pub/grawt
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: add lock to terminate handler

Browse Source
This commit is contained in:
jar3b 2020-08-13 15:26:57 +03:00
parent 9eec782920
commit ed59ea1d0a
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
close_handler.go
View File

@ -1,6 +1,9 @@
package grawt package grawt
import "sync"
type CloseHandler struct { type CloseHandler struct {
sync.Mutex
waiter *Waiter waiter *Waiter
Quit chan struct{} Quit chan struct{}
active bool active bool

12
waiter.go
View File

@ -16,11 +16,11 @@ type Waiter struct {
func (w *Waiter) addHandler(f *func(), autoDone bool) *CloseHandler { func (w *Waiter) addHandler(f *func(), autoDone bool) *CloseHandler {
ch := CloseHandler{ ch := CloseHandler{
w, waiter: w,
make(chan struct{}, 1), Quit: make(chan struct{}, 1),
true, active: true,
autoDone, autoDone: autoDone,
f, handlerFunc: f,
} }
w.waitGroup.Add(1) w.waitGroup.Add(1)
w.closeHandlers = append(w.closeHandlers, &ch) w.closeHandlers = append(w.closeHandlers, &ch)
@ -32,6 +32,7 @@ func (w *Waiter) terminateHandler(h *CloseHandler, forceWaitGroupDone bool) {
if h.handlerFunc != nil && *h.handlerFunc != nil { if h.handlerFunc != nil && *h.handlerFunc != nil {
(*h.handlerFunc)() (*h.handlerFunc)()
} }
h.Lock()
if h.active { if h.active {
close(h.Quit) close(h.Quit)
} }
@ -39,6 +40,7 @@ func (w *Waiter) terminateHandler(h *CloseHandler, forceWaitGroupDone bool) {
w.waitGroup.Done() w.waitGroup.Done()
} }
h.active = false h.active = false
h.Unlock()
} }
func (w *Waiter) AddCloseHandler(f func(), waitForChannel bool) *CloseHandler { func (w *Waiter) AddCloseHandler(f func(), waitForChannel bool) *CloseHandler {