Enable per thread heap for database thread

third_party/WebKit/Source/modules/webdatabase/DatabaseThread.cpp

 /*
  * Copyright (C) 2007, 2008, 2013 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  *
  * 1.  Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer.
  * 2.  Redistributions in binary form must reproduce the above copyright
@@ skipping 23 matching lines @@
 #include "modules/webdatabase/SQLTransactionCoordinator.h"
 #include "platform/Logging.h"
 #include "platform/ThreadSafeFunctional.h"
 #include "platform/WebThreadSupportingGC.h"
 #include "public/platform/Platform.h"
 
 namespace blink {
 
 DatabaseThread::DatabaseThread()
     : m_transactionClient(adoptPtr(new SQLTransactionClient()))
-    , m_transactionCoordinator(new SQLTransactionCoordinator())
     , m_cleanupSync(nullptr)
     , m_terminationRequested(false)
 {
+    DCHECK(isMainThread());
 }
 
 DatabaseThread::~DatabaseThread()
 {
-    ASSERT(m_openDatabaseSet.isEmpty());
+    DCHECK(!m_openDatabaseSet);
     ASSERT(!m_thread);
 }
 
 DEFINE_TRACE(DatabaseThread)
 {
-    visitor->trace(m_openDatabaseSet);
-    visitor->trace(m_transactionCoordinator);
 }
 
 void DatabaseThread::start()
 {
-    ASSERT(isMainThread());
+    DCHECK(isMainThread());
     if (m_thread)
         return;
-    m_thread = WebThreadSupportingGC::create("WebCore: Database");
+    m_thread = WebThreadSupportingGC::create("WebCore: Database", true);
     m_thread->postTask(BLINK_FROM_HERE, threadSafeBind(&DatabaseThread::setupDatabaseThread, wrapCrossThreadPersistent(this)));
 }
 
 void DatabaseThread::setupDatabaseThread()
 {
     m_thread->initialize();
+    m_transactionCoordinator = new SQLTransactionCoordinator();
 }
 
 void DatabaseThread::terminate()
 {
-    ASSERT(isMainThread());
+    DCHECK(isMainThread());
     TaskSynchronizer sync;
     {
         MutexLocker lock(m_terminationRequestedMutex);
         ASSERT(!m_terminationRequested);
         m_terminationRequested = true;
         m_cleanupSync = &sync;
         WTF_LOG(StorageAPI, "DatabaseThread %p was asked to terminate\n", this);
         m_thread->postTask(BLINK_FROM_HERE, threadSafeBind(&DatabaseThread::cleanupDatabaseThread, wrapCrossThreadPersistent(this)));
     }
     sync.waitForTaskCompletion();
     // The WebThread destructor blocks until all the tasks of the database
     // thread are processed. However, it shouldn't block at all because
     // the database thread has already finished processing the cleanup task.
     m_thread.clear();
 }
 
 void DatabaseThread::cleanupDatabaseThread()
 {
+    DCHECK(isDatabaseThread());
+
     WTF_LOG(StorageAPI, "Cleaning up DatabaseThread %p", this);
 
     // Clean up the list of all pending transactions on this database thread
     m_transactionCoordinator->shutdown();
 
     // Close the databases that we ran transactions on. This ensures that if any transactions are still open, they are rolled back and we don't leave the database in an
     // inconsistent or locked state.
-    if (m_openDatabaseSet.size() > 0) {
+    if (m_openDatabaseSet) {
         // As the call to close will modify the original set, we must take a copy to iterate over.
-        HeapHashSet<Member<Database>> openSetCopy;
-        openSetCopy.swap(m_openDatabaseSet);
-        HeapHashSet<Member<Database>>::iterator end = openSetCopy.end();
-        for (HeapHashSet<Member<Database>>::iterator it = openSetCopy.begin(); it != end; ++it)
+        HashSet<CrossThreadPersistent<Database>> openSetCopy;
+        openSetCopy.swap(*m_openDatabaseSet);
+        HashSet<CrossThreadPersistent<Database>>::iterator end = openSetCopy.end();
+        for (HashSet<CrossThreadPersistent<Database>>::iterator it = openSetCopy.begin(); it != end; ++it)
             (*it)->close();
+        m_openDatabaseSet = nullptr;
     }
-    m_openDatabaseSet.clear();
 
     m_thread->postTask(BLINK_FROM_HERE, WTF::bind(&DatabaseThread::cleanupDatabaseThreadCompleted, this));
 }
 
 void DatabaseThread::cleanupDatabaseThreadCompleted()
 {
     m_thread->shutdown();
     if (m_cleanupSync) // Someone wanted to know when we were done cleaning up.
         m_cleanupSync->taskCompleted();
 }
 
 void DatabaseThread::recordDatabaseOpen(Database* database)
 {
     ASSERT(isDatabaseThread());
     ASSERT(database);
-    ASSERT(!m_openDatabaseSet.contains(database));
+    if (!m_openDatabaseSet)
+        m_openDatabaseSet = adoptPtr(new HashSet<CrossThreadPersistent<Database>>());
+    DCHECK(!m_openDatabaseSet->contains(database));
     MutexLocker lock(m_terminationRequestedMutex);
     if (!m_terminationRequested)
-        m_openDatabaseSet.add(database);
+        m_openDatabaseSet->add(database);
 }
 
 void DatabaseThread::recordDatabaseClosed(Database* database)
 {
     ASSERT(isDatabaseThread());
     ASSERT(database);
 #if ENABLE(ASSERT)
     {
         MutexLocker lock(m_terminationRequestedMutex);
-        ASSERT(m_terminationRequested || m_openDatabaseSet.contains(database));
+        DCHECK(m_terminationRequested || m_openDatabaseSet->contains(database));
     }
 #endif
-    m_openDatabaseSet.remove(database);
+    if (!m_openDatabaseSet) {
+        m_openDatabaseSet->remove(database);
+        if (m_openDatabaseSet->isEmpty())
+            m_openDatabaseSet = nullptr;
+    }
 }
 
 bool DatabaseThread::isDatabaseOpen(Database* database)
 {
     ASSERT(isDatabaseThread());
     ASSERT(database);
     MutexLocker lock(m_terminationRequestedMutex);
-    return !m_terminationRequested && m_openDatabaseSet.contains(database);
+    return !m_terminationRequested && m_openDatabaseSet->contains(database);
 }
 
 bool DatabaseThread::isDatabaseThread() const
 {
     // This function is called only from the main thread or the database
     // thread. If we are not in the main thread, we are in the database thread.
     return !isMainThread();
 }
 
 void DatabaseThread::scheduleTask(PassOwnPtr<DatabaseTask> task)
 {
     ASSERT(m_thread);
 #if ENABLE(ASSERT)
     {
         MutexLocker lock(m_terminationRequestedMutex);
         ASSERT(!m_terminationRequested);
     }
 #endif
     // WebThread takes ownership of the task.
     m_thread->postTask(BLINK_FROM_HERE, threadSafeBind(&DatabaseTask::run, std::move(task)));
 }
 
 } // namespace blink