Bug 1111830 - b2g profiling shouldn't delegate to child processes like e10s. r=mconley
authorBenoit Girard <b56girard@gmail.com>
Mon, 15 Dec 2014 18:17:25 -0500
changeset 219858 73fa6e65763dff90da670e8caba1903599a967ae
parent 219857 bc6e0cee432619e1dbd40cccac1cffd2695bc858
child 219859 09cc04998a3dd073376ca58dddd8d65b4315da40
push id10419
push usercbook@mozilla.com
push dateTue, 16 Dec 2014 12:45:27 +0000
treeherderfx-team@ec87657146eb [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmconley
bugs1111830
milestone37.0a1
Bug 1111830 - b2g profiling shouldn't delegate to child processes like e10s. r=mconley
tools/profiler/platform.h
--- a/tools/profiler/platform.h
+++ b/tools/profiler/platform.h
@@ -357,17 +357,20 @@ class Sampler {
   static void Shutdown();
 
   static TableTicker* GetActiveSampler() { return sActiveSampler; }
   static void SetActiveSampler(TableTicker* sampler) { sActiveSampler = sampler; }
 
   static mozilla::Mutex* sRegisteredThreadsMutex;
 
   static bool CanNotifyObservers() {
-#if defined(SPS_OS_android) && !defined(MOZ_WIDGET_GONK)
+#ifdef MOZ_WIDGET_GONK
+    // We use profile.sh on b2g to manually select threads and options per process.
+    return false;
+#elif defined(SPS_OS_android) && !defined(MOZ_WIDGET_GONK)
     // Android ANR reporter uses the profiler off the main thread
     return NS_IsMainThread();
 #else
     MOZ_ASSERT(NS_IsMainThread());
     return true;
 #endif
   }