Skip to content
Snippets Groups Projects
Commit c75b8c52 authored by Automerge script's avatar Automerge script
Browse files

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
parent b353c80d
Branches
Tags
No related merge requests found
......@@ -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();
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment