Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(14)

Side by Side Diff: webrtc/pc/rtcstats_integrationtest.cc

Issue 2710363003: Fix TSAN race in webrtc::voe::Channel (Closed)
Patch Set: EXCLUSIVE_LOCKS_REQUIRED used (and moved TODO to right function, whoops) Created 3 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | webrtc/voice_engine/channel.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright 2016 The WebRTC project authors. All Rights Reserved. 2 * Copyright 2016 The WebRTC project authors. All Rights Reserved.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license 4 * Use of this source code is governed by a BSD-style license
5 * that can be found in the LICENSE file in the root of the source 5 * that can be found in the LICENSE file in the root of the source
6 * tree. An additional intellectual property rights grant can be found 6 * tree. An additional intellectual property rights grant can be found
7 * in the file PATENTS. All contributing project authors may 7 * in the file PATENTS. All contributing project authors may
8 * be found in the AUTHORS file in the root of the source tree. 8 * be found in the AUTHORS file in the root of the source tree.
9 */ 9 */
10 10
(...skipping 598 matching lines...) Expand 10 before | Expand all | Expand 10 after
609 transport.local_certificate_id, RTCCertificateStats::kType); 609 transport.local_certificate_id, RTCCertificateStats::kType);
610 verifier.TestMemberIsIDReference( 610 verifier.TestMemberIsIDReference(
611 transport.remote_certificate_id, RTCCertificateStats::kType); 611 transport.remote_certificate_id, RTCCertificateStats::kType);
612 return verifier.ExpectAllMembersSuccessfullyTested(); 612 return verifier.ExpectAllMembersSuccessfullyTested();
613 } 613 }
614 614
615 private: 615 private:
616 rtc::scoped_refptr<const RTCStatsReport> report_; 616 rtc::scoped_refptr<const RTCStatsReport> report_;
617 }; 617 };
618 618
619 // Disabled on Tsan due to:
620 // https://bugs.chromium.org/p/webrtc/issues/detail?id=7231
621 #if !defined(THREAD_SANITIZER)
622 #ifdef HAVE_SCTP 619 #ifdef HAVE_SCTP
623 TEST_F(RTCStatsIntegrationTest, GetStatsFromCaller) { 620 TEST_F(RTCStatsIntegrationTest, GetStatsFromCaller) {
624 StartCall(); 621 StartCall();
625 622
626 rtc::scoped_refptr<const RTCStatsReport> report = GetStatsFromCaller(); 623 rtc::scoped_refptr<const RTCStatsReport> report = GetStatsFromCaller();
627 RTCStatsReportVerifier(report.get()).VerifyReport(); 624 RTCStatsReportVerifier(report.get()).VerifyReport();
628 } 625 }
629 626
630 TEST_F(RTCStatsIntegrationTest, GetStatsFromCallee) { 627 TEST_F(RTCStatsIntegrationTest, GetStatsFromCallee) {
631 StartCall(); 628 StartCall();
632 629
633 rtc::scoped_refptr<const RTCStatsReport> report = GetStatsFromCallee(); 630 rtc::scoped_refptr<const RTCStatsReport> report = GetStatsFromCallee();
634 RTCStatsReportVerifier(report.get()).VerifyReport(); 631 RTCStatsReportVerifier(report.get()).VerifyReport();
635 } 632 }
636 633
637 TEST_F(RTCStatsIntegrationTest, GetsStatsWhileDestroyingPeerConnections) { 634 TEST_F(RTCStatsIntegrationTest, GetsStatsWhileDestroyingPeerConnections) {
638 StartCall(); 635 StartCall();
639 636
640 rtc::scoped_refptr<RTCStatsObtainer> stats_obtainer = 637 rtc::scoped_refptr<RTCStatsObtainer> stats_obtainer =
641 RTCStatsObtainer::Create(); 638 RTCStatsObtainer::Create();
642 caller_->pc()->GetStats(stats_obtainer); 639 caller_->pc()->GetStats(stats_obtainer);
643 // This will destroy the peer connection. 640 // This will destroy the peer connection.
644 caller_ = nullptr; 641 caller_ = nullptr;
645 // Any pending stats requests should have completed in the act of destroying 642 // Any pending stats requests should have completed in the act of destroying
646 // the peer connection. 643 // the peer connection.
647 EXPECT_TRUE(stats_obtainer->report()); 644 EXPECT_TRUE(stats_obtainer->report());
648 } 645 }
649 #endif // HAVE_SCTP 646 #endif // HAVE_SCTP
650 #endif // !defined(THREAD_SANITIZER)
651 647
652 } // namespace 648 } // namespace
653 649
654 } // namespace webrtc 650 } // namespace webrtc
OLDNEW
« no previous file with comments | « no previous file | webrtc/voice_engine/channel.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698