npob, jprof support for transformiix standalone, rs=peterv

content/xslt/src/main/Makefile.in

@@ -34,7 +34,8 @@ endif
 REQUIRES = string \
 	   xpcom \
 	   expat \
-           $(NULL)
+	   jprof \
+	   $(NULL)
 
 CPP_PROG_LINK          = 1
 
@@ -47,6 +48,10 @@ EXTRA_LIBS = \
              $(MOZ_COMPONENT_LIBS) \
              $(NULL)
 
+ifdef MOZ_JPROF
+LIBS         += -ljprof
+endif
+
 include $(topsrcdir)/config/rules.mk
 
 INCLUDES += -I$(srcdir)/../xslt -I$(srcdir)/../base -I$(srcdir)/../net \

content/xslt/src/main/testXalan.cpp

@@ -53,6 +53,9 @@
 #ifdef NS_TRACE_MALLOC
 #include "nsTraceMalloc.h"
 #endif
+#ifdef MOZ_JPROF
+#include "jprof.h"
+#endif
 
 /**
  * Prints the command line help screen to the console
@@ -285,6 +288,9 @@ int main(int argc, char** argv)
 {
 #ifdef NS_TRACE_MALLOC
     NS_TraceMallocStartupArgs(argc, argv);
+#endif
+#ifdef MOZ_JPROF
+    setupProfilingStuff();
 #endif
     char* xalan = PR_GetEnv("XALAN_DIR");
     if (!xalan) {

content/xslt/src/main/transformiix.cpp

@@ -38,6 +38,9 @@
 #include <fstream.h>
 #include "nsDoubleHashtable.h"
 #include "nsVoidArray.h"
+#ifdef MOZ_JPROF
+#include "jprof.h"
+#endif
 
 /**
  * Prints the command line help screen to the console
@@ -122,6 +125,9 @@ int main(int argc, char** argv)
 {
     using namespace std;
     nsresult rv;
+#ifdef MOZ_JPROF
+    setupProfilingStuff();
+#endif
     rv = NS_InitXPCOM2(nsnull, nsnull, nsnull);
     NS_ENSURE_SUCCESS(rv, rv);
 

content/xslt/src/main/txXSLTMarkDriver.cpp

@@ -47,6 +47,9 @@
 #include "txStandaloneXSLTProcessor.h"
 #include "nsXPCOM.h"
 #include "xmExternalDriver.hpp"
+#ifdef MOZ_JPROF
+#include "jprof.h"
+#endif
 
 class txDriverProcessor : public txStandaloneXSLTProcessor,
                           public xmExternalDriver
@@ -116,6 +119,9 @@ private:
 int main (int argc, char ** argv)
 {
     txDriverProcessor driver;
+#ifdef MOZ_JPROF
+    setupProfilingStuff();
+#endif
     NS_InitXPCOM2(nsnull, nsnull, nsnull);
     if (!txDriverProcessor::init())
         return 1;