<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[182124] trunk/Source/WebKit2</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/182124">182124</a></dd>
<dt>Author</dt> <dd>antti@apple.com</dd>
<dt>Date</dt> <dd>2015-03-29 16:43:32 -0700 (Sun, 29 Mar 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Use st_mtime instead of st_atime to track file access time
https://bugs.webkit.org/show_bug.cgi?id=143200
Reviewed by Darin Adler.
On OS X atime updates automatically on read so calling Storage::traverse() would always ends up updating access times
for all cache entries to the current time. This would make entry worth computation produce unexpected results.
We update mtime manually on successful cache retrieve only so switching to it fixes the problem.
* NetworkProcess/cache/NetworkCacheFileSystemPosix.h:
(WebKit::NetworkCache::fileTimes):
(WebKit::NetworkCache::updateFileModificationTimeIfNeeded):
(WebKit::NetworkCache::updateFileAccessTimeIfNeeded): Deleted.
* NetworkProcess/cache/NetworkCacheStorage.cpp:
(WebKit::NetworkCache::Storage::updateFileModificationTime):
(WebKit::NetworkCache::Storage::dispatchReadOperation):
(WebKit::NetworkCache::deletionProbability):
(WebKit::NetworkCache::Storage::updateFileAccessTime): Deleted.
* NetworkProcess/cache/NetworkCacheStorage.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcesscacheNetworkCacheFileSystemPosixh">trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheFileSystemPosix.h</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcesscacheNetworkCacheStoragecpp">trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheStorage.cpp</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcesscacheNetworkCacheStorageh">trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheStorage.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (182123 => 182124)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-03-29 21:54:36 UTC (rev 182123)
+++ trunk/Source/WebKit2/ChangeLog 2015-03-29 23:43:32 UTC (rev 182124)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+2015-03-29 Antti Koivisto <antti@apple.com>
+
+ Use st_mtime instead of st_atime to track file access time
+ https://bugs.webkit.org/show_bug.cgi?id=143200
+
+ Reviewed by Darin Adler.
+
+ On OS X atime updates automatically on read so calling Storage::traverse() would always ends up updating access times
+ for all cache entries to the current time. This would make entry worth computation produce unexpected results.
+ We update mtime manually on successful cache retrieve only so switching to it fixes the problem.
+
+ * NetworkProcess/cache/NetworkCacheFileSystemPosix.h:
+ (WebKit::NetworkCache::fileTimes):
+ (WebKit::NetworkCache::updateFileModificationTimeIfNeeded):
+ (WebKit::NetworkCache::updateFileAccessTimeIfNeeded): Deleted.
+ * NetworkProcess/cache/NetworkCacheStorage.cpp:
+ (WebKit::NetworkCache::Storage::updateFileModificationTime):
+ (WebKit::NetworkCache::Storage::dispatchReadOperation):
+ (WebKit::NetworkCache::deletionProbability):
+ (WebKit::NetworkCache::Storage::updateFileAccessTime): Deleted.
+ * NetworkProcess/cache/NetworkCacheStorage.h:
+
</ins><span class="cx"> 2015-03-27 Gwang Yoon Hwang <yoon@igalia.com>
</span><span class="cx">
</span><span class="cx"> [TexMap] Seperate BitmapTexture related classes implementations from TextureMapper
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcesscacheNetworkCacheFileSystemPosixh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheFileSystemPosix.h (182123 => 182124)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheFileSystemPosix.h 2015-03-29 21:54:36 UTC (rev 182123)
+++ trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheFileSystemPosix.h 2015-03-29 23:43:32 UTC (rev 182124)
</span><span class="lines">@@ -71,7 +71,7 @@
</span><span class="cx">
</span><span class="cx"> struct FileTimes {
</span><span class="cx"> std::chrono::system_clock::time_point creation;
</span><del>- std::chrono::system_clock::time_point access;
</del><ins>+ std::chrono::system_clock::time_point modification;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> inline FileTimes fileTimes(const String& path)
</span><span class="lines">@@ -79,18 +79,18 @@
</span><span class="cx"> struct stat fileInfo;
</span><span class="cx"> if (stat(WebCore::fileSystemRepresentation(path).data(), &fileInfo))
</span><span class="cx"> return { };
</span><del>- return { std::chrono::system_clock::from_time_t(fileInfo.st_birthtime), std::chrono::system_clock::from_time_t(fileInfo.st_atime) };
</del><ins>+ return { std::chrono::system_clock::from_time_t(fileInfo.st_birthtime), std::chrono::system_clock::from_time_t(fileInfo.st_mtime) };
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-inline void updateFileAccessTimeIfNeeded(const String& path)
</del><ins>+inline void updateFileModificationTimeIfNeeded(const String& path)
</ins><span class="cx"> {
</span><span class="cx"> auto times = fileTimes(path);
</span><del>- if (times.creation != times.access) {
- // Don't update more than once per hour;
- if (std::chrono::system_clock::now() - times.access < std::chrono::hours(1))
</del><ins>+ if (times.creation != times.modification) {
+ // Don't update more than once per hour.
+ if (std::chrono::system_clock::now() - times.modification < std::chrono::hours(1))
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><del>- // This really updates both access time and modification time.
</del><ins>+ // This really updates both the access time and the modification time.
</ins><span class="cx"> utimes(WebCore::fileSystemRepresentation(path).data(), 0);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcesscacheNetworkCacheStoragecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheStorage.cpp (182123 => 182124)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheStorage.cpp 2015-03-29 21:54:36 UTC (rev 182123)
+++ trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheStorage.cpp 2015-03-29 23:43:32 UTC (rev 182124)
</span><span class="lines">@@ -292,11 +292,11 @@
</span><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void Storage::updateFileAccessTime(IOChannel& channel)
</del><ins>+void Storage::updateFileModificationTime(IOChannel& channel)
</ins><span class="cx"> {
</span><span class="cx"> StringCapture filePathCapture(channel.path());
</span><span class="cx"> serialBackgroundIOQueue().dispatch([filePathCapture] {
</span><del>- updateFileAccessTimeIfNeeded(filePathCapture.string());
</del><ins>+ updateFileModificationTimeIfNeeded(filePathCapture.string());
</ins><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -316,7 +316,7 @@
</span><span class="cx"> auto record = decodeRecord(fileData, channel->fileDescriptor(), read.key);
</span><span class="cx"> bool success = read.completionHandler(WTF::move(record));
</span><span class="cx"> if (success)
</span><del>- updateFileAccessTime(*channel);
</del><ins>+ updateFileModificationTime(*channel);
</ins><span class="cx"> else
</span><span class="cx"> remove(read.key);
</span><span class="cx"> }
</span><span class="lines">@@ -589,7 +589,8 @@
</span><span class="cx">
</span><span class="cx"> using namespace std::chrono;
</span><span class="cx"> auto age = system_clock::now() - times.creation;
</span><del>- auto accessAge = times.access - times.creation;
</del><ins>+ // File modification time is updated manually on cache read. We don't use access time since OS may update it automatically.
+ auto accessAge = times.modification - times.creation;
</ins><span class="cx">
</span><span class="cx"> // For sanity.
</span><span class="cx"> if (age <= seconds::zero() || accessAge < seconds::zero() || accessAge > age)
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcesscacheNetworkCacheStorageh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheStorage.h (182123 => 182124)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheStorage.h 2015-03-29 21:54:36 UTC (rev 182123)
+++ trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheStorage.h 2015-03-29 23:43:32 UTC (rev 182124)
</span><span class="lines">@@ -97,7 +97,7 @@
</span><span class="cx"> void dispatchHeaderWriteOperation(const WriteOperation&);
</span><span class="cx"> void dispatchPendingWriteOperations();
</span><span class="cx">
</span><del>- void updateFileAccessTime(IOChannel&);
</del><ins>+ void updateFileModificationTime(IOChannel&);
</ins><span class="cx">
</span><span class="cx"> WorkQueue& ioQueue() { return m_ioQueue.get(); }
</span><span class="cx"> WorkQueue& backgroundIOQueue() { return m_backgroundIOQueue.get(); }
</span></span></pre>
</div>
</div>
</body>
</html>