summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorakalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-02-29 02:32:01 +0000
committerakalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-02-29 02:32:01 +0000
commit71a0f72557b8ca5fa196b634ae129c2e160359f1 (patch)
treec5acc5163c74853f28293977be2b3ac3dbfccd03 /tools
parentd555e0da6e9b7a0ead6ca984ecf355fc2a8bc673 (diff)
downloadchromium_src-71a0f72557b8ca5fa196b634ae129c2e160359f1.zip
chromium_src-71a0f72557b8ca5fa196b634ae129c2e160359f1.tar.gz
chromium_src-71a0f72557b8ca5fa196b634ae129c2e160359f1.tar.bz2
Fix memory leak in SequencedWorkerPool
The leak was due to a cyclic reference from SequencedWorkerPool::Worker. BUG=115987 TEST= TBR=brettw Review URL: https://chromiumcodereview.appspot.com/9480016 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@124097 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'tools')
-rw-r--r--tools/valgrind/drmemory/suppressions_full.txt5
-rw-r--r--tools/valgrind/memcheck/suppressions.txt9
-rw-r--r--tools/valgrind/memcheck/suppressions_mac.txt27
3 files changed, 1 insertions, 40 deletions
diff --git a/tools/valgrind/drmemory/suppressions_full.txt b/tools/valgrind/drmemory/suppressions_full.txt
index 7ce6e00..949b372 100644
--- a/tools/valgrind/drmemory/suppressions_full.txt
+++ b/tools/valgrind/drmemory/suppressions_full.txt
@@ -1127,8 +1127,3 @@ name=http://crbug.com/115606
*!media::WebMListParser::OnListStart
*!media::WebMListParser::ParseListElement
*!media::WebMListParser::Parse
-
-LEAK
-name=http://crbug.com/115987
-...
-*!base::SequencedWorkerPool::*
diff --git a/tools/valgrind/memcheck/suppressions.txt b/tools/valgrind/memcheck/suppressions.txt
index 9900d1a..3e58d56 100644
--- a/tools/valgrind/memcheck/suppressions.txt
+++ b/tools/valgrind/memcheck/suppressions.txt
@@ -5930,14 +5930,7 @@
fun:_ZN7WebCore18HarfBuzzShaperBase10setPaddingEi
fun:_ZN7WebCore21ComplexTextController*
}
-{
- bug_115987
- Memcheck:Leak
- fun:_Znw*
- fun:_ZN4base12_GLOBAL__N_123SequencedWorkerPoolTestC2Ev
- fun:_ZN4base*SequencedWorkerPoolTest_*
- fun:_ZN7testing8internal15TestFactoryImplIN4base*SequencedWorkerPoolTest_*
-}
+
#-----------------------------------------------------------------------
# 4. These only occur on our Google workstations
diff --git a/tools/valgrind/memcheck/suppressions_mac.txt b/tools/valgrind/memcheck/suppressions_mac.txt
index d6a3734..447e901 100644
--- a/tools/valgrind/memcheck/suppressions_mac.txt
+++ b/tools/valgrind/memcheck/suppressions_mac.txt
@@ -2358,30 +2358,3 @@
fun:find_registered_purgeable_zone
fun:malloc_make_purgeable
}
-{
- bug_115987_a
- Memcheck:Leak
- fun:_Znw*
- fun:_ZN4base19SequencedWorkerPool5Inner30FinishStartingAdditionalThreadEi
- fun:_ZN4base19SequencedWorkerPool5Inner*
-}
-{
- bug_115987_b
- Memcheck:Leak
- fun:_Znw*
- fun:_ZN4base12_GLOBAL__N_123SequencedWorkerPoolTestC2Ev
- fun:_ZN4base*SequencedWorkerPoolTest_*
- fun:_ZN4base*SequencedWorkerPoolTest_*
- fun:_ZN7testing8internal15TestFactoryImplIN4base*SequencedWorkerPoolTest_*
-}
-{
- bug_115987_c
- Memcheck:Leak
- fun:_Znw*
- fun:_ZN9__gnu_cxx13new_allocatorI10linked_ptrIN4base19SequencedWorkerPool6WorkerEEE8allocateEmPKv
- fun:_ZNSt12_Vector_baseI10linked_ptrIN4base19SequencedWorkerPool6WorkerEESaIS4_EE11_M_allocateEm
- fun:_ZNSt6vectorI10linked_ptrIN4base19SequencedWorkerPool6WorkerEESaIS4_EE13_M_insert_auxEN9__gnu_cxx17__normal_iteratorIPS4_S6_EERKS4_
- fun:_ZNSt6vectorI10linked_ptrIN4base19SequencedWorkerPool6WorkerEESaIS4_EE9push_backERKS4_
- fun:_ZN4base19SequencedWorkerPool5Inner10ThreadLoopEPNS0_6WorkerE
- fun:_ZN4base19SequencedWorkerPool6Worker3RunEv
-}