<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[187958] trunk/Source/WebKit2</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/187958">187958</a></dd>
<dt>Author</dt> <dd>antti@apple.com</dd>
<dt>Date</dt> <dd>2015-08-05 03:27:18 -0700 (Wed, 05 Aug 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Network cache fetches should have timeout
https://bugs.webkit.org/show_bug.cgi?id=147631
Reviewed by Andreas Kling.
System might be under heavy I/O pressure. If it takes long time to get data from disk we should load from network instead.
This patch introduces 1.5s timeout for disk reads. If the last dispatched cache read takes longer than that we cancel all
active and pending reads and just load those resources from network.
* NetworkProcess/cache/NetworkCacheStorage.cpp:
(WebKit::NetworkCache::Storage::ReadOperation::ReadOperation):
(WebKit::NetworkCache::Storage::ReadOperation::cancel):
(WebKit::NetworkCache::Storage::ReadOperation::finish):
Factor to functions.
(WebKit::NetworkCache::Storage::Storage):
(WebKit::NetworkCache::Storage::updateFileModificationTime):
(WebKit::NetworkCache::Storage::dispatchReadOperation):
(WebKit::NetworkCache::Storage::finishReadOperation):
(WebKit::NetworkCache::Storage::cancelAllReadOperations):
(WebKit::NetworkCache::Storage::dispatchPendingReadOperations):
(WebKit::NetworkCache::Storage::dispatchPendingWriteOperations):
Also make dispatch functions transfer the operation ownership.
(WebKit::NetworkCache::shouldStoreBodyAsBlob):
(WebKit::NetworkCache::Storage::dispatchWriteOperation):
* NetworkProcess/cache/NetworkCacheStorage.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcesscacheNetworkCacheStoragecpp">trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheStorage.cpp</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcesscacheNetworkCacheStorageh">trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheStorage.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (187957 => 187958)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-08-05 10:25:41 UTC (rev 187957)
+++ trunk/Source/WebKit2/ChangeLog 2015-08-05 10:27:18 UTC (rev 187958)
</span><span class="lines">@@ -1,3 +1,36 @@
</span><ins>+2015-08-04 Antti Koivisto <antti@apple.com>
+
+ Network cache fetches should have timeout
+ https://bugs.webkit.org/show_bug.cgi?id=147631
+
+ Reviewed by Andreas Kling.
+
+ System might be under heavy I/O pressure. If it takes long time to get data from disk we should load from network instead.
+
+ This patch introduces 1.5s timeout for disk reads. If the last dispatched cache read takes longer than that we cancel all
+ active and pending reads and just load those resources from network.
+
+ * NetworkProcess/cache/NetworkCacheStorage.cpp:
+ (WebKit::NetworkCache::Storage::ReadOperation::ReadOperation):
+ (WebKit::NetworkCache::Storage::ReadOperation::cancel):
+ (WebKit::NetworkCache::Storage::ReadOperation::finish):
+
+ Factor to functions.
+
+ (WebKit::NetworkCache::Storage::Storage):
+ (WebKit::NetworkCache::Storage::updateFileModificationTime):
+ (WebKit::NetworkCache::Storage::dispatchReadOperation):
+ (WebKit::NetworkCache::Storage::finishReadOperation):
+ (WebKit::NetworkCache::Storage::cancelAllReadOperations):
+ (WebKit::NetworkCache::Storage::dispatchPendingReadOperations):
+ (WebKit::NetworkCache::Storage::dispatchPendingWriteOperations):
+
+ Also make dispatch functions transfer the operation ownership.
+
+ (WebKit::NetworkCache::shouldStoreBodyAsBlob):
+ (WebKit::NetworkCache::Storage::dispatchWriteOperation):
+ * NetworkProcess/cache/NetworkCacheStorage.h:
+
</ins><span class="cx"> 2015-08-04 Matt Rajca <mrajca@apple.com>
</span><span class="cx">
</span><span class="cx"> Media Session: add a focus manager that WebKit clients can use to access the focused media element
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcesscacheNetworkCacheStoragecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheStorage.cpp (187957 => 187958)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheStorage.cpp 2015-08-05 10:25:41 UTC (rev 187957)
+++ trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheStorage.cpp 2015-08-05 10:27:18 UTC (rev 187958)
</span><span class="lines">@@ -56,6 +56,9 @@
</span><span class="cx"> , completionHandler(completionHandler)
</span><span class="cx"> { }
</span><span class="cx">
</span><ins>+ void cancel();
+ bool finish();
+
</ins><span class="cx"> const Key key;
</span><span class="cx"> const RetrieveCompletionHandler completionHandler;
</span><span class="cx">
</span><span class="lines">@@ -63,8 +66,34 @@
</span><span class="cx"> SHA1::Digest expectedBodyHash;
</span><span class="cx"> BlobStorage::Blob resultBodyBlob;
</span><span class="cx"> std::atomic<unsigned> activeCount { 0 };
</span><ins>+ bool isCanceled { false };
</ins><span class="cx"> };
</span><span class="cx">
</span><ins>+void Storage::ReadOperation::cancel()
+{
+ ASSERT(RunLoop::isMain());
+
+ if (isCanceled)
+ return;
+ isCanceled = true;
+ completionHandler(nullptr);
+}
+
+bool Storage::ReadOperation::finish()
+{
+ ASSERT(RunLoop::isMain());
+
+ if (isCanceled)
+ return false;
+ if (resultRecord && resultRecord->body.isNull()) {
+ if (resultBodyBlob.hash == expectedBodyHash)
+ resultRecord->body = resultBodyBlob.data;
+ else
+ resultRecord = nullptr;
+ }
+ return completionHandler(WTF::move(resultRecord));
+}
+
</ins><span class="cx"> struct Storage::WriteOperation {
</span><span class="cx"> WTF_MAKE_FAST_ALLOCATED;
</span><span class="cx"> public:
</span><span class="lines">@@ -147,6 +176,7 @@
</span><span class="cx"> Storage::Storage(const String& baseDirectoryPath)
</span><span class="cx"> : m_basePath(baseDirectoryPath)
</span><span class="cx"> , m_recordsPath(makeRecordsDirectoryPath(baseDirectoryPath))
</span><ins>+ , m_readOperationTimeoutTimer(*this, &Storage::cancelAllReadOperations)
</ins><span class="cx"> , m_writeOperationDispatchTimer(*this, &Storage::dispatchPendingWriteOperations)
</span><span class="cx"> , m_ioQueue(WorkQueue::create("com.apple.WebKit.Cache.Storage", WorkQueue::Type::Concurrent))
</span><span class="cx"> , m_backgroundIOQueue(WorkQueue::create("com.apple.WebKit.Cache.Storage.background", WorkQueue::Type::Concurrent, WorkQueue::QOS::Background))
</span><span class="lines">@@ -486,11 +516,17 @@
</span><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void Storage::dispatchReadOperation(ReadOperation& readOperation)
</del><ins>+void Storage::dispatchReadOperation(std::unique_ptr<ReadOperation> readOperationPtr)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(RunLoop::isMain());
</span><del>- ASSERT(m_activeReadOperations.contains(&readOperation));
</del><span class="cx">
</span><ins>+ auto& readOperation = *readOperationPtr;
+ m_activeReadOperations.add(WTF::move(readOperationPtr));
+
+ // I/O pressure may make disk operations slow. If they start taking very long time we rather go to network.
+ const auto readTimeout = 1500_ms;
+ m_readOperationTimeoutTimer.startOneShot(readTimeout);
+
</ins><span class="cx"> bool shouldGetBodyBlob = !m_bodyFilter || m_bodyFilter->mayContain(readOperation.key.hash());
</span><span class="cx">
</span><span class="cx"> ioQueue().dispatch([this, &readOperation, shouldGetBodyBlob] {
</span><span class="lines">@@ -524,26 +560,43 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> RunLoop::main().dispatch([this, &readOperation] {
</span><del>- if (readOperation.resultRecord && readOperation.resultRecord->body.isNull()) {
- if (readOperation.resultBodyBlob.hash == readOperation.expectedBodyHash)
- readOperation.resultRecord->body = readOperation.resultBodyBlob.data;
- else
- readOperation.resultRecord = nullptr;
- }
-
- bool success = readOperation.completionHandler(WTF::move(readOperation.resultRecord));
</del><ins>+ bool success = readOperation.finish();
</ins><span class="cx"> if (success)
</span><span class="cx"> updateFileModificationTime(recordPathForKey(readOperation.key));
</span><del>- else
</del><ins>+ else if (!readOperation.isCanceled)
</ins><span class="cx"> remove(readOperation.key);
</span><ins>+
</ins><span class="cx"> ASSERT(m_activeReadOperations.contains(&readOperation));
</span><span class="cx"> m_activeReadOperations.remove(&readOperation);
</span><ins>+
+ if (m_activeReadOperations.isEmpty())
+ m_readOperationTimeoutTimer.stop();
+
</ins><span class="cx"> dispatchPendingReadOperations();
</span><span class="cx">
</span><span class="cx"> LOG(NetworkCacheStorage, "(NetworkProcess) read complete success=%d", success);
</span><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void Storage::cancelAllReadOperations()
+{
+ ASSERT(RunLoop::isMain());
+
+ for (auto& readOperation : m_activeReadOperations)
+ readOperation->cancel();
+
+ size_t pendingCount = 0;
+ for (int priority = maximumRetrievePriority; priority >= 0; --priority) {
+ auto& pendingRetrieveQueue = m_pendingReadOperationsByPriority[priority];
+ pendingCount += pendingRetrieveQueue.size();
+ for (auto it = pendingRetrieveQueue.rbegin(), end = pendingRetrieveQueue.rend(); it != end; ++it)
+ (*it)->cancel();
+ pendingRetrieveQueue.clear();
+ }
+
+ LOG(NetworkCacheStorage, "(NetworkProcess) retrieve timeout, canceled %u active and %zu pending", m_activeReadOperations.size(), pendingCount);
+}
+
</ins><span class="cx"> void Storage::dispatchPendingReadOperations()
</span><span class="cx"> {
</span><span class="cx"> ASSERT(RunLoop::isMain());
</span><span class="lines">@@ -558,10 +611,7 @@
</span><span class="cx"> auto& pendingRetrieveQueue = m_pendingReadOperationsByPriority[priority];
</span><span class="cx"> if (pendingRetrieveQueue.isEmpty())
</span><span class="cx"> continue;
</span><del>- auto readOperation = pendingRetrieveQueue.takeLast();
- auto& read = *readOperation;
- m_activeReadOperations.add(WTF::move(readOperation));
- dispatchReadOperation(read);
</del><ins>+ dispatchReadOperation(pendingRetrieveQueue.takeLast());
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -591,11 +641,7 @@
</span><span class="cx"> LOG(NetworkCacheStorage, "(NetworkProcess) limiting parallel writes");
</span><span class="cx"> return;
</span><span class="cx"> }
</span><del>- auto writeOperation = m_pendingWriteOperations.takeLast();
- auto& write = *writeOperation;
- m_activeWriteOperations.add(WTF::move(writeOperation));
-
- dispatchWriteOperation(write);
</del><ins>+ dispatchWriteOperation(m_pendingWriteOperations.takeLast());
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -605,11 +651,13 @@
</span><span class="cx"> return bodyData.size() > maximumInlineBodySize;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void Storage::dispatchWriteOperation(WriteOperation& writeOperation)
</del><ins>+void Storage::dispatchWriteOperation(std::unique_ptr<WriteOperation> writeOperationPtr)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(RunLoop::isMain());
</span><del>- ASSERT(m_activeWriteOperations.contains(&writeOperation));
</del><span class="cx">
</span><ins>+ auto& writeOperation = *writeOperationPtr;
+ m_activeWriteOperations.add(WTF::move(writeOperationPtr));
+
</ins><span class="cx"> // This was added already when starting the store but filter might have been wiped.
</span><span class="cx"> addToRecordFilter(writeOperation.record.key);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcesscacheNetworkCacheStorageh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheStorage.h (187957 => 187958)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheStorage.h 2015-08-05 10:25:41 UTC (rev 187957)
+++ trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheStorage.h 2015-08-05 10:27:18 UTC (rev 187958)
</span><span class="lines">@@ -107,12 +107,13 @@
</span><span class="cx"> void shrink();
</span><span class="cx">
</span><span class="cx"> struct ReadOperation;
</span><del>- void dispatchReadOperation(ReadOperation&);
</del><ins>+ void dispatchReadOperation(std::unique_ptr<ReadOperation>);
</ins><span class="cx"> void dispatchPendingReadOperations();
</span><span class="cx"> void finishReadOperation(ReadOperation&);
</span><ins>+ void cancelAllReadOperations();
</ins><span class="cx">
</span><span class="cx"> struct WriteOperation;
</span><del>- void dispatchWriteOperation(WriteOperation&);
</del><ins>+ void dispatchWriteOperation(std::unique_ptr<WriteOperation>);
</ins><span class="cx"> void dispatchPendingWriteOperations();
</span><span class="cx"> void finishWriteOperation(WriteOperation&);
</span><span class="cx">
</span><span class="lines">@@ -150,6 +151,7 @@
</span><span class="cx"> static const int maximumRetrievePriority = 4;
</span><span class="cx"> Deque<std::unique_ptr<ReadOperation>> m_pendingReadOperationsByPriority[maximumRetrievePriority + 1];
</span><span class="cx"> HashSet<std::unique_ptr<ReadOperation>> m_activeReadOperations;
</span><ins>+ WebCore::Timer m_readOperationTimeoutTimer;
</ins><span class="cx">
</span><span class="cx"> Deque<std::unique_ptr<WriteOperation>> m_pendingWriteOperations;
</span><span class="cx"> HashSet<std::unique_ptr<WriteOperation>> m_activeWriteOperations;
</span></span></pre>
</div>
</div>
</body>
</html>