Changeset 277446 in webkit

Timestamp:

May 13, 2021, 12:43:37 PM (5 years ago)

Author:

Chris Dumez

Message:

Introduce FileSystem::hardLinkCount()
​https://bugs.webkit.org/show_bug.cgi?id=225767

Reviewed by Darin Adler.

Source/WebKit:

Leverage the FileSystem API instead of having platform-specific code.

• NetworkProcess/cache/NetworkCacheBlobStorage.cpp:

(WebKit::NetworkCache::BlobStorage::synchronize):
(WebKit::NetworkCache::BlobStorage::shareCount):

Source/WTF:

Introduce FileSystem::hardLinkCount() to replace our platform-specific implementation
in NetworkCacheBlobStorage.

• wtf/FileSystem.cpp:

(WTF::FileSystemImpl::hardLinkCount):

• wtf/FileSystem.h:

Tools:

Add API test coverage.

• TestWebKitAPI/Tests/WTF/FileSystem.cpp:

(TestWebKitAPI::TEST_F):

Location:

trunk

Files:

• Source/WTF/ChangeLog (modified) (1 diff)
• Source/WTF/wtf/FileSystem.cpp (modified) (1 diff)
• Source/WTF/wtf/FileSystem.h (modified) (1 diff)
• Source/WebKit/ChangeLog (modified) (1 diff)
• Source/WebKit/NetworkProcess/cache/NetworkCacheBlobStorage.cpp (modified) (2 diffs)
• Tools/ChangeLog (modified) (1 diff)
• Tools/TestWebKitAPI/Tests/WTF/FileSystem.cpp (modified) (1 diff)

trunk/Source/WTF/ChangeLog

@@ +1 @@
+2021-05-13  Chris Dumez  <cdumez@apple.com>
+
+        Introduce FileSystem::hardLinkCount()
+        https://bugs.webkit.org/show_bug.cgi?id=225767
+
+        Reviewed by Darin Adler.
+
+        Introduce FileSystem::hardLinkCount() to replace our platform-specific implementation
+        in NetworkCacheBlobStorage.
+
+        * wtf/FileSystem.cpp:
+        (WTF::FileSystemImpl::hardLinkCount):
+        * wtf/FileSystem.h:
+
 2021-05-13  Alicia Boya García  <aboya@igalia.com>
 

trunk/Source/WTF/wtf/FileSystem.cpp

@@ -664 +664 @@
 }
 
+Optional<uint64_t> hardLinkCount(const String& path)
+{
+    std::error_code ec;
+    uint64_t linkCount = std::filesystem::hard_link_count(toStdFileSystemPath(path), ec);
+    return ec ? WTF::nullopt : makeOptional(linkCount);
+}
+
 bool deleteNonEmptyDirectory(const String& path)
 {

trunk/Source/WTF/wtf/FileSystem.h

@@ -170 +170 @@
 // Hard links a file if possible, copies it if not.
 WTF_EXPORT_PRIVATE bool hardLinkOrCopyFile(const String& targetPath, const String& linkPath);
+WTF_EXPORT_PRIVATE Optional<uint64_t> hardLinkCount(const String& path);
 
 #if USE(FILE_LOCK)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2021-05-13  Chris Dumez  <cdumez@apple.com>
+
+        Introduce FileSystem::hardLinkCount()
+        https://bugs.webkit.org/show_bug.cgi?id=225767
+
+        Reviewed by Darin Adler.
+
+        Leverage the FileSystem API instead of having platform-specific code.
+
+        * NetworkProcess/cache/NetworkCacheBlobStorage.cpp:
+        (WebKit::NetworkCache::BlobStorage::synchronize):
+        (WebKit::NetworkCache::BlobStorage::shareCount):
+
 2021-05-13  Sam Weinig  <weinig@apple.com>
 

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

@@ -66 +66 @@
             return;
         auto path = FileSystem::pathByAppendingComponent(blobDirectory, name);
-        auto filePath = FileSystem::fileSystemRepresentation(path);
-        struct stat stat;
-        ::stat(filePath.data(), &stat);
+        auto linkCount = FileSystem::hardLinkCount(path);
         // No clients left for this blob.
-        if (stat.st_nlink == 1)
-            unlink(filePath.data());
-        else
-            m_approximateSize += stat.st_size;
+        if (linkCount && *linkCount == 1)
+            FileSystem::deleteFile(path);
+        else {
+            long long fileSize = 0;
+            FileSystem::getFileSize(path, fileSize);
+            m_approximateSize += fileSize;
+        }
     });
 
@@ -142 +143 @@
     ASSERT(!RunLoop::isMain());
 
-    auto linkPath = FileSystem::fileSystemRepresentation(path);
-    struct stat stat;
-    if (::stat(linkPath.data(), &stat) < 0)
+    auto linkCount = FileSystem::hardLinkCount(path);
+    if (!linkCount)
         return 0;
     // Link count is 2 in the single client case (the blob file and a link).
-    return stat.st_nlink - 1;
+    return *linkCount - 1;
 }
 

trunk/Tools/ChangeLog

@@ +1 @@
+2021-05-13  Chris Dumez  <cdumez@apple.com>
+
+        Introduce FileSystem::hardLinkCount()
+        https://bugs.webkit.org/show_bug.cgi?id=225767
+
+        Reviewed by Darin Adler.
+
+        Add API test coverage.
+
+        * TestWebKitAPI/Tests/WTF/FileSystem.cpp:
+        (TestWebKitAPI::TEST_F):
+
 2021-05-13  Jonathan Bedard  <jbedard@apple.com>
 

trunk/Tools/TestWebKitAPI/Tests/WTF/FileSystem.cpp

@@ -660 +660 @@
 }
 
+TEST_F(FileSystemTest, hardLinkCount)
+{
+    auto linkCount = FileSystem::hardLinkCount(tempFilePath());
+    ASSERT_TRUE(!!linkCount);
+    EXPECT_EQ(*linkCount, 1U);
+
+    auto hardlink1Path = FileSystem::pathByAppendingComponent(tempEmptyFolderPath(), "tempFile-hardlink1");
+    EXPECT_TRUE(FileSystem::hardLink(tempFilePath(), hardlink1Path));
+    linkCount = FileSystem::hardLinkCount(tempFilePath());
+    ASSERT_TRUE(!!linkCount);
+    EXPECT_EQ(*linkCount, 2U);
+
+    auto hardlink2Path = FileSystem::pathByAppendingComponent(tempEmptyFolderPath(), "tempFile-hardlink2");
+    EXPECT_TRUE(FileSystem::hardLink(tempFilePath(), hardlink2Path));
+    linkCount = FileSystem::hardLinkCount(tempFilePath());
+    ASSERT_TRUE(!!linkCount);
+    EXPECT_EQ(*linkCount, 3U);
+
+    EXPECT_TRUE(FileSystem::deleteFile(hardlink1Path));
+    linkCount = FileSystem::hardLinkCount(tempFilePath());
+    ASSERT_TRUE(!!linkCount);
+    EXPECT_EQ(*linkCount, 2U);
+
+    EXPECT_TRUE(FileSystem::deleteFile(hardlink2Path));
+    linkCount = FileSystem::hardLinkCount(tempFilePath());
+    ASSERT_TRUE(!!linkCount);
+    EXPECT_EQ(*linkCount, 1U);
+
+    EXPECT_TRUE(FileSystem::deleteFile(tempFilePath()));
+    linkCount = FileSystem::hardLinkCount(tempFilePath());
+    EXPECT_TRUE(!linkCount);
+}
+
 static void runGetFileModificationTimeTest(const String& path, Function<Optional<WallTime>(const String&)>&& getFileModificationTime)
 {