Changeset 54506 in webkit

Timestamp:

Feb 8, 2010 1:20:01 PM (14 years ago)

Author:

dumi@chromium.org

Message:

WebCore: Adding a way to get the set of all open database handles pointing
to a given database.
​https://bugs.webkit.org/show_bug.cgi?id=34619

Reviewed by Jeremy Orlow.

Sometimes we need to be able to close all handles to a database as
soon as possible (to delete the DB file, for example).

• storage/DatabaseTracker.cpp:

(WebCore::DatabaseTracker::getOpenDatabases):

• storage/DatabaseTracker.h:
• storage/chromium/DatabaseTrackerChromium.cpp:

(WebCore::DatabaseTracker::addOpenDatabase):
(WebCore::DatabaseTracker::removeOpenDatabase):
(WebCore::DatabaseTracker::getOpenDatabases):

WebKit/chromium: Adding a way to close all database handles pointing to a certain
database as soon as possible.
​https://bugs.webkit.org/show_bug.cgi?id=34619

Reviewed by Jeremy Orlow.

• public/WebDatabase.h:
• src/WebDatabase.cpp:

(WebKit::WebDatabase::closeDatabaseImmediately):

Location:

trunk

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/storage/DatabaseTracker.cpp (modified) (1 diff)
• WebCore/storage/DatabaseTracker.h (modified) (5 diffs)
• WebCore/storage/chromium/DatabaseTrackerChromium.cpp (modified) (3 diffs)
• WebKit/chromium/ChangeLog (modified) (1 diff)
• WebKit/chromium/public/WebDatabase.h (modified) (1 diff)
• WebKit/chromium/src/WebDatabase.cpp (modified) (2 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-02-05  Dumitru Daniliuc  <dumi@chromium.org>
+
+        Reviewed by Jeremy Orlow.
+
+        Adding a way to get the set of all open database handles pointing
+        to a given database.
+        https://bugs.webkit.org/show_bug.cgi?id=34619
+
+        Sometimes we need to be able to close all handles to a database as
+        soon as possible (to delete the DB file, for example).
+
+        * storage/DatabaseTracker.cpp:
+        (WebCore::DatabaseTracker::getOpenDatabases):
+        * storage/DatabaseTracker.h:
+        * storage/chromium/DatabaseTrackerChromium.cpp:
+        (WebCore::DatabaseTracker::addOpenDatabase):
+        (WebCore::DatabaseTracker::removeOpenDatabase):
+        (WebCore::DatabaseTracker::getOpenDatabases):
+
 2010-02-08  Dirk Schulze  <krit@webkit.org>
 

trunk/WebCore/storage/DatabaseTracker.cpp

@@ -479 +479 @@
 }
 
+void DatabaseTracker::getOpenDatabases(SecurityOrigin* origin, const String& name, HashSet<RefPtr<Database> >* databases)
+{
+    MutexLocker openDatabaseMapLock(m_openDatabaseMapGuard);
+    if (!m_openDatabaseMap)
+        return;
+
+    DatabaseNameMap* nameMap = m_openDatabaseMap->get(origin);
+    if (!nameMap)
+        return;
+
+    DatabaseSet* databaseSet = nameMap->get(name);
+    if (!databaseSet)
+        return;
+
+    for (DatabaseSet::iterator it = databaseSet->begin(); it != databaseSet->end(); ++it)
+        databases->add(*it);
+}
+
 unsigned long long DatabaseTracker::usageForOrigin(SecurityOrigin* origin)
 {

trunk/WebCore/storage/DatabaseTracker.h

@@ -33 +33 @@
 
 #include "PlatformString.h"
+#include "StringHash.h"
+#include <wtf/HashMap.h>
+#include <wtf/HashSet.h>
 
 #if !PLATFORM(CHROMIUM)
 #include "DatabaseDetails.h"
 #include "SQLiteDatabase.h"
-#include "StringHash.h"
-#include <wtf/HashMap.h>
-#include <wtf/HashSet.h>
 #include <wtf/OwnPtr.h>
 #endif // !PLATFORM(CHROMIUM)
@@ -49 +49 @@
 class SecurityOrigin;
 
+struct SecurityOriginHash;
+
 #if !PLATFORM(CHROMIUM)
 class DatabaseTrackerClient;
 class OriginQuotaManager;
 
-struct SecurityOriginHash;
 struct SecurityOriginTraits;
 #endif // !PLATFORM(CHROMIUM)
@@ -70 +71 @@
     void addOpenDatabase(Database*);
     void removeOpenDatabase(Database*);
+    void getOpenDatabases(SecurityOrigin* origin, const String& name, HashSet<RefPtr<Database> >* databases);
 
     unsigned long long getMaxSizeForDatabase(const Database*);
@@ -75 +77 @@
 private:
     DatabaseTracker();
+
+    typedef HashSet<Database*> DatabaseSet;
+    typedef HashMap<String, DatabaseSet*> DatabaseNameMap;
+    typedef HashMap<RefPtr<SecurityOrigin>, DatabaseNameMap*, SecurityOriginHash> DatabaseOriginMap;
+
+    Mutex m_openDatabaseMapGuard;
+    mutable OwnPtr<DatabaseOriginMap> m_openDatabaseMap;
 
 #if !PLATFORM(CHROMIUM)
@@ -124 +133 @@
     mutable OwnPtr<QuotaMap> m_quotaMap;
 
-    typedef HashSet<Database*> DatabaseSet;
-    typedef HashMap<String, DatabaseSet*> DatabaseNameMap;
-    typedef HashMap<RefPtr<SecurityOrigin>, DatabaseNameMap*, SecurityOriginHash> DatabaseOriginMap;
-
-    Mutex m_openDatabaseMapGuard;
-    mutable OwnPtr<DatabaseOriginMap> m_openDatabaseMap;
-
     OwnPtr<OriginQuotaManager> m_quotaManager;
 

trunk/WebCore/storage/chromium/DatabaseTrackerChromium.cpp

@@ -39 +39 @@
 #include "ScriptExecutionContext.h"
 #include "SecurityOrigin.h"
+#include "SecurityOriginHash.h"
 #include "SQLiteFileSystem.h"
 #include <wtf/HashSet.h>
@@ -77 +78 @@
 {
     ASSERT(database->scriptExecutionContext()->isContextThread());
+    MutexLocker openDatabaseMapLock(m_openDatabaseMapGuard);
+    if (!m_openDatabaseMap)
+        m_openDatabaseMap.set(new DatabaseOriginMap());
+
+    DatabaseNameMap* nameMap = m_openDatabaseMap->get(database->securityOrigin());
+    if (!nameMap) {
+        nameMap = new DatabaseNameMap();
+        m_openDatabaseMap->set(database->securityOrigin(), nameMap);
+    }
+
+    String name(database->stringIdentifier());
+    DatabaseSet* databaseSet = nameMap->get(name);
+    if (!databaseSet) {
+        databaseSet = new DatabaseSet();
+        nameMap->set(name, databaseSet);
+    }
+
+    databaseSet->add(database);
+
     DatabaseObserver::databaseOpened(database);
 }
@@ -108 +128 @@
     }
 
+    MutexLocker openDatabaseMapLock(m_openDatabaseMapGuard);
+    ASSERT(m_openDatabaseMap);
+    DatabaseNameMap* nameMap = m_openDatabaseMap->get(database->securityOrigin());
+    ASSERT(nameMap);
+    String name(database->stringIdentifier());
+    DatabaseSet* databaseSet = nameMap->get(name);
+    ASSERT(databaseSet);
+    databaseSet->remove(database);
+
+    if (databaseSet->isEmpty()) {
+        nameMap->remove(name);
+        delete databaseSet;
+        if (nameMap->isEmpty()) {
+            m_openDatabaseMap->remove(database->securityOrigin());
+            delete nameMap;
+        }
+    }
+
     DatabaseObserver::databaseClosed(database);
+}
+
+
+void DatabaseTracker::getOpenDatabases(SecurityOrigin* origin, const String& name, HashSet<RefPtr<Database> >* databases)
+{
+    MutexLocker openDatabaseMapLock(m_openDatabaseMapGuard);
+    if (!m_openDatabaseMap)
+        return;
+
+    DatabaseNameMap* nameMap = m_openDatabaseMap->get(origin);
+    if (!nameMap)
+        return;
+
+    DatabaseSet* databaseSet = nameMap->get(name);
+    if (!databaseSet)
+        return;
+
+    for (DatabaseSet::iterator it = databaseSet->begin(); it != databaseSet->end(); ++it)
+        databases->add(*it);
 }
 

trunk/WebKit/chromium/ChangeLog

@@ +1 @@
+2010-02-05  Dumitru Daniliuc  <dumi@chromium.org>
+
+        Reviewed by Jeremy Orlow.
+
+        Adding a way to close all database handles pointing to a certain
+        database as soon as possible.
+        https://bugs.webkit.org/show_bug.cgi?id=34619
+
+        * public/WebDatabase.h:
+        * src/WebDatabase.cpp:
+        (WebKit::WebDatabase::closeDatabaseImmediately):
+
 2010-02-08  Dirk Schulze  <krit@webkit.org>
 

trunk/WebKit/chromium/public/WebDatabase.h

@@ -73 +73 @@
         const WebString& originIdentifier, const WebString& databaseName,
         unsigned long long databaseSize, unsigned long long spaceAvailable);
+    WEBKIT_API static void closeDatabaseImmediately(
+        const WebString& originIdentifier, const WebString& databaseName);
 
 #if WEBKIT_IMPLEMENTATION

trunk/WebKit/chromium/src/WebDatabase.cpp

@@ -33 +33 @@
 
 #include "Database.h"
+#include "DatabaseTask.h"
 #include "DatabaseThread.h"
+#include "DatabaseTracker.h"
 #include "Document.h"
 #include "KURL.h"
@@ -107 +109 @@
 }
 
+void WebDatabase::closeDatabaseImmediately(const WebString& originIdentifier, const WebString& databaseName)
+{
+    HashSet<RefPtr<Database> > databaseHandles;
+    PassRefPtr<SecurityOrigin> originPrp(*WebSecurityOrigin::createFromDatabaseIdentifier(originIdentifier));
+    RefPtr<SecurityOrigin> origin = originPrp;
+    DatabaseTracker::tracker().getOpenDatabases(origin.get(), databaseName, &databaseHandles);
+    for (HashSet<RefPtr<Database> >::iterator it = databaseHandles.begin(); it != databaseHandles.end(); ++it) {
+        Database* database = it->get();
+        DatabaseThread* databaseThread = database->scriptExecutionContext()->databaseThread();
+        if (databaseThread && !databaseThread->terminationRequested()) {
+            database->stop();
+            databaseThread->scheduleTask(DatabaseCloseTask::create(database, 0));
+        }
+    }
+}
+
 WebDatabase::WebDatabase(const WTF::PassRefPtr<Database>& database)
     : m_private(static_cast<WebDatabasePrivate*>(database.releaseRef()))