From c75b8c528398699ca3568f481f2eb83193e3dce2 Mon Sep 17 00:00:00 2001
From: Automerge script <automerge@asterisk.org>
Date: Sat, 8 Dec 2012 00:19:39 +0000
Subject: [PATCH] Merged revisions 377402 via svnmerge from
file:///srv/subversion/repos/asterisk/trunk
................
r377402 | rmudgett | 2012-12-07 17:45:15 -0600 (Fri, 07 Dec 2012) | 11 lines
MALLOC_DEBUG: Only wait if we want atexit allocation dumps.
........
Merged revisions 377398 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........
Merged revisions 377399 from http://svn.asterisk.org/svn/asterisk/branches/10
........
Merged revisions 377401 from http://svn.asterisk.org/svn/asterisk/branches/11
................
git-svn-id: https://origsvn.digium.com/svn/asterisk/team/mmichelson/threadpool@377409 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---
main/astmm.c | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/main/astmm.c b/main/astmm.c
index 1283de2dfe..9396d09873 100644
--- a/main/astmm.c
+++ b/main/astmm.c
@@ -1333,8 +1333,11 @@ static void mm_atexit_final(void)
{
FILE *log;
- fprintf(stderr, "Waiting 10 seconds to let other threads die.\n");
- sleep(10);
+ /* Only wait if we want atexit allocation dumps. */
+ if (atexit_list || atexit_summary) {
+ fprintf(stderr, "Waiting 10 seconds to let other threads die.\n");
+ sleep(10);
+ }
regions_check_all_fences();
--
GitLab