diff options
author | wolfbeast <mcwerewolf@gmail.com> | 2018-05-12 16:19:33 +0200 |
---|---|---|
committer | wolfbeast <mcwerewolf@gmail.com> | 2018-05-12 16:19:58 +0200 |
commit | 6571d2ceb42930dab01677ef0e95e732d5076fb8 (patch) | |
tree | 8c593b8e09f2cfb457df72d40dc719bb0e0df066 /tools/profiler/core/platform.cpp | |
parent | 2f359ed80ccb2cab440c0cda886404ed42ad9fdf (diff) | |
download | UXP-6571d2ceb42930dab01677ef0e95e732d5076fb8.tar UXP-6571d2ceb42930dab01677ef0e95e732d5076fb8.tar.gz UXP-6571d2ceb42930dab01677ef0e95e732d5076fb8.tar.lz UXP-6571d2ceb42930dab01677ef0e95e732d5076fb8.tar.xz UXP-6571d2ceb42930dab01677ef0e95e732d5076fb8.zip |
Remove MOZ_WIDGET_GONK [1/2]
Tag #288
Diffstat (limited to 'tools/profiler/core/platform.cpp')
-rw-r--r-- | tools/profiler/core/platform.cpp | 21 |
1 files changed, 6 insertions, 15 deletions
diff --git a/tools/profiler/core/platform.cpp b/tools/profiler/core/platform.cpp index 0d3cb1648..a8a09d66f 100644 --- a/tools/profiler/core/platform.cpp +++ b/tools/profiler/core/platform.cpp @@ -36,11 +36,11 @@ #include "GeckoTaskTracer.h" #endif -#if defined(SPS_OS_android) && !defined(MOZ_WIDGET_GONK) +#if defined(SPS_OS_android) #include "FennecJNIWrappers.h" #endif -#if defined(SPS_OS_android) && !defined(MOZ_WIDGET_GONK) +#if defined(SPS_OS_android) #include "FennecJNINatives.h" #endif @@ -52,7 +52,7 @@ #endif #endif -#if defined(SPS_OS_android) && !defined(MOZ_WIDGET_GONK) +#if defined(SPS_OS_android) class GeckoJavaSampler : public java::GeckoJavaSampler::Natives<GeckoJavaSampler> { private: @@ -502,7 +502,7 @@ void mozilla_sampler_init(void* stackTop) set_stderr_callback(mozilla_sampler_log); #endif -#if defined(SPS_OS_android) && !defined(MOZ_WIDGET_GONK) +#if defined(SPS_OS_android) if (mozilla::jni::IsFennec()) { GeckoJavaSampler::Init(); } @@ -524,7 +524,7 @@ void mozilla_sampler_init(void* stackTop) || defined(SPS_PLAT_amd64_linux) || defined(SPS_PLAT_x86_linux) , "stackwalk" #endif -#if defined(SPS_OS_android) && !defined(MOZ_WIDGET_GONK) +#if defined(SPS_OS_android) , "java" #endif }; @@ -819,7 +819,7 @@ void mozilla_sampler_start(int aProfileEntries, double aInterval, } } -#if defined(SPS_OS_android) && !defined(MOZ_WIDGET_GONK) +#if defined(SPS_OS_android) if (t->ProfileJava()) { int javaInterval = aInterval; // Java sampling doesn't accuratly keep up with 1ms sampling @@ -1021,15 +1021,6 @@ bool mozilla_sampler_register_thread(const char* aName, void* aGuessStackTop) return false; } -#if defined(MOZ_WIDGET_GONK) && !defined(MOZ_PROFILING) - // The only way to profile secondary threads on b2g - // is to build with profiling OR have the profiler - // running on startup. - if (!profiler_is_active()) { - return false; - } -#endif - MOZ_ASSERT(tlsPseudoStack.get() == nullptr); PseudoStack* stack = PseudoStack::create(); tlsPseudoStack.set(stack); |