Changeset 181161 in webkit

Timestamp:

Mar 6, 2015, 9:30:32 AM (11 years ago)

Author:

Antti Koivisto

Message:

Don't use dispatch_semaphore in NetworkCacheStorage
​https://bugs.webkit.org/show_bug.cgi?id=142395

Reviewed by Anders Carlsson.

• NetworkProcess/cache/NetworkCacheIOChannel.h:
• NetworkProcess/cache/NetworkCacheIOChannelCocoa.mm:

(WebKit::NetworkCache::IOChannel::read):
(WebKit::NetworkCache::IOChannel::readSync):

Add readSync to encapsulate the semaphore.

• NetworkProcess/cache/NetworkCacheStorageCocoa.mm:

(WebKit::NetworkCache::Storage::traverse):

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• NetworkProcess/cache/NetworkCacheIOChannel.h (modified) (1 diff)
• NetworkProcess/cache/NetworkCacheIOChannelCocoa.mm (modified) (2 diffs)
• NetworkProcess/cache/NetworkCacheStorageCocoa.mm (modified) (3 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2015-03-06  Antti Koivisto  <antti@apple.com>
+
+        Don't use dispatch_semaphore in NetworkCacheStorage
+        https://bugs.webkit.org/show_bug.cgi?id=142395
+
+        Reviewed by Anders Carlsson.
+
+        * NetworkProcess/cache/NetworkCacheIOChannel.h:
+        * NetworkProcess/cache/NetworkCacheIOChannelCocoa.mm:
+        (WebKit::NetworkCache::IOChannel::read):
+        (WebKit::NetworkCache::IOChannel::readSync):
+
+            Add readSync to encapsulate the semaphore.
+
+        * NetworkProcess/cache/NetworkCacheStorageCocoa.mm:
+        (WebKit::NetworkCache::Storage::traverse):
+
 2015-03-06  Antti Koivisto  <antti@apple.com>
 

trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheIOChannel.h

@@ -43 +43 @@
 
     void read(size_t offset, size_t, std::function<void (Data&, int error)>);
+    void readSync(size_t offset, size_t, std::function<void (Data&, int error)>);
     void write(size_t offset, const Data&, std::function<void (int error)>);
 

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

@@ -76 +76 @@
 }
 
-void IOChannel::read(size_t offset, size_t size, std::function<void ( Data&, int error)> completionHandler)
+void IOChannel::read(size_t offset, size_t size, std::function<void (Data&, int error)> completionHandler)
 {
     RefPtr<IOChannel> channel(this);
@@ -96 +96 @@
 }
 
+// FIXME: It would be better to do without this.
+void IOChannel::readSync(size_t offset, size_t size, std::function<void (Data&, int error)> completionHandler)
+{
+    auto semaphore = adoptDispatch(dispatch_semaphore_create(0));
+    read(offset, size, [semaphore, &completionHandler](Data& data, int error) {
+        completionHandler(data, error);
+        dispatch_semaphore_signal(semaphore.get());
+    });
+    dispatch_semaphore_wait(semaphore.get(), DISPATCH_TIME_FOREVER);
+}
+
 void IOChannel::write(size_t offset, const Data& data, std::function<void (int error)> completionHandler)
 {

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

@@ -33 +33 @@
 #include "NetworkCacheFileSystemPosix.h"
 #include "NetworkCacheIOChannel.h"
-#include <dispatch/dispatch.h>
 #include <wtf/PageBlock.h>
 #include <wtf/RandomNumber.h>
@@ -410 +409 @@
     ioQueue().dispatch([this, cachePathCapture, traverseHandler] {
         String cachePath = cachePathCapture.string();
-        auto semaphore = adoptDispatch(dispatch_semaphore_create(0));
-        traverseCacheFiles(cachePath, [this, &semaphore, &traverseHandler](const String& fileName, const String& partitionPath) {
+        traverseCacheFiles(cachePath, [this, &traverseHandler](const String& fileName, const String& partitionPath) {
             auto filePath = WebCore::pathByAppendingComponent(partitionPath, fileName);
             auto channel = IOChannel::open(filePath, IOChannel::Type::Read);
             const size_t headerReadSize = 16 << 10;
-            channel->read(0, headerReadSize, [this, &semaphore, &traverseHandler](Data& fileData, int) {
+            // FIXME: Traversal is slower than it should be due to lack of parallelism.
+            channel->readSync(0, headerReadSize, [this, &traverseHandler](Data& fileData, int) {
                 EntryMetaData metaData;
                 Data headerData;
@@ -422 +421 @@
                     traverseHandler(&entry);
                 }
-                dispatch_semaphore_signal(semaphore.get());
             });
-            dispatch_semaphore_wait(semaphore.get(), DISPATCH_TIME_FOREVER);
         });
         RunLoop::main().dispatch([this, traverseHandler] {