Skip to content

Fixing data race and potential dead-lock #44

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fixing data race and potential dead-lock #44

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 7 additions & 11 deletions manager.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,8 +97,8 @@ func NewAbstractManager(e *Engine) (*AbstractManager, error) {
}

func (a *AbstractManager) startMainLoop(preLoop func() error, receive func(r Reply) (UpdateStatus, error), preDestroy func()) {
errors := make(chan error)
preLoopFinished := make(chan bool)
preLoopError := make(chan error, 1) // 1 - to guarantee that preLoop won't hang on writing to the channel, if we exit the for/select loop earlier for some reason
preLoopFinished := make(chan struct{})

defer func() {
<-preLoopFinished // ensures preLoop goroutine has exited
Expand All @@ -110,21 +110,17 @@ func (a *AbstractManager) startMainLoop(preLoop func() error, receive func(r Rep

go a.eng.SubscribeState(a.engs)
go func() {
err := preLoop()
if err != nil {
errors <- err
}
close(errors)
errors = nil
preLoopFinished <- true
preLoopError <- preLoop()
close(preLoopFinished)
}()

for {
select {
case <-a.exit:
return
case e, ok := <-errors:
if ok {
case e := <-preLoopError:
preLoopError = nil // ignore listening on the channel
if e != nil {
a.err = e
return
}
Expand Down