Backed out 8 changesets (bug 1695580) for causing build bustages on DataMutex.h. CLOSED TREE

Backed out changeset ec0b0fcc8d88 (bug 1695580)
Backed out changeset 982a46056fcb (bug 1695580)
Backed out changeset e38e8b90f119 (bug 1695580)
Backed out changeset 6fdd154aa151 (bug 1695580)
Backed out changeset d04f7a7ec375 (bug 1695580)
Backed out changeset 2103cd9e58b7 (bug 1695580)
Backed out changeset de9a7dd7fc79 (bug 1695580)
Backed out changeset ae16f09be41b (bug 1695580)

Author: cristianbrindusan

dom/media/mediacontrol/MediaController.h

@@ -15,7 +15,6 @@
 #include "mozilla/dom/MediaSession.h"
 #include "mozilla/LinkedList.h"
 #include "nsISupportsImpl.h"
-#include "nsITimer.h"
 
 namespace mozilla {
 namespace dom {

modules/libpref/init/all.js

@@ -803,7 +803,7 @@ pref("toolkit.telemetry.unified", true);
   #if defined(MOZ_TSAN)
     pref("toolkit.asyncshutdown.crash_timeout", 360000); // 6 minutes
   #else
-    pref("toolkit.asyncshutdown.crash_timeout", 300000); // 5 minutes
+    pref("toolkit.asyncshutdown.crash_timeout", 180000); // 3 minutes
   #endif
 #endif // !defined(MOZ_ASAN) && !defined(MOZ_TSAN)
 // Extra logging for AsyncShutdown barriers and phases

netwerk/base/nsStreamTransportService.cpp

@@ -16,7 +16,6 @@
 #include "nsITransport.h"
 #include "nsIObserverService.h"
 #include "nsThreadPool.h"
-#include "mozilla/DelayedRunnable.h"
 #include "mozilla/Services.h"
 
 namespace mozilla {
@@ -244,12 +243,6 @@ nsInputStreamTransport::OnInputStreamReady(nsIAsyncInputStream* aStream) {
 // nsStreamTransportService
 //-----------------------------------------------------------------------------
 
-nsStreamTransportService::nsStreamTransportService()
-    : mScheduledDelayedRunnables(
-          "nsStreamTransportService.mScheduledDelayedRunnables"),
-      mShutdownLock("nsStreamTransportService.mShutdownLock"),
-      mIsShutdown(false) {}
-
 nsStreamTransportService::~nsStreamTransportService() {
   NS_ASSERTION(!mPool, "thread pool wasn't shutdown");
 }
@@ -269,25 +262,8 @@ nsresult nsStreamTransportService::Init() {
   return NS_OK;
 }
 
-void nsStreamTransportService::OnDelayedRunnableCreated(
-    DelayedRunnable* aRunnable) {}
-
-void nsStreamTransportService::OnDelayedRunnableScheduled(
-    DelayedRunnable* aRunnable) {
-  MOZ_ASSERT(IsOnCurrentThread());
-  auto delayedRunnables = mScheduledDelayedRunnables.Lock();
-  delayedRunnables->AppendElement(aRunnable);
-}
-
-void nsStreamTransportService::OnDelayedRunnableRan(
-    DelayedRunnable* aRunnable) {
-  MOZ_ASSERT(IsOnCurrentThread());
-  auto delayedRunnables = mScheduledDelayedRunnables.Lock();
-  MOZ_ALWAYS_TRUE(delayedRunnables->RemoveElement(aRunnable));
-}
-
 NS_IMPL_ISUPPORTS(nsStreamTransportService, nsIStreamTransportService,
-                  nsIEventTarget, nsIDelayedRunnableObserver, nsIObserver)
+                  nsIEventTarget, nsIObserver)
 
 NS_IMETHODIMP
 nsStreamTransportService::DispatchFromScript(nsIRunnable* task,
@@ -377,31 +353,6 @@ nsStreamTransportService::Observe(nsISupports* subject, const char* topic,
     mPool->Shutdown();
     mPool = nullptr;
   }
-
-  // Because the DelayedRunnables are run by a thread pool, no guarantee is
-  // given to which thread they run or get released on. Releasing them on the
-  // thread pool or on the background target thus doesn't really matter. We are
-  // forced to do it on the background target after the thread pool has finished
-  // processing all events, since doing it on the thread pool would allow the
-  // shutdown task to race with scheduling new DelayedRunnables, possibly
-  // missing the cleanup of some of them.
-  nsTArray<RefPtr<DelayedRunnable>> delayedRunnables;
-  {
-    auto sdrs = mScheduledDelayedRunnables.Lock();
-    std::swap(*sdrs, delayedRunnables);
-    MOZ_ASSERT(sdrs->IsEmpty());
-  }
-  if (!delayedRunnables.IsEmpty()) {
-    NS_DispatchBackgroundTask(
-        NS_NewRunnableFunction(
-            "nsStreamTransportService::mScheduledDelayedRunnables Cancel",
-            [delayedRunnables = std::move(delayedRunnables)] {
-              for (const auto& r : delayedRunnables) {
-                r->CancelTimer();
-              }
-            }),
-        NS_DISPATCH_SYNC);
-  }
   return NS_OK;
 }
 

netwerk/base/nsStreamTransportService.h

@@ -5,26 +5,21 @@
 #ifndef nsStreamTransportService_h__
 #define nsStreamTransportService_h__
 
-#include "nsIDelayedRunnableObserver.h"
 #include "nsIStreamTransportService.h"
 #include "nsIEventTarget.h"
 #include "nsIObserver.h"
 #include "nsCOMPtr.h"
 #include "nsThreadUtils.h"
 #include "mozilla/Attributes.h"
-#include "mozilla/DataMutex.h"
 #include "mozilla/Mutex.h"
 
 class nsIThreadPool;
 
 namespace mozilla {
-class DelayedRunnable;
-
 namespace net {
 
 class nsStreamTransportService final : public nsIStreamTransportService,
                                        public nsIEventTarget,
-                                       public nsIDelayedRunnableObserver,
                                        public nsIObserver {
  public:
   NS_DECL_THREADSAFE_ISUPPORTS
@@ -34,19 +29,15 @@ class nsStreamTransportService final : public nsIStreamTransportService,
 
   nsresult Init();
 
-  nsStreamTransportService();
-
-  void OnDelayedRunnableCreated(DelayedRunnable* aRunnable) override;
-  void OnDelayedRunnableScheduled(DelayedRunnable* aRunnable) override;
-  void OnDelayedRunnableRan(DelayedRunnable* aRunnable) override;
+  nsStreamTransportService()
+      : mShutdownLock("nsStreamTransportService.mShutdownLock"),
+        mIsShutdown(false) {}
 
  private:
   ~nsStreamTransportService();
 
   nsCOMPtr<nsIThreadPool> mPool;
 
-  DataMutex<nsTArray<RefPtr<DelayedRunnable>>> mScheduledDelayedRunnables;
-
   mozilla::Mutex mShutdownLock;
   bool mIsShutdown;
 };

netwerk/protocol/websocket/WebSocketChannel.cpp

@@ -1181,8 +1181,6 @@ WebSocketChannel::~WebSocketChannel() {
 
   NS_ReleaseOnMainThread("WebSocketChannel::mLoadGroup", mLoadGroup.forget());
   NS_ReleaseOnMainThread("WebSocketChannel::mLoadInfo", mLoadInfo.forget());
-  NS_ReleaseOnMainThread("WebSocketChannel::mTargetThread",
-                         mTargetThread.forget());
   NS_ReleaseOnMainThread("WebSocketChannel::mService", mService.forget());
 }
 

testing/mochitest/mochitest_options.py

@@ -1174,6 +1174,7 @@ def validate(self, parser, options, context):
             "forkserver": options.defaultLeakThreshold,
             # GMP rarely gets a log, but when it does, it leaks a little.
             "gmplugin": 20000,
+            "rdd": 400,
         }
 
         # See the dependencies of bug 1401764.

xpcom/build/XPCOMInit.cpp

@@ -621,7 +621,6 @@ nsresult ShutdownXPCOM(nsIServiceManager* aServMgr) {
 
     mozilla::AppShutdown::AdvanceShutdownPhase(
         mozilla::ShutdownPhase::XPCOMShutdownThreads);
-    nsThreadManager::get().CancelBackgroundDelayedRunnables();
     gXPCOMThreadsShutDown = true;
     NS_ProcessPendingEvents(thread);
 

xpcom/tests/gtest/TestDelayedRunnable.cpp

@@ -16,7 +16,6 @@ UNIFIED_SOURCES += [
     "TestCOMPtrEq.cpp",
     "TestCRT.cpp",
     "TestDafsa.cpp",
-    "TestDelayedRunnable.cpp",
     "TestEncoding.cpp",
     "TestEscape.cpp",
     "TestEventPriorities.cpp",

xpcom/tests/gtest/moz.build

@@ -7,7 +7,6 @@
 #include "mozilla/AbstractThread.h"
 
 #include "mozilla/ClearOnShutdown.h"
-#include "mozilla/DelayedRunnable.h"
 #include "mozilla/Maybe.h"
 #include "mozilla/MozPromise.h"  // We initialize the MozPromise logging in this file.
 #include "mozilla/StateWatching.h"  // We initialize the StateWatching logging in this file.
@@ -31,14 +30,12 @@ MOZ_THREAD_LOCAL(AbstractThread*) AbstractThread::sCurrentThreadTLS;
 
 class XPCOMThreadWrapper final : public AbstractThread,
                                  public nsIThreadObserver,
-                                 public nsIDirectTaskDispatcher,
-                                 public nsIDelayedRunnableObserver {
+                                 public nsIDirectTaskDispatcher {
  public:
   XPCOMThreadWrapper(nsIThreadInternal* aThread, bool aRequireTailDispatch,
                      bool aOnThread)
       : AbstractThread(aRequireTailDispatch),
         mThread(aThread),
-        mDelayedRunnableObserver(do_QueryInterface(mThread)),
         mDirectTaskDispatcher(do_QueryInterface(aThread)),
         mOnThread(aOnThread) {
     MOZ_DIAGNOSTIC_ASSERT(mThread && mDirectTaskDispatcher);
@@ -160,22 +157,8 @@ class XPCOMThreadWrapper final : public AbstractThread,
     return mDirectTaskDispatcher->HaveDirectTasks(aResult);
   }
 
-  //-----------------------------------------------------------------------------
-  // nsIDelayedRunnableObserver
-  //-----------------------------------------------------------------------------
-  void OnDelayedRunnableCreated(DelayedRunnable* aRunnable) override {
-    mDelayedRunnableObserver->OnDelayedRunnableCreated(aRunnable);
-  }
-  void OnDelayedRunnableScheduled(DelayedRunnable* aRunnable) override {
-    mDelayedRunnableObserver->OnDelayedRunnableScheduled(aRunnable);
-  }
-  void OnDelayedRunnableRan(DelayedRunnable* aRunnable) override {
-    mDelayedRunnableObserver->OnDelayedRunnableRan(aRunnable);
-  }
-
  private:
   const RefPtr<nsIThreadInternal> mThread;
-  const nsCOMPtr<nsIDelayedRunnableObserver> mDelayedRunnableObserver;
   const nsCOMPtr<nsIDirectTaskDispatcher> mDirectTaskDispatcher;
   Maybe<AutoTaskDispatcher> mTailDispatcher;
   const bool mOnThread;
@@ -231,16 +214,8 @@ class XPCOMThreadWrapper final : public AbstractThread,
     const RefPtr<nsIRunnable> mRunnable;
   };
 };
-
-NS_INTERFACE_MAP_BEGIN(XPCOMThreadWrapper)
-  NS_INTERFACE_MAP_ENTRY(nsIThreadObserver)
-  NS_INTERFACE_MAP_ENTRY(nsIDirectTaskDispatcher)
-  NS_INTERFACE_MAP_ENTRY_CONDITIONAL(nsIDelayedRunnableObserver,
-                                     mDelayedRunnableObserver)
-NS_INTERFACE_MAP_END_INHERITING(AbstractThread)
-
-NS_IMPL_ADDREF_INHERITED(XPCOMThreadWrapper, AbstractThread)
-NS_IMPL_RELEASE_INHERITED(XPCOMThreadWrapper, AbstractThread)
+NS_IMPL_ISUPPORTS_INHERITED(XPCOMThreadWrapper, AbstractThread,
+                            nsIThreadObserver, nsIDirectTaskDispatcher);
 
 NS_IMPL_ISUPPORTS(AbstractThread, nsIEventTarget, nsISerialEventTarget)