summaryrefslogtreecommitdiffstats
path: root/build/sanitizers/tsan_suppressions.cc
diff options
context:
space:
mode:
authorguidou <guidou@chromium.org>2015-03-31 01:31:36 -0700
committerCommit bot <commit-bot@chromium.org>2015-03-31 08:32:25 +0000
commit5330f31cf74e3756dc2103f8c3d5840b5f6a2884 (patch)
tree72919c3b7c9346397a06d6d71db824b6e21aea1c /build/sanitizers/tsan_suppressions.cc
parentfa34da31c7efc3d71e2f28686788fc3db27d748e (diff)
downloadchromium_src-5330f31cf74e3756dc2103f8c3d5840b5f6a2884.zip
chromium_src-5330f31cf74e3756dc2103f8c3d5840b5f6a2884.tar.gz
chromium_src-5330f31cf74e3756dc2103f8c3d5840b5f6a2884.tar.bz2
WebRtcAudioDeviceImpl and WebRtcAudioRenderer reference each other and are invoked in different threads.
This CL ensures that locks are taken in the same order in both threads in order to avoid deadlocks. BUG=433993 TEST=Existing WebRtc content_browsertests with TSAN enabled. Review URL: https://codereview.chromium.org/1036993003 Cr-Commit-Position: refs/heads/master@{#322995}
Diffstat (limited to 'build/sanitizers/tsan_suppressions.cc')
-rw-r--r--build/sanitizers/tsan_suppressions.cc3
1 files changed, 0 insertions, 3 deletions
diff --git a/build/sanitizers/tsan_suppressions.cc b/build/sanitizers/tsan_suppressions.cc
index 9a420df..519bda2 100644
--- a/build/sanitizers/tsan_suppressions.cc
+++ b/build/sanitizers/tsan_suppressions.cc
@@ -285,9 +285,6 @@ char kTSanDefaultSuppressions[] =
// http://crbug.com/425057
"deadlock:webrtc::ViEChannelManagerScoped::ViEChannelManagerScoped\n"
-// https://crbug.com/433993
-"deadlock:content::WebRtcAudioDeviceImpl\n"
-
// http://crbug.com/417193
// Suppressing both AudioContext.{cpp,h}.
"race:modules/webaudio/AudioContext\n"