[asterisk-commits] rmudgett: branch 11 r377401 - in /branches/11: ./ main/astmm.c

[SVN commits to the Asterisk project]

Author: rmudgett
Date: Fri Dec  7 17:43:36 2012
New Revision: 377401

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=377401
Log:
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

Modified:
    branches/11/   (props changed)
    branches/11/main/astmm.c

Propchange: branches/11/
------------------------------------------------------------------------------
Binary property 'branch-10-merged' - no diff available.

Modified: branches/11/main/astmm.c
URL: http://svnview.digium.com/svn/asterisk/branches/11/main/astmm.c?view=diff&rev=377401&r1=377400&r2=377401
==============================================================================
--- branches/11/main/astmm.c (original)
+++ branches/11/main/astmm.c Fri Dec  7 17:43:36 2012
@@ -1333,8 +1333,11 @@
 {
 	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();