summaryrefslogtreecommitdiffstats
path: root/toolkit/xre
diff options
context:
space:
mode:
authorwolfbeast <mcwerewolf@gmail.com>2018-05-23 20:16:00 +0200
committerwolfbeast <mcwerewolf@gmail.com>2018-05-23 20:16:00 +0200
commit94988a2b4e6bd85ee8216c65cc8cd73d14cf1ad1 (patch)
treeb10414cf2c2d85136861bae6df7ab1d0295c439a /toolkit/xre
parent542da56e2c4f992afb50c4222dcf757c3a3e6a5c (diff)
downloadUXP-94988a2b4e6bd85ee8216c65cc8cd73d14cf1ad1.tar
UXP-94988a2b4e6bd85ee8216c65cc8cd73d14cf1ad1.tar.gz
UXP-94988a2b4e6bd85ee8216c65cc8cd73d14cf1ad1.tar.lz
UXP-94988a2b4e6bd85ee8216c65cc8cd73d14cf1ad1.tar.xz
UXP-94988a2b4e6bd85ee8216c65cc8cd73d14cf1ad1.zip
Remove the jprof profiler.
This resolves #377.
Diffstat (limited to 'toolkit/xre')
-rw-r--r--toolkit/xre/nsAppRunner.cpp14
-rw-r--r--toolkit/xre/nsEmbedFunctions.cpp9
2 files changed, 0 insertions, 23 deletions
diff --git a/toolkit/xre/nsAppRunner.cpp b/toolkit/xre/nsAppRunner.cpp
index 2050b9671..e43aea926 100644
--- a/toolkit/xre/nsAppRunner.cpp
+++ b/toolkit/xre/nsAppRunner.cpp
@@ -182,10 +182,6 @@
#include "mozilla/Logging.h"
#endif
-#ifdef MOZ_JPROF
-#include "jprof.h"
-#endif
-
#include "base/command_line.h"
#include "GTestRunner.h"
@@ -1513,11 +1509,6 @@ static nsresult LaunchChild(nsINativeAppSupport* aNative,
// Restart this process by exec'ing it into the current process
// if supported by the platform. Otherwise, use NSPR.
-#ifdef MOZ_JPROF
- // make sure JPROF doesn't think we're E10s
- unsetenv("JPROF_SLAVE");
-#endif
-
if (aBlankCommandLine) {
gRestartArgc = 1;
gRestartArgv[gRestartArgc] = nullptr;
@@ -3393,11 +3384,6 @@ XREMain::XRE_mainStartup(bool* aExitFlag)
XRE_InstallX11ErrorHandler();
#endif
- // Call the code to install our handler
-#ifdef MOZ_JPROF
- setupProfilingStuff();
-#endif
-
rv = NS_CreateNativeAppSupport(getter_AddRefs(mNativeApp));
if (NS_FAILED(rv))
return 1;
diff --git a/toolkit/xre/nsEmbedFunctions.cpp b/toolkit/xre/nsEmbedFunctions.cpp
index f62dbdd6d..1498b0d17 100644
--- a/toolkit/xre/nsEmbedFunctions.cpp
+++ b/toolkit/xre/nsEmbedFunctions.cpp
@@ -82,10 +82,6 @@
using mozilla::_ipdltest::IPDLUnitTestProcessChild;
#endif // ifdef MOZ_IPDL_TESTS
-#ifdef MOZ_JPROF
-#include "jprof.h"
-#endif
-
using namespace mozilla;
using mozilla::ipc::BrowserProcessSubThread;
@@ -250,11 +246,6 @@ XRE_InitChildProcess(int aArgc,
NS_ENSURE_ARG_POINTER(aArgv[0]);
MOZ_ASSERT(aChildData);
-#ifdef MOZ_JPROF
- // Call the code to install our handler
- setupProfilingStuff();
-#endif
-
#if !defined(MOZ_WIDGET_ANDROID)
// On non-Fennec Gecko, the GMPLoader code resides in plugin-container,
// and we must forward it through to the GMP code here.