summaryrefslogtreecommitdiffstats
path: root/base/debug
diff options
context:
space:
mode:
authordalecurtis@google.com <dalecurtis@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2014-06-21 01:07:36 +0000
committerdalecurtis@google.com <dalecurtis@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2014-06-21 01:07:36 +0000
commitf80709001745fb9369c5bcf3acc108e88f354f9c (patch)
treee082f26c3b514eac807a497922c517e81d1a8436 /base/debug
parent2256b5debe36205e666fa6b9ff6f8c2ba92b8841 (diff)
downloadchromium_src-f80709001745fb9369c5bcf3acc108e88f354f9c.zip
chromium_src-f80709001745fb9369c5bcf3acc108e88f354f9c.tar.gz
chromium_src-f80709001745fb9369c5bcf3acc108e88f354f9c.tar.bz2
Fix potential deadlock situation for ChromeOS sounds.
Lock order was inverted while stopping the stream which can lead to deadlock. BUG=327817,374135 TEST=No more lock inversion warning from TSANv2. R=ajwong@chromium.org, dgreid@chromium.org TBR=awong Review URL: https://codereview.chromium.org/348843004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@278885 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/debug')
-rw-r--r--base/debug/tsan_suppressions.cc2
1 files changed, 0 insertions, 2 deletions
diff --git a/base/debug/tsan_suppressions.cc b/base/debug/tsan_suppressions.cc
index 8cf79fc..70ce21e 100644
--- a/base/debug/tsan_suppressions.cc
+++ b/base/debug/tsan_suppressions.cc
@@ -281,8 +281,6 @@ char kTSanDefaultSuppressions[] =
// http://crbug.com/374135
"race:media::AlsaWrapper::PcmWritei\n"
-"deadlock:media::AudioOutputDispatcherImpl::StopStream\n"
-"deadlock:media::AudioStreamHandler::AudioStreamContainer::OnMoreData\n"
// False positive in libc's tzset_internal, http://crbug.com/379738.
"race:tzset_internal\n"