From 767d98ebff59d23833c7f1998ecc97cbd938a6e9 Mon Sep 17 00:00:00 2001 From: "kjellander@webrtc.org" Date: Fri, 27 Jun 2014 09:18:51 +0000 Subject: [PATCH] TSan: Move suppressions to source file. Chromium has deprecated text-file based suppressions for TSan (v2) and is about to remove the support for it in the test toolchain in https://codereview.chromium.org/357673002/ This CL moves our suppressions to a source file (based on the Chromium copy). It also moves the sanitizer_options.gyp into webrtc/build. BUG=chromium:302040 TEST=Locally executing all the standalone tests under TSan v2. R=niklas.enbom@webrtc.org, pbos@webrtc.org Review URL: https://webrtc-codereview.appspot.com/14759004 git-svn-id: http://webrtc.googlecode.com/svn/trunk@6552 4adac7df-926f-26a2-2b94-8c16560cd09d --- DEPS | 3 - .../valgrind-webrtc/tsan_v2/suppressions.txt | 46 ----- webrtc/build/OWNERS | 9 +- webrtc/{ => build}/sanitizer_options.gyp | 2 +- webrtc/build/tsan_suppressions.cc | 169 ++++++++++++++++++ webrtc/supplement.gypi | 2 +- 6 files changed, 176 insertions(+), 55 deletions(-) delete mode 100644 tools/valgrind-webrtc/tsan_v2/suppressions.txt rename webrtc/{ => build}/sanitizer_options.gyp (96%) create mode 100644 webrtc/build/tsan_suppressions.cc diff --git a/DEPS b/DEPS index d742374b4..7d53a10e5 100644 --- a/DEPS +++ b/DEPS @@ -152,9 +152,6 @@ deps = { "tools/swarming_client": From("chromium_deps", "src/tools/swarming_client"), - "tools/tsan_suppressions": - File(Var("chromium_trunk") + "/src/base/debug/tsan_suppressions.cc@" + Var("chromium_revision")), - "tools/valgrind": Var("chromium_trunk") + "/src/tools/valgrind@" + Var("chromium_revision"), diff --git a/tools/valgrind-webrtc/tsan_v2/suppressions.txt b/tools/valgrind-webrtc/tsan_v2/suppressions.txt deleted file mode 100644 index e783cd301..000000000 --- a/tools/valgrind-webrtc/tsan_v2/suppressions.txt +++ /dev/null @@ -1,46 +0,0 @@ -# False positive in system wrappers. -# See https://code.google.com/p/webrtc/issues/detail?id=300 for details. -race:webrtc/system_wrappers/source/thread_posix.cc - -# Audio processing -# See https://code.google.com/p/webrtc/issues/detail?id=2521 for details. -race:webrtc/modules/audio_processing/aec/aec_core.c -race:webrtc/modules/audio_processing/aec/aec_rdft.c - -# Video coding -# See https://code.google.com/p/webrtc/issues/detail?id=2484 for details. -# race:webrtc/modules/video_coding/codecs/vp8/vp8_impl.cc - -# libjingle_p2p_unittest -# See https://code.google.com/p/webrtc/issues/detail?id=2079 -race:webrtc/base/messagequeue.cc -race:webrtc/base/testclient.cc -race:webrtc/base/virtualsocketserver.cc -race:talk/base/messagequeue.cc -race:talk/base/testclient.cc -race:talk/base/virtualsocketserver.cc -race:talk/p2p/base/stunserver_unittest.cc - -# libjingle_unittest -# See https://code.google.com/p/webrtc/issues/detail?id=2080 -race:webrtc/base/logging.cc -race:webrtc/base/sharedexclusivelock_unittest.cc -race:webrtc/base/signalthread_unittest.cc -race:webrtc/base/thread.cc -race:talk/base/logging.cc -race:talk/base/sharedexclusivelock_unittest.cc -race:talk/base/signalthread_unittest.cc -race:talk/base/thread.cc - -# third_party/usrsctp -# TODO(jiayl): https://code.google.com/p/webrtc/issues/detail?id=3492 -race:third_party/usrsctp/usrsctplib/user_sctp_timer_iterate.c - -# Potential deadlocks detected after roll in r6516. -# https://code.google.com/p/webrtc/issues/detail?id=3509 -deadlock:talk/base/criticalsection.h -deadlock:talk/base/sigslot.h -deadlock:webrtc/system_wrappers/source/critical_section_posix.cc -deadlock:webrtc/system_wrappers/source/rw_lock_posix.cc -deadlock:webrtc/system_wrappers/source/thread_posix.cc - diff --git a/webrtc/build/OWNERS b/webrtc/build/OWNERS index 2978427ca..6f02741d3 100644 --- a/webrtc/build/OWNERS +++ b/webrtc/build/OWNERS @@ -1,7 +1,8 @@ -fischman@webrtc.org -kjellander@webrtc.org -wu@webrtc.org - +fischman@webrtc.org +kjellander@webrtc.org +wu@webrtc.org + +per-file tsan_suppressions.cc=* # These are for the common case of adding or renaming files. If you're doing # structural changes, please get a review from a reviewer in this file. diff --git a/webrtc/sanitizer_options.gyp b/webrtc/build/sanitizer_options.gyp similarity index 96% rename from webrtc/sanitizer_options.gyp rename to webrtc/build/sanitizer_options.gyp index ece9dc920..32dcf361b 100644 --- a/webrtc/sanitizer_options.gyp +++ b/webrtc/build/sanitizer_options.gyp @@ -39,7 +39,7 @@ }], ['tsan==1', { 'sources': [ - '<(DEPTH)/tools/tsan_suppressions/tsan_suppressions.cc', + 'tsan_suppressions.cc', ], }], ], diff --git a/webrtc/build/tsan_suppressions.cc b/webrtc/build/tsan_suppressions.cc new file mode 100644 index 000000000..e3321d577 --- /dev/null +++ b/webrtc/build/tsan_suppressions.cc @@ -0,0 +1,169 @@ +/* + * Copyright (c) 2014 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. + */ + +// This file contains the WebRTC suppressions for ThreadSanitizer. +// Please refer to +// http://dev.chromium.org/developers/testing/threadsanitizer-tsan-v2 +// for more info. + +#if defined(THREAD_SANITIZER) + +// Please make sure the code below declares a single string variable +// kTSanDefaultSuppressions contains TSan suppressions delimited by newlines. +// See http://dev.chromium.org/developers/testing/threadsanitizer-tsan-v2 +// for the instructions on writing suppressions. +char kTSanDefaultSuppressions[] = + +// WebRTC specific suppressions. + +// False positive in system wrappers. +// https://code.google.com/p/webrtc/issues/detail?id=300 +"race:webrtc/system_wrappers/source/thread_posix.cc\n" + +// Audio processing +// https://code.google.com/p/webrtc/issues/detail?id=2521 for details. +"race:webrtc/modules/audio_processing/aec/aec_core.c\n" +"race:webrtc/modules/audio_processing/aec/aec_rdft.c\n" + +// libjingle_p2p_unittest +// https://code.google.com/p/webrtc/issues/detail?id=2079 +"race:webrtc/base/messagequeue.cc\n" +"race:webrtc/base/testclient.cc\n" +"race:webrtc/base/virtualsocketserver.cc\n" +"race:talk/base/messagequeue.cc\n" +"race:talk/base/testclient.cc\n" +"race:talk/base/virtualsocketserver.cc\n" +"race:talk/p2p/base/stunserver_unittest.cc\n" + +// libjingle_unittest +// https://code.google.com/p/webrtc/issues/detail?id=2080 +"race:webrtc/base/logging.cc\n" +"race:webrtc/base/sharedexclusivelock_unittest.cc\n" +"race:webrtc/base/signalthread_unittest.cc\n" +"race:webrtc/base/thread.cc\n" +"race:talk/base/logging.cc\n" +"race:talk/base/sharedexclusivelock_unittest.cc\n" +"race:talk/base/signalthread_unittest.cc\n" +"race:talk/base/thread.cc\n" + +// third_party/usrsctp +// TODO(jiayl): https://code.google.com/p/webrtc/issues/detail?id=3492 +"race:third_party/usrsctp/usrsctplib/user_sctp_timer_iterate.c\n" + +// 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" + + + +// From Chromium's tsan_suppressions.cc file. + +// False positives in libglib.so. Since we don't instrument them, we cannot +// reason about the synchronization in them. +"race:libglib*.so\n" + +// Races in libevent, http://crbug.com/23244. +"race:libevent/event.c\n" + +// http://crbug.com/84094. +"race:sqlite3StatusSet\n" +"race:pcache1EnforceMaxPage\n" +"race:pcache1AllocPage\n" + +// http://crbug.com/157586 +"race:third_party/libvpx/source/libvpx/vp8/decoder/threading.c\n" + +// http://crbug.com/158922 +"race:third_party/libvpx/source/libvpx/vp8/encoder/*\n" + +// http://crbug.com/223352 +"race:uprv_malloc_46\n" +"race:uprv_realloc_46\n" + +// http://crbug.com/244385 +"race:unixTempFileDir\n" + +// http://crbug.com/244774 +"race:webrtc::RTPReceiver::ProcessBitrate\n" +"race:webrtc::RTPSender::ProcessBitrate\n" +"race:webrtc::VideoCodingModuleImpl::Decode\n" +"race:webrtc::RTPSender::SendOutgoingData\n" +"race:webrtc::VP8EncoderImpl::GetEncodedPartitions\n" +"race:webrtc::VP8EncoderImpl::Encode\n" +"race:webrtc::ViEEncoder::DeliverFrame\n" +"race:webrtc::vcm::VideoReceiver::Decode\n" +"race:webrtc::VCMReceiver::FrameForDecoding\n" +"race:*trace_event_unique_catstatic*\n" + +// http://crbug.com/244856 +"race:AutoPulseLock\n" + +// http://crbug.com/246968 +"race:webrtc::VideoCodingModuleImpl::RegisterPacketRequestCallback\n" + +// http://crbug.com/246970 +"race:webrtc::EventPosix::StartTimer\n" + +// http://crbug.com/258479 +"race:SamplingStateScope\n" +"race:g_trace_state\n" + +// http://crbug.com/270037 +"race:gLibCleanupFunctions\n" + +// http://crbug.com/272987 +"race:webrtc::MediaStreamTrack::set_enabled\n" + +// http://crbug.com/345245 +"race:jingle_glue::JingleThreadWrapper::~JingleThreadWrapper\n" +"race:webrtc::voe::Channel::UpdatePacketDelay\n" +"race:webrtc::voe::Channel::GetDelayEstimate\n" +"race:webrtc::VCMCodecDataBase::DeregisterReceiveCodec\n" +"race:webrtc::GainControlImpl::set_stream_analog_level\n" + +// http://crbug.com/347538 +"race:sctp_timer_start\n" + +// http://crbug.com/347548 +"race:cricket::WebRtcVideoMediaChannel::MaybeResetVieSendCodec\n" +"race:cricket::WebRtcVideoMediaChannel::SetSendCodec\n" + +// http://crbug.com/348511 +"race:webrtc::acm1::AudioCodingModuleImpl::PlayoutData10Ms\n" + +// http://crbug.com/348982 +"race:cricket::P2PTransportChannel::OnConnectionDestroyed\n" +"race:cricket::P2PTransportChannel::AddConnection\n" + +// http://crbug.com/348984 +"race:sctp_express_handle_sack\n" + +// http://crbug.com/350982 +"race:libvpx/vp9/decoder/vp9_thread.c\n" + +// http://crbug.com/372807 +"deadlock:net::X509Certificate::CreateCertificateListFromBytes\n" +"deadlock:net::X509Certificate::CreateFromBytes\n" +"deadlock:net::SSLClientSocketNSS::Core::DoHandshakeLoop\n" + +// False positive in libc's tzset_internal, http://crbug.com/379738. +"race:tzset_internal\n" + +// http://crbug.com/380554 +"deadlock:g_type_add_interface_static\n" + +// End of suppressions. +; // Please keep this semicolon. + +#endif // THREAD_SANITIZER diff --git a/webrtc/supplement.gypi b/webrtc/supplement.gypi index 351e10f2f..0a10cbc2c 100644 --- a/webrtc/supplement.gypi +++ b/webrtc/supplement.gypi @@ -15,7 +15,7 @@ # GYP_DEFINES="asan=1". ['OS=="linux" and (chromeos==0 or target_arch!="ia32")', { 'dependencies': [ - '<(webrtc_root)/sanitizer_options.gyp:sanitizer_options', + '<(webrtc_root)/build/sanitizer_options.gyp:sanitizer_options', ], }], ],