Changeset 219274 in webkit

Timestamp:

Jul 7, 2017 5:07:13 PM (7 years ago)

Author:

Brent Fulgham

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 Chris Dumez.

Source/WebCore:

Add a KeyedDecoder specialization for Deque.

• platform/KeyedCoding.h:

(WebCore::KeyedDecoder::decodeObjects):

Source/WebKit2:

• UIProcess/API/Cocoa/WKWebsiteDataStore.cpp:

(WebKit::WKWebsiteDataStore::_resourceLoadStatisticsResetToConsistentState): Initialize time-to-live to zero by default.

• UIProcess/Storage/ResourceLoadStatisticsStore.cpp:

(WebKit::ResourceLoadStatisticsStore::createEncoderFromData): Write out vector
of operating dates.
(WebKit::ResourceLoadStatisticsStore::readDataFromDecoder): Read in vector of
operating dates.
(WebKit::ResourceLoadStatisticsStore::hasHadRecentUserInteraction): Check new
convenience method.
(WebKit::ResourceLoadStatisticsStore::markTodayAsOperatingDate): Added.
(WebKit::ResourceLoadStatisticsStore::hasStatisticsExpired): Added.

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

(WebKit::WebResourceLoadStatisticsStore::readDataFromDiskIfNeeded): When reading
a new data file, update the current operating date (if needed).
(WebKit::WebResourceLoadStatisticsStore::handleDailyTasks): Roll uptime dates as
needed, then handle telemetry.

• UIProcess/WebResourceLoadStatisticsStore.h:

Source/WTF:

Modify Deque to allow it to be used in a template specialization in KeyedDecoder.

• wtf/Deque.h:

Location:

trunk/Source

Files:

• WTF/ChangeLog (modified) (1 diff)
• WTF/wtf/Deque.h (modified) (1 diff)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/platform/KeyedCoding.h (modified) (4 diffs)
• WebKit2/ChangeLog (modified) (1 diff)
• WebKit2/UIProcess/API/Cocoa/WKWebsiteDataStore.mm (modified) (2 diffs)
• WebKit2/UIProcess/Storage/ResourceLoadStatisticsStore.cpp (modified) (6 diffs)
• WebKit2/UIProcess/Storage/ResourceLoadStatisticsStore.h (modified) (3 diffs)
• WebKit2/UIProcess/WebResourceLoadStatisticsStore.cpp (modified) (3 diffs)
• WebKit2/UIProcess/WebResourceLoadStatisticsStore.h (modified) (1 diff)

trunk/Source/WTF/ChangeLog

@@ +1 @@
+2017-07-07  Brent Fulgham  <bfulgham@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 Chris Dumez.
+
+        Modify Deque to allow it to be used in a template specialization in KeyedDecoder.
+
+        * wtf/Deque.h:
+
 2017-07-07  Commit Queue  <commit-queue@webkit.org>
 

trunk/Source/WTF/wtf/Deque.h

@@ -47 +47 @@
     WTF_MAKE_FAST_ALLOCATED;
 public:
+    typedef T ValueType;
+
     typedef DequeIterator<T, inlineCapacity> iterator;
     typedef DequeConstIterator<T, inlineCapacity> const_iterator;

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2017-07-07  Brent Fulgham  <bfulgham@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 Chris Dumez.
+
+        Add a KeyedDecoder specialization for Deque.
+
+        * platform/KeyedCoding.h:
+        (WebCore::KeyedDecoder::decodeObjects):
+
 2017-07-07  Daniel Bates  <dabates@apple.com>
 

trunk/Source/WebCore/platform/KeyedCoding.h

@@ -1 +1 @@
 /*
- * Copyright (C) 2013 Apple Inc. All rights reserved.
+ * Copyright (C) 2013-2017 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -27 +27 @@
 
 #include <functional>
+#include <wtf/Deque.h>
 #include <wtf/Forward.h>
 #include <wtf/Vector.h>
@@ -105 +106 @@
     }
 
-    template<typename T, typename F>
-    bool decodeObjects(const String& key, Vector<T>& objects, F&& function)
+    template<typename ContainerType, typename F>
+    bool decodeObjects(const String& key, ContainerType& objects, F&& function)
     {
         if (!beginArray(key))
@@ -113 +114 @@
         bool result = true;
         while (beginArrayElement()) {
-            T element;
+            typename ContainerType::ValueType element;
             if (!function(*this, element)) {
                 result = false;

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2017-07-07  Brent Fulgham  <bfulgham@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 Chris Dumez.
+
+        * UIProcess/API/Cocoa/WKWebsiteDataStore.cpp:
+        (WebKit::WKWebsiteDataStore::_resourceLoadStatisticsResetToConsistentState): Initialize time-to-live to zero by default.
+        * UIProcess/Storage/ResourceLoadStatisticsStore.cpp:
+        (WebKit::ResourceLoadStatisticsStore::createEncoderFromData): Write out vector
+        of operating dates.
+        (WebKit::ResourceLoadStatisticsStore::readDataFromDecoder): Read in vector of
+        operating dates.
+        (WebKit::ResourceLoadStatisticsStore::hasHadRecentUserInteraction): Check new
+        convenience method.
+        (WebKit::ResourceLoadStatisticsStore::markTodayAsOperatingDate): Added.
+        (WebKit::ResourceLoadStatisticsStore::hasStatisticsExpired): Added.
+        * UIProcess/Storage/ResourceLoadStatisticsStore.h:
+        * UIProcess/WebResourceLoadStatisticsStore.cpp:
+        (WebKit::WebResourceLoadStatisticsStore::readDataFromDiskIfNeeded): When reading
+        a new data file, update the current operating date (if needed).
+        (WebKit::WebResourceLoadStatisticsStore::handleDailyTasks): Roll uptime dates as
+        needed, then handle telemetry.
+        * UIProcess/WebResourceLoadStatisticsStore.h:
+
 2017-07-07  Wenson Hsieh  <wenson_hsieh@apple.com>
 

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

@@ -1 +1 @@
 /*
- * Copyright (C) 2014, 2016 Apple Inc. All rights reserved.
+ * Copyright (C) 2014-2017 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -441 +441 @@
         return;
 
-    store->setTimeToLiveUserInteraction(24_h * 30.);
+    store->setTimeToLiveUserInteraction(0_s);
     store->setTimeToLiveCookiePartitionFree(24_h);
     store->setMinimumTimeBetweenDataRecordsRemoval(1_h);

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

@@ -40 +40 @@
 using namespace WebCore;
 
-const unsigned statisticsModelVersion { 5 };
-
+const unsigned statisticsModelVersion { 6 };
+const unsigned operatingDatesWindow { 30 };
+    
 Ref<ResourceLoadStatisticsStore> ResourceLoadStatisticsStore::create()
 {
@@ -90 +91 @@
     });
 
+    encoder->encodeObjects("operatingDates", m_operatingDates.begin(), m_operatingDates.end(), [](KeyedEncoder& encoderInner, WallTime date) {
+        encoderInner.encodeDouble("date", date.secondsSinceEpoch().value());
+    });
+    
     return encoder;
 }
@@ -129 +134 @@
         m_resourceStatisticsMap.set(statistics.highLevelDomain, WTFMove(statistics));
     }
+
+    succeeded = decoder.decodeObjects("operatingDates", m_operatingDates, [](KeyedDecoder& decoder, WallTime& wallTime) {
+        double value;
+        if (!decoder.decodeDouble("date", value))
+            return false;
+        
+        wallTime = WallTime::fromRawSeconds(value);
+        return true;
+    });
+
+    if (!succeeded)
+        return;
     
     fireShouldPartitionCookiesHandler({ }, prevalentResourceDomainsWithoutUserInteraction, true);
@@ -137 +154 @@
     ASSERT(!RunLoop::isMain());
     m_resourceStatisticsMap.clear();
-    
+    m_operatingDates.clear();
+
     fireShouldPartitionCookiesHandler({ }, { }, true);
 }
@@ -294 +312 @@
         return false;
 
-    if (WallTime::now() > resourceStatistic.mostRecentUserInteractionTime + m_timeToLiveUserInteraction) {
+    if (hasStatisticsExpired(resourceStatistic)) {
         // Drop privacy sensitive data because we no longer need it.
         // Set timestamp to 0 so that statistics merge will know
@@ -404 +422 @@
     m_dataRecordsRemovalPending = false;
 }
-    
-}
+
+void ResourceLoadStatisticsStore::includeTodayAsOperatingDateIfNecessary()
+{
+    if (!m_operatingDates.isEmpty() && (WallTime::now() - m_operatingDates.last() < 24_h))
+        return;
+
+    while (m_operatingDates.size() >= operatingDatesWindow)
+        m_operatingDates.removeFirst();
+
+    m_operatingDates.append(WallTime::now());
+}
+    
+bool ResourceLoadStatisticsStore::hasStatisticsExpired(const ResourceLoadStatistics& resourceStatistic) const
+{
+    if (m_operatingDates.size() >= operatingDatesWindow) {
+        if (resourceStatistic.mostRecentUserInteractionTime < m_operatingDates.first())
+            return true;
+    }
+
+    // If we don't meet the real criteria for an expired statistic, check the user
+    // setting for a tighter restriction (mainly for testing).
+    if (m_timeToLiveUserInteraction) {
+        if (WallTime::now() > resourceStatistic.mostRecentUserInteractionTime + m_timeToLiveUserInteraction)
+            return true;
+    }
+    
+    return false;
+}
+    
+}

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

@@ -26 +26 @@
 #pragma once
 
+#include <wtf/Deque.h>
 #include <wtf/Function.h>
 #include <wtf/HashMap.h>
@@ -100 +101 @@
     void dataRecordsWereRemoved();
 
+    void includeTodayAsOperatingDateIfNecessary();
+
 private:
     ResourceLoadStatisticsStore() = default;
 
     bool shouldPartitionCookies(const WebCore::ResourceLoadStatistics&) const;
+    bool hasStatisticsExpired(const WebCore::ResourceLoadStatistics&) const;
 
     HashMap<String, WebCore::ResourceLoadStatistics> m_resourceStatisticsMap;
+    Deque<WTF::WallTime> m_operatingDates;
 
     WTF::Function<void()> m_dataAddedHandler;
@@ -113 +118 @@
     WTF::Function<void()> m_fireTelemetryHandler;
 
-    Seconds m_timeToLiveUserInteraction { 24_h * 30. };
+    Seconds m_timeToLiveUserInteraction { 0_s };
     Seconds m_timeToLiveCookiePartitionFree { 24_h };
     Seconds m_grandfatheringTime { 1_h };

trunk/Source/WebKit2/UIProcess/WebResourceLoadStatisticsStore.cpp

@@ -95 +95 @@
     , m_statisticsQueue(WorkQueue::create("WebResourceLoadStatisticsStore Process Data Queue", WorkQueue::Type::Serial, WorkQueue::QOS::Utility))
     , m_statisticsStoragePath(resourceLoadStatisticsDirectory)
-    , m_telemetryOneShotTimer(RunLoop::main(), this, &WebResourceLoadStatisticsStore::telemetryTimerFired)
-    , m_telemetryRepeatedTimer(RunLoop::main(), this, &WebResourceLoadStatisticsStore::telemetryTimerFired)
+    , m_telemetryOneShotTimer(RunLoop::main(), this, &WebResourceLoadStatisticsStore::submitTelemetryIfNecessary)
+    , m_telemetryRepeatedTimer(RunLoop::main(), this, &WebResourceLoadStatisticsStore::performDailyTasks)
 {
     ASSERT(RunLoop::isMain());
@@ -273 +273 @@
     if (coreStore().isEmpty())
         grandfatherExistingWebsiteData();
+
+    coreStore().includeTodayAsOperatingDateIfNecessary();
 }
     
@@ -527 +529 @@
 }
 
-void WebResourceLoadStatisticsStore::telemetryTimerFired()
+void WebResourceLoadStatisticsStore::performDailyTasks()
+{
+    ASSERT(RunLoop::isMain());
+
+    coreStore().includeTodayAsOperatingDateIfNecessary();
+
+    submitTelemetryIfNecessary();
+}
+
+void WebResourceLoadStatisticsStore::submitTelemetryIfNecessary()
 {
     ASSERT(RunLoop::isMain());

trunk/Source/WebKit2/UIProcess/WebResourceLoadStatisticsStore.h

@@ -133 +133 @@
     void syncWithExistingStatisticsStorageIfNeeded();
     void refreshFromDisk();
-    void telemetryTimerFired();
+    void submitTelemetryIfNecessary();
     void submitTelemetry();
     bool hasStatisticsFileChangedSinceLastSync(const String& path);
+    void performDailyTasks();
 
 #if PLATFORM(COCOA)