From: Brad Fitzpatrick Date: Thu, 19 Jan 2012 00:49:59 +0000 (-0800) Subject: net: use NewTimer, not NewTicker, in fd_windows.go X-Git-Tag: weekly.2012-01-20~45 X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=98af38807e9bc240b83d1a0aa6985a2b4a9f9778;p=gostls13.git net: use NewTimer, not NewTicker, in fd_windows.go It works with NewTicker too, but is potentially a bit less efficient, and reads wrong. This is what happens when you TBR Windows changes, I guess. R=golang-dev, gri, iant CC=golang-dev https://golang.org/cl/5536060 --- diff --git a/src/pkg/net/fd_windows.go b/src/pkg/net/fd_windows.go index 9e799bde9f..637510b732 100644 --- a/src/pkg/net/fd_windows.go +++ b/src/pkg/net/fd_windows.go @@ -179,11 +179,11 @@ func (s *ioSrv) ExecIO(oi anOpIface, deadline int64) (n int, err error) { if dt < 1 { dt = 1 } - ticker := time.NewTicker(time.Duration(dt) * time.Nanosecond) - defer ticker.Stop() + timer := time.NewTimer(time.Duration(dt) * time.Nanosecond) + defer timer.Stop() select { case r = <-o.resultc: - case <-ticker.C: + case <-timer.C: s.canchan <- oi <-o.errnoc r = <-o.resultc