From 1a40e00771ccd6b51396e18dabad67fff1645061 Mon Sep 17 00:00:00 2001
From: "wtc@chromium.org"
 <wtc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Fri, 2 Sep 2011 02:40:04 +0000
Subject: [PATCH] Move the PR_GetCurrentThread suppression for worker threads
 to section 2 because it is an expected leak.  Widen the suppression by
 eliding the functions in the middle of the call stack.

R=thakis@chromium.org
BUG=32624
TEST=none

Review URL: http://codereview.chromium.org/7831016

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@99299 0039d316-1c4b-4281-b951-d872f2087c98
---
 tools/valgrind/memcheck/suppressions.txt | 34 ++++++++++++------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/tools/valgrind/memcheck/suppressions.txt b/tools/valgrind/memcheck/suppressions.txt
index 5cf8fd21126557..94ed7707de0f20 100644
--- a/tools/valgrind/memcheck/suppressions.txt
+++ b/tools/valgrind/memcheck/suppressions.txt
@@ -868,6 +868,23 @@
    fun:PL_ArenaAllocate
    fun:PORT_ArenaAlloc_Util
 }
+{
+   # PR_GetCurrentThread allocates a PRThread structure and stores it in
+   # thread-specific data.  The PRThread structure is freed by the
+   # PR_DetachThread call in CertVerifierWorker::Run or when the thread
+   # terminates.  Since we do not shut down worker threads, the PRThread
+   # structure created for a worker thread may be leaked at Chrome shutdown
+   # if the worker thread did not make it to the PR_DetachThread call.
+   bug_32624
+   Memcheck:Leak
+   fun:calloc
+   fun:PR_Calloc
+   fun:PR_GetCurrentThread
+   ...
+   fun:_ZNK3net15X509Certificate14VerifyInternalERKSsiPNS_16CertVerifyResultE
+   fun:_ZNK3net15X509Certificate6VerifyERKSsiPNS_16CertVerifyResultE
+   fun:_ZN3net18CertVerifierWorker3RunEv
+}
 {
    # Histograms are used on un-joined threads, and can't be deleted atexit.
    Histograms via FactoryGet including Linear Custom Boolean and Basic
@@ -1908,23 +1925,6 @@
    fun:_ZNK3net15X509Certificate6VerifyERKSsiPNS_16CertVerifyResultE
    fun:_ZN3net18CertVerifierWorker3RunEv
 }
-{
-   bug_32624_f
-   Memcheck:Leak
-   fun:calloc
-   fun:PR_Calloc
-   fun:PR_GetCurrentThread
-   fun:PR_SetError
-   fun:PORT_SetError_Util
-   fun:cert_FindExtensionByOID
-   fun:cert_FindExtension
-   fun:CERT_FindCertExtension
-   fun:cert_VerifySubjectAltName
-   fun:CERT_VerifyCertName
-   fun:_ZNK3net15X509Certificate14VerifyInternalERKSsiPNS_16CertVerifyResultE
-   fun:_ZNK3net15X509Certificate6VerifyERKSsiPNS_16CertVerifyResultE
-   fun:_ZN3net18CertVerifierWorker3RunEv
-}
 {
   bug_34554_a
   Memcheck:Leak