Avoid race in RampUpTest

webrtc/video/rampup_tests.cc

 /*
  *  Copyright (c) 2013 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 50 matching lines @@
       ssrcs_(GenerateSsrcs(num_streams, 100)),
       rtx_ssrcs_(GenerateSsrcs(num_streams, 200)),
       poller_thread_(ThreadWrapper::CreateThread(&BitrateStatsPollingThread,
                                                  this,
                                                  "BitrateStatsPollingThread")),
       sender_call_(nullptr) {
   if (rtx_) {
     for (size_t i = 0; i < ssrcs_.size(); ++i)
       rtx_ssrc_map_[rtx_ssrcs_[i]] = ssrcs_[i];
   }
-  poller_thread_->Start();
 }
 
 RampUpTester::~RampUpTester() {
   event_.Set();
-  poller_thread_->Stop();
 }
 
 Call::Config RampUpTester::GetSenderCallConfig() {
   Call::Config call_config;
   if (start_bitrate_bps_ != 0) {
     call_config.bitrate_config.start_bitrate_bps = start_bitrate_bps_;
   }
   call_config.bitrate_config.min_bitrate_bps = 10000;
   return call_config;
 }
@@ skipping 170 matching lines @@
   ReportResult("ramp-up-rtx-total-sent", rtx_total_sent, "bytes");
   ReportResult("ramp-up-rtx-media-sent", rtx_media_sent, "bytes");
   ReportResult("ramp-up-rtx-padding-sent", rtx_padding_sent, "bytes");
   if (ramp_up_finished_ms_ >= 0) {
     ReportResult("ramp-up-time", ramp_up_finished_ms_ - test_start_ms_,
                  "milliseconds");
   }
 }
 
 void RampUpTester::PerformTest() {
+  poller_thread_->Start();
   if (Wait() != kEventSignaled) {
     printf("Timed out while waiting for ramp-up to complete.");
     return;
   }
   TriggerTestDone();
+  poller_thread_->Stop();
 }
 
 RampUpDownUpTester::RampUpDownUpTester(size_t num_streams,
                                        unsigned int start_bitrate_bps,
                                        const std::string& extension_type,
                                        bool rtx,
                                        bool red)
     : RampUpTester(num_streams, start_bitrate_bps, extension_type, rtx, red),
       test_state_(kFirstRampup),
       state_start_ms_(clock_->TimeInMilliseconds()),
@@ skipping 209 matching lines @@
   RampUpTester test(3, 0, RtpExtension::kTransportSequenceNumber, true, true);
   RunBaseTest(&test);
 }
 
 TEST_F(RampUpTest, TransportSequenceNumberSingleStreamWithHighStartBitrate) {
   RampUpTester test(1, 0.9 * kSingleStreamTargetBps,
                     RtpExtension::kTransportSequenceNumber, false, false);
   RunBaseTest(&test);
 }
 }  // namespace webrtc