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

Add thread asserts to StatsCollector.

Browse Source 
Also adding a "ForTest" postfix to a test-only method.

R=perkj@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/34489004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@7894 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
tommi@webrtc.org 2014-12-15 09:44:48 +00:00
parent 788acd17ad
commit 69bc5a300f
3 changed files with 23 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
talk/app/webrtc/statscollector.cc
View File

@ -357,11 +357,13 @@ StatsCollector::StatsCollector(WebRtcSession* session)
}
StatsCollector::~StatsCollector() {
ASSERT(session_->signaling_thread()->IsCurrent());
}
// Adds a MediaStream with tracks that can be used as a |selector| in a call
// to GetStats.
void StatsCollector::AddStream(MediaStreamInterface* stream) {
ASSERT(session_->signaling_thread()->IsCurrent());
ASSERT(stream != NULL);
CreateTrackReports<AudioTrackVector>(stream->GetAudioTracks(),
@ -372,6 +374,7 @@ void StatsCollector::AddStream(MediaStreamInterface* stream) {
void StatsCollector::AddLocalAudioTrack(AudioTrackInterface* audio_track,
uint32 ssrc) {
ASSERT(session_->signaling_thread()->IsCurrent());
ASSERT(audio_track != NULL);
for (LocalAudioTrackVector::iterator it = local_audio_tracks_.begin();
it != local_audio_tracks_.end(); ++it) {
@ -404,6 +407,7 @@ void StatsCollector::RemoveLocalAudioTrack(AudioTrackInterface* audio_track,
void StatsCollector::GetStats(MediaStreamTrackInterface* track,
StatsReports* reports) {
ASSERT(session_->signaling_thread()->IsCurrent());
ASSERT(reports != NULL);
ASSERT(reports->empty());
@ -446,6 +450,7 @@ void StatsCollector::GetStats(MediaStreamTrackInterface* track,
void
StatsCollector::UpdateStats(PeerConnectionInterface::StatsOutputLevel level) {
ASSERT(session_->signaling_thread()->IsCurrent());
double time_now = GetTimeNow();
// Calls to UpdateStats() that occur less than kMinGatherStatsPeriod number of
// ms apart will be ignored.
@ -467,6 +472,7 @@ StatsReport* StatsCollector::PrepareLocalReport(
uint32 ssrc,
const std::string& transport_id,
TrackDirection direction) {
ASSERT(session_->signaling_thread()->IsCurrent());
const std::string ssrc_id = rtc::ToString<uint32>(ssrc);
StatsReport* report = reports_.Find(
StatsId(StatsReport::kStatsReportTypeSsrc, ssrc_id, direction));
@ -510,6 +516,7 @@ StatsReport* StatsCollector::PrepareRemoteReport(
uint32 ssrc,
const std::string& transport_id,
TrackDirection direction) {
ASSERT(session_->signaling_thread()->IsCurrent());
const std::string ssrc_id = rtc::ToString<uint32>(ssrc);
StatsReport* report = reports_.Find(
StatsId(StatsReport::kStatsReportTypeRemoteSsrc, ssrc_id, direction));
@ -613,6 +620,7 @@ std::string StatsCollector::AddCertificateReports(
}
void StatsCollector::ExtractSessionInfo() {
ASSERT(session_->signaling_thread()->IsCurrent());
// Extract information from the base session.
StatsReport* report = reports_.ReplaceOrAddNew(
StatsId(StatsReport::kStatsReportTypeSession, session_->id()));
@ -721,6 +729,8 @@ void StatsCollector::ExtractSessionInfo() {
}
void StatsCollector::ExtractVoiceInfo() {
ASSERT(session_->signaling_thread()->IsCurrent());
if (!session_->voice_channel()) {
return;
}
@ -745,9 +755,11 @@ void StatsCollector::ExtractVoiceInfo() {
void StatsCollector::ExtractVideoInfo(
PeerConnectionInterface::StatsOutputLevel level) {
if (!session_->video_channel()) {
ASSERT(session_->signaling_thread()->IsCurrent());
if (!session_->video_channel())
return;
}
cricket::StatsOptions options;
options.include_received_propagation_stats =
(level >= PeerConnectionInterface::kStatsOutputLevelDebug) ?
@ -780,6 +792,7 @@ void StatsCollector::ExtractVideoInfo(
StatsReport* StatsCollector::GetReport(const std::string& type,
const std::string& id,
TrackDirection direction) {
ASSERT(session_->signaling_thread()->IsCurrent());
ASSERT(type == StatsReport::kStatsReportTypeSsrc ||
type == StatsReport::kStatsReportTypeRemoteSsrc);
return reports_.Find(StatsId(type, id, direction));
@ -788,6 +801,7 @@ StatsReport* StatsCollector::GetReport(const std::string& type,
StatsReport* StatsCollector::GetOrCreateReport(const std::string& type,
const std::string& id,
TrackDirection direction) {
ASSERT(session_->signaling_thread()->IsCurrent());
ASSERT(type == StatsReport::kStatsReportTypeSsrc ||
type == StatsReport::kStatsReportTypeRemoteSsrc);
StatsReport* report = GetReport(type, id, direction);
@ -802,6 +816,7 @@ StatsReport* StatsCollector::GetOrCreateReport(const std::string& type,
}
void StatsCollector::UpdateStatsFromExistingLocalAudioTracks() {
ASSERT(session_->signaling_thread()->IsCurrent());
// Loop through the existing local audio tracks.
for (LocalAudioTrackVector::const_iterator it = local_audio_tracks_.begin();
it != local_audio_tracks_.end(); ++it) {
@ -833,6 +848,7 @@ void StatsCollector::UpdateStatsFromExistingLocalAudioTracks() {
void StatsCollector::UpdateReportFromAudioTrack(AudioTrackInterface* track,
StatsReport* report) {
ASSERT(session_->signaling_thread()->IsCurrent());
ASSERT(track != NULL);
if (report == NULL)
return;
@ -867,6 +883,7 @@ void StatsCollector::UpdateReportFromAudioTrack(AudioTrackInterface* track,
bool StatsCollector::GetTrackIdBySsrc(uint32 ssrc, std::string* track_id,
TrackDirection direction) {
ASSERT(session_->signaling_thread()->IsCurrent());
if (direction == kSending) {
if (!session_->GetLocalTrackIdBySsrc(ssrc, track_id)) {
LOG(LS_WARNING) << "The SSRC " << ssrc
@ -885,7 +902,7 @@ bool StatsCollector::GetTrackIdBySsrc(uint32 ssrc, std::string* track_id,
return true;
}
void StatsCollector::ClearUpdateStatsCache() {
void StatsCollector::ClearUpdateStatsCacheForTest() {
stats_gathering_started_ = 0;
}

2
talk/app/webrtc/statscollector.h
View File

@ -90,7 +90,7 @@ class StatsCollector {
// Method used by the unittest to force a update of stats since UpdateStats()
// that occur less than kMinGatherStatsPeriod number of ms apart will be
// ignored.
void ClearUpdateStatsCache();
void ClearUpdateStatsCacheForTest();
private:
bool CopySelectedReports(const std::string& selector, StatsReports* reports);

4
talk/app/webrtc/statscollector_unittest.cc
View File

@ -535,7 +535,7 @@ class StatsCollectorTest : public testing::Test {
.WillOnce(DoAll(SetArgPointee<0>(*stats_read), Return(true)));
stats->UpdateStats(PeerConnectionInterface::kStatsOutputLevelStandard);
stats->ClearUpdateStatsCache();
stats->ClearUpdateStatsCacheForTest();
stats->GetStats(NULL, reports);
// Verify the existence of the track report.
@ -1451,7 +1451,7 @@ TEST_F(StatsCollectorTest, TwoLocalTracksWithSameSsrc) {
stream_->AddTrack(new_audio_track);
stats.AddLocalAudioTrack(new_audio_track, kSsrcOfTrack);
stats.ClearUpdateStatsCache();
stats.ClearUpdateStatsCacheForTest();
cricket::VoiceSenderInfo new_voice_sender_info;
InitVoiceSenderInfo(&new_voice_sender_info);
cricket::VoiceMediaInfo new_stats_read;