Changeset 219275 in webkit

Timestamp:

Jul 7, 2017 10:09:55 PM (7 years ago)

Author:

Chris Dumez

Message:

[WK2] Use a rolling 30-day uptime for processing statistics
​https://bugs.webkit.org/show_bug.cgi?id=174235
<rdar://problem/33164381>

Reviewed by Brent Fulgham.

Follow-up fix for r219274 because it caused this test to time out:
http/tests/loading/resourceLoadStatistics/prevalent-resource-with-user-interaction-timeout.html

The test sets TimeToLiveUserInteraction to 0 so our implementation cannot use
0 as magic value to see if it was set. Instead, use std::optional.

• UIProcess/API/Cocoa/WKWebsiteDataStore.mm:

(-[WKWebsiteDataStore _resourceLoadStatisticsResetToConsistentState]):

• UIProcess/Storage/ResourceLoadStatisticsStore.cpp:

(WebKit::ResourceLoadStatisticsStore::setTimeToLiveUserInteraction):
(WebKit::ResourceLoadStatisticsStore::hasStatisticsExpired):

• UIProcess/Storage/ResourceLoadStatisticsStore.h:
• UIProcess/WebResourceLoadStatisticsStore.cpp:

(WebKit::WebResourceLoadStatisticsStore::setTimeToLiveUserInteraction):

• UIProcess/WebResourceLoadStatisticsStore.h:

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/API/Cocoa/WKWebsiteDataStore.mm (modified) (1 diff)
• UIProcess/Storage/ResourceLoadStatisticsStore.cpp (modified) (2 diffs)
• UIProcess/Storage/ResourceLoadStatisticsStore.h (modified) (2 diffs)
• UIProcess/WebResourceLoadStatisticsStore.cpp (modified) (1 diff)
• UIProcess/WebResourceLoadStatisticsStore.h (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2017-07-07  Chris Dumez  <cdumez@apple.com>
+
+        [WK2] Use a rolling 30-day uptime for processing statistics
+        https://bugs.webkit.org/show_bug.cgi?id=174235
+        <rdar://problem/33164381>
+
+        Reviewed by Brent Fulgham.
+
+        Follow-up fix for r219274 because it caused this test to time out:
+        http/tests/loading/resourceLoadStatistics/prevalent-resource-with-user-interaction-timeout.html
+
+        The test sets TimeToLiveUserInteraction to 0 so our implementation cannot use
+        0 as magic value to see if it was set. Instead, use std::optional.
+
+        * UIProcess/API/Cocoa/WKWebsiteDataStore.mm:
+        (-[WKWebsiteDataStore _resourceLoadStatisticsResetToConsistentState]):
+        * UIProcess/Storage/ResourceLoadStatisticsStore.cpp:
+        (WebKit::ResourceLoadStatisticsStore::setTimeToLiveUserInteraction):
+        (WebKit::ResourceLoadStatisticsStore::hasStatisticsExpired):
+        * UIProcess/Storage/ResourceLoadStatisticsStore.h:
+        * UIProcess/WebResourceLoadStatisticsStore.cpp:
+        (WebKit::WebResourceLoadStatisticsStore::setTimeToLiveUserInteraction):
+        * UIProcess/WebResourceLoadStatisticsStore.h:
+
 2017-07-07  Brent Fulgham  <bfulgham@apple.com>
 

trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebsiteDataStore.mm

@@ -441 +441 @@
         return;
 
-    store->setTimeToLiveUserInteraction(0_s);
+    // FIXME: These needs to match the default data member values in ResourceLoadStatistics, which is fragile.
+    store->setTimeToLiveUserInteraction(std::nullopt);
     store->setTimeToLiveCookiePartitionFree(24_h);
     store->setMinimumTimeBetweenDataRecordsRemoval(1_h);

trunk/Source/WebKit2/UIProcess/Storage/ResourceLoadStatisticsStore.cpp

@@ -276 +276 @@
 }
 
-void ResourceLoadStatisticsStore::setTimeToLiveUserInteraction(Seconds seconds)
-{
-    ASSERT(seconds >= 0_s);
+void ResourceLoadStatisticsStore::setTimeToLiveUserInteraction(std::optional<Seconds> seconds)
+{
+    ASSERT(!seconds || seconds.value() >= 0_s);
     m_timeToLiveUserInteraction = seconds;
 }
@@ -444 +444 @@
     // setting for a tighter restriction (mainly for testing).
     if (m_timeToLiveUserInteraction) {
-        if (WallTime::now() > resourceStatistic.mostRecentUserInteractionTime + m_timeToLiveUserInteraction)
+        if (WallTime::now() > resourceStatistic.mostRecentUserInteractionTime + m_timeToLiveUserInteraction.value())
             return true;
     }

trunk/Source/WebKit2/UIProcess/Storage/ResourceLoadStatisticsStore.h

@@ -82 +82 @@
     void fireDataModificationHandler();
     void fireTelemetryHandler();
-    void setTimeToLiveUserInteraction(Seconds);
+    void setTimeToLiveUserInteraction(std::optional<Seconds>);
     void setTimeToLiveCookiePartitionFree(Seconds);
     void setMinimumTimeBetweenDataRecordsRemoval(Seconds);
@@ -118 +118 @@
     WTF::Function<void()> m_fireTelemetryHandler;
 
-    Seconds m_timeToLiveUserInteraction { 0_s };
+    std::optional<Seconds> m_timeToLiveUserInteraction;
     Seconds m_timeToLiveCookiePartitionFree { 24_h };
     Seconds m_grandfatheringTime { 1_h };

trunk/Source/WebKit2/UIProcess/WebResourceLoadStatisticsStore.cpp

@@ -748 +748 @@
 }
 
-void WebResourceLoadStatisticsStore::setTimeToLiveUserInteraction(Seconds seconds)
+void WebResourceLoadStatisticsStore::setTimeToLiveUserInteraction(std::optional<Seconds> seconds)
 {
     coreStore().setTimeToLiveUserInteraction(seconds);

trunk/Source/WebKit2/UIProcess/WebResourceLoadStatisticsStore.h

@@ -96 +96 @@
     void clearInMemoryAndPersistent(std::chrono::system_clock::time_point modifiedSince);
 
-    void setTimeToLiveUserInteraction(Seconds);
+    void setTimeToLiveUserInteraction(std::optional<Seconds>);
     void setTimeToLiveCookiePartitionFree(Seconds);
     void setMinimumTimeBetweenDataRecordsRemoval(Seconds);