Changeset 252381 in webkit

Timestamp:

Nov 12, 2019 5:24:28 PM (4 years ago)

Author:

sihui_liu@apple.com

Message:

Add size file for CacheStorage
​https://bugs.webkit.org/show_bug.cgi?id=204027
<rdar://problem/57100861>

Reviewed by Youenn Fablet.

Keep the CacheStorage size in a separate file so that we can get that value without waiting for Engine to
initialize and read caches from disk.

No behavior change as the file is not in use now.

• NetworkProcess/cache/CacheStorageEngine.cpp:

(WebKit::CacheStorage::Engine::writeSizeFile):
(WebKit::CacheStorage::Engine::readSizeFile):
(WebKit::CacheStorage::Engine::clearAllCachesFromDisk):
(WebKit::CacheStorage::Engine::deleteDirectoryRecursivelyOnBackgroundThread):

• NetworkProcess/cache/CacheStorageEngine.h:
• NetworkProcess/cache/CacheStorageEngineCaches.cpp:

(WebKit::CacheStorage::Caches::cachesSizeFilename):
(WebKit::CacheStorage::Caches::updateSizeFile):
(WebKit::CacheStorage::Caches::initializeSize):
(WebKit::CacheStorage::Caches::writeRecord):
(WebKit::CacheStorage::Caches::removeRecord):
(WebKit::CacheStorage::Caches::resetSpaceUsed):

• NetworkProcess/cache/CacheStorageEngineCaches.h:

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• NetworkProcess/cache/CacheStorageEngine.cpp (modified) (5 diffs)
• NetworkProcess/cache/CacheStorageEngine.h (modified) (1 diff)
• NetworkProcess/cache/CacheStorageEngineCaches.cpp (modified) (6 diffs)
• NetworkProcess/cache/CacheStorageEngineCaches.h (modified) (2 diffs)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2019-11-12  Sihui Liu  <sihui_liu@apple.com>
+
+        Add size file for CacheStorage
+        https://bugs.webkit.org/show_bug.cgi?id=204027
+        <rdar://problem/57100861>
+
+        Reviewed by Youenn Fablet.
+
+        Keep the CacheStorage size in a separate file so that we can get that value without waiting for Engine to 
+        initialize and read caches from disk.
+
+        No behavior change as the file is not in use now.
+
+        * NetworkProcess/cache/CacheStorageEngine.cpp:
+        (WebKit::CacheStorage::Engine::writeSizeFile):
+        (WebKit::CacheStorage::Engine::readSizeFile):
+        (WebKit::CacheStorage::Engine::clearAllCachesFromDisk):
+        (WebKit::CacheStorage::Engine::deleteDirectoryRecursivelyOnBackgroundThread):
+        * NetworkProcess/cache/CacheStorageEngine.h:
+        * NetworkProcess/cache/CacheStorageEngineCaches.cpp:
+        (WebKit::CacheStorage::Caches::cachesSizeFilename):
+        (WebKit::CacheStorage::Caches::updateSizeFile):
+        (WebKit::CacheStorage::Caches::initializeSize):
+        (WebKit::CacheStorage::Caches::writeRecord):
+        (WebKit::CacheStorage::Caches::removeRecord):
+        (WebKit::CacheStorage::Caches::resetSpaceUsed):
+        * NetworkProcess/cache/CacheStorageEngineCaches.h:
+
 2019-11-12  Wenson Hsieh  <wenson_hsieh@apple.com>
 

trunk/Source/WebKit/NetworkProcess/cache/CacheStorageEngine.cpp

@@ -36 +36 @@
 #include <wtf/CallbackAggregator.h>
 #include <wtf/NeverDestroyed.h>
+#include <wtf/Scope.h>
 #include <wtf/text/StringBuilder.h>
 #include <wtf/text/StringHash.h>
@@ -45 +46 @@
 using namespace WebCore::DOMCacheEngine;
 using namespace NetworkCache;
+
+static Lock globalSizeFileLock;
 
 String Engine::cachesRootPath(const WebCore::ClientOrigin& origin)
@@ -462 +465 @@
 }
 
+void Engine::writeSizeFile(const String& path, uint64_t size)
+{
+    if (!shouldPersist())
+        return;
+
+    m_ioQueue->dispatch([path = path.isolatedCopy(), size]() {
+        LockHolder locker(globalSizeFileLock);
+        auto fileHandle = FileSystem::openFile(path, FileSystem::FileOpenMode::Write);
+        auto closeFileHandler = makeScopeExit([&] {
+            FileSystem::closeFile(fileHandle);
+        });
+        if (!FileSystem::isHandleValid(fileHandle))
+            return;
+
+        FileSystem::truncateFile(fileHandle, 0);
+        FileSystem::writeToFile(fileHandle, String::number(size).utf8().data(), String::number(size).utf8().length());
+    });
+}
+
+Optional<uint64_t> Engine::readSizeFile(const String& path)
+{
+    ASSERT(!RunLoop::isMain());
+
+    LockHolder locker(globalSizeFileLock);
+    auto fileHandle = FileSystem::openFile(path, FileSystem::FileOpenMode::Read);
+    auto closeFileHandle = makeScopeExit([&] {
+        FileSystem::closeFile(fileHandle);
+    });
+
+    if (!FileSystem::isHandleValid(fileHandle))
+        return WTF::nullopt;
+
+    long long fileSize = 0;
+    if (!FileSystem::getFileSize(path, fileSize) || !fileSize)
+        return WTF::nullopt;
+
+    size_t bytesToRead;
+    if (!WTF::convertSafely(fileSize, bytesToRead))
+        return WTF::nullopt;
+
+    Vector<char> buffer(bytesToRead);
+    size_t totalBytesRead = FileSystem::readFromFile(fileHandle, buffer.data(), buffer.size());
+    if (totalBytesRead != bytesToRead)
+        return WTF::nullopt;
+
+    return String::fromUTF8(buffer.data()).toUInt64Strict();
+}
+
 class ReadOriginsTaskCounter : public RefCounted<ReadOriginsTaskCounter> {
 public:
@@ -566 +617 @@
 
     m_ioQueue->dispatch([path = m_rootPath.isolatedCopy(), completionHandler = WTFMove(completionHandler)]() mutable {
+        LockHolder locker(globalSizeFileLock);
         for (auto& filename : FileSystem::listDirectory(path, "*")) {
             if (FileSystem::fileIsDirectory(filename, FileSystem::ShouldFollowSymbolicLinks::No))
@@ -624 +676 @@
 
     m_ioQueue->dispatch([path = path.isolatedCopy(), completionHandler = WTFMove(completionHandler)]() mutable {
+        LockHolder locker(globalSizeFileLock);
         deleteDirectoryRecursively(path);
 

trunk/Source/WebKit/NetworkProcess/cache/CacheStorageEngine.h

@@ -85 +85 @@
     void readFile(const String& filename, CompletionHandler<void(const NetworkCache::Data&, int error)>&&);
     void removeFile(const String& filename);
+    void writeSizeFile(const String&, uint64_t size);
+    static Optional<uint64_t> readSizeFile(const String&);
 
     const String& rootPath() const { return m_rootPath; }

trunk/Source/WebKit/NetworkProcess/cache/CacheStorageEngineCaches.cpp

@@ -52 +52 @@
 }
 
+String Caches::cachesSizeFilename(const String& cachesRootsPath)
+{
+    return FileSystem::pathByAppendingComponent(cachesRootsPath, "estimatedsize"_s);
+}
+
 Ref<Caches> Caches::create(Engine& engine, WebCore::ClientOrigin&& origin, String&& rootPath, WebCore::StorageQuotaManager& quotaManager)
 {
@@ -204 +209 @@
 }
 
+void Caches::updateSizeFile()
+{
+    if (m_engine)
+        m_engine->writeSizeFile(cachesSizeFilename(m_rootPath), m_size);
+}
+
 void Caches::initializeSize()
 {
@@ -222 +233 @@
             }
             m_size = size;
+            updateSizeFile();
+
             m_isInitialized = true;
             auto pendingCallbacks = WTFMove(m_pendingInitializationCallbacks);
@@ -536 +549 @@
     m_size += recordInformation.size;
     m_size -= previousRecordSize;
+    updateSizeFile();
 
     if (!shouldPersist()) {
@@ -592 +606 @@
     ASSERT(m_size >= record.size);
     m_size -= record.size;
+    updateSizeFile();
+
     removeCacheEntry(record.key);
 }
@@ -609 +625 @@
 {
     m_size = 0;
+    updateSizeFile();
+
     if (m_quotaManager) {
         m_quotaManager->removeUser(*this);

trunk/Source/WebKit/NetworkProcess/cache/CacheStorageEngineCaches.h

@@ -45 +45 @@
 class Caches final : public RefCounted<Caches>, private WebCore::StorageQuotaUser {
 public:
+    static String cachesSizeFilename(const String&);
     static Ref<Caches> create(Engine&, WebCore::ClientOrigin&&, String&& rootPath, WebCore::StorageQuotaManager&);
     ~Caches();
@@ -106 +107 @@
     bool hasActiveCache() const;
 
+    void updateSizeFile();
+
     bool m_isInitialized { false };
     Engine* m_engine { nullptr };