fix race in test setup/teardown

not easily triggered, but it happened just now on a build server.
This commit is contained in:
Mechiel Lukkien
2023-08-07 23:14:31 +02:00
parent 849b4ec9e9
commit 49cf16d3f2
15 changed files with 29 additions and 36 deletions

View File

@ -101,7 +101,7 @@ type ChangeMailboxKeywords struct {
var switchboardBusy atomic.Bool
// Switchboard distributes changes to accounts to interested listeners. See Comm and Change.
func Switchboard() chan struct{} {
func Switchboard() (stop func()) {
regs := map[*Account]map[*Comm]struct{}{}
done := make(chan struct{})
@ -145,14 +145,18 @@ func Switchboard() chan struct{} {
chReq.done <- struct{}{}
case <-done:
if !switchboardBusy.CompareAndSwap(true, false) {
panic("switchboard already unregistered?")
}
done <- struct{}{}
return
}
}
}()
return done
return func() {
done <- struct{}{}
<-done
if !switchboardBusy.CompareAndSwap(true, false) {
panic("switchboard already unregistered?")
}
}
}
// Comm handles communication with the goroutine that maintains the