qbit/go
1
0
Fork 0
mirror of https://github.com/golang/go synced 2024-11-24 12:30:14 -07:00
Code Releases Activity

time: fix bug in Ticker: shutdown using channel rather than memory

Browse Source 
R=rsc
CC=golang-dev
https://golang.org/cl/3609042
This commit is contained in:
Rob Pike 2010-12-13 13:52:19 -08:00
parent 1b31c37428
commit 2ef09148a0
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/pkg/time/tick.go
View File

@ -14,13 +14,16 @@ type Ticker struct {
C <-chan int64 // The channel on which the ticks are delivered. C <-chan int64 // The channel on which the ticks are delivered.
c chan<- int64 // The same channel, but the end we use. c chan<- int64 // The same channel, but the end we use.
ns int64 ns int64
shutdown bool shutdown chan bool // Buffered channel used to signal shutdown.
nextTick int64 nextTick int64
next *Ticker next *Ticker
} }
// Stop turns off a ticker. After Stop, no more ticks will be sent. // Stop turns off a ticker. After Stop, no more ticks will be sent.
func (t *Ticker) Stop() { t.shutdown = true } func (t *Ticker) Stop() {
// Make it non-blocking so multiple Stops don't block.
_ = t.shutdown <- true
}
// Tick is a convenience wrapper for NewTicker providing access to the ticking // Tick is a convenience wrapper for NewTicker providing access to the ticking
// channel only. Useful for clients that have no need to shut down the ticker. // channel only. Useful for clients that have no need to shut down the ticker.
@ -116,7 +119,7 @@ func tickerLoop() {
// that need it and determining the next wake time. // that need it and determining the next wake time.
// TODO(r): list should be sorted in time order. // TODO(r): list should be sorted in time order.
for t := tickers; t != nil; t = t.next { for t := tickers; t != nil; t = t.next {
if t.shutdown { if _, ok := <-t.shutdown; ok {
// Ticker is done; remove it from list. // Ticker is done; remove it from list.
if prev == nil { if prev == nil {
tickers = t.next tickers = t.next
@ -166,7 +169,13 @@ func NewTicker(ns int64) *Ticker {
return nil return nil
} }
c := make(chan int64, 1) // See comment on send in tickerLoop c := make(chan int64, 1) // See comment on send in tickerLoop
t := &Ticker{c, c, ns, false, Nanoseconds() + ns, nil} t := &Ticker{
C: c,
c: c,
ns: ns,
shutdown: make(chan bool, 1),
nextTick: Nanoseconds() + ns,
}
onceStartTickerLoop.Do(startTickerLoop) onceStartTickerLoop.Do(startTickerLoop)
// must be run in background so global Tickers can be created // must be run in background so global Tickers can be created
go func() { newTicker <- t }() go func() { newTicker <- t }()