Diff
Modified: trunk/Source/WebKit2/ChangeLog (181161 => 181162)
--- trunk/Source/WebKit2/ChangeLog 2015-03-06 17:30:32 UTC (rev 181161)
+++ trunk/Source/WebKit2/ChangeLog 2015-03-06 18:09:06 UTC (rev 181162)
@@ -1,5 +1,19 @@
2015-03-06 Antti Koivisto <an...@apple.com>
+ Rename NetworkCacheStorageCocoa.mm to NetworkCacheStorage.cpp
+ https://bugs.webkit.org/show_bug.cgi?id=142401
+
+ Rubber-stamped by Anders Carlsson.
+
+ It is now fully cross-platform.
+
+ * NetworkProcess/cache/NetworkCacheStorage.cpp: Copied from Source/WebKit2/NetworkProcess/cache/NetworkCacheStorageCocoa.mm.
+ (WebKit::NetworkCache::Storage::shrinkIfNeeded):
+ * NetworkProcess/cache/NetworkCacheStorageCocoa.mm: Removed.
+ * WebKit2.xcodeproj/project.pbxproj:
+
+2015-03-06 Antti Koivisto <an...@apple.com>
+
Don't use dispatch_semaphore in NetworkCacheStorage
https://bugs.webkit.org/show_bug.cgi?id=142395
Copied: trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheStorage.cpp (from rev 181161, trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheStorageCocoa.mm) (0 => 181162)
--- trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheStorage.cpp (rev 0)
+++ trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheStorage.cpp 2015-03-06 18:09:06 UTC (rev 181162)
@@ -0,0 +1,638 @@
+/*
+ * Copyright (C) 2014-2015 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "config.h"
+#include "NetworkCacheStorage.h"
+
+#if ENABLE(NETWORK_CACHE)
+
+#include "Logging.h"
+#include "NetworkCacheCoders.h"
+#include "NetworkCacheFileSystemPosix.h"
+#include "NetworkCacheIOChannel.h"
+#include <wtf/PageBlock.h>
+#include <wtf/RandomNumber.h>
+#include <wtf/RunLoop.h>
+#include <wtf/text/CString.h>
+#include <wtf/text/StringBuilder.h>
+
+namespace WebKit {
+namespace NetworkCache {
+
+static const char networkCacheSubdirectory[] = "WebKitCache";
+static const char versionDirectoryPrefix[] = "Version ";
+
+std::unique_ptr<Storage> Storage::open(const String& cachePath)
+{
+ ASSERT(RunLoop::isMain());
+
+ String networkCachePath = WebCore::pathByAppendingComponent(cachePath, networkCacheSubdirectory);
+ if (!WebCore::makeAllDirectories(networkCachePath))
+ return nullptr;
+ return std::unique_ptr<Storage>(new Storage(networkCachePath));
+}
+
+static String makeVersionedDirectoryPath(const String& baseDirectoryPath)
+{
+ String versionSubdirectory = versionDirectoryPrefix + String::number(Storage::version);
+ return WebCore::pathByAppendingComponent(baseDirectoryPath, versionSubdirectory);
+}
+
+Storage::Storage(const String& baseDirectoryPath)
+ : m_baseDirectoryPath(baseDirectoryPath)
+ , m_directoryPath(makeVersionedDirectoryPath(baseDirectoryPath))
+ , m_ioQueue(WorkQueue::create("com.apple.WebKit.Cache.Storage", WorkQueue::Type::Concurrent))
+ , m_backgroundIOQueue(WorkQueue::create("com.apple.WebKit.Cache.Storage", WorkQueue::Type::Concurrent, WorkQueue::QOS::Background))
+{
+ deleteOldVersions();
+ initialize();
+}
+
+void Storage::initialize()
+{
+ ASSERT(RunLoop::isMain());
+
+ StringCapture cachePathCapture(m_directoryPath);
+
+ backgroundIOQueue().dispatch([this, cachePathCapture] {
+ String cachePath = cachePathCapture.string();
+ traverseCacheFiles(cachePath, [this](const String& fileName, const String& partitionPath) {
+ Key::HashType hash;
+ if (!Key::stringToHash(fileName, hash))
+ return;
+ unsigned shortHash = Key::toShortHash(hash);
+ RunLoop::main().dispatch([this, shortHash] {
+ m_contentsFilter.add(shortHash);
+ });
+ auto filePath = WebCore::pathByAppendingComponent(partitionPath, fileName);
+ long long fileSize = 0;
+ WebCore::getFileSize(filePath, fileSize);
+ m_approximateSize += fileSize;
+ });
+ });
+}
+
+static String directoryPathForKey(const Key& key, const String& cachePath)
+{
+ ASSERT(!key.partition().isEmpty());
+ return WebCore::pathByAppendingComponent(cachePath, key.partition());
+}
+
+static String fileNameForKey(const Key& key)
+{
+ return key.hashAsString();
+}
+
+static String filePathForKey(const Key& key, const String& cachePath)
+{
+ return WebCore::pathByAppendingComponent(directoryPathForKey(key, cachePath), fileNameForKey(key));
+}
+
+static Ref<IOChannel> openFileForKey(const Key& key, IOChannel::Type type, const String& cachePath)
+{
+ auto directoryPath = directoryPathForKey(key, cachePath);
+ auto filePath = WebCore::pathByAppendingComponent(directoryPath, fileNameForKey(key));
+ if (type == IOChannel::Type::Create)
+ WebCore::makeAllDirectories(directoryPath);
+ return IOChannel::open(filePath, type);
+}
+
+static unsigned hashData(const Data& data)
+{
+ StringHasher hasher;
+ data.apply([&hasher](const uint8_t* data, size_t size) {
+ hasher.addCharacters(data, size);
+ return true;
+ });
+ return hasher.hash();
+}
+
+struct EntryMetaData {
+ EntryMetaData() { }
+ explicit EntryMetaData(const Key& key)
+ : cacheStorageVersion(Storage::version)
+ , key(key)
+ { }
+
+ unsigned cacheStorageVersion;
+ Key key;
+ std::chrono::milliseconds timeStamp;
+ unsigned headerChecksum;
+ uint64_t headerOffset;
+ uint64_t headerSize;
+ unsigned bodyChecksum;
+ uint64_t bodyOffset;
+ uint64_t bodySize;
+};
+
+static bool decodeEntryMetaData(EntryMetaData& metaData, const Data& fileData)
+{
+ bool success = false;
+ fileData.apply([&metaData, &success](const uint8_t* data, size_t size) {
+ Decoder decoder(data, size);
+ if (!decoder.decode(metaData.cacheStorageVersion))
+ return false;
+ if (!decoder.decode(metaData.key))
+ return false;
+ if (!decoder.decode(metaData.timeStamp))
+ return false;
+ if (!decoder.decode(metaData.headerChecksum))
+ return false;
+ if (!decoder.decode(metaData.headerSize))
+ return false;
+ if (!decoder.decode(metaData.bodyChecksum))
+ return false;
+ if (!decoder.decode(metaData.bodySize))
+ return false;
+ if (!decoder.verifyChecksum())
+ return false;
+ metaData.headerOffset = decoder.currentOffset();
+ metaData.bodyOffset = WTF::roundUpToMultipleOf(pageSize(), metaData.headerOffset + metaData.headerSize);
+ success = true;
+ return false;
+ });
+ return success;
+}
+
+static bool decodeEntryHeader(const Data& fileData, EntryMetaData& metaData, Data& data)
+{
+ if (!decodeEntryMetaData(metaData, fileData))
+ return false;
+ if (metaData.cacheStorageVersion != Storage::version)
+ return false;
+ if (metaData.headerOffset + metaData.headerSize > metaData.bodyOffset)
+ return false;
+
+ auto headerData = fileData.subrange(metaData.headerOffset, metaData.headerSize);
+ if (metaData.headerChecksum != hashData(headerData)) {
+ LOG(NetworkCacheStorage, "(NetworkProcess) header checksum mismatch");
+ return false;
+ }
+ data = { headerData };
+ return true;
+}
+
+static std::unique_ptr<Storage::Entry> decodeEntry(const Data& fileData, int fd, const Key& key)
+{
+ EntryMetaData metaData;
+ Data headerData;
+ if (!decodeEntryHeader(fileData, metaData, headerData))
+ return nullptr;
+
+ if (metaData.key != key)
+ return nullptr;
+ if (metaData.bodyOffset + metaData.bodySize != fileData.size())
+ return nullptr;
+
+ auto bodyData = mapFile(fd, metaData.bodyOffset, metaData.bodySize);
+ if (bodyData.isNull()) {
+ LOG(NetworkCacheStorage, "(NetworkProcess) map failed");
+ return nullptr;
+ }
+
+ if (metaData.bodyChecksum != hashData(bodyData)) {
+ LOG(NetworkCacheStorage, "(NetworkProcess) data checksum mismatch");
+ return nullptr;
+ }
+
+ return std::make_unique<Storage::Entry>(Storage::Entry {
+ metaData.key,
+ metaData.timeStamp,
+ headerData,
+ bodyData
+ });
+}
+
+static Data encodeEntryMetaData(const EntryMetaData& entry)
+{
+ Encoder encoder;
+
+ encoder << entry.cacheStorageVersion;
+ encoder << entry.key;
+ encoder << entry.timeStamp;
+ encoder << entry.headerChecksum;
+ encoder << entry.headerSize;
+ encoder << entry.bodyChecksum;
+ encoder << entry.bodySize;
+
+ encoder.encodeChecksum();
+
+ return Data(encoder.buffer(), encoder.bufferSize());
+}
+
+static Data encodeEntryHeader(const Storage::Entry& entry)
+{
+ EntryMetaData metaData(entry.key);
+ metaData.timeStamp = entry.timeStamp;
+ metaData.headerChecksum = hashData(entry.header);
+ metaData.headerSize = entry.header.size();
+ metaData.bodyChecksum = hashData(entry.body);
+ metaData.bodySize = entry.body.size();
+
+ auto encodedMetaData = encodeEntryMetaData(metaData);
+ auto headerData = concatenate(encodedMetaData, entry.header);
+ if (!entry.body.size())
+ return { headerData };
+
+ 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);
+}
+
+void Storage::removeEntry(const Key& key)
+{
+ ASSERT(RunLoop::isMain());
+
+ // For simplicity we don't reduce m_approximateSize on removals caused by load or decode errors.
+ // The next cache shrink will update the size.
+
+ if (m_contentsFilter.mayContain(key.shortHash()))
+ m_contentsFilter.remove(key.shortHash());
+
+ StringCapture filePathCapture(filePathForKey(key, m_directoryPath));
+ backgroundIOQueue().dispatch([this, filePathCapture] {
+ WebCore::deleteFile(filePathCapture.string());
+ });
+}
+
+void Storage::dispatchReadOperation(const ReadOperation& read)
+{
+ ASSERT(RunLoop::isMain());
+ ASSERT(m_activeReadOperations.contains(&read));
+
+ StringCapture cachePathCapture(m_directoryPath);
+ ioQueue().dispatch([this, &read, cachePathCapture] {
+ auto channel = openFileForKey(read.key, IOChannel::Type::Read, cachePathCapture.string());
+ int fd = channel->fileDescriptor();
+ channel->read(0, std::numeric_limits<size_t>::max(), [this, &read, fd](Data& fileData, int error) {
+ if (error) {
+ removeEntry(read.key);
+ read.completionHandler(nullptr);
+ } else {
+ auto entry = decodeEntry(fileData, fd, read.key);
+ bool success = read.completionHandler(WTF::move(entry));
+ if (!success)
+ removeEntry(read.key);
+ }
+
+ ASSERT(m_activeReadOperations.contains(&read));
+ m_activeReadOperations.remove(&read);
+ dispatchPendingReadOperations();
+
+ LOG(NetworkCacheStorage, "(NetworkProcess) read complete error=%d", error);
+ });
+ });
+}
+
+void Storage::dispatchPendingReadOperations()
+{
+ ASSERT(RunLoop::isMain());
+
+ const int maximumActiveReadOperationCount = 5;
+
+ for (int priority = maximumRetrievePriority; priority >= 0; --priority) {
+ if (m_activeReadOperations.size() > maximumActiveReadOperationCount) {
+ LOG(NetworkCacheStorage, "(NetworkProcess) limiting parallel retrieves");
+ return;
+ }
+ auto& pendingRetrieveQueue = m_pendingReadOperationsByPriority[priority];
+ if (pendingRetrieveQueue.isEmpty())
+ continue;
+ auto readOperation = pendingRetrieveQueue.takeFirst();
+ auto& read = *readOperation;
+ m_activeReadOperations.add(WTF::move(readOperation));
+ dispatchReadOperation(read);
+ }
+}
+
+template <class T> bool retrieveFromMemory(const T& operations, const Key& key, Storage::RetrieveCompletionHandler& completionHandler)
+{
+ for (auto& operation : operations) {
+ if (operation->entry.key == key) {
+ LOG(NetworkCacheStorage, "(NetworkProcess) found write operation in progress");
+ auto entry = operation->entry;
+ RunLoop::main().dispatch([entry, completionHandler] {
+ completionHandler(std::make_unique<Storage::Entry>(entry));
+ });
+ return true;
+ }
+ }
+ return false;
+}
+
+void Storage::retrieve(const Key& key, unsigned priority, RetrieveCompletionHandler&& completionHandler)
+{
+ ASSERT(RunLoop::isMain());
+ ASSERT(priority <= maximumRetrievePriority);
+ ASSERT(!key.isNull());
+
+ if (!m_maximumSize) {
+ completionHandler(nullptr);
+ return;
+ }
+
+ if (!m_contentsFilter.mayContain(key.shortHash())) {
+ completionHandler(nullptr);
+ return;
+ }
+
+ if (retrieveFromMemory(m_pendingWriteOperations, key, completionHandler))
+ return;
+ if (retrieveFromMemory(m_activeWriteOperations, key, completionHandler))
+ return;
+
+ m_pendingReadOperationsByPriority[priority].append(new ReadOperation { key, WTF::move(completionHandler) });
+ dispatchPendingReadOperations();
+}
+
+void Storage::store(const Entry& entry, StoreCompletionHandler&& completionHandler)
+{
+ ASSERT(RunLoop::isMain());
+ ASSERT(!entry.key.isNull());
+
+ if (!m_maximumSize) {
+ completionHandler(false, { });
+ return;
+ }
+
+ m_pendingWriteOperations.append(new WriteOperation { entry, { }, WTF::move(completionHandler) });
+
+ // Add key to the filter already here as we do lookups from the pending operations too.
+ m_contentsFilter.add(entry.key.shortHash());
+
+ dispatchPendingWriteOperations();
+}
+
+void Storage::update(const Entry& updateEntry, const Entry& existingEntry, StoreCompletionHandler&& completionHandler)
+{
+ ASSERT(RunLoop::isMain());
+ ASSERT(!existingEntry.key.isNull());
+ ASSERT(existingEntry.key == updateEntry.key);
+
+ if (!m_maximumSize) {
+ completionHandler(false, { });
+ return;
+ }
+
+ m_pendingWriteOperations.append(new WriteOperation { updateEntry, existingEntry, WTF::move(completionHandler) });
+
+ dispatchPendingWriteOperations();
+}
+
+void Storage::traverse(std::function<void (const Entry*)>&& traverseHandler)
+{
+ StringCapture cachePathCapture(m_directoryPath);
+ ioQueue().dispatch([this, cachePathCapture, traverseHandler] {
+ String cachePath = cachePathCapture.string();
+ 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;
+ // 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;
+ if (decodeEntryHeader(fileData, metaData, headerData)) {
+ Entry entry { metaData.key, metaData.timeStamp, headerData, { } };
+ traverseHandler(&entry);
+ }
+ });
+ });
+ RunLoop::main().dispatch([this, traverseHandler] {
+ traverseHandler(nullptr);
+ });
+ });
+}
+
+void Storage::dispatchPendingWriteOperations()
+{
+ ASSERT(RunLoop::isMain());
+
+ const int maximumActiveWriteOperationCount { 3 };
+
+ while (!m_pendingWriteOperations.isEmpty()) {
+ if (m_activeWriteOperations.size() >= maximumActiveWriteOperationCount) {
+ LOG(NetworkCacheStorage, "(NetworkProcess) limiting parallel writes");
+ return;
+ }
+ auto writeOperation = m_pendingWriteOperations.takeFirst();
+ auto& write = *writeOperation;
+ m_activeWriteOperations.add(WTF::move(writeOperation));
+
+ if (write.existingEntry && m_contentsFilter.mayContain(write.entry.key.shortHash())) {
+ dispatchHeaderWriteOperation(write);
+ continue;
+ }
+ dispatchFullWriteOperation(write);
+ }
+}
+
+void Storage::dispatchFullWriteOperation(const WriteOperation& write)
+{
+ ASSERT(RunLoop::isMain());
+ ASSERT(m_activeWriteOperations.contains(&write));
+
+ if (!m_contentsFilter.mayContain(write.entry.key.shortHash()))
+ m_contentsFilter.add(write.entry.key.shortHash());
+
+ StringCapture cachePathCapture(m_directoryPath);
+ backgroundIOQueue().dispatch([this, &write, cachePathCapture] {
+ auto encodedHeader = encodeEntryHeader(write.entry);
+ auto headerAndBodyData = concatenate(encodedHeader, write.entry.body);
+
+ auto channel = openFileForKey(write.entry.key, IOChannel::Type::Create, cachePathCapture.string());
+ int fd = channel->fileDescriptor();
+ size_t bodyOffset = encodedHeader.size();
+
+ channel->write(0, headerAndBodyData, [this, &write, bodyOffset, fd](int error) {
+ LOG(NetworkCacheStorage, "(NetworkProcess) write complete error=%d", error);
+ if (error) {
+ if (m_contentsFilter.mayContain(write.entry.key.shortHash()))
+ m_contentsFilter.remove(write.entry.key.shortHash());
+ }
+ size_t bodySize = write.entry.body.size();
+ size_t totalSize = bodyOffset + bodySize;
+
+ m_approximateSize += totalSize;
+
+ bool shouldMapBody = !error && bodySize >= pageSize();
+ auto bodyMap = shouldMapBody ? mapFile(fd, bodyOffset, bodySize) : Data();
+
+ write.completionHandler(!error, bodyMap);
+
+ ASSERT(m_activeWriteOperations.contains(&write));
+ m_activeWriteOperations.remove(&write);
+ dispatchPendingWriteOperations();
+ });
+ });
+
+ shrinkIfNeeded();
+}
+
+void Storage::dispatchHeaderWriteOperation(const WriteOperation& write)
+{
+ ASSERT(RunLoop::isMain());
+ ASSERT(write.existingEntry);
+ ASSERT(m_activeWriteOperations.contains(&write));
+ ASSERT(m_contentsFilter.mayContain(write.entry.key.shortHash()));
+
+ // Try to update the header of an existing entry.
+ StringCapture cachePathCapture(m_directoryPath);
+ backgroundIOQueue().dispatch([this, &write, cachePathCapture] {
+ auto headerData = encodeEntryHeader(write.entry);
+ auto existingHeaderData = encodeEntryHeader(write.existingEntry.value());
+
+ bool pageRoundedHeaderSizeChanged = headerData.size() != existingHeaderData.size();
+ if (pageRoundedHeaderSizeChanged) {
+ LOG(NetworkCacheStorage, "(NetworkProcess) page-rounded header size changed, storing full entry");
+ RunLoop::main().dispatch([this, &write] {
+ dispatchFullWriteOperation(write);
+ });
+ return;
+ }
+
+ auto channel = openFileForKey(write.entry.key, IOChannel::Type::Write, cachePathCapture.string());
+ channel->write(0, headerData, [this, &write](int error) {
+ LOG(NetworkCacheStorage, "(NetworkProcess) update complete error=%d", error);
+
+ if (error)
+ removeEntry(write.entry.key);
+
+ write.completionHandler(!error, { });
+
+ ASSERT(m_activeWriteOperations.contains(&write));
+ m_activeWriteOperations.remove(&write);
+ dispatchPendingWriteOperations();
+ });
+ });
+}
+
+void Storage::setMaximumSize(size_t size)
+{
+ ASSERT(RunLoop::isMain());
+ m_maximumSize = size;
+
+ shrinkIfNeeded();
+}
+
+void Storage::clear()
+{
+ ASSERT(RunLoop::isMain());
+ LOG(NetworkCacheStorage, "(NetworkProcess) clearing cache");
+
+ m_contentsFilter.clear();
+ m_approximateSize = 0;
+
+ StringCapture directoryPathCapture(m_directoryPath);
+
+ ioQueue().dispatch([directoryPathCapture] {
+ String directoryPath = directoryPathCapture.string();
+ traverseDirectory(directoryPath, DT_DIR, [&directoryPath](const String& subdirName) {
+ String subdirPath = WebCore::pathByAppendingComponent(directoryPath, subdirName);
+ traverseDirectory(subdirPath, DT_REG, [&subdirPath](const String& fileName) {
+ WebCore::deleteFile(WebCore::pathByAppendingComponent(subdirPath, fileName));
+ });
+ WebCore::deleteEmptyDirectory(subdirPath);
+ });
+ });
+}
+
+void Storage::shrinkIfNeeded()
+{
+ ASSERT(RunLoop::isMain());
+
+ static const double deletionProbability { 0.25 };
+
+ if (m_approximateSize <= m_maximumSize)
+ return;
+ if (m_shrinkInProgress)
+ return;
+ m_shrinkInProgress = true;
+
+ LOG(NetworkCacheStorage, "(NetworkProcess) shrinking cache approximateSize=%zu, m_maximumSize=%zu", static_cast<size_t>(m_approximateSize), m_maximumSize);
+
+ m_approximateSize = 0;
+
+ StringCapture cachePathCapture(m_directoryPath);
+ backgroundIOQueue().dispatch([this, cachePathCapture] {
+ String cachePath = cachePathCapture.string();
+ traverseCacheFiles(cachePath, [this](const String& fileName, const String& partitionPath) {
+ auto filePath = WebCore::pathByAppendingComponent(partitionPath, fileName);
+
+ bool shouldDelete = randomNumber() < deletionProbability;
+ if (!shouldDelete) {
+ long long fileSize = 0;
+ WebCore::getFileSize(filePath, fileSize);
+ m_approximateSize += fileSize;
+ return;
+ }
+
+ WebCore::deleteFile(filePath);
+ Key::HashType hash;
+ if (!Key::stringToHash(fileName, hash))
+ return;
+ unsigned shortHash = Key::toShortHash(hash);
+ RunLoop::main().dispatch([this, shortHash] {
+ if (m_contentsFilter.mayContain(shortHash))
+ m_contentsFilter.remove(shortHash);
+ });
+ });
+
+ // Let system figure out if they are really empty.
+ traverseDirectory(cachePath, DT_DIR, [&cachePath](const String& subdirName) {
+ auto partitionPath = WebCore::pathByAppendingComponent(cachePath, subdirName);
+ WebCore::deleteEmptyDirectory(partitionPath);
+ });
+
+ m_shrinkInProgress = false;
+
+ LOG(NetworkCacheStorage, "(NetworkProcess) cache shrink completed approximateSize=%zu", static_cast<size_t>(m_approximateSize));
+ });
+}
+
+void Storage::deleteOldVersions()
+{
+ // Delete V1 cache.
+ StringCapture cachePathCapture(m_baseDirectoryPath);
+ backgroundIOQueue().dispatch([cachePathCapture] {
+ String cachePath = cachePathCapture.string();
+ traverseDirectory(cachePath, DT_DIR, [&cachePath](const String& subdirName) {
+ if (subdirName.startsWith(versionDirectoryPrefix))
+ return;
+ String partitionPath = WebCore::pathByAppendingComponent(cachePath, subdirName);
+ traverseDirectory(partitionPath, DT_REG, [&partitionPath](const String& fileName) {
+ WebCore::deleteFile(WebCore::pathByAppendingComponent(partitionPath, fileName));
+ });
+ WebCore::deleteEmptyDirectory(partitionPath);
+ });
+ });
+}
+
+}
+}
+
+#endif
Deleted: trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheStorageCocoa.mm (181161 => 181162)
--- trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheStorageCocoa.mm 2015-03-06 17:30:32 UTC (rev 181161)
+++ trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheStorageCocoa.mm 2015-03-06 18:09:06 UTC (rev 181162)
@@ -1,638 +0,0 @@
-/*
- * Copyright (C) 2014-2015 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
- * THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "config.h"
-#include "NetworkCacheStorage.h"
-
-#if ENABLE(NETWORK_CACHE)
-
-#include "Logging.h"
-#include "NetworkCacheCoders.h"
-#include "NetworkCacheFileSystemPosix.h"
-#include "NetworkCacheIOChannel.h"
-#include <wtf/PageBlock.h>
-#include <wtf/RandomNumber.h>
-#include <wtf/RunLoop.h>
-#include <wtf/text/CString.h>
-#include <wtf/text/StringBuilder.h>
-
-namespace WebKit {
-namespace NetworkCache {
-
-static const char networkCacheSubdirectory[] = "WebKitCache";
-static const char versionDirectoryPrefix[] = "Version ";
-
-std::unique_ptr<Storage> Storage::open(const String& cachePath)
-{
- ASSERT(RunLoop::isMain());
-
- String networkCachePath = WebCore::pathByAppendingComponent(cachePath, networkCacheSubdirectory);
- if (!WebCore::makeAllDirectories(networkCachePath))
- return nullptr;
- return std::unique_ptr<Storage>(new Storage(networkCachePath));
-}
-
-static String makeVersionedDirectoryPath(const String& baseDirectoryPath)
-{
- String versionSubdirectory = versionDirectoryPrefix + String::number(Storage::version);
- return WebCore::pathByAppendingComponent(baseDirectoryPath, versionSubdirectory);
-}
-
-Storage::Storage(const String& baseDirectoryPath)
- : m_baseDirectoryPath(baseDirectoryPath)
- , m_directoryPath(makeVersionedDirectoryPath(baseDirectoryPath))
- , m_ioQueue(WorkQueue::create("com.apple.WebKit.Cache.Storage", WorkQueue::Type::Concurrent))
- , m_backgroundIOQueue(WorkQueue::create("com.apple.WebKit.Cache.Storage", WorkQueue::Type::Concurrent, WorkQueue::QOS::Background))
-{
- deleteOldVersions();
- initialize();
-}
-
-void Storage::initialize()
-{
- ASSERT(RunLoop::isMain());
-
- StringCapture cachePathCapture(m_directoryPath);
-
- backgroundIOQueue().dispatch([this, cachePathCapture] {
- String cachePath = cachePathCapture.string();
- traverseCacheFiles(cachePath, [this](const String& fileName, const String& partitionPath) {
- Key::HashType hash;
- if (!Key::stringToHash(fileName, hash))
- return;
- unsigned shortHash = Key::toShortHash(hash);
- RunLoop::main().dispatch([this, shortHash] {
- m_contentsFilter.add(shortHash);
- });
- auto filePath = WebCore::pathByAppendingComponent(partitionPath, fileName);
- long long fileSize = 0;
- WebCore::getFileSize(filePath, fileSize);
- m_approximateSize += fileSize;
- });
- });
-}
-
-static String directoryPathForKey(const Key& key, const String& cachePath)
-{
- ASSERT(!key.partition().isEmpty());
- return WebCore::pathByAppendingComponent(cachePath, key.partition());
-}
-
-static String fileNameForKey(const Key& key)
-{
- return key.hashAsString();
-}
-
-static String filePathForKey(const Key& key, const String& cachePath)
-{
- return WebCore::pathByAppendingComponent(directoryPathForKey(key, cachePath), fileNameForKey(key));
-}
-
-static Ref<IOChannel> openFileForKey(const Key& key, IOChannel::Type type, const String& cachePath)
-{
- auto directoryPath = directoryPathForKey(key, cachePath);
- auto filePath = WebCore::pathByAppendingComponent(directoryPath, fileNameForKey(key));
- if (type == IOChannel::Type::Create)
- WebCore::makeAllDirectories(directoryPath);
- return IOChannel::open(filePath, type);
-}
-
-static unsigned hashData(const Data& data)
-{
- StringHasher hasher;
- data.apply([&hasher](const uint8_t* data, size_t size) {
- hasher.addCharacters(data, size);
- return true;
- });
- return hasher.hash();
-}
-
-struct EntryMetaData {
- EntryMetaData() { }
- explicit EntryMetaData(const Key& key)
- : cacheStorageVersion(Storage::version)
- , key(key)
- { }
-
- unsigned cacheStorageVersion;
- Key key;
- std::chrono::milliseconds timeStamp;
- unsigned headerChecksum;
- uint64_t headerOffset;
- uint64_t headerSize;
- unsigned bodyChecksum;
- uint64_t bodyOffset;
- uint64_t bodySize;
-};
-
-static bool decodeEntryMetaData(EntryMetaData& metaData, const Data& fileData)
-{
- bool success = false;
- fileData.apply([&metaData, &success](const uint8_t* data, size_t size) {
- Decoder decoder(data, size);
- if (!decoder.decode(metaData.cacheStorageVersion))
- return false;
- if (!decoder.decode(metaData.key))
- return false;
- if (!decoder.decode(metaData.timeStamp))
- return false;
- if (!decoder.decode(metaData.headerChecksum))
- return false;
- if (!decoder.decode(metaData.headerSize))
- return false;
- if (!decoder.decode(metaData.bodyChecksum))
- return false;
- if (!decoder.decode(metaData.bodySize))
- return false;
- if (!decoder.verifyChecksum())
- return false;
- metaData.headerOffset = decoder.currentOffset();
- metaData.bodyOffset = WTF::roundUpToMultipleOf(pageSize(), metaData.headerOffset + metaData.headerSize);
- success = true;
- return false;
- });
- return success;
-}
-
-static bool decodeEntryHeader(const Data& fileData, EntryMetaData& metaData, Data& data)
-{
- if (!decodeEntryMetaData(metaData, fileData))
- return false;
- if (metaData.cacheStorageVersion != Storage::version)
- return false;
- if (metaData.headerOffset + metaData.headerSize > metaData.bodyOffset)
- return false;
-
- auto headerData = fileData.subrange(metaData.headerOffset, metaData.headerSize);
- if (metaData.headerChecksum != hashData(headerData)) {
- LOG(NetworkCacheStorage, "(NetworkProcess) header checksum mismatch");
- return false;
- }
- data = { headerData };
- return true;
-}
-
-static std::unique_ptr<Storage::Entry> decodeEntry(const Data& fileData, int fd, const Key& key)
-{
- EntryMetaData metaData;
- Data headerData;
- if (!decodeEntryHeader(fileData, metaData, headerData))
- return nullptr;
-
- if (metaData.key != key)
- return nullptr;
- if (metaData.bodyOffset + metaData.bodySize != fileData.size())
- return nullptr;
-
- auto bodyData = mapFile(fd, metaData.bodyOffset, metaData.bodySize);
- if (bodyData.isNull()) {
- LOG(NetworkCacheStorage, "(NetworkProcess) map failed");
- return nullptr;
- }
-
- if (metaData.bodyChecksum != hashData(bodyData)) {
- LOG(NetworkCacheStorage, "(NetworkProcess) data checksum mismatch");
- return nullptr;
- }
-
- return std::make_unique<Storage::Entry>(Storage::Entry {
- metaData.key,
- metaData.timeStamp,
- headerData,
- bodyData
- });
-}
-
-static Data encodeEntryMetaData(const EntryMetaData& entry)
-{
- Encoder encoder;
-
- encoder << entry.cacheStorageVersion;
- encoder << entry.key;
- encoder << entry.timeStamp;
- encoder << entry.headerChecksum;
- encoder << entry.headerSize;
- encoder << entry.bodyChecksum;
- encoder << entry.bodySize;
-
- encoder.encodeChecksum();
-
- return Data(encoder.buffer(), encoder.bufferSize());
-}
-
-static Data encodeEntryHeader(const Storage::Entry& entry)
-{
- EntryMetaData metaData(entry.key);
- metaData.timeStamp = entry.timeStamp;
- metaData.headerChecksum = hashData(entry.header);
- metaData.headerSize = entry.header.size();
- metaData.bodyChecksum = hashData(entry.body);
- metaData.bodySize = entry.body.size();
-
- auto encodedMetaData = encodeEntryMetaData(metaData);
- auto headerData = concatenate(encodedMetaData, entry.header);
- if (!entry.body.size())
- return { headerData };
-
- 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);
-}
-
-void Storage::removeEntry(const Key& key)
-{
- ASSERT(RunLoop::isMain());
-
- // For simplicity we don't reduce m_approximateSize on removals caused by load or decode errors.
- // The next cache shrink will update the size.
-
- if (m_contentsFilter.mayContain(key.shortHash()))
- m_contentsFilter.remove(key.shortHash());
-
- StringCapture filePathCapture(filePathForKey(key, m_directoryPath));
- backgroundIOQueue().dispatch([this, filePathCapture] {
- WebCore::deleteFile(filePathCapture.string());
- });
-}
-
-void Storage::dispatchReadOperation(const ReadOperation& read)
-{
- ASSERT(RunLoop::isMain());
- ASSERT(m_activeReadOperations.contains(&read));
-
- StringCapture cachePathCapture(m_directoryPath);
- ioQueue().dispatch([this, &read, cachePathCapture] {
- auto channel = openFileForKey(read.key, IOChannel::Type::Read, cachePathCapture.string());
- int fd = channel->fileDescriptor();
- channel->read(0, std::numeric_limits<size_t>::max(), [this, &read, fd](Data& fileData, int error) {
- if (error) {
- removeEntry(read.key);
- read.completionHandler(nullptr);
- } else {
- auto entry = decodeEntry(fileData, fd, read.key);
- bool success = read.completionHandler(WTF::move(entry));
- if (!success)
- removeEntry(read.key);
- }
-
- ASSERT(m_activeReadOperations.contains(&read));
- m_activeReadOperations.remove(&read);
- dispatchPendingReadOperations();
-
- LOG(NetworkCacheStorage, "(NetworkProcess) read complete error=%d", error);
- });
- });
-}
-
-void Storage::dispatchPendingReadOperations()
-{
- ASSERT(RunLoop::isMain());
-
- const int maximumActiveReadOperationCount = 5;
-
- for (int priority = maximumRetrievePriority; priority >= 0; --priority) {
- if (m_activeReadOperations.size() > maximumActiveReadOperationCount) {
- LOG(NetworkCacheStorage, "(NetworkProcess) limiting parallel retrieves");
- return;
- }
- auto& pendingRetrieveQueue = m_pendingReadOperationsByPriority[priority];
- if (pendingRetrieveQueue.isEmpty())
- continue;
- auto readOperation = pendingRetrieveQueue.takeFirst();
- auto& read = *readOperation;
- m_activeReadOperations.add(WTF::move(readOperation));
- dispatchReadOperation(read);
- }
-}
-
-template <class T> bool retrieveFromMemory(const T& operations, const Key& key, Storage::RetrieveCompletionHandler& completionHandler)
-{
- for (auto& operation : operations) {
- if (operation->entry.key == key) {
- LOG(NetworkCacheStorage, "(NetworkProcess) found write operation in progress");
- auto entry = operation->entry;
- RunLoop::main().dispatch([entry, completionHandler] {
- completionHandler(std::make_unique<Storage::Entry>(entry));
- });
- return true;
- }
- }
- return false;
-}
-
-void Storage::retrieve(const Key& key, unsigned priority, RetrieveCompletionHandler&& completionHandler)
-{
- ASSERT(RunLoop::isMain());
- ASSERT(priority <= maximumRetrievePriority);
- ASSERT(!key.isNull());
-
- if (!m_maximumSize) {
- completionHandler(nullptr);
- return;
- }
-
- if (!m_contentsFilter.mayContain(key.shortHash())) {
- completionHandler(nullptr);
- return;
- }
-
- if (retrieveFromMemory(m_pendingWriteOperations, key, completionHandler))
- return;
- if (retrieveFromMemory(m_activeWriteOperations, key, completionHandler))
- return;
-
- m_pendingReadOperationsByPriority[priority].append(new ReadOperation { key, WTF::move(completionHandler) });
- dispatchPendingReadOperations();
-}
-
-void Storage::store(const Entry& entry, StoreCompletionHandler&& completionHandler)
-{
- ASSERT(RunLoop::isMain());
- ASSERT(!entry.key.isNull());
-
- if (!m_maximumSize) {
- completionHandler(false, { });
- return;
- }
-
- m_pendingWriteOperations.append(new WriteOperation { entry, { }, WTF::move(completionHandler) });
-
- // Add key to the filter already here as we do lookups from the pending operations too.
- m_contentsFilter.add(entry.key.shortHash());
-
- dispatchPendingWriteOperations();
-}
-
-void Storage::update(const Entry& updateEntry, const Entry& existingEntry, StoreCompletionHandler&& completionHandler)
-{
- ASSERT(RunLoop::isMain());
- ASSERT(!existingEntry.key.isNull());
- ASSERT(existingEntry.key == updateEntry.key);
-
- if (!m_maximumSize) {
- completionHandler(false, { });
- return;
- }
-
- m_pendingWriteOperations.append(new WriteOperation { updateEntry, existingEntry, WTF::move(completionHandler) });
-
- dispatchPendingWriteOperations();
-}
-
-void Storage::traverse(std::function<void (const Entry*)>&& traverseHandler)
-{
- StringCapture cachePathCapture(m_directoryPath);
- ioQueue().dispatch([this, cachePathCapture, traverseHandler] {
- String cachePath = cachePathCapture.string();
- 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;
- // 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;
- if (decodeEntryHeader(fileData, metaData, headerData)) {
- Entry entry { metaData.key, metaData.timeStamp, headerData, { } };
- traverseHandler(&entry);
- }
- });
- });
- RunLoop::main().dispatch([this, traverseHandler] {
- traverseHandler(nullptr);
- });
- });
-}
-
-void Storage::dispatchPendingWriteOperations()
-{
- ASSERT(RunLoop::isMain());
-
- const int maximumActiveWriteOperationCount { 3 };
-
- while (!m_pendingWriteOperations.isEmpty()) {
- if (m_activeWriteOperations.size() >= maximumActiveWriteOperationCount) {
- LOG(NetworkCacheStorage, "(NetworkProcess) limiting parallel writes");
- return;
- }
- auto writeOperation = m_pendingWriteOperations.takeFirst();
- auto& write = *writeOperation;
- m_activeWriteOperations.add(WTF::move(writeOperation));
-
- if (write.existingEntry && m_contentsFilter.mayContain(write.entry.key.shortHash())) {
- dispatchHeaderWriteOperation(write);
- continue;
- }
- dispatchFullWriteOperation(write);
- }
-}
-
-void Storage::dispatchFullWriteOperation(const WriteOperation& write)
-{
- ASSERT(RunLoop::isMain());
- ASSERT(m_activeWriteOperations.contains(&write));
-
- if (!m_contentsFilter.mayContain(write.entry.key.shortHash()))
- m_contentsFilter.add(write.entry.key.shortHash());
-
- StringCapture cachePathCapture(m_directoryPath);
- backgroundIOQueue().dispatch([this, &write, cachePathCapture] {
- auto encodedHeader = encodeEntryHeader(write.entry);
- auto headerAndBodyData = concatenate(encodedHeader, write.entry.body);
-
- auto channel = openFileForKey(write.entry.key, IOChannel::Type::Create, cachePathCapture.string());
- int fd = channel->fileDescriptor();
- size_t bodyOffset = encodedHeader.size();
-
- channel->write(0, headerAndBodyData, [this, &write, bodyOffset, fd](int error) {
- LOG(NetworkCacheStorage, "(NetworkProcess) write complete error=%d", error);
- if (error) {
- if (m_contentsFilter.mayContain(write.entry.key.shortHash()))
- m_contentsFilter.remove(write.entry.key.shortHash());
- }
- size_t bodySize = write.entry.body.size();
- size_t totalSize = bodyOffset + bodySize;
-
- m_approximateSize += totalSize;
-
- bool shouldMapBody = !error && bodySize >= pageSize();
- auto bodyMap = shouldMapBody ? mapFile(fd, bodyOffset, bodySize) : Data();
-
- write.completionHandler(!error, bodyMap);
-
- ASSERT(m_activeWriteOperations.contains(&write));
- m_activeWriteOperations.remove(&write);
- dispatchPendingWriteOperations();
- });
- });
-
- shrinkIfNeeded();
-}
-
-void Storage::dispatchHeaderWriteOperation(const WriteOperation& write)
-{
- ASSERT(RunLoop::isMain());
- ASSERT(write.existingEntry);
- ASSERT(m_activeWriteOperations.contains(&write));
- ASSERT(m_contentsFilter.mayContain(write.entry.key.shortHash()));
-
- // Try to update the header of an existing entry.
- StringCapture cachePathCapture(m_directoryPath);
- backgroundIOQueue().dispatch([this, &write, cachePathCapture] {
- auto headerData = encodeEntryHeader(write.entry);
- auto existingHeaderData = encodeEntryHeader(write.existingEntry.value());
-
- bool pageRoundedHeaderSizeChanged = headerData.size() != existingHeaderData.size();
- if (pageRoundedHeaderSizeChanged) {
- LOG(NetworkCacheStorage, "(NetworkProcess) page-rounded header size changed, storing full entry");
- RunLoop::main().dispatch([this, &write] {
- dispatchFullWriteOperation(write);
- });
- return;
- }
-
- auto channel = openFileForKey(write.entry.key, IOChannel::Type::Write, cachePathCapture.string());
- channel->write(0, headerData, [this, &write](int error) {
- LOG(NetworkCacheStorage, "(NetworkProcess) update complete error=%d", error);
-
- if (error)
- removeEntry(write.entry.key);
-
- write.completionHandler(!error, { });
-
- ASSERT(m_activeWriteOperations.contains(&write));
- m_activeWriteOperations.remove(&write);
- dispatchPendingWriteOperations();
- });
- });
-}
-
-void Storage::setMaximumSize(size_t size)
-{
- ASSERT(RunLoop::isMain());
- m_maximumSize = size;
-
- shrinkIfNeeded();
-}
-
-void Storage::clear()
-{
- ASSERT(RunLoop::isMain());
- LOG(NetworkCacheStorage, "(NetworkProcess) clearing cache");
-
- m_contentsFilter.clear();
- m_approximateSize = 0;
-
- StringCapture directoryPathCapture(m_directoryPath);
-
- ioQueue().dispatch([directoryPathCapture] {
- String directoryPath = directoryPathCapture.string();
- traverseDirectory(directoryPath, DT_DIR, [&directoryPath](const String& subdirName) {
- String subdirPath = WebCore::pathByAppendingComponent(directoryPath, subdirName);
- traverseDirectory(subdirPath, DT_REG, [&subdirPath](const String& fileName) {
- WebCore::deleteFile(WebCore::pathByAppendingComponent(subdirPath, fileName));
- });
- WebCore::deleteEmptyDirectory(subdirPath);
- });
- });
-}
-
-void Storage::shrinkIfNeeded()
-{
- ASSERT(RunLoop::isMain());
-
- static const double deletionProbability { 0.25 };
-
- if (m_approximateSize <= m_maximumSize)
- return;
- if (m_shrinkInProgress)
- return;
- m_shrinkInProgress = true;
-
- LOG(NetworkCacheStorage, "(NetworkProcess) shrinking cache approximateSize=%d, m_maximumSize=%d", static_cast<size_t>(m_approximateSize), m_maximumSize);
-
- m_approximateSize = 0;
-
- StringCapture cachePathCapture(m_directoryPath);
- backgroundIOQueue().dispatch([this, cachePathCapture] {
- String cachePath = cachePathCapture.string();
- traverseCacheFiles(cachePath, [this](const String& fileName, const String& partitionPath) {
- auto filePath = WebCore::pathByAppendingComponent(partitionPath, fileName);
-
- bool shouldDelete = randomNumber() < deletionProbability;
- if (!shouldDelete) {
- long long fileSize = 0;
- WebCore::getFileSize(filePath, fileSize);
- m_approximateSize += fileSize;
- return;
- }
-
- WebCore::deleteFile(filePath);
- Key::HashType hash;
- if (!Key::stringToHash(fileName, hash))
- return;
- unsigned shortHash = Key::toShortHash(hash);
- RunLoop::main().dispatch([this, shortHash] {
- if (m_contentsFilter.mayContain(shortHash))
- m_contentsFilter.remove(shortHash);
- });
- });
-
- // Let system figure out if they are really empty.
- traverseDirectory(cachePath, DT_DIR, [&cachePath](const String& subdirName) {
- auto partitionPath = WebCore::pathByAppendingComponent(cachePath, subdirName);
- WebCore::deleteEmptyDirectory(partitionPath);
- });
-
- m_shrinkInProgress = false;
-
- LOG(NetworkCacheStorage, "(NetworkProcess) cache shrink completed approximateSize=%d", static_cast<size_t>(m_approximateSize));
- });
-}
-
-void Storage::deleteOldVersions()
-{
- // Delete V1 cache.
- StringCapture cachePathCapture(m_baseDirectoryPath);
- backgroundIOQueue().dispatch([cachePathCapture] {
- String cachePath = cachePathCapture.string();
- traverseDirectory(cachePath, DT_DIR, [&cachePath](const String& subdirName) {
- if (subdirName.startsWith(versionDirectoryPrefix))
- return;
- String partitionPath = WebCore::pathByAppendingComponent(cachePath, subdirName);
- traverseDirectory(partitionPath, DT_REG, [&partitionPath](const String& fileName) {
- WebCore::deleteFile(WebCore::pathByAppendingComponent(partitionPath, fileName));
- });
- WebCore::deleteEmptyDirectory(partitionPath);
- });
- });
-}
-
-}
-}
-
-#endif
Modified: trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj (181161 => 181162)
--- trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2015-03-06 17:30:32 UTC (rev 181161)
+++ trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2015-03-06 18:09:06 UTC (rev 181162)
@@ -1762,7 +1762,7 @@
E4436ECD1A0D040B00EAD204 /* NetworkCacheKey.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E4436EC01A0CFDB200EAD204 /* NetworkCacheKey.cpp */; };
E4436ECE1A0D040B00EAD204 /* NetworkCacheKey.h in Headers */ = {isa = PBXBuildFile; fileRef = E4436EC11A0CFDB200EAD204 /* NetworkCacheKey.h */; };
E4436ECF1A0D040B00EAD204 /* NetworkCacheStorage.h in Headers */ = {isa = PBXBuildFile; fileRef = E4436EC21A0CFDB200EAD204 /* NetworkCacheStorage.h */; };
- E4436ED01A0D040B00EAD204 /* NetworkCacheStorageCocoa.mm in Sources */ = {isa = PBXBuildFile; fileRef = E4436EC31A0CFDB200EAD204 /* NetworkCacheStorageCocoa.mm */; };
+ E4436ED01A0D040B00EAD204 /* NetworkCacheStorage.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E4436EC31A0CFDB200EAD204 /* NetworkCacheStorage.cpp */; };
E489D28A1A0A2DB80078C06A /* NetworkCacheCoder.h in Headers */ = {isa = PBXBuildFile; fileRef = E489D2831A0A2DB80078C06A /* NetworkCacheCoder.h */; };
E489D28B1A0A2DB80078C06A /* NetworkCacheCoders.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E489D2841A0A2DB80078C06A /* NetworkCacheCoders.cpp */; };
E489D28C1A0A2DB80078C06A /* NetworkCacheCoders.h in Headers */ = {isa = PBXBuildFile; fileRef = E489D2851A0A2DB80078C06A /* NetworkCacheCoders.h */; };
@@ -3998,7 +3998,7 @@
E4436EC01A0CFDB200EAD204 /* NetworkCacheKey.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = NetworkCacheKey.cpp; sourceTree = "<group>"; };
E4436EC11A0CFDB200EAD204 /* NetworkCacheKey.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NetworkCacheKey.h; sourceTree = "<group>"; };
E4436EC21A0CFDB200EAD204 /* NetworkCacheStorage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NetworkCacheStorage.h; sourceTree = "<group>"; };
- E4436EC31A0CFDB200EAD204 /* NetworkCacheStorageCocoa.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = NetworkCacheStorageCocoa.mm; sourceTree = "<group>"; };
+ E4436EC31A0CFDB200EAD204 /* NetworkCacheStorage.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = NetworkCacheStorage.cpp; sourceTree = "<group>"; };
E489D2831A0A2DB80078C06A /* NetworkCacheCoder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NetworkCacheCoder.h; sourceTree = "<group>"; };
E489D2841A0A2DB80078C06A /* NetworkCacheCoders.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = NetworkCacheCoders.cpp; sourceTree = "<group>"; };
E489D2851A0A2DB80078C06A /* NetworkCacheCoders.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NetworkCacheCoders.h; sourceTree = "<group>"; };
@@ -7438,8 +7438,8 @@
E4436EC11A0CFDB200EAD204 /* NetworkCacheKey.h */,
834B25101A842C8700CFB150 /* NetworkCacheStatistics.h */,
834B25111A842C8700CFB150 /* NetworkCacheStatisticsCocoa.mm */,
+ E4436EC31A0CFDB200EAD204 /* NetworkCacheStorage.cpp */,
E4436EC21A0CFDB200EAD204 /* NetworkCacheStorage.h */,
- E4436EC31A0CFDB200EAD204 /* NetworkCacheStorageCocoa.mm */,
);
name = cache;
path = NetworkProcess/cache;
@@ -9464,7 +9464,7 @@
E489D28D1A0A2DB80078C06A /* NetworkCacheDecoder.cpp in Sources */,
E489D28F1A0A2DB80078C06A /* NetworkCacheEncoder.cpp in Sources */,
E4436ECD1A0D040B00EAD204 /* NetworkCacheKey.cpp in Sources */,
- E4436ED01A0D040B00EAD204 /* NetworkCacheStorageCocoa.mm in Sources */,
+ E4436ED01A0D040B00EAD204 /* NetworkCacheStorage.cpp in Sources */,
513A164C1630A9BF005D7D22 /* NetworkConnectionToWebProcess.cpp in Sources */,
7C89D2B91A6B0F2C003A5FDE /* _WKUserContentFilter.mm in Sources */,
51DD9F2816367DA2001578E9 /* NetworkConnectionToWebProcessMessageReceiver.cpp in Sources */,
