Bug 1731564: Use motivated SpinEventLoopUntil inside storage/*. r=janv

Depends on D127232 Differential Revision: https://phabricator.services.mozilla.com/D127233
dothq · Oct 7, 2021 · 1a837fb · 1a837fb
1 parent 4320224
commit 1a837fb
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 12 deletions.
diff --git a/storage/mozStorageConnection.cpp b/storage/mozStorageConnection.cpp
@@ -1423,7 +1423,9 @@ Connection::SpinningSynchronousClose() {
   RefPtr<CloseListener> listener = new CloseListener();
   rv = AsyncClose(listener);
   NS_ENSURE_SUCCESS(rv, rv);
-  MOZ_ALWAYS_TRUE(SpinEventLoopUntil([&]() { return listener->mClosed; }));
+  MOZ_ALWAYS_TRUE(
+      SpinEventLoopUntil("storage::Connection::SpinningSynchronousClose"_ns,
+                         [&]() { return listener->mClosed; }));
   MOZ_ASSERT(isClosed(), "The connection should be closed at this point");
 
   return rv;

diff --git a/storage/mozStorageService.cpp b/storage/mozStorageService.cpp
@@ -701,17 +701,19 @@ Service::Observe(nsISupports*, const char* aTopic, const char16_t*) {
       (void)os->RemoveObserver(this, sObserverTopics[i]);
     }
 
-    SpinEventLoopUntil([&]() -> bool {
-      // We must wait until all the closing connections are closed.
-      nsTArray<RefPtr<Connection>> connections;
-      getConnections(connections);
-      for (auto& conn : connections) {
-        if (conn->isClosing()) {
-          return false;
-        }
-      }
-      return true;
-    });
+    SpinEventLoopUntil("storage::Service::Observe(xpcom-shutdown-threads)"_ns,
+                       [&]() -> bool {
+                         // We must wait until all the closing connections are
+                         // closed.
+                         nsTArray<RefPtr<Connection>> connections;
+                         getConnections(connections);
+                         for (auto& conn : connections) {
+                           if (conn->isClosing()) {
+                             return false;
+                           }
+                         }
+                         return true;
+                       });
 
 #ifdef DEBUG
     nsTArray<RefPtr<Connection>> connections;