diff options
| author | Automerge script <automerge@asterisk.org> | 2012-12-08 00:19:39 +0000 |
|---|---|---|
| committer | Automerge script <automerge@asterisk.org> | 2012-12-08 00:19:39 +0000 |
| commit | c75b8c528398699ca3568f481f2eb83193e3dce2 (patch) | |
| tree | 37baaaf460bb8fb66a0b66e8cdf64611b4d8bfdb /main/astmm.c | |
| parent | b353c80dc0b3d65fd1bae9d5cd7f9efd4717f708 (diff) | |
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
Diffstat (limited to 'main/astmm.c')
| -rw-r--r-- | main/astmm.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/main/astmm.c b/main/astmm.c index 1283de2df..9396d0987 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(); |