From 124929e7260f0f102da43cf49cfbaea878e780ef Mon Sep 17 00:00:00 2001 From: "dbaron%dbaron.org" Date: Sat, 21 Jun 2003 00:28:05 +0000 Subject: [PATCH] Be sure to call NS_TraceMallocStartup so we know (on Unix) not to waste time logging everything once we know there is no command-line argument. b=113833 r+sr=brendan git-svn-id: svn://10.0.0.236/trunk@144013 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/tools/trace-malloc/lib/nsTraceMalloc.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/mozilla/tools/trace-malloc/lib/nsTraceMalloc.c b/mozilla/tools/trace-malloc/lib/nsTraceMalloc.c index fe20d72b268..9c57cab375e 100644 --- a/mozilla/tools/trace-malloc/lib/nsTraceMalloc.c +++ b/mozilla/tools/trace-malloc/lib/nsTraceMalloc.c @@ -1671,7 +1671,7 @@ PR_IMPLEMENT(void) NS_TraceMallocStartup(int logfd) #ifdef XP_WIN32 /* Register listeners for win32. */ - { + if (suppress_tracing == 0) { StartupHooker(); } #endif @@ -1816,8 +1816,7 @@ PR_IMPLEMENT(int) NS_TraceMallocStartupArgs(int argc, char* argv[]) } } - if (logfd >= 0) - NS_TraceMallocStartup(logfd); + NS_TraceMallocStartup(logfd); return argc; } @@ -1855,7 +1854,9 @@ PR_IMPLEMENT(void) NS_TraceMallocShutdown() PR_DestroyMonitor(mon); } #ifdef XP_WIN32 - ShutdownHooker(); + if (suppress_tracing == 0) { + ShutdownHooker(); + } #endif }