Check in jlnance's jprof patches. r=alecf. Thanks!

Makefile.in

@@ -107,6 +107,10 @@ ifdef MOZ_LEAKY
 DIRS        += tools/leaky
 endif
 
+ifdef MOZ_JPROF
+DIRS        += tools/jprof
+endif
+
 include $(topsrcdir)/config/rules.mk
 
 real_all: all

allmakefiles.sh

@@ -680,6 +680,13 @@ END_L10N_LANG_MAKEFILES
 fi
 #
 
+# tools/jprof
+if [ "$MOZ_JPROF" ]; then
+  add_makefiles <<END_JPROF_MAKEFILES
+  tools/jprof/Makefile
+END_JPROF_MAKEFILES
+fi
+
 # tools/leaky
 if [ "$MOZ_LEAKY" ]; then
   add_makefiles <<END_LEAKY_MAKEFILES

config/autoconf.mk.in

@@ -50,6 +50,7 @@ MOZ_LOG_REFCNT	= @MOZ_LOG_REFCNT@
 MOZILLA_GPROF	= @MOZILLA_GPROF@
 MOZ_PERF_METRICS = @MOZ_PERF_METRICS@
 MOZ_LEAKY	= @MOZ_LEAKY@
+MOZ_JPROF	= @MOZ_JPROF@
 DETECT_WEBSHELL_LEAKS = @DETECT_WEBSHELL_LEAKS@
 BUILD_PROFILE	= @MOZILLA_GPROF@
 GC_LEAK_DETECTOR = @GC_LEAK_DETECTOR@

configure.in

@@ -2624,6 +2624,12 @@ MOZ_ARG_ENABLE_BOOL(leaky,
 [  --enable-leaky          Enable leaky memory tool],
   MOZ_LEAKY=1)
 
+dnl mozilla/tools/leaky not part of default build.
+MOZ_ARG_ENABLE_BOOL(jprof,
+[  --enable-jprof          Enable leaky memory tool],
+  MOZ_JPROF=1
+  AC_DEFINE(MOZ_JPROF))
+
 dnl Detect webshell leaks
 MOZ_ARG_ENABLE_BOOL(detect-webshell-leaks,
 [  --enable-detect-webshell-leaks   Enable detection of webshell leaks],
@@ -2835,6 +2841,7 @@ AC_SUBST(MOZ_PERF_METRICS)
 AC_SUBST(GC_LEAK_DETECTOR)
 AC_SUBST(MOZ_LOG_REFCNT)
 AC_SUBST(MOZ_LEAKY)
+AC_SUBST(MOZ_JPROF)
 AC_SUBST(DETECT_WEBSHELL_LEAKS)
 AC_SUBST(MOZ_INSURE)
 AC_SUBST(MOZ_INSURE_DIRS)

xpfe/bootstrap/nsAppRunner.cpp

@@ -75,6 +75,10 @@ static NS_DEFINE_CID(kCookieServiceCID,    NS_COOKIESERVICE_CID);
 #include "fullsoft.h"
 #endif
 
+#ifdef MOZ_JPROF
+#include "jprof.h"
+#endif
+
 // header file for profile manager
 #include "nsIProfile.h"
 
@@ -656,6 +660,11 @@ int main(int argc, char* argv[])
 	}
   }
     
+  // Call the code to install our handler
+#ifdef MOZ_JPROF
+  setupProfilingStuff();
+#endif
+
   if( !NS_CanRun() )
     return 1; 
   NS_ShowSplashScreen();