vbatts/pkg
1
0
Fork 0
Code Pull requests Releases Activity

Merge pull request #16226 from aaronlehmann/broadcaster-catch-up

Browse source 
Broadcaster writer goroutines must only finish when they are caught up
This commit is contained in:
Brian Goff 2015-09-10 22:55:44 -04:00
commit 3f268f7166
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
progressreader/broadcaster.go
View file

@ -77,6 +77,12 @@ func (broadcaster *Broadcaster) receiveWrites(observer io.Writer) {
broadcaster.Lock() broadcaster.Lock()
// If we are behind, we need to catch up instead of waiting
// or handling a closure.
if len(broadcaster.history) != n {
continue
}
// detect closure of the broadcast writer // detect closure of the broadcast writer
if broadcaster.closed() { if broadcaster.closed() {
broadcaster.Unlock() broadcaster.Unlock()
@ -84,9 +90,7 @@ func (broadcaster *Broadcaster) receiveWrites(observer io.Writer) {
return return
} }
if len(broadcaster.history) == n { broadcaster.cond.Wait()
broadcaster.cond.Wait()
}
// Mutex is still locked as the loop continues // Mutex is still locked as the loop continues
} }