Merge pull request #286 from ZymoticB/td-fix-shutdown

Fix racy requester shutdown logic

runner/requester.go

@@ -353,10 +353,12 @@ func (b *Requester) runWorkers(wt load.WorkerTicker, p load.Pacer) error {
 
 	errC := make(chan error, b.config.c)
 	done := make(chan struct{})
+	workerTickerDone := make(chan struct{})
 	ticks := make(chan TickValue)
 	counter := Counter{}
 
 	go func() {
+		defer close(workerTickerDone)
 		n := 0
 		wc := 0
 		for tv := range wct {
@@ -424,13 +426,14 @@ func (b *Requester) runWorkers(wt load.WorkerTicker, p load.Pacer) error {
 				}
 				wm.Unlock()
 			}
+			if tv.Done {
+				return
+			}
 		}
 	}()
 
 	go func() {
 		defer close(ticks)
-		defer wt.Finish()
-
 		defer func() {
 			wm.Lock()
 			nw := len(b.workers)
@@ -440,6 +443,11 @@ func (b *Requester) runWorkers(wt load.WorkerTicker, p load.Pacer) error {
 			wm.Unlock()
 		}()
 
+		defer func() {
+			wt.Finish()
+			<-workerTickerDone
+		}()
+
 		began := time.Now()
 
 		for {