Changeset 279660 in webkit

Timestamp:

Jul 7, 2021, 12:54:06 PM (4 years ago)

Author:

chris.reid@sony.com

Message:

[PlayStation] Don't assume 4KB block size when estimating Network Cache disk usage
​https://bugs.webkit.org/show_bug.cgi?id=227502

Reviewed by Chris Dumez.

Source/WebKit:

Network Cache disk usage can underestimate the real disk usage on platforms
with file blocks larger than 4 KB.
Adding call to FileSystem::getVolumeFileBlockSize to use the FileSystem's
block size in the estimation.

• NetworkProcess/cache/NetworkCacheStorage.cpp:
• NetworkProcess/cache/NetworkCacheStorage.h:

Source/WTF:

Add getVolumeFileBlockSize to fetch the block size from the filesystem.
Currently only implemented for Windows and POSIX filesystems.

• wtf/FileSystem.cpp:
• wtf/FileSystem.h:
• wtf/playstation/FileSystemPlayStation.cpp:

Location:

trunk/Source

Files:

• WTF/ChangeLog (modified) (1 diff)
• WTF/wtf/FileSystem.h (modified) (1 diff)
• WTF/wtf/glib/FileSystemGlib.cpp (modified) (1 diff)
• WTF/wtf/posix/FileSystemPOSIX.cpp (modified) (1 diff)
• WTF/wtf/win/FileSystemWin.cpp (modified) (1 diff)
• WebKit/ChangeLog (modified) (1 diff)
• WebKit/NetworkProcess/cache/NetworkCacheStorage.cpp (modified) (1 diff)
• WebKit/NetworkProcess/cache/NetworkCacheStorage.h (modified) (2 diffs)

trunk/Source/WTF/ChangeLog

@@ +1 @@
+2021-07-07  Christopher Reid  <chris.reid@sony.com>
+
+        [PlayStation] Don't assume 4KB block size when estimating Network Cache disk usage
+        https://bugs.webkit.org/show_bug.cgi?id=227502
+
+        Reviewed by Chris Dumez.
+
+        Add getVolumeFileBlockSize to fetch the block size from the filesystem.
+        Currently only implemented for Windows and POSIX filesystems.
+
+        * wtf/FileSystem.cpp:
+        * wtf/FileSystem.h:
+        * wtf/playstation/FileSystemPlayStation.cpp:
+
 2021-07-07  Alex Christensen  <achristensen@webkit.org>
 

trunk/Source/WTF/wtf/FileSystem.h

@@ -124 +124 @@
 WTF_EXPORT_PRIVATE String parentPath(const String&);
 WTF_EXPORT_PRIVATE std::optional<uint64_t> volumeFreeSpace(const String&);
+WTF_EXPORT_PRIVATE std::optional<uint32_t> volumeFileBlockSize(const String&);
 WTF_EXPORT_PRIVATE std::optional<int32_t> getFileDeviceId(const CString&);
 WTF_EXPORT_PRIVATE bool createSymbolicLink(const String& targetPath, const String& symbolicLinkPath);

trunk/Source/WTF/wtf/glib/FileSystemGlib.cpp

@@ -247 +247 @@
 }
 
+std::optional<uint32_t> volumeFileBlockSize(const String&)
+{
+    return std::nullopt;
+}
+
 #if USE(FILE_LOCK)
 bool lockFile(PlatformFileHandle handle, OptionSet<FileLockMode> lockMode)

trunk/Source/WTF/wtf/posix/FileSystemPOSIX.cpp

@@ -185 +185 @@
 }
 
+std::optional<uint32_t> volumeFileBlockSize(const String& path)
+{
+    struct statvfs fileStat;
+    if (!statvfs(fileSystemRepresentation(path).data(), &fileStat))
+        return fileStat.f_frsize;
+
+    return std::nullopt;
+}
+
 #if !USE(CF)
 String stringFromFileSystemRepresentation(const char* path)

trunk/Source/WTF/wtf/win/FileSystemWin.cpp

@@ -364 +364 @@
 }
 
+std::optional<uint32_t> volumeFileBlockSize(const String& path)
+{
+    DWORD sectorsPerCluster, bytesPerSector, freeClusters, totalClusters;
+    if (!GetDiskFreeSpaceW(path.wideCharacters().data(), &sectorsPerCluster, &bytesPerSector, &freeClusters, &totalClusters))
+        return std::nullopt;
+
+    return sectorsPerCluster * bytesPerSector;
+}
+
 MappedFileData::~MappedFileData()
 {

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2021-07-07  Christopher Reid  <chris.reid@sony.com>
+
+        [PlayStation] Don't assume 4KB block size when estimating Network Cache disk usage
+        https://bugs.webkit.org/show_bug.cgi?id=227502
+
+        Reviewed by Chris Dumez.
+
+        Network Cache disk usage can underestimate the real disk usage on platforms 
+        with file blocks larger than 4 KB.
+        Adding call to FileSystem::getVolumeFileBlockSize to use the FileSystem's
+        block size in the estimation.
+
+        * NetworkProcess/cache/NetworkCacheStorage.cpp:
+        * NetworkProcess/cache/NetworkCacheStorage.h:
+
 2021-07-07  Fujii Hironori  <Hironori.Fujii@sony.com>
 

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

@@ -311 +311 @@
 }
 
-static size_t estimateRecordsSize(unsigned recordCount, unsigned blobCount)
+uint32_t Storage::volumeBlockSize() const
+{
+    ASSERT(!RunLoop::isMain());
+
+    if (!m_volumeBlockSize)
+        m_volumeBlockSize = FileSystem::volumeFileBlockSize(m_basePath).value_or(4 * KB);
+
+    return *m_volumeBlockSize;
+}
+
+size_t Storage::estimateRecordsSize(unsigned recordCount, unsigned blobCount) const
 {
     auto inlineBodyCount = recordCount - std::min(blobCount, recordCount);
-    auto headerSizes = recordCount * 4096;
+    auto headerSizes = recordCount * volumeBlockSize();
     auto inlineBodySizes = (maximumInlineBodySize() / 2) * inlineBodyCount;
     return headerSizes + inlineBodySizes;

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

@@ -163 +163 @@
     static bool isHigherPriority(const std::unique_ptr<ReadOperation>&, const std::unique_ptr<ReadOperation>&);
 
+    size_t estimateRecordsSize(unsigned recordCount, unsigned blobCount) const;
+    uint32_t volumeBlockSize() const;
+
     const String m_basePath;
     const String m_recordsPath;
@@ -171 +174 @@
     size_t m_capacity { std::numeric_limits<size_t>::max() };
     size_t m_approximateRecordsSize { 0 };
+    mutable std::optional<uint32_t> m_volumeBlockSize;
 
     // 2^18 bit filter can support up to 26000 entries with false positive rate < 1%.