gr1ffon/quic-go
1
0
Fork 0
forked from quic-go/quic-go
Code Pull Requests Activity

don't set a timer when the deadline is the zero value

Browse Source
This commit is contained in:
Marten Seemann
2018-12-16 21:04:39 +06:30
parent 072b84870c
commit 516b427d46
2 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
internal/utils/timer.go
View File

@@ -34,7 +34,9 @@ func (t *Timer) Reset(deadline time.Time) {
if !t.t.Stop() && !t.read { if !t.t.Stop() && !t.read {
<-t.t.C <-t.t.C
} }
t.t.Reset(time.Until(deadline)) if !deadline.IsZero() {
t.t.Reset(time.Until(deadline))
}
t.read = false t.read = false
t.deadline = deadline t.deadline = deadline

6
internal/utils/timer_test.go
View File

@@ -54,6 +54,12 @@ var _ = Describe("Timer", func() {
Eventually(t.Chan()).Should(Receive()) Eventually(t.Chan()).Should(Receive())
}) })
It("doesn't set a timer if the deadline is the zero value", func() {
t := NewTimer()
t.Reset(time.Time{})
Consistently(t.Chan()).ShouldNot(Receive())
})
It("fires the timer twice, if reset to the same deadline", func() { It("fires the timer twice, if reset to the same deadline", func() {
deadline := time.Now().Add(-time.Millisecond) deadline := time.Now().Add(-time.Millisecond)
t := NewTimer() t := NewTimer()