From 33586c83b1ea506400d0d9d862c5db4e57c656a6 Mon Sep 17 00:00:00 2001 From: "andresp@webrtc.org" Date: Wed, 2 Jul 2014 14:19:05 +0000 Subject: [PATCH] Make deadlock suppressions less generic. Previously they were enabled on all webrtc and talk primitives directly when TSAN config changed to enable deadlock detections. BUG=3509 R=kjellander@webrtc.org Review URL: https://webrtc-codereview.appspot.com/18679004 git-svn-id: http://webrtc.googlecode.com/svn/trunk@6583 4adac7df-926f-26a2-2b94-8c16560cd09d --- webrtc/build/tsan_suppressions.cc | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/webrtc/build/tsan_suppressions.cc b/webrtc/build/tsan_suppressions.cc index e3321d577d..4002d3c2ff 100644 --- a/webrtc/build/tsan_suppressions.cc +++ b/webrtc/build/tsan_suppressions.cc @@ -59,13 +59,21 @@ char kTSanDefaultSuppressions[] = // Potential deadlocks detected after roll in r6516. // https://code.google.com/p/webrtc/issues/detail?id=3509 -"deadlock:talk/base/criticalsection.h\n" -"deadlock:talk/base/sigslot.h\n" -"deadlock:webrtc/system_wrappers/source/critical_section_posix.cc\n" -"deadlock:webrtc/system_wrappers/source/rw_lock_posix.cc\n" -"deadlock:webrtc/system_wrappers/source/thread_posix.cc\n" - - +"deadlock:cricket::WebRtcVideoChannel2::WebRtcVideoSendStream::InputFrame\n" +"deadlock:cricket::WebRtcVideoChannel2::WebRtcVideoSendStream::SetCapturer\n" +"deadlock:talk_base::AsyncResolver::~AsyncResolver\n" +"deadlock:webrtc::ProcessThreadImpl::RegisterModule\n" +"deadlock:webrtc::RTCPReceiver::SetSsrcs\n" +"deadlock:webrtc::RTPSenderAudio::RegisterAudioPayload\n" +"deadlock:webrtc/system_wrappers/source/logging_unittest.cc\n" +"deadlock:webrtc::test::UdpSocketManagerPosixImpl::RemoveSocket\n" +"deadlock:webrtc::vcm::VideoReceiver::RegisterPacketRequestCallback\n" +"deadlock:webrtc::VideoSendStreamTest_SuspendBelowMinBitrate_Test::TestBody\n" +"deadlock:webrtc::ViECaptureImpl::ConnectCaptureDevice\n" +"deadlock:webrtc::ViEChannel::StartSend\n" +"deadlock:webrtc::ViECodecImpl::GetSendSideDelay\n" +"deadlock:webrtc::ViEEncoder::OnLocalSsrcChanged\n" +"deadlock:webrtc::ViESender::RegisterSendTransport\n" // From Chromium's tsan_suppressions.cc file.