From e0d55a0782c3b10911b5d10f4c98be9b827fe631 Mon Sep 17 00:00:00 2001
From: "wu@webrtc.org" <wu@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d>
Date: Mon, 7 Oct 2013 16:44:38 +0000
Subject: [PATCH] Removing suppressions that has been fixed, i.e. r4661. Rename
 suppressions to match the correct issue.

TBR=mallinath

Review URL: https://webrtc-codereview.appspot.com/2357004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@4940 4adac7df-926f-26a2-2b94-8c16560cd09d
---
 tools/valgrind-webrtc/tsan/suppressions.txt | 63 +++++++--------------
 1 file changed, 21 insertions(+), 42 deletions(-)

diff --git a/tools/valgrind-webrtc/tsan/suppressions.txt b/tools/valgrind-webrtc/tsan/suppressions.txt
index a8dd0bd297..33efe07f75 100644
--- a/tools/valgrind-webrtc/tsan/suppressions.txt
+++ b/tools/valgrind-webrtc/tsan/suppressions.txt
@@ -47,6 +47,27 @@
   fun:webrtc::ThreadPosix::Run
   fun:webrtc::StartThread
 }
+{
+  bug_2461_1
+  ThreadSanitizer:Race
+  fun:webrtc::voe::Channel::SetChannelOutputVolumeScaling
+  fun:webrtc::VoEVolumeControlImpl::SetChannelOutputVolumeScaling
+  fun:cricket::WebRtcVoiceMediaChannel::SetOutputScaling
+  fun:cricket::VoiceChannel::SetOutputScaling_w
+  fun:cricket::VoiceChannel::OnMessage
+  ...
+}
+{
+  bug_2461_2
+  ThreadSanitizer:Race
+  fun:webrtc::voe::Channel::SetOutputVolumePan
+  fun:webrtc::VoEVolumeControlImpl::SetOutputVolumePan
+  fun:cricket::WebRtcVoiceMediaChannel::SetOutputScaling
+  fun:cricket::VoiceChannel::SetOutputScaling_w
+  fun:cricket::VoiceChannel::OnMessage
+  ...
+}
+
 
 #-----------------------------------------------------------------------
 # 2. libjingle stuff (talk folder)
@@ -61,17 +82,6 @@
   fun:webrtc::ThreadPosix::Run
   fun:StartThread
 }
-{
-  bug_1205_6
-  ThreadSanitizer:Race
-  fun:std::__detail::_List_node_base::_M_hook
-  fun:std::list::_M_insert
-  fun:std::list::push_back
-  fun:webrtc::ModuleRtpRtcpImpl::RegisterChildModule
-  fun:webrtc::ModuleRtpRtcpImpl::ModuleRtpRtcpImpl
-  fun:webrtc::RtpRtcp::CreateRtpRtcp
-  ...
-}
 {
   bug_1205_7
   ThreadSanitizer:Race
@@ -162,37 +172,6 @@
   fun:cricket::ChannelManager::DestroyVideoChannel_w
   ...
 }
-{
-  bug_1205_16
-  ThreadSanitizer:Race
-  fun:std::__detail::_List_node_base::_M_unhook
-  fun:std::list::_M_erase
-  fun:std::list::erase
-  fun:webrtc::ModuleRtpRtcpImpl::DeRegisterChildModule
-  fun:webrtc::ModuleRtpRtcpImpl::~ModuleRtpRtcpImpl
-  fun:webrtc::ModuleRtpRtcpImpl::~ModuleRtpRtcpImpl
-  ...
-}
-{
-  bug_1205_18
-  ThreadSanitizer:Race
-  fun:webrtc::voe::Channel::SetChannelOutputVolumeScaling
-  fun:webrtc::VoEVolumeControlImpl::SetChannelOutputVolumeScaling
-  fun:cricket::WebRtcVoiceMediaChannel::SetOutputScaling
-  fun:cricket::VoiceChannel::SetOutputScaling_w
-  fun:cricket::VoiceChannel::OnMessage
-  ...
-}
-{
-  bug_1205_19
-  ThreadSanitizer:Race
-  fun:webrtc::voe::Channel::SetOutputVolumePan
-  fun:webrtc::VoEVolumeControlImpl::SetOutputVolumePan
-  fun:cricket::WebRtcVoiceMediaChannel::SetOutputScaling
-  fun:cricket::VoiceChannel::SetOutputScaling_w
-  fun:cricket::VoiceChannel::OnMessage
-  ...
-}
 {
   bug_1205_20
   ThreadSanitizer:Race