Changeset 179327 in webkit

Timestamp:

Jan 28, 2015, 6:52:30 PM (11 years ago)

Author:

Antti Koivisto

Message:

http/tests/xmlhttprequest/workers/methods.html sometimes times out with disk cache enabled
​https://bugs.webkit.org/show_bug.cgi?id=140976

Reviewed by Chris Dumez.

The previous fix sometimes invoked the completion handler twice. Explicitly track if we
have called it or not.

• NetworkProcess/cache/NetworkCacheStorageCocoa.mm:

(WebKit::NetworkCacheStorage::dispatchRetrieveOperation):

Also move the error case to the done branch. According to the documentation 'done' is always set on error.

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• NetworkProcess/cache/NetworkCacheStorageCocoa.mm (modified) (2 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2015-01-28  Antti Koivisto  <antti@apple.com>
+
+        http/tests/xmlhttprequest/workers/methods.html sometimes times out with disk cache enabled
+        https://bugs.webkit.org/show_bug.cgi?id=140976
+
+        Reviewed by Chris Dumez.
+
+        The previous fix sometimes invoked the completion handler twice. Explicitly track if we
+        have called it or not.
+
+        * NetworkProcess/cache/NetworkCacheStorageCocoa.mm:
+        (WebKit::NetworkCacheStorage::dispatchRetrieveOperation):
+
+        Also move the error case to the done branch. According to the documentation 'done' is always set on error.
+
 2015-01-28  Timothy Horton  <timothy_horton@apple.com>
 

trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheStorageCocoa.mm

@@ -363 +363 @@
         auto channel = createIOChannelForKey(retrieve.key, IOChannelType::Read, cachePathCapture.string(), fd);
 
-        dispatch_io_read(channel.get(), 0, std::numeric_limits<size_t>::max(), dispatch_get_main_queue(), [this, fd, retrieve](bool done, dispatch_data_t fileData, int error) {
+        bool didCallCompletionHandler = false;
+        dispatch_io_read(channel.get(), 0, std::numeric_limits<size_t>::max(), dispatch_get_main_queue(), [this, fd, retrieve, didCallCompletionHandler](bool done, dispatch_data_t fileData, int error) mutable {
             if (done) {
                 ASSERT(m_activeRetrieveOperationCount);
@@ -369 +370 @@
                 dispatchPendingRetrieveOperations();
             }
-            if (error) {
-                retrieve.completionHandler(nullptr);
-                removeEntry(retrieve.key);
+            if (done) {
+                if (!didCallCompletionHandler)
+                    retrieve.completionHandler(nullptr);
+                if (error)
+                    removeEntry(retrieve.key);
                 return;
             }
-            if (done) {
-                // File exists but is empty. Invoke the completion handler as it hasn't been done yet.
-                if (fileData == dispatch_data_empty)
-                    retrieve.completionHandler(nullptr);
-                return;
-            }
+            ASSERT(!didCallCompletionHandler); // We are requesting maximum sized chunk so we should never get called more than once with data.
+
             auto entry = decodeEntry(fileData, fd, retrieve.key);
             bool success = retrieve.completionHandler(WTF::move(entry));
+            didCallCompletionHandler = true;
             if (!success)
                 removeEntry(retrieve.key);