Changeset 186510 in webkit

Timestamp:

Jul 8, 2015, 10:02:54 AM (10 years ago)

Author:

Antti Koivisto

Message:

Network Cache: Don't open files in main thread
​https://bugs.webkit.org/show_bug.cgi?id=146722

Reviewed by Chris Dumez.

While we use open() with O_NONBLOCK profiling indicates that we still may block up to 5ms under the syscall in some case.

• NetworkProcess/cache/NetworkCacheStorage.cpp:

(WebKit::NetworkCache::Storage::dispatchReadOperation):

Dispatch read operation to a concurrent queue.
With this we can also eliminate the separate dispatch() for body blob read.

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• NetworkProcess/cache/NetworkCacheStorage.cpp (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2015-07-08  Antti Koivisto  <antti@apple.com>
+
+        Network Cache: Don't open files in main thread
+        https://bugs.webkit.org/show_bug.cgi?id=146722
+
+        Reviewed by Chris Dumez.
+
+        While we use open() with O_NONBLOCK profiling indicates that we still may block up to 5ms under the syscall in some case.
+
+        * NetworkProcess/cache/NetworkCacheStorage.cpp:
+        (WebKit::NetworkCache::Storage::dispatchReadOperation):
+
+            Dispatch read operation to a concurrent queue.
+            With this we can also eliminate the separate dispatch() for body blob read.
+
 2015-07-08  Sungmann Cho  <sungmann.cho@navercorp.com>
 

trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheStorage.cpp

@@ -486 +486 @@
     ASSERT(m_activeReadOperations.contains(&readOperation));
 
-    auto recordPath = recordPathForKey(readOperation.key);
-
-    ++readOperation.activeCount;
-
-    bool shouldGetBodyBlob = !m_bodyFilter || m_bodyFilter->mayContain(readOperation.key.hash());
-    if (shouldGetBodyBlob)
+    ioQueue().dispatch([this, &readOperation] {
+        auto recordPath = recordPathForKey(readOperation.key);
+
         ++readOperation.activeCount;
 
-    RefPtr<IOChannel> channel = IOChannel::open(recordPath, IOChannel::Type::Read);
-    channel->read(0, std::numeric_limits<size_t>::max(), &ioQueue(), [this, &readOperation](const Data& fileData, int error) {
-        if (!error)
-            readRecord(readOperation, fileData);
-        finishReadOperation(readOperation);
-    });
-
-    if (!shouldGetBodyBlob)
-        return;
-
-    // Read the body blob in parallel with the record read.
-    ioQueue().dispatch([this, &readOperation] {
-        auto bodyPath = bodyPathForKey(readOperation.key);
-        readOperation.resultBodyBlob = m_blobStorage.get(bodyPath);
-        finishReadOperation(readOperation);
+        bool shouldGetBodyBlob = !m_bodyFilter || m_bodyFilter->mayContain(readOperation.key.hash());
+        if (shouldGetBodyBlob)
+            ++readOperation.activeCount;
+
+        auto channel = IOChannel::open(recordPath, IOChannel::Type::Read);
+        channel->read(0, std::numeric_limits<size_t>::max(), &ioQueue(), [this, &readOperation](const Data& fileData, int error) {
+            if (!error)
+                readRecord(readOperation, fileData);
+            finishReadOperation(readOperation);
+        });
+
+        if (shouldGetBodyBlob) {
+            // Read the body blob in parallel with the record read.
+            auto bodyPath = bodyPathForKey(readOperation.key);
+            readOperation.resultBodyBlob = m_blobStorage.get(bodyPath);
+            finishReadOperation(readOperation);
+        }
     });
 }