Bug 1791767 - Exclude CachingDatabaseConnection with event target fro…

…m general thread checks. r=dom-storage-reviewers,janv CachingDatabaseConnection relies on a global macro to toggle thread ownership checks. The checks do not work with thread pool event targets and by this change we ensure that the global macro users are not impacted by such event target changes. Depends on D190598 Differential Revision: https://phabricator.services.mozilla.com/D190601
dothq · Oct 16, 2023 · 9ca4cc5 · 9ca4cc5
1 parent 485e9fb
commit 9ca4cc5
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 4 deletions.
diff --git a/dom/quota/CachingDatabaseConnection.cpp b/dom/quota/CachingDatabaseConnection.cpp
@@ -14,15 +14,15 @@ namespace mozilla::dom::quota {
 CachingDatabaseConnection::CachingDatabaseConnection(
     MovingNotNull<nsCOMPtr<mozIStorageConnection>> aStorageConnection)
     :
-#ifdef MOZ_THREAD_SAFETY_OWNERSHIP_CHECKS_SUPPORTED
+#ifdef CACHING_DB_CONNECTION_CHECK_THREAD_OWNERSHIP
       mOwningThread{nsAutoOwningThread{}},
 #endif
       mStorageConnection(std::move(aStorageConnection)) {
 }
 
 void CachingDatabaseConnection::LazyInit(
     MovingNotNull<nsCOMPtr<mozIStorageConnection>> aStorageConnection) {
-#ifdef MOZ_THREAD_SAFETY_OWNERSHIP_CHECKS_SUPPORTED
+#ifdef CACHING_DB_CONNECTION_CHECK_THREAD_OWNERSHIP
   mOwningThread.init();
 #endif
   mStorageConnection.init(std::move(aStorageConnection));

diff --git a/dom/quota/CachingDatabaseConnection.h b/dom/quota/CachingDatabaseConnection.h
@@ -67,7 +67,7 @@ class CachingDatabaseConnection {
   class LazyStatement;
 
   void AssertIsOnConnectionThread() const {
-#ifdef MOZ_THREAD_SAFETY_OWNERSHIP_CHECKS_SUPPORTED
+#ifdef CACHING_DB_CONNECTION_CHECK_THREAD_OWNERSHIP
     mOwningThread->AssertOwnership("CachingDatabaseConnection not thread-safe");
 #endif
   }
@@ -125,7 +125,7 @@ class CachingDatabaseConnection {
   void Close();
 
  private:
-#ifdef MOZ_THREAD_SAFETY_OWNERSHIP_CHECKS_SUPPORTED
+#ifdef CACHING_DB_CONNECTION_CHECK_THREAD_OWNERSHIP
   LazyInitializedOnce<const nsAutoOwningThread> mOwningThread;
 #endif
 

diff --git a/dom/quota/Config.h b/dom/quota/Config.h
@@ -33,4 +33,14 @@
 #  define QM_COLLECTING_OPERATION_TELEMETRY
 #endif
 
+/**
+ * The thread ownership checks in CachingDatabaseConnection assumes that the
+ * object lives on a single thread, not any serial event target.
+ * Defining CACHING_DB_CONNECTION_CHECK_THREAD_OWNERSHIP restores the checks.
+ * See bug 1858989.
+ */
+#if 0
+#  define CACHING_DB_CONNECTION_CHECK_THREAD_OWNERSHIP 1
+#endif
+
 #endif  // DOM_QUOTA_CONFIG_H_