Changeset 103429 in webkit

Timestamp:

Dec 21, 2011 12:27:37 PM (12 years ago)

Author:

dslomov@google.com

Message:

Source/WebCore: [Chromium] DatabaseTrackerChromium: iterating DatabaseSet races with Database disposal on worker thread
​https://bugs.webkit.org/show_bug.cgi?id=74554

Reviewed by David Levin.

Covered by existing tests in fast/workers/storage.

• storage/chromium/DatabaseTrackerChromium.cpp:

(WebCore::NotifyDatabaseObserverOnCloseTask::create):
(WebCore::NotifyDatabaseObserverOnCloseTask::performTask):
(WebCore::NotifyDatabaseObserverOnCloseTask::isCleanupTask):
(WebCore::NotifyDatabaseObserverOnCloseTask::NotifyDatabaseObserverOnCloseTask):
(WebCore::DatabaseTracker::removeOpenDatabase):

LayoutTests: [Chromium] DatabaseTrackerChromium: iterating DatabaseSet races with Database disposal on worker thread.
​https://bugs.webkit.org/show_bug.cgi?id=74554

Reviewed by David Levin.

• platform/chromium/test_expectations.txt:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff, 1 prop)
• LayoutTests/platform/chromium/test_expectations.txt (modified) (2 diffs)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/storage/AbstractDatabase.cpp (modified) (1 diff)
• Source/WebCore/storage/chromium/DatabaseTrackerChromium.cpp (modified) (3 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-12-20  Dmitry Lomov  <dslomov@google.com>
+
+        [Chromium] DatabaseTrackerChromium: iterating DatabaseSet races with Database disposal on worker thread.
+        https://bugs.webkit.org/show_bug.cgi?id=74554
+
+        Reviewed by David Levin.
+
+        * platform/chromium/test_expectations.txt:
+
 2011-12-21  Nikolas Zimmermann  <nzimmermann@rim.com>
 

trunk/LayoutTests/platform/chromium/test_expectations.txt

@@ -182 +182 @@
 BUGWK74459 SKIP : fast/workers/worker-multi-port.html = CRASH
 
-BUGWK74554 SKIP : fast/workers/storage = CRASH TIMEOUT
-
 BUGWK74449 SKIP : fast/workers/dedicated-worker-lifecycle.html = TIMEOUT
 BUGWK74449 SKIP : fast/workers/worker-close-more.html = TIMEOUT
@@ -190 +188 @@
 BUGWK74466 : fast/workers/worker-script-error.html = PASS TIMEOUT FAIL
 
+// Tests timing out because layoutTestController.workerThreadCount is not implemented in DRT
 BUGWK74653 SKIP : http/tests/xmlhttprequest/workers/abort-exception-assert.html = TIMEOUT
+BUGWK74653 SKIP : http/tests/workers/interrupt-database-sync-open-crash.html = TIMEOUT
+BUGWK74653 SKIP : fast/workers/storage/interrupt-database.html = TIMEOUT
 
 BUGWK71968 : fast/files/workers/worker-apply-blob-url-to-xhr.html = TEXT

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-12-20  Dmitry Lomov  <dslomov@google.com>
+
+        [Chromium] DatabaseTrackerChromium: iterating DatabaseSet races with Database disposal on worker thread 
+        https://bugs.webkit.org/show_bug.cgi?id=74554
+
+        Reviewed by David Levin.
+
+        Covered by existing tests in fast/workers/storage.
+
+        * storage/chromium/DatabaseTrackerChromium.cpp:
+        (WebCore::NotifyDatabaseObserverOnCloseTask::create):
+        (WebCore::NotifyDatabaseObserverOnCloseTask::performTask):
+        (WebCore::NotifyDatabaseObserverOnCloseTask::isCleanupTask):
+        (WebCore::NotifyDatabaseObserverOnCloseTask::NotifyDatabaseObserverOnCloseTask):
+        (WebCore::DatabaseTracker::removeOpenDatabase):
+
 2011-12-21  Eric Carlson  <eric.carlson@apple.com>
 

trunk/Source/WebCore/storage/AbstractDatabase.cpp

@@ -224 +224 @@
 AbstractDatabase::~AbstractDatabase()
 {
+    ASSERT(!m_opened);
 }
 

trunk/Source/WebCore/storage/chromium/DatabaseTrackerChromium.cpp

@@ -98 +98 @@
 }
 
-class TrackerRemoveOpenDatabaseTask : public ScriptExecutionContext::Task {
+class NotifyDatabaseObserverOnCloseTask : public ScriptExecutionContext::Task {
 public:
-    static PassOwnPtr<TrackerRemoveOpenDatabaseTask> create(PassRefPtr<AbstractDatabase> database)
-    {
-        return adoptPtr(new TrackerRemoveOpenDatabaseTask(database));
+    static PassOwnPtr<NotifyDatabaseObserverOnCloseTask> create(PassRefPtr<AbstractDatabase> database)
+    {
+        return adoptPtr(new NotifyDatabaseObserverOnCloseTask(database));
     }
 
     virtual void performTask(ScriptExecutionContext* context)
     {
-        DatabaseTracker::tracker().removeOpenDatabase(m_database.get());
+        DatabaseObserver::databaseClosed(m_database.get());
+    }
+
+    virtual bool isCleanupTask() const
+    {
+        return true;
     }
 
 private:
-    TrackerRemoveOpenDatabaseTask(PassRefPtr<AbstractDatabase> database)
+    NotifyDatabaseObserverOnCloseTask(PassRefPtr<AbstractDatabase> database)
         : m_database(database)
     {
@@ -121 +126 @@
 void DatabaseTracker::removeOpenDatabase(AbstractDatabase* database)
 {
-    if (!database->scriptExecutionContext()->isContextThread()) {
-        database->scriptExecutionContext()->postTask(TrackerRemoveOpenDatabaseTask::create(database));
-        return;
-    }
-
     String originIdentifier = database->securityOrigin()->databaseIdentifier();
     MutexLocker openDatabaseMapLock(m_openDatabaseMapGuard);
@@ -152 +152 @@
     }
 
-    DatabaseObserver::databaseClosed(database);
+    if (!database->scriptExecutionContext()->isContextThread())
+        database->scriptExecutionContext()->postTask(NotifyDatabaseObserverOnCloseTask::create(database));
+    else
+        DatabaseObserver::databaseClosed(database);
 }