even more locks

livepeer · Mar 3, 2020 · c95d781 · c95d781
1 parent 6057717
commit c95d781
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/cmd/testdriver/testdriver.go b/cmd/testdriver/testdriver.go
@@ -101,7 +101,7 @@ func main() {
 		*numStreamsStep,
 		sc,
 		func(s string, r *testdriver.Result) {
-			messenger.SendMessage(fmt.Sprintf("%s rtmp host: %s:%d / media port: %d using streamtester host: %s:%d - now testing %d concurrent streams with %d profiles",
+			messenger.SendMessage(fmt.Sprintf("%s rtmp host: %s:%d / media port: %d using streamtester host: %s:%d - now testing **%d** concurrent streams with %d profiles",
 				s, *ingestHost, *rtmpPort, *mediaPort, *streamTesterHost, *streamTesterPort, r.NumStreams, r.NumProfiles))
 		},
 	)

diff --git a/internal/testers/streamer.go b/internal/testers/streamer.go
@@ -185,6 +185,7 @@ func (sr *streamer) startStreams(baseManfistID, sourceFileName string, repeatNum
 			glog.Infof("RTMP: %s", rtmpURL)
 			glog.Infof("MEDIA: %s", mediaURL)
 			if sr.mistMode {
+				time.Sleep(50 * time.Millisecond)
 				messenger.SendMessage(mediaURL)
 			}
 			var bar *uiprogress.Bar
@@ -368,6 +369,7 @@ func (sr *streamer) Stats(basedManifestID string) (*model.Stats, error) {
 				md.mu.Unlock()
 			}
 		}
+		mt.mu.RLock()
 		// find skipped keyframes number
 		skipSourceSegments := 0
 		var sourceTimes []time.Duration
@@ -418,6 +420,7 @@ func (sr *streamer) Stats(basedManifestID string) (*model.Stats, error) {
 			// glog.Infoln("\n" + strings.Join(dl.downloadedSegments, "\n"))
 			dl.mu.Unlock()
 		}
+		mt.mu.RUnlock()
 		stats.DownloadedSourceSegments -= skipSourceSegments
 		if sr.mistMode && stats.DownloadedSourceSegments > 0 {
 			stats.DownloadedSourceSegments--