Finish all timers when stopping Wheel

timers/timers.go

@@ -117,6 +117,8 @@ func (w *Wheel) Stop() {
 		w.ticker.Stop()
 		close(w.stop)
 		<-w.stopped
+		todo := w.gatherTimers(0, uint64(len(w.buckets)))
+		w.fire(todo)
 	})
 }
 
@@ -155,13 +157,17 @@ func (w *Wheel) tick() {
 
 func (w *Wheel) work() {
 	for batch := range w.fired {
-		for t := batch; t != nil; t = t.next {
-			t.f()
-		}
+		w.fire(batch)
 	}
 	close(w.stopped)
 }
 
+func (w *Wheel) fire(batch *Timer) {
+	for t := batch; t != nil; t = t.next {
+		t.f()
+	}
+}
+
 func (w *Wheel) gatherTimers(startTick, endTick uint64) *Timer {
 	var todo *Timer
 	for tick := startTick; tick < endTick; tick++ {

timers/timers_test.go

@@ -92,6 +92,21 @@ func TestTimerDroppingTicks(t *testing.T) {
 	wg.Wait()
 }
 
+func TestTimerClearAfterStop(t *testing.T) {
+	const numTimers = 100
+	w, _ := fakeWheel(1 * time.Millisecond)
+
+	var wg sync.WaitGroup
+	wg.Add(numTimers)
+	timeouts := randomTimeouts(numTimers, 100*time.Millisecond)
+	for _, d := range timeouts {
+		w.AfterFunc(d, func() { wg.Done() })
+	}
+
+	w.Stop()
+	wg.Wait()
+}
+
 func TestPowersOfTwo(t *testing.T) {
 	tests := []struct {
 		in       int