admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove use-after-free when quality tests stall.

Browse Source 
Reduces TSan warnings when running screenshare FullStack tests.

BUG=
R=sprang@webrtc.org

Review URL: https://codereview.webrtc.org/1601033004 .

Cr-Commit-Position: refs/heads/master@{#11305}
This commit is contained in:
Peter Boström 2016-01-19 15:22:32 +01:00
parent 8a2c31d208
commit dd45eb6801
1 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
webrtc/video/video_quality_test.cc
View File

@ -73,7 +73,7 @@ class VideoAnalyzer : public PacketReceiver,
avg_ssim_threshold_(avg_ssim_threshold),
stats_polling_thread_(&PollStatsThread, this, "StatsPoller"),
comparison_available_event_(false, false),
done_(false, false) {
done_(true, false) {
// Create thread pool for CPU-expensive PSNR/SSIM calculations.
// Try to use about as many threads as cores, but leave kMinCoresLeft alone,
@ -243,18 +243,18 @@ class VideoAnalyzer : public PacketReceiver,
last_frames_processed = frames_processed;
continue;
}
ASSERT_GT(frames_processed, last_frames_processed)
<< "Analyzer stalled while waiting for test to finish.";
if (frames_processed == last_frames_processed) {
EXPECT_GT(frames_processed, last_frames_processed)
<< "Analyzer stalled while waiting for test to finish.";
done_.Set();
break;
}
last_frames_processed = frames_processed;
}
if (iteration > 0)
printf("- Farewell, sweet Concorde!\n");
// Signal stats polling thread if that is still waiting and stop it now,
// since it uses the send_stream_ reference that might be reclaimed after
// returning from this method.
done_.Set();
stats_polling_thread_.Stop();
}
@ -359,12 +359,8 @@ class VideoAnalyzer : public PacketReceiver,
}
bool PollStats() {
if (done_.Wait(kSendStatsPollingIntervalMs)) {
// Set event again to make sure main thread is also signaled, then we're
// done.
done_.Set();
if (done_.Wait(kSendStatsPollingIntervalMs))
return false;
}
VideoSendStream::Stats stats = send_stream_->GetStats();