Bug 1323100 - Stop double-registering the IPDL Background thread with the profiler. r=froydnj
☠☠ backed out by dbe5b7ff43b6 ☠ ☠
authorMarkus Stange <mstange@themasta.com>
Wed, 21 Dec 2016 23:07:10 +0100
changeset 374859 b6953e3f573984c322e59219ffc8e57b2689e9f6
parent 374858 5572f3b63215abb059e49c366a4769a55b2cc80f
child 374860 1b0855bb0c387415b4c619b7aa9562442ba14615
push id1419
push userjlund@mozilla.com
push dateMon, 10 Apr 2017 20:44:07 +0000
treeherdermozilla-release@5e6801b73ef6 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersfroydnj
bugs1323100
milestone53.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 1323100 - Stop double-registering the IPDL Background thread with the profiler. r=froydnj MozReview-Commit-ID: 2BlEhqrxdUz
ipc/glue/BackgroundImpl.cpp
--- a/ipc/glue/BackgroundImpl.cpp
+++ b/ipc/glue/BackgroundImpl.cpp
@@ -1339,18 +1339,16 @@ ParentImpl::ShutdownObserver::Observe(ns
 }
 
 NS_IMETHODIMP
 ParentImpl::RequestMessageLoopRunnable::Run()
 {
   AssertIsInMainProcess();
   MOZ_ASSERT(mTargetThread);
 
-  char stackBaseGuess;
-
   if (NS_IsMainThread()) {
     MOZ_ASSERT(mMessageLoop);
 
     if (!sBackgroundThread ||
         !SameCOMIdentity(mTargetThread.get(), sBackgroundThread.get())) {
       return NS_OK;
     }
 
@@ -1370,18 +1368,16 @@ ParentImpl::RequestMessageLoopRunnable::
           NS_WARNING("Failed to dispatch callback runnable!");
         }
       }
     }
 
     return NS_OK;
   }
 
-  profiler_register_thread("IPDL Background", &stackBaseGuess);
-
 #ifdef DEBUG
   {
     bool correctThread;
     MOZ_ASSERT(NS_SUCCEEDED(mTargetThread->IsOnCurrentThread(&correctThread)));
     MOZ_ASSERT(correctThread);
   }
 #endif
 
@@ -1409,18 +1405,16 @@ ParentImpl::ShutdownBackgroundThreadRunn
 {
   AssertIsInMainProcess();
 
   // It is possible that another background thread was created while this thread
   // was shutting down. In that case we can't assert anything about
   // sBackgroundPRThread and we should not modify it here.
   sBackgroundPRThread.compareExchange(PR_GetCurrentThread(), nullptr);
 
-  profiler_unregister_thread();
-
   return NS_OK;
 }
 
 NS_IMETHODIMP
 ParentImpl::ForceCloseBackgroundActorsRunnable::Run()
 {
   AssertIsInMainProcess();
   MOZ_ASSERT(mActorArray);