<!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>[181160] 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/181160">181160</a></dd>
<dt>Author</dt> <dd>antti@apple.com</dd>
<dt>Date</dt> <dd>2015-03-06 09:25:54 -0800 (Fri, 06 Mar 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Move dispatch_data use behind NetworkCache::Data abstraction
https://bugs.webkit.org/show_bug.cgi?id=142392
Reviewed by Anders Carlsson.
* NetworkProcess/cache/NetworkCacheData.h:
(WebKit::NetworkCache::DispatchPtr::DispatchPtr):
* NetworkProcess/cache/NetworkCacheDataCocoa.mm:
(WebKit::NetworkCache::Data::Data):
(WebKit::NetworkCache::Data::apply):
(WebKit::NetworkCache::Data::subrange):
(WebKit::NetworkCache::concatenate):
(WebKit::NetworkCache::mapFile):
* NetworkProcess/cache/NetworkCacheIOChannelCocoa.mm:
(WebKit::NetworkCache::IOChannel::read):
* NetworkProcess/cache/NetworkCacheStorageCocoa.mm:
(WebKit::NetworkCache::hashData):
(WebKit::NetworkCache::decodeEntryMetaData):
(WebKit::NetworkCache::decodeEntryHeader):
(WebKit::NetworkCache::decodeEntry):
(WebKit::NetworkCache::encodeEntryMetaData):
(WebKit::NetworkCache::encodeEntryHeader):
(WebKit::NetworkCache::Storage::dispatchFullWriteOperation):
(WebKit::NetworkCache::mapFile): Deleted.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcesscacheNetworkCacheDatah">trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheData.h</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcesscacheNetworkCacheDataCocoamm">trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheDataCocoa.mm</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 (181159 => 181160)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-03-06 17:21:11 UTC (rev 181159)
+++ trunk/Source/WebKit2/ChangeLog 2015-03-06 17:25:54 UTC (rev 181160)
</span><span class="lines">@@ -1,5 +1,32 @@
</span><span class="cx"> 2015-03-06 Antti Koivisto <antti@apple.com>
</span><span class="cx">
</span><ins>+ Move dispatch_data use behind NetworkCache::Data abstraction
+ https://bugs.webkit.org/show_bug.cgi?id=142392
+
+ Reviewed by Anders Carlsson.
+
+ * NetworkProcess/cache/NetworkCacheData.h:
+ (WebKit::NetworkCache::DispatchPtr::DispatchPtr):
+ * NetworkProcess/cache/NetworkCacheDataCocoa.mm:
+ (WebKit::NetworkCache::Data::Data):
+ (WebKit::NetworkCache::Data::apply):
+ (WebKit::NetworkCache::Data::subrange):
+ (WebKit::NetworkCache::concatenate):
+ (WebKit::NetworkCache::mapFile):
+ * NetworkProcess/cache/NetworkCacheIOChannelCocoa.mm:
+ (WebKit::NetworkCache::IOChannel::read):
+ * NetworkProcess/cache/NetworkCacheStorageCocoa.mm:
+ (WebKit::NetworkCache::hashData):
+ (WebKit::NetworkCache::decodeEntryMetaData):
+ (WebKit::NetworkCache::decodeEntryHeader):
+ (WebKit::NetworkCache::decodeEntry):
+ (WebKit::NetworkCache::encodeEntryMetaData):
+ (WebKit::NetworkCache::encodeEntryHeader):
+ (WebKit::NetworkCache::Storage::dispatchFullWriteOperation):
+ (WebKit::NetworkCache::mapFile): Deleted.
+
+2015-03-06 Antti Koivisto <antti@apple.com>
+
</ins><span class="cx"> Use WTF abstraction for page size in NetworkCacheStorage
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=142396
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcesscacheNetworkCacheDatah"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheData.h (181159 => 181160)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheData.h 2015-03-06 17:21:11 UTC (rev 181159)
+++ trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheData.h 2015-03-06 17:25:54 UTC (rev 181160)
</span><span class="lines">@@ -47,7 +47,7 @@
</span><span class="cx"> : m_ptr(nullptr)
</span><span class="cx"> {
</span><span class="cx"> }
</span><del>- DispatchPtr(T ptr)
</del><ins>+ explicit DispatchPtr(T ptr)
</ins><span class="cx"> : m_ptr(ptr)
</span><span class="cx"> {
</span><span class="cx"> if (m_ptr)
</span><span class="lines">@@ -108,6 +108,10 @@
</span><span class="cx"> size_t size() const { return m_size; }
</span><span class="cx"> bool isMap() const { return m_isMap; }
</span><span class="cx">
</span><ins>+ Data subrange(size_t offset, size_t) const;
+
+ bool apply(const std::function<bool (const uint8_t*, size_t)>&&) const;
+
</ins><span class="cx"> #if PLATFORM(COCOA)
</span><span class="cx"> dispatch_data_t dispatchData() const { return m_dispatchData.get(); }
</span><span class="cx"> #endif
</span><span class="lines">@@ -120,6 +124,9 @@
</span><span class="cx"> bool m_isMap { false };
</span><span class="cx"> };
</span><span class="cx">
</span><ins>+Data concatenate(const Data&, const Data&);
+Data mapFile(int fd, size_t offset, size_t);
+
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcesscacheNetworkCacheDataCocoamm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheDataCocoa.mm (181159 => 181160)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheDataCocoa.mm 2015-03-06 17:21:11 UTC (rev 181159)
+++ trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheDataCocoa.mm 2015-03-06 17:25:54 UTC (rev 181160)
</span><span class="lines">@@ -29,6 +29,7 @@
</span><span class="cx"> #if ENABLE(NETWORK_CACHE)
</span><span class="cx">
</span><span class="cx"> #include <dispatch/dispatch.h>
</span><ins>+#include <sys/mman.h>
</ins><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="cx"> namespace NetworkCache {
</span><span class="lines">@@ -40,13 +41,10 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> Data::Data(DispatchPtr<dispatch_data_t> dispatchData, Backing backing)
</span><ins>+ : m_dispatchData(dispatchData)
+ , m_size(m_dispatchData ? dispatch_data_get_size(m_dispatchData.get()) : 0)
+ , m_isMap(m_size && backing == Backing::Map)
</ins><span class="cx"> {
</span><del>- if (!dispatchData)
- return;
- const void* data;
- m_dispatchData = adoptDispatch(dispatch_data_create_map(dispatchData.get(), &data, &m_size));
- m_data = static_cast<const uint8_t*>(data);
- m_isMap = m_size && backing == Backing::Map;
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> const uint8_t* Data::data() const
</span><span class="lines">@@ -66,7 +64,41 @@
</span><span class="cx"> return !m_dispatchData;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+bool Data::apply(const std::function<bool (const uint8_t*, size_t)>&& applier) const
+{
+ if (!m_size)
+ return false;
+ return dispatch_data_apply(m_dispatchData.get(), [&applier](dispatch_data_t, size_t, const void* data, size_t size) {
+ return applier(static_cast<const uint8_t*>(data), size);
+ });
</ins><span class="cx"> }
</span><ins>+
+Data Data::subrange(size_t offset, size_t size) const
+{
+ return { adoptDispatch(dispatch_data_create_subrange(dispatchData(), offset, size)) };
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+Data concatenate(const Data& a, const Data& b)
+{
+ if (a.isNull())
+ return b;
+ if (b.isNull())
+ return a;
+ return { adoptDispatch(dispatch_data_create_concat(a.dispatchData(), b.dispatchData())) };
+}
+
+Data mapFile(int fd, size_t offset, size_t size)
+{
+ void* map = mmap(nullptr, size, PROT_READ, MAP_PRIVATE, fd, offset);
+ if (map == MAP_FAILED)
+ return { };
+ auto bodyMap = adoptDispatch(dispatch_data_create(map, size, dispatch_get_main_queue(), [map, size] {
+ munmap(map, size);
+ }));
+ return { bodyMap, Data::Backing::Map };
+}
+
+}
+}
+
</ins><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcesscacheNetworkCacheIOChannelCocoamm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheIOChannelCocoa.mm (181159 => 181160)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheIOChannelCocoa.mm 2015-03-06 17:21:11 UTC (rev 181159)
+++ trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheIOChannelCocoa.mm 2015-03-06 17:25:54 UTC (rev 181160)
</span><span class="lines">@@ -88,7 +88,8 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx"> ASSERT(!didCallCompletionHandler);
</span><del>- Data data(fileData);
</del><ins>+ DispatchPtr<dispatch_data_t> fileDataPtr(fileData);
+ Data data(fileDataPtr);
</ins><span class="cx"> completionHandler(data, error);
</span><span class="cx"> didCallCompletionHandler = true;
</span><span class="cx"> });
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcesscacheNetworkCacheStorageCocoamm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheStorageCocoa.mm (181159 => 181160)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheStorageCocoa.mm 2015-03-06 17:21:11 UTC (rev 181159)
+++ trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheStorageCocoa.mm 2015-03-06 17:25:54 UTC (rev 181160)
</span><span class="lines">@@ -33,9 +33,6 @@
</span><span class="cx"> #include "NetworkCacheFileSystemPosix.h"
</span><span class="cx"> #include "NetworkCacheIOChannel.h"
</span><span class="cx"> #include <dispatch/dispatch.h>
</span><del>-#include <mach/vm_param.h>
-#include <sys/mman.h>
-#include <sys/stat.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">@@ -123,13 +120,11 @@
</span><span class="cx"> return IOChannel::open(filePath, type);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static unsigned hashData(dispatch_data_t data)
</del><ins>+static unsigned hashData(const Data& data)
</ins><span class="cx"> {
</span><del>- if (!data || !dispatch_data_get_size(data))
- return 0;
</del><span class="cx"> StringHasher hasher;
</span><del>- dispatch_data_apply(data, [&hasher](dispatch_data_t, size_t, const void* data, size_t size) {
- hasher.addCharacters(static_cast<const uint8_t*>(data), size);
</del><ins>+ data.apply([&hasher](const uint8_t* data, size_t size) {
+ hasher.addCharacters(data, size);
</ins><span class="cx"> return true;
</span><span class="cx"> });
</span><span class="cx"> return hasher.hash();
</span><span class="lines">@@ -156,8 +151,8 @@
</span><span class="cx"> static bool decodeEntryMetaData(EntryMetaData& metaData, const Data& fileData)
</span><span class="cx"> {
</span><span class="cx"> bool success = false;
</span><del>- dispatch_data_apply(fileData.dispatchData(), [&metaData, &success](dispatch_data_t, size_t, const void* data, size_t size) {
- Decoder decoder(reinterpret_cast<const uint8_t*>(data), size);
</del><ins>+ fileData.apply([&metaData, &success](const uint8_t* data, size_t size) {
+ Decoder decoder(data, size);
</ins><span class="cx"> if (!decoder.decode(metaData.cacheStorageVersion))
</span><span class="cx"> return false;
</span><span class="cx"> if (!decoder.decode(metaData.key))
</span><span class="lines">@@ -182,17 +177,6 @@
</span><span class="cx"> return success;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static DispatchPtr<dispatch_data_t> mapFile(int fd, size_t offset, size_t size)
-{
- void* map = mmap(nullptr, size, PROT_READ, MAP_PRIVATE, fd, offset);
- if (map == MAP_FAILED)
- return nullptr;
- auto bodyMap = adoptDispatch(dispatch_data_create(map, size, dispatch_get_main_queue(), [map, size] {
- munmap(map, size);
- }));
- return bodyMap;
-}
-
</del><span class="cx"> static bool decodeEntryHeader(const Data& fileData, EntryMetaData& metaData, Data& data)
</span><span class="cx"> {
</span><span class="cx"> if (!decodeEntryMetaData(metaData, fileData))
</span><span class="lines">@@ -202,8 +186,8 @@
</span><span class="cx"> if (metaData.headerOffset + metaData.headerSize > metaData.bodyOffset)
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- auto headerData = adoptDispatch(dispatch_data_create_subrange(fileData.dispatchData(), metaData.headerOffset, metaData.headerSize));
- if (metaData.headerChecksum != hashData(headerData.get())) {
</del><ins>+ auto headerData = fileData.subrange(metaData.headerOffset, metaData.headerSize);
+ if (metaData.headerChecksum != hashData(headerData)) {
</ins><span class="cx"> LOG(NetworkCacheStorage, "(NetworkProcess) header checksum mismatch");
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="lines">@@ -224,25 +208,25 @@
</span><span class="cx"> return nullptr;
</span><span class="cx">
</span><span class="cx"> auto bodyData = mapFile(fd, metaData.bodyOffset, metaData.bodySize);
</span><del>- if (!bodyData) {
</del><ins>+ if (bodyData.isNull()) {
</ins><span class="cx"> LOG(NetworkCacheStorage, "(NetworkProcess) map failed");
</span><span class="cx"> return nullptr;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (metaData.bodyChecksum != hashData(bodyData.get())) {
</del><ins>+ if (metaData.bodyChecksum != hashData(bodyData)) {
</ins><span class="cx"> LOG(NetworkCacheStorage, "(NetworkProcess) data checksum mismatch");
</span><span class="cx"> return nullptr;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- return std::unique_ptr<Storage::Entry>(new Storage::Entry {
</del><ins>+ return std::make_unique<Storage::Entry>(Storage::Entry {
</ins><span class="cx"> metaData.key,
</span><span class="cx"> metaData.timeStamp,
</span><span class="cx"> headerData,
</span><del>- { bodyData, Data::Backing::Map }
</del><ins>+ bodyData
</ins><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static DispatchPtr<dispatch_data_t> encodeEntryMetaData(const EntryMetaData& entry)
</del><ins>+static Data encodeEntryMetaData(const EntryMetaData& entry)
</ins><span class="cx"> {
</span><span class="cx"> Encoder encoder;
</span><span class="cx">
</span><span class="lines">@@ -256,28 +240,28 @@
</span><span class="cx">
</span><span class="cx"> encoder.encodeChecksum();
</span><span class="cx">
</span><del>- return adoptDispatch(dispatch_data_create(encoder.buffer(), encoder.bufferSize(), nullptr, DISPATCH_DATA_DESTRUCTOR_DEFAULT));
</del><ins>+ return Data(encoder.buffer(), encoder.bufferSize());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static Data encodeEntryHeader(const Storage::Entry& entry)
</span><span class="cx"> {
</span><span class="cx"> EntryMetaData metaData(entry.key);
</span><span class="cx"> metaData.timeStamp = entry.timeStamp;
</span><del>- metaData.headerChecksum = hashData(entry.header.dispatchData());
</del><ins>+ metaData.headerChecksum = hashData(entry.header);
</ins><span class="cx"> metaData.headerSize = entry.header.size();
</span><del>- metaData.bodyChecksum = hashData(entry.body.dispatchData());
</del><ins>+ metaData.bodyChecksum = hashData(entry.body);
</ins><span class="cx"> metaData.bodySize = entry.body.size();
</span><span class="cx">
</span><span class="cx"> auto encodedMetaData = encodeEntryMetaData(metaData);
</span><del>- auto headerData = adoptDispatch(dispatch_data_create_concat(encodedMetaData.get(), entry.header.dispatchData()));
</del><ins>+ auto headerData = concatenate(encodedMetaData, entry.header);
</ins><span class="cx"> if (!entry.body.size())
</span><span class="cx"> return { headerData };
</span><span class="cx">
</span><del>- size_t headerSize = dispatch_data_get_size(headerData.get());
- size_t dataOffset = round_page(headerSize);
- Vector<uint8_t, 4096> filler(dataOffset - headerSize, 0);
- auto alignmentData = adoptDispatch(dispatch_data_create(filler.data(), filler.size(), nullptr, DISPATCH_DATA_DESTRUCTOR_DEFAULT));
- return { adoptDispatch(dispatch_data_create_concat(headerData.get(), alignmentData.get())) };
</del><ins>+ size_t dataOffset = WTF::roundUpToMultipleOf(pageSize(), headerData.size());
+ Vector<uint8_t, 4096> filler(dataOffset - headerData.size(), 0);
+ Data alignmentData(filler.data(), filler.size());
+
+ return concatenate(headerData, alignmentData);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void Storage::removeEntry(const Key& key)
</span><span class="lines">@@ -481,15 +465,13 @@
</span><span class="cx"> StringCapture cachePathCapture(m_directoryPath);
</span><span class="cx"> backgroundIOQueue().dispatch([this, &write, cachePathCapture] {
</span><span class="cx"> auto encodedHeader = encodeEntryHeader(write.entry);
</span><del>- auto headerAndBodyData = adoptDispatch(dispatch_data_create_concat(encodedHeader.dispatchData(), write.entry.body.dispatchData()));
</del><ins>+ auto headerAndBodyData = concatenate(encodedHeader, write.entry.body);
</ins><span class="cx">
</span><del>- Data writeData(headerAndBodyData);
-
</del><span class="cx"> auto channel = openFileForKey(write.entry.key, IOChannel::Type::Create, cachePathCapture.string());
</span><span class="cx"> int fd = channel->fileDescriptor();
</span><span class="cx"> size_t bodyOffset = encodedHeader.size();
</span><span class="cx">
</span><del>- channel->write(0, writeData, [this, &write, bodyOffset, fd](int error) {
</del><ins>+ channel->write(0, headerAndBodyData, [this, &write, bodyOffset, fd](int error) {
</ins><span class="cx"> LOG(NetworkCacheStorage, "(NetworkProcess) write complete error=%d", error);
</span><span class="cx"> if (error) {
</span><span class="cx"> if (m_contentsFilter.mayContain(write.entry.key.shortHash()))
</span><span class="lines">@@ -501,10 +483,9 @@
</span><span class="cx"> m_approximateSize += totalSize;
</span><span class="cx">
</span><span class="cx"> bool shouldMapBody = !error && bodySize >= pageSize();
</span><del>- auto bodyMap = shouldMapBody ? mapFile(fd, bodyOffset, bodySize) : nullptr;
</del><ins>+ auto bodyMap = shouldMapBody ? mapFile(fd, bodyOffset, bodySize) : Data();
</ins><span class="cx">
</span><del>- Data bodyData(bodyMap, Data::Backing::Map);
- write.completionHandler(!error, bodyData);
</del><ins>+ write.completionHandler(!error, bodyMap);
</ins><span class="cx">
</span><span class="cx"> ASSERT(m_activeWriteOperations.contains(&write));
</span><span class="cx"> m_activeWriteOperations.remove(&write);
</span></span></pre>
</div>
</div>
</body>
</html>