diff options
Diffstat (limited to 'libgo/go/time/tick.go')
| -rw-r--r-- | libgo/go/time/tick.go | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/libgo/go/time/tick.go b/libgo/go/time/tick.go index ddd72727027..6c21bf19b92 100644 --- a/libgo/go/time/tick.go +++ b/libgo/go/time/tick.go @@ -22,8 +22,12 @@ type Ticker struct { // Stop turns off a ticker. After Stop, no more ticks will be sent. func (t *Ticker) Stop() { - // Make it non-blocking so multiple Stops don't block. - _ = t.shutdown <- true + select { + case t.shutdown <- true: + // ok + default: + // Stop in progress already + } } // Tick is a convenience wrapper for NewTicker providing access to the ticking @@ -106,7 +110,8 @@ func tickerLoop() { // that need it and determining the next wake time. // TODO(r): list should be sorted in time order. for t := tickers; t != nil; t = t.next { - if _, ok := <-t.shutdown; ok { + select { + case <-t.shutdown: // Ticker is done; remove it from list. if prev == nil { tickers = t.next @@ -114,6 +119,7 @@ func tickerLoop() { prev.next = t.next } continue + default: } if t.nextTick <= now { if len(t.c) == 0 { |