<!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>[181161] 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/181161">181161</a></dd>
<dt>Author</dt> <dd>antti@apple.com</dd>
<dt>Date</dt> <dd>2015-03-06 09:30:32 -0800 (Fri, 06 Mar 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>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):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcesscacheNetworkCacheIOChannelh">trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheIOChannel.h</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcesscacheNetworkCacheIOChannelCocoamm">trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheIOChannelCocoa.mm</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcesscacheNetworkCacheStorageCocoamm">trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheStorageCocoa.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (181160 => 181161)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog        2015-03-06 17:25:54 UTC (rev 181160)
+++ trunk/Source/WebKit2/ChangeLog        2015-03-06 17:30:32 UTC (rev 181161)
</span><span class="lines">@@ -1,5 +1,22 @@
</span><span class="cx"> 2015-03-06 Antti Koivisto <antti@apple.com>
</span><span class="cx">
</span><ins>+ 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>
+
</ins><span class="cx"> Move dispatch_data use behind NetworkCache::Data abstraction
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=142392
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcesscacheNetworkCacheIOChannelh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheIOChannel.h (181160 => 181161)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheIOChannel.h        2015-03-06 17:25:54 UTC (rev 181160)
+++ trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheIOChannel.h        2015-03-06 17:30:32 UTC (rev 181161)
</span><span class="lines">@@ -42,6 +42,7 @@
</span><span class="cx"> static Ref<IOChannel> open(const String& file, Type);
</span><span class="cx">
</span><span class="cx"> void read(size_t offset, size_t, std::function<void (Data&, int error)>);
</span><ins>+ void readSync(size_t offset, size_t, std::function<void (Data&, int error)>);
</ins><span class="cx"> void write(size_t offset, const Data&, std::function<void (int error)>);
</span><span class="cx">
</span><span class="cx"> int fileDescriptor() const { return m_fileDescriptor; }
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcesscacheNetworkCacheIOChannelCocoamm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheIOChannelCocoa.mm (181160 => 181161)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheIOChannelCocoa.mm        2015-03-06 17:25:54 UTC (rev 181160)
+++ trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheIOChannelCocoa.mm        2015-03-06 17:30:32 UTC (rev 181161)
</span><span class="lines">@@ -75,7 +75,7 @@
</span><span class="cx"> return adoptRef(*new IOChannel(fd));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void IOChannel::read(size_t offset, size_t size, std::function<void ( Data&, int error)> completionHandler)
</del><ins>+void IOChannel::read(size_t offset, size_t size, std::function<void (Data&, int error)> completionHandler)
</ins><span class="cx"> {
</span><span class="cx"> RefPtr<IOChannel> channel(this);
</span><span class="cx"> bool didCallCompletionHandler = false;
</span><span class="lines">@@ -95,6 +95,17 @@
</span><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+// 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);
+}
+
</ins><span class="cx"> void IOChannel::write(size_t offset, const Data& data, std::function<void (int error)> completionHandler)
</span><span class="cx"> {
</span><span class="cx"> RefPtr<IOChannel> channel(this);
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcesscacheNetworkCacheStorageCocoamm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheStorageCocoa.mm (181160 => 181161)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheStorageCocoa.mm        2015-03-06 17:25:54 UTC (rev 181160)
+++ trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheStorageCocoa.mm        2015-03-06 17:30:32 UTC (rev 181161)
</span><span class="lines">@@ -32,7 +32,6 @@
</span><span class="cx"> #include "NetworkCacheCoders.h"
</span><span class="cx"> #include "NetworkCacheFileSystemPosix.h"
</span><span class="cx"> #include "NetworkCacheIOChannel.h"
</span><del>-#include <dispatch/dispatch.h>
</del><span class="cx"> #include <wtf/PageBlock.h>
</span><span class="cx"> #include <wtf/RandomNumber.h>
</span><span class="cx"> #include <wtf/RunLoop.h>
</span><span class="lines">@@ -409,21 +408,19 @@
</span><span class="cx"> StringCapture cachePathCapture(m_directoryPath);
</span><span class="cx"> ioQueue().dispatch([this, cachePathCapture, traverseHandler] {
</span><span class="cx"> String cachePath = cachePathCapture.string();
</span><del>- auto semaphore = adoptDispatch(dispatch_semaphore_create(0));
- traverseCacheFiles(cachePath, [this, &semaphore, &traverseHandler](const String& fileName, const String& partitionPath) {
</del><ins>+ traverseCacheFiles(cachePath, [this, &traverseHandler](const String& fileName, const String& partitionPath) {
</ins><span class="cx"> auto filePath = WebCore::pathByAppendingComponent(partitionPath, fileName);
</span><span class="cx"> auto channel = IOChannel::open(filePath, IOChannel::Type::Read);
</span><span class="cx"> const size_t headerReadSize = 16 << 10;
</span><del>- channel->read(0, headerReadSize, [this, &semaphore, &traverseHandler](Data& fileData, int) {
</del><ins>+ // FIXME: Traversal is slower than it should be due to lack of parallelism.
+ channel->readSync(0, headerReadSize, [this, &traverseHandler](Data& fileData, int) {
</ins><span class="cx"> EntryMetaData metaData;
</span><span class="cx"> Data headerData;
</span><span class="cx"> if (decodeEntryHeader(fileData, metaData, headerData)) {
</span><span class="cx"> Entry entry { metaData.key, metaData.timeStamp, headerData, { } };
</span><span class="cx"> traverseHandler(&entry);
</span><span class="cx"> }
</span><del>- dispatch_semaphore_signal(semaphore.get());
</del><span class="cx"> });
</span><del>- dispatch_semaphore_wait(semaphore.get(), DISPATCH_TIME_FOREVER);
</del><span class="cx"> });
</span><span class="cx"> RunLoop::main().dispatch([this, traverseHandler] {
</span><span class="cx"> traverseHandler(nullptr);
</span></span></pre>
</div>
</div>
</body>
</html>