Changeset 149631 in webkit

Timestamp:

May 6, 2013, 1:13:08 PM (12 years ago)

Author:

andersca@apple.com

Message:

Handle closing the local storage database
​https://bugs.webkit.org/show_bug.cgi?id=115669

Reviewed by Beth Dakin.

• UIProcess/Storage/LocalStorageDatabase.cpp:

(WebKit::LocalStorageDatabase::LocalStorageDatabase):
Initialize m_isClosed.

(WebKit::LocalStorageDatabase::~LocalStorageDatabase):
Assert that m_isClosed is false.

(WebKit::LocalStorageDatabase::close):
Set m_isClosed to true and write any pending changes to disk.

(WebKit::LocalStorageDatabase::updateDatabase):
Compute the changed items and pass them to updateDatabaseWithChangedItems.

(WebKit::LocalStorageDatabase::updateDatabaseWithChangedItems):
Split out the code that actually writes to the database from updateDatabase and into this function.

• UIProcess/Storage/LocalStorageDatabase.h:
• UIProcess/Storage/StorageManager.cpp:

(WebKit::StorageManager::StorageArea::~StorageArea):
Call close().

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/Storage/LocalStorageDatabase.cpp (modified) (5 diffs)
• UIProcess/Storage/LocalStorageDatabase.h (modified) (3 diffs)
• UIProcess/Storage/StorageManager.cpp (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2013-05-06  Anders Carlsson  <andersca@apple.com>
+
+        Handle closing the local storage database
+        https://bugs.webkit.org/show_bug.cgi?id=115669
+
+        Reviewed by Beth Dakin.
+
+        * UIProcess/Storage/LocalStorageDatabase.cpp:
+        (WebKit::LocalStorageDatabase::LocalStorageDatabase):
+        Initialize m_isClosed.
+    
+        (WebKit::LocalStorageDatabase::~LocalStorageDatabase):
+        Assert that m_isClosed is false.
+
+        (WebKit::LocalStorageDatabase::close):
+        Set m_isClosed to true and write any pending changes to disk.
+
+        (WebKit::LocalStorageDatabase::updateDatabase):
+        Compute the changed items and pass them to updateDatabaseWithChangedItems.
+
+        (WebKit::LocalStorageDatabase::updateDatabaseWithChangedItems):
+        Split out the code that actually writes to the database from updateDatabase and into this function.
+
+        * UIProcess/Storage/LocalStorageDatabase.h:
+        * UIProcess/Storage/StorageManager.cpp:
+        (WebKit::StorageManager::StorageArea::~StorageArea):
+        Call close().
+
 2013-05-06  Zan Dobersek  <zdobersek@igalia.com>
 

trunk/Source/WebKit2/UIProcess/Storage/LocalStorageDatabase.cpp

@@ -54 +54 @@
     , m_failedToOpenDatabase(false)
     , m_didImportItems(false)
+    , m_isClosed(false)
     , m_didScheduleDatabaseUpdate(false)
     , m_shouldClearItems(false)
@@ -61 +62 @@
 LocalStorageDatabase::~LocalStorageDatabase()
 {
+    ASSERT(m_isClosed);
 }
 
@@ -204 +206 @@
 }
 
+void LocalStorageDatabase::close()
+{
+    ASSERT(!m_isClosed);
+    m_isClosed = true;
+
+    if (m_didScheduleDatabaseUpdate) {
+        updateDatabaseWithChangedItems(m_changedItems);
+        m_changedItems.clear();
+    }
+
+    // FIXME: Delete the database if it's empty.
+}
+
 void LocalStorageDatabase::itemDidChange(const String& key, const String& value)
 {
@@ -221 +236 @@
 void LocalStorageDatabase::updateDatabase()
 {
+    if (m_isClosed)
+        return;
+
     ASSERT(m_didScheduleDatabaseUpdate);
-
     m_didScheduleDatabaseUpdate = false;
 
+    HashMap<String, String> changedItems;
+    if (m_changedItems.size() <= maximumItemsToUpdate) {
+        // There are few enough changed items that we can just always write all of them.
+        m_changedItems.swap(changedItems);
+    } else {
+        for (int i = 0; i < maximumItemsToUpdate; ++i) {
+            auto it = m_changedItems.begin();
+            changedItems.add(it->key, it->value);
+
+            m_changedItems.remove(it);
+        }
+
+        ASSERT(changedItems.size() <= maximumItemsToUpdate);
+
+        // Reschedule the update for the remaining items.
+        scheduleDatabaseUpdate();
+    }
+
+    updateDatabaseWithChangedItems(changedItems);
+}
+
+void LocalStorageDatabase::updateDatabaseWithChangedItems(const HashMap<String, String>& changedItems)
+{
     if (m_shouldClearItems) {
         m_shouldClearItems = false;
@@ -241 +281 @@
     }
 
-    HashMap<String, String> changedItems;
-    if (m_changedItems.size() > maximumItemsToUpdate) {
-        for (int i = 0; i < maximumItemsToUpdate; ++i) {
-            auto it = m_changedItems.begin();
-            changedItems.add(it->key, it->value);
-
-            m_changedItems.remove(it);
-        }
-
-        // Reschedule the update for the remaining items.
-        scheduleDatabaseUpdate();
-    } else {
-        // There are few enough changed items that we can just always write all of them.
-        m_changedItems.swap(changedItems);
-    }
-
-    ASSERT(changedItems.size() <= maximumItemsToUpdate);
-
     SQLiteStatement insertStatement(m_database, "INSERT INTO ItemTable VALUES (?, ?)");
     if (insertStatement.prepare() != SQLResultOk) {

trunk/Source/WebKit2/UIProcess/Storage/LocalStorageDatabase.h

@@ -53 +53 @@
     void clear();
 
+    // Will block until all pending changes have been written to disk.
+    void close();
+
 private:
     LocalStorageDatabase(const String& databaseFilename, PassRefPtr<WorkQueue>);
@@ -69 +72 @@
     void scheduleDatabaseUpdate();
     void updateDatabase();
+    void updateDatabaseWithChangedItems(const HashMap<String, String>&);
 
     String m_databaseFilename;
@@ -76 +80 @@
     bool m_failedToOpenDatabase;
     bool m_didImportItems;
+    bool m_isClosed;
 
     bool m_didScheduleDatabaseUpdate;

trunk/Source/WebKit2/UIProcess/Storage/StorageManager.cpp

@@ -118 +118 @@
     ASSERT(m_eventListeners.isEmpty());
 
+    if (m_localStorageDatabase)
+        m_localStorageDatabase->close();
+
     if (m_localStorageNamespace)
         m_localStorageNamespace->didDestroyStorageArea(this);