fix: add lock to terminate handler

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

View File

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

View File

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