aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSverker Eriksson <[email protected]>2012-05-25 15:46:22 +0200
committerSverker Eriksson <[email protected]>2012-05-25 15:46:22 +0200
commit8341e29bbc5fb0c979beb8e3f60665cff19a241f (patch)
tree50ee98b48405383b68b1c8e25d9f54db4db2aa94
parent5c0b87f2d1be9d5355cbe38beb9b02073377a8d6 (diff)
parent70f1e73d83877a22e3bee4b9e95d676ada7eb317 (diff)
downloadotp-8341e29bbc5fb0c979beb8e3f60665cff19a241f.tar.gz
otp-8341e29bbc5fb0c979beb8e3f60665cff19a241f.tar.bz2
otp-8341e29bbc5fb0c979beb8e3f60665cff19a241f.zip
Merge branch 'maint'
-rw-r--r--erts/emulator/valgrind/suppress.patched.3.6.011
-rw-r--r--erts/emulator/valgrind/suppress.standard11
2 files changed, 22 insertions, 0 deletions
diff --git a/erts/emulator/valgrind/suppress.patched.3.6.0 b/erts/emulator/valgrind/suppress.patched.3.6.0
index 61d23529ba..62ba032520 100644
--- a/erts/emulator/valgrind/suppress.patched.3.6.0
+++ b/erts/emulator/valgrind/suppress.patched.3.6.0
@@ -346,3 +346,14 @@ fun:erl_start
fun:main
}
+{
+Harmless leak of ErtsThrPrgrData from async threads in exiting emulator
+Memcheck:Leak
+...
+fun:erts_alloc
+fun:erts_thr_progress_register_unmanaged_thread
+fun:async_thread_init
+fun:async_main
+...
+}
+
diff --git a/erts/emulator/valgrind/suppress.standard b/erts/emulator/valgrind/suppress.standard
index ca7b804cb9..5a129bfd10 100644
--- a/erts/emulator/valgrind/suppress.standard
+++ b/erts/emulator/valgrind/suppress.standard
@@ -304,3 +304,14 @@ fun:erl_start
fun:main
}
+{
+Harmless leak of ErtsThrPrgrData from async threads in exiting emulator
+Memcheck:Leak
+...
+fun:erts_alloc
+fun:erts_thr_progress_register_unmanaged_thread
+fun:async_thread_init
+fun:async_main
+...
+}
+