Bug 1331804 - Add more runnable names (r=ehsan)

MozReview-Commit-ID: 1QBmqfgY6WI
Brli · Jan 24, 2017 · e67fda1 · e67fda1
1 parent 4391ca4
commit e67fda1
Show file tree

Hide file tree

Showing 17 changed files with 57 additions and 23 deletions.
diff --git a/dom/workers/RuntimeService.cpp b/dom/workers/RuntimeService.cpp
@@ -1192,7 +1192,8 @@ class WorkerThreadPrimaryRunnable final : public Runnable
 
   public:
     explicit FinishedRunnable(already_AddRefed<WorkerThread> aThread)
-    : mThread(aThread)
+    : Runnable("WorkerThreadPrimaryRunnable::FinishedRunnable")
+    , mThread(aThread)
     {
       MOZ_ASSERT(mThread);
     }

diff --git a/ipc/glue/BackgroundImpl.cpp b/ipc/glue/BackgroundImpl.cpp
@@ -750,7 +750,8 @@ class ChildImpl::OpenMainProcessActorRunnable final : public Runnable
   OpenMainProcessActorRunnable(already_AddRefed<ChildImpl>&& aChildActor,
                                already_AddRefed<ParentImpl> aParentActor,
                                MessageLoop* aParentMessageLoop)
-  : mActor(aChildActor), mParentActor(aParentActor),
+  : Runnable("ChildImpl::OpenMainProcessActorRunnable"),
+    mActor(aChildActor), mParentActor(aParentActor),
     mParentMessageLoop(aParentMessageLoop)
   {
     AssertIsOnMainThread();

diff --git a/ipc/glue/MessageChannel.cpp b/ipc/glue/MessageChannel.cpp
@@ -1591,6 +1591,14 @@ MessageChannel::RunMessage(MessageTask& aTask)
 
 NS_IMPL_ISUPPORTS_INHERITED(MessageChannel::MessageTask, CancelableRunnable, nsIRunnablePriority)
 
+MessageChannel::MessageTask::MessageTask(MessageChannel* aChannel, Message&& aMessage)
+  : CancelableRunnable(StringFromIPCMessageType(aMessage.type()))
+  , mChannel(aChannel)
+  , mMessage(Move(aMessage))
+  , mScheduled(false)
+{
+}
+
 nsresult
 MessageChannel::MessageTask::Run()
 {

diff --git a/ipc/glue/MessageChannel.h b/ipc/glue/MessageChannel.h
@@ -455,9 +455,7 @@ class MessageChannel : HasResultCodes
         public nsIRunnablePriority
     {
     public:
-        explicit MessageTask(MessageChannel* aChannel, Message&& aMessage)
-          : mChannel(aChannel), mMessage(Move(aMessage)), mScheduled(false)
-        {}
+        explicit MessageTask(MessageChannel* aChannel, Message&& aMessage);
 
         NS_DECL_ISUPPORTS_INHERITED
 

diff --git a/netwerk/base/nsTransportUtils.cpp b/netwerk/base/nsTransportUtils.cpp
@@ -55,7 +55,8 @@ class nsTransportStatusEvent : public Runnable
                            nsresult status,
                            int64_t progress,
                            int64_t progressMax)
-        : mProxy(proxy)
+        : Runnable("nsTransportStatusEvent")
+        , mProxy(proxy)
         , mTransport(transport)
         , mStatus(status)
         , mProgress(progress)

diff --git a/netwerk/cache2/CacheEntry.h b/netwerk/cache2/CacheEntry.h
@@ -186,7 +186,8 @@ class CacheEntry final : public nsICacheEntry
   public:
     AvailableCallbackRunnable(CacheEntry* aEntry,
                               Callback const &aCallback)
-      : mEntry(aEntry)
+      : Runnable("CacheEntry::AvailableCallbackRunnable")
+      , mEntry(aEntry)
       , mCallback(aCallback)
     {}
 

diff --git a/netwerk/dns/DNSListenerProxy.h b/netwerk/dns/DNSListenerProxy.h
@@ -43,7 +43,8 @@ class DNSListenerProxy final
                              nsICancelable* aRequest,
                              nsIDNSRecord* aRecord,
                              nsresult aStatus)
-      : mListener(aListener)
+      : Runnable("DNSListenerProxy::OnLookupCompleteRunnable")
+      , mListener(aListener)
       , mRequest(aRequest)
       , mRecord(aRecord)
       , mStatus(aStatus)

diff --git a/parser/html/nsHtml5SVGLoadDispatcher.cpp b/parser/html/nsHtml5SVGLoadDispatcher.cpp
@@ -12,7 +12,8 @@
 using namespace mozilla;
 
 nsHtml5SVGLoadDispatcher::nsHtml5SVGLoadDispatcher(nsIContent* aElement)
-  : mElement(aElement)
+  : Runnable("nsHtml5SVGLoadDispatcher")
+  , mElement(aElement)
   , mDocument(mElement->OwnerDoc())
 {
   mDocument->BlockOnload();

diff --git a/storage/mozStorageAsyncStatementExecution.cpp b/storage/mozStorageAsyncStatementExecution.cpp
@@ -56,7 +56,8 @@ class CallbackResultNotifier : public Runnable
   CallbackResultNotifier(mozIStorageStatementCallback *aCallback,
                          mozIStorageResultSet *aResults,
                          AsyncExecuteStatements *aEventStatus) :
-      mCallback(aCallback)
+      Runnable("storage::CallbackResultNotifier")
+    , mCallback(aCallback)
     , mResults(aResults)
     , mEventStatus(aEventStatus)
   {
@@ -93,7 +94,8 @@ class ErrorNotifier : public Runnable
   ErrorNotifier(mozIStorageStatementCallback *aCallback,
                 mozIStorageError *aErrorObj,
                 AsyncExecuteStatements *aEventStatus) :
-      mCallback(aCallback)
+      Runnable("storage::ErrorNotifier")
+    , mCallback(aCallback)
     , mErrorObj(aErrorObj)
     , mEventStatus(aEventStatus)
   {
@@ -133,7 +135,8 @@ class CompletionNotifier : public Runnable
    */
   CompletionNotifier(mozIStorageStatementCallback *aCallback,
                      ExecutionState aReason)
-    : mCallback(aCallback)
+    : Runnable("storage::CompletionNotifier")
+    , mCallback(aCallback)
     , mReason(aReason)
   {
   }

diff --git a/storage/mozStorageConnection.cpp b/storage/mozStorageConnection.cpp
@@ -446,7 +446,8 @@ class AsyncInitializeClone final: public Runnable
                        Connection* aClone,
                        const bool aReadOnly,
                        mozIStorageCompletionCallback* aCallback)
-    : mConnection(aConnection)
+    : Runnable("storage::AsyncInitializeClone")
+    , mConnection(aConnection)
     , mClone(aClone)
     , mReadOnly(aReadOnly)
     , mCallback(aCallback)

diff --git a/storage/mozStorageConnection.h b/storage/mozStorageConnection.h
@@ -398,7 +398,8 @@ class CallbackComplete final : public Runnable
   CallbackComplete(nsresult aStatus,
                    nsISupports* aValue,
                    already_AddRefed<mozIStorageCompletionCallback> aCallback)
-    : mStatus(aStatus)
+    : Runnable("storage::CallbackComplete")
+    , mStatus(aStatus)
     , mValue(aValue)
     , mCallback(aCallback)
   {

diff --git a/widget/nsBaseAppShell.cpp b/widget/nsBaseAppShell.cpp
@@ -308,7 +308,7 @@ nsBaseAppShell::DispatchDummyEvent(nsIThread* aTarget)
   NS_ASSERTION(NS_IsMainThread(), "Wrong thread!");
 
   if (!mDummyEvent)
-    mDummyEvent = new mozilla::Runnable();
+    mDummyEvent = new mozilla::Runnable("DummyEvent");
 
   return NS_SUCCEEDED(aTarget->Dispatch(mDummyEvent, NS_DISPATCH_NORMAL));
 }

diff --git a/xpcom/io/nsStreamUtils.cpp b/xpcom/io/nsStreamUtils.cpp
@@ -38,7 +38,8 @@ class nsInputStreamReadyEvent final
 
   nsInputStreamReadyEvent(nsIInputStreamCallback* aCallback,
                           nsIEventTarget* aTarget)
-    : mCallback(aCallback)
+    : CancelableRunnable("nsInputStreamReadyEvent")
+    , mCallback(aCallback)
     , mTarget(aTarget)
   {
   }
@@ -128,7 +129,8 @@ class nsOutputStreamReadyEvent final
 
   nsOutputStreamReadyEvent(nsIOutputStreamCallback* aCallback,
                            nsIEventTarget* aTarget)
-    : mCallback(aCallback)
+    : CancelableRunnable("nsOutputStreamReadyEvent")
+    , mCallback(aCallback)
     , mTarget(aTarget)
   {
   }
@@ -241,7 +243,8 @@ class nsAStreamCopier
   NS_DECL_ISUPPORTS_INHERITED
 
   nsAStreamCopier()
-    : mLock("nsAStreamCopier.mLock")
+    : CancelableRunnable("nsAStreamCopier")
+    , mLock("nsAStreamCopier.mLock")
     , mCallback(nullptr)
     , mProgressCallback(nullptr)
     , mClosure(nullptr)

diff --git a/xpcom/threads/nsProxyRelease.h b/xpcom/threads/nsProxyRelease.h
@@ -29,7 +29,7 @@ class ProxyReleaseEvent : public mozilla::Runnable
 {
 public:
   explicit ProxyReleaseEvent(already_AddRefed<T> aDoomed)
-  : mDoomed(aDoomed.take()) {}
+  : Runnable("ProxyReleaseEvent"), mDoomed(aDoomed.take()) {}
 
   NS_IMETHOD Run() override
   {

diff --git a/xpcom/threads/nsThread.cpp b/xpcom/threads/nsThread.cpp
@@ -195,7 +195,8 @@ class nsThreadStartupEvent : public Runnable
 {
 public:
   nsThreadStartupEvent()
-    : mMon("nsThreadStartupEvent.mMon")
+    : Runnable("nsThreadStartupEvent")
+    , mMon("nsThreadStartupEvent.mMon")
     , mInitialized(false)
   {
   }
@@ -334,7 +335,8 @@ class nsThreadShutdownAckEvent : public CancelableRunnable
 {
 public:
   explicit nsThreadShutdownAckEvent(NotNull<nsThreadShutdownContext*> aCtx)
-    : mShutdownContext(aCtx)
+    : CancelableRunnable("nsThreadShutdownAckEvent")
+    , mShutdownContext(aCtx)
   {
   }
   NS_IMETHOD Run() override
@@ -358,7 +360,8 @@ class nsThreadShutdownEvent : public Runnable
 public:
   nsThreadShutdownEvent(NotNull<nsThread*> aThr,
                         NotNull<nsThreadShutdownContext*> aCtx)
-    : mThread(aThr)
+    : Runnable("nsThreadShutdownEvent")
+    , mThread(aThr)
     , mShutdownContext(aCtx)
   {
   }

diff --git a/xpcom/threads/nsThreadUtils.cpp b/xpcom/threads/nsThreadUtils.cpp
@@ -57,7 +57,11 @@ Runnable::GetName(nsACString& aName)
 #ifdef RELEASE_OR_BETA
   aName.Truncate();
 #else
-  aName.AssignASCII(mName);
+  if (mName) {
+    aName.AssignASCII(mName);
+  } else {
+    aName.Truncate();
+  }
 #endif
   return NS_OK;
 }

diff --git a/xpcom/threads/nsThreadUtils.h b/xpcom/threads/nsThreadUtils.h
@@ -237,6 +237,12 @@ class Runnable : public nsIRunnable, public nsINamed
 
   Runnable() {}
 
+#ifdef RELEASE_OR_BETA
+  explicit Runnable(const char* aName) {}
+#else
+  explicit Runnable(const char* aName) : mName(aName) {}
+#endif
+
 protected:
   virtual ~Runnable() {}
 private:
@@ -259,6 +265,7 @@ class CancelableRunnable : public Runnable,
   virtual nsresult Cancel() override;
 
   CancelableRunnable() {}
+  explicit CancelableRunnable(const char* aName) : Runnable(aName) {}
 
 protected:
   virtual ~CancelableRunnable() {}