Bug 1358074 (part 6) - Don't use mWasPaused on Android. r=mstange.
☠☠ backed out by 265931fd5e5a ☠ ☠
authorNicholas Nethercote <nnethercote@mozilla.com>
Fri, 21 Apr 2017 13:27:59 +1000
changeset 402703 c3f35f8a1f219f47437f63bb87e9308870a151d9
parent 402702 1d214f8ac8fdf99766b975ad6e9c20d82c61900b
child 402704 6c4cc6a04cc44983c9c2ac19f34318adcb654d72
push id7391
push usermtabara@mozilla.com
push dateMon, 12 Jun 2017 13:08:53 +0000
treeherdermozilla-beta@2191d7f87e2e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmstange
bugs1358074
milestone55.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1358074 (part 6) - Don't use mWasPaused on Android. r=mstange. It's not needed.
tools/profiler/core/platform.cpp
--- a/tools/profiler/core/platform.cpp
+++ b/tools/profiler/core/platform.cpp
@@ -149,17 +149,17 @@ public:
     , mFeatureMemory(false)
     , mFeaturePrivacy(false)
     , mFeatureRestyle(false)
     , mFeatureStackWalk(false)
     , mFeatureTaskTracer(false)
     , mFeatureThreads(false)
     , mBuffer(nullptr)
     , mIsPaused(false)
-#if defined(GP_OS_linux) || defined(GP_OS_android)
+#if defined(GP_OS_linux)
     , mWasPaused(false)
 #endif
     , mSamplerThread(nullptr)
 #ifdef USE_LUL_STACKWALK
     , mLUL(nullptr)
 #endif
     , mInterposeObserver(nullptr)
     , mFrameNumber(0)
@@ -208,17 +208,17 @@ public:
     // On overflow, reset to 1 instead of 0, because 0 means inactive.
     sNextActivityGeneration = (sNextActivityGeneration == 0xffffffff)
                             ? 1
                             : sNextActivityGeneration + 1;
   }
 
   GET_AND_SET(bool, IsPaused)
 
-#if defined(GP_OS_linux) || defined(GP_OS_android)
+#if defined(GP_OS_linux)
   GET_AND_SET(bool, WasPaused)
 #endif
 
   GET_AND_SET(class SamplerThread*, SamplerThread)
 
 #ifdef USE_LUL_STACKWALK
   GET_AND_SET(lul::LUL*, LUL)
 #endif
@@ -300,17 +300,17 @@ private:
   // SamplerThread::Run() even after gPS has been destroyed by
   // profiler_shutdown().
   static uint32_t sActivityGeneration;
   static uint32_t sNextActivityGeneration;
 
   // Is the profiler paused? False when the profiler is inactive.
   bool mIsPaused;
 
-#if defined(GP_OS_linux) || defined(GP_OS_android)
+#if defined(GP_OS_linux)
   // Used to record whether the profiler was paused just before forking. False
   // at all times except just before/after forking.
   bool mWasPaused;
 #endif
 
   // The current sampler thread. Null when the profiler is inactive.
   class SamplerThread* mSamplerThread;