Changeset 184567 in webkit

Timestamp:

May 19, 2015 9:37:11 AM (9 years ago)

Author:

commit-queue@webkit.org

Message:

[SOUP] Use st_birthtime to get creation time of files on systems support it
​https://bugs.webkit.org/show_bug.cgi?id=144989

Patch by Ting-Wei Lan <Ting-Wei Lan> on 2015-05-19
Reviewed by Carlos Garcia Campos.

Source/WebKit2:

FreeBSD and NetBSD have either st_birthtime field or compatiblity macro
with the same name in stat. It is better to use it instead of manually
setting xattr, which is unreliable because both operating systems and
file systems support are required.

• NetworkProcess/cache/NetworkCacheFileSystemPosix.h:

(WebKit::NetworkCache::fileTimes):

• NetworkProcess/cache/NetworkCacheIOChannelSoup.cpp:

(WebKit::NetworkCache::IOChannel::IOChannel):

Source/WTF:

Define HAVE(STAT_BIRTHTIME) as 1 on operating systems supporting
getting creation time of files using st_birthtime in stat.

• wtf/Platform.h:

Location:

trunk/Source

Files:

• WTF/ChangeLog (modified) (1 diff)
• WTF/wtf/Platform.h (modified) (1 diff)
• WebKit2/ChangeLog (modified) (1 diff)
• WebKit2/NetworkProcess/cache/NetworkCacheFileSystemPosix.h (modified) (1 diff)
• WebKit2/NetworkProcess/cache/NetworkCacheIOChannelSoup.cpp (modified) (1 diff)

trunk/Source/WTF/ChangeLog

@@ +1 @@
+2015-05-19  Ting-Wei Lan  <lantw44@gmail.com>
+
+        [SOUP] Use st_birthtime to get creation time of files on systems support it
+        https://bugs.webkit.org/show_bug.cgi?id=144989
+
+        Reviewed by Carlos Garcia Campos.
+
+        Define HAVE(STAT_BIRTHTIME) as 1 on operating systems supporting
+        getting creation time of files using st_birthtime in stat.
+
+        * wtf/Platform.h:
+
 2015-05-19  Chris Dumez  <cdumez@apple.com>
 

trunk/Source/WTF/wtf/Platform.h

@@ -606 +606 @@
 #endif
 
+#if OS(DARWIN) || OS(FREEBSD) || OS(NETBSD)
+#define HAVE_STAT_BIRTHTIME 1
+#endif
+
 #if !OS(WINDOWS) && !OS(SOLARIS)
 #define HAVE_TM_GMTOFF 1

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2015-05-19  Ting-Wei Lan  <lantw44@gmail.com>
+
+        [SOUP] Use st_birthtime to get creation time of files on systems support it
+        https://bugs.webkit.org/show_bug.cgi?id=144989
+
+        Reviewed by Carlos Garcia Campos.
+
+        FreeBSD and NetBSD have either st_birthtime field or compatiblity macro
+        with the same name in stat. It is better to use it instead of manually
+        setting xattr, which is unreliable because both operating systems and
+        file systems support are required.
+
+        * NetworkProcess/cache/NetworkCacheFileSystemPosix.h:
+        (WebKit::NetworkCache::fileTimes):
+        * NetworkProcess/cache/NetworkCacheIOChannelSoup.cpp:
+        (WebKit::NetworkCache::IOChannel::IOChannel):
+
 2015-05-19  Chris Dumez  <cdumez@apple.com>
 

trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheFileSystemPosix.h

@@ -78 +78 @@
 inline FileTimes fileTimes(const String& path)
 {
-#if PLATFORM(COCOA)
+#if HAVE(STAT_BIRTHTIME)
     struct stat fileInfo;
     if (stat(WebCore::fileSystemRepresentation(path).data(), &fileInfo))
         return { };
     return { std::chrono::system_clock::from_time_t(fileInfo.st_birthtime), std::chrono::system_clock::from_time_t(fileInfo.st_mtime) };
-#endif
-#if USE(SOUP)
+#elif USE(SOUP)
     // There's no st_birthtime in some operating systems like Linux, so we use xattrs to set/get the creation time.
     GRefPtr<GFile> file = adoptGRef(g_file_new_for_path(WebCore::fileSystemRepresentation(path).data()));

trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheIOChannelSoup.cpp

@@ -50 +50 @@
         m_outputStream = adoptGRef(G_OUTPUT_STREAM(g_file_create(file.get(), static_cast<GFileCreateFlags>(G_FILE_CREATE_PRIVATE), nullptr, nullptr)));
         ASSERT(m_outputStream);
+#if !HAVE(STAT_BIRTHTIME)
         GUniquePtr<char> birthtimeString(g_strdup_printf("%" G_GUINT64_FORMAT, std::chrono::system_clock::to_time_t(std::chrono::system_clock::now())));
         g_file_set_attribute_string(file.get(), "xattr::birthtime", birthtimeString.get(), G_FILE_QUERY_INFO_NONE, nullptr, nullptr);
+#endif
         break;
     }