certusone
/
tendermint
mirror of https://github.com/certusone/tendermint.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

cmn: fix race

This commit is contained in:
Ethan Buchman 2017-12-21 14:21:15 -05:00
parent b0b740210c
commit e2d7f1aa41
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
common/repeat_timer.go
View File

@ -102,14 +102,14 @@ func NewRepeatTimerWithTicker(name string, ticker Ticker) *RepeatTimer {
name: name,
}
t.wg.Add(1)
go t.fireRoutine(t.ticker)
go t.fireRoutine(t.ticker.Chan())
return t
}
func (t *RepeatTimer) fireRoutine(ticker Ticker) {
func (t *RepeatTimer) fireRoutine(ch <-chan time.Time) {
for {
select {
case t_ := <-ticker.Chan():
case t_ := <-ch:
t.Ch <- t_
case <-t.quit:
// needed so we know when we can reset t.quit
@ -129,7 +129,7 @@ func (t *RepeatTimer) Reset() {
t.ticker.Reset()
t.quit = make(chan struct{})
t.wg.Add(1)
go t.fireRoutine(t.ticker)
go t.fireRoutine(t.ticker.Chan())
}
// For ease of .Stop()'ing services before .Start()'ing them,