Changeset 219207 in webkit

Timestamp:

Jul 6, 2017 11:28:40 AM (7 years ago)

Author:

Chris Dumez

Message:

Move ResourceLoadObserver notification throttling logic from WebProcess class to ResourceLoadObserver
​https://bugs.webkit.org/show_bug.cgi?id=174194

Reviewed by Brent Fulgham.

Move ResourceLoadObserver notification throttling logic from WebProcess class to
ResourceLoadObserver. This makes more sense and decreases the complexity of the
WebProcess class.

Source/WebCore:

• loader/ResourceLoadObserver.cpp:

(WebCore::ResourceLoadObserver::setNotificationCallback):
(WebCore::ResourceLoadObserver::ResourceLoadObserver):
(WebCore::ResourceLoadObserver::logFrameNavigation):
(WebCore::ResourceLoadObserver::logSubresourceLoading):
(WebCore::ResourceLoadObserver::logWebSocketLoading):
(WebCore::ResourceLoadObserver::logUserInteractionWithReducedTimeResolution):
(WebCore::ResourceLoadObserver::scheduleNotificationIfNeeded):
(WebCore::ResourceLoadObserver::notificationTimerFired):

• loader/ResourceLoadObserver.h:

Source/WebKit2:

• WebProcess/WebProcess.cpp:

(WebKit::m_webSQLiteDatabaseTracker):
(WebKit::WebProcess::statisticsChangedTimerFired): Deleted.

• WebProcess/WebProcess.h:

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/loader/ResourceLoadObserver.cpp (modified) (8 diffs)
• WebCore/loader/ResourceLoadObserver.h (modified) (4 diffs)
• WebKit2/ChangeLog (modified) (1 diff)
• WebKit2/WebProcess/WebProcess.cpp (modified) (3 diffs)
• WebKit2/WebProcess/WebProcess.h (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2017-07-06  Chris Dumez  <cdumez@apple.com>
+
+        Move ResourceLoadObserver notification throttling logic from WebProcess class to ResourceLoadObserver
+        https://bugs.webkit.org/show_bug.cgi?id=174194
+
+        Reviewed by Brent Fulgham.
+
+        Move ResourceLoadObserver notification throttling logic from WebProcess class to
+        ResourceLoadObserver. This makes more sense and decreases the complexity of the
+        WebProcess class.
+
+        * loader/ResourceLoadObserver.cpp:
+        (WebCore::ResourceLoadObserver::setNotificationCallback):
+        (WebCore::ResourceLoadObserver::ResourceLoadObserver):
+        (WebCore::ResourceLoadObserver::logFrameNavigation):
+        (WebCore::ResourceLoadObserver::logSubresourceLoading):
+        (WebCore::ResourceLoadObserver::logWebSocketLoading):
+        (WebCore::ResourceLoadObserver::logUserInteractionWithReducedTimeResolution):
+        (WebCore::ResourceLoadObserver::scheduleNotificationIfNeeded):
+        (WebCore::ResourceLoadObserver::notificationTimerFired):
+        * loader/ResourceLoadObserver.h:
+
 2017-07-06  Said Abou-Hallawa  <sabouhallawa@apple.com>
 

trunk/Source/WebCore/loader/ResourceLoadObserver.cpp

@@ -38 +38 @@
 #include "Settings.h"
 #include "URL.h"
-#include <wtf/NeverDestroyed.h>
 
 namespace WebCore {
@@ -48 +47 @@
 
 static Seconds timestampResolution { 1_h };
+static const Seconds minimumNotificationInterval { 5_s };
 
 ResourceLoadObserver& ResourceLoadObserver::shared()
@@ -55 +55 @@
 }
 
-void ResourceLoadObserver::setNotificationCallback(WTF::Function<void()>&& notificationCallback)
+void ResourceLoadObserver::setNotificationCallback(WTF::Function<void (Vector<ResourceLoadStatistics>&&)>&& notificationCallback)
 {
     ASSERT(!m_notificationCallback);
     m_notificationCallback = WTFMove(notificationCallback);
+}
+
+ResourceLoadObserver::ResourceLoadObserver()
+    : m_notificationTimer(*this, &ResourceLoadObserver::notificationTimerFired)
+{
 }
 
@@ -159 +164 @@
 
     if (shouldCallNotificationCallback)
-        m_notificationCallback();
+        scheduleNotificationIfNeeded();
 }
     
@@ -225 +230 @@
 
     if (shouldCallNotificationCallback)
-        m_notificationCallback();
+        scheduleNotificationIfNeeded();
 }
 
@@ -268 +273 @@
 
     if (shouldCallNotificationCallback)
-        m_notificationCallback();
+        scheduleNotificationIfNeeded();
 }
 
@@ -295 +300 @@
     statistics.mostRecentUserInteractionTime = newTime;
 
-    m_notificationCallback();
+    scheduleNotificationIfNeeded();
 }
 
@@ -323 +328 @@
 }
 
+void ResourceLoadObserver::scheduleNotificationIfNeeded()
+{
+    ASSERT(m_notificationCallback);
+    if (m_resourceStatisticsMap.isEmpty()) {
+        m_notificationTimer.stop();
+        return;
+    }
+
+    if (!m_notificationTimer.isActive())
+        m_notificationTimer.startOneShot(minimumNotificationInterval);
+}
+
+void ResourceLoadObserver::notificationTimerFired()
+{
+    ASSERT(m_notificationCallback);
+    m_notificationCallback(takeStatistics());
+}
+
 String ResourceLoadObserver::statisticsForOrigin(const String& origin)
 {

trunk/Source/WebCore/loader/ResourceLoadObserver.h

@@ -26 +26 @@
 #pragma once
 
+#include "Timer.h"
 #include <wtf/HashMap.h>
+#include <wtf/NeverDestroyed.h>
 #include <wtf/text/WTFString.h>
 
@@ -46 +48 @@
 
 class ResourceLoadObserver {
-    friend class NeverDestroyed<ResourceLoadObserver>;
+    friend class WTF::NeverDestroyed<ResourceLoadObserver>;
 public:
     WEBCORE_EXPORT static ResourceLoadObserver& shared();
@@ -57 +59 @@
     WEBCORE_EXPORT String statisticsForOrigin(const String&);
 
-    WEBCORE_EXPORT void setNotificationCallback(WTF::Function<void()>&&);
-    WEBCORE_EXPORT Vector<ResourceLoadStatistics> takeStatistics();
+    WEBCORE_EXPORT void setNotificationCallback(WTF::Function<void (Vector<ResourceLoadStatistics>&&)>&&);
 
 private:
+    ResourceLoadObserver();
+
     bool shouldLog(Page*) const;
     ResourceLoadStatistics& ensureResourceStatisticsForPrimaryDomain(const String&);
@@ -66 +69 @@
     bool isPrevalentResource(const String& primaryDomain) const;
 
+    void scheduleNotificationIfNeeded();
+    void notificationTimerFired();
+    Vector<ResourceLoadStatistics> takeStatistics();
+
     HashMap<String, ResourceLoadStatistics> m_resourceStatisticsMap;
-    WTF::Function<void()> m_notificationCallback;
+    WTF::Function<void (Vector<ResourceLoadStatistics>&&)> m_notificationCallback;
+    Timer m_notificationTimer;
     HashMap<String, size_t> m_originsVisitedMap;
 };

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2017-07-06  Chris Dumez  <cdumez@apple.com>
+
+        Move ResourceLoadObserver notification throttling logic from WebProcess class to ResourceLoadObserver
+        https://bugs.webkit.org/show_bug.cgi?id=174194
+
+        Reviewed by Brent Fulgham.
+
+        Move ResourceLoadObserver notification throttling logic from WebProcess class to
+        ResourceLoadObserver. This makes more sense and decreases the complexity of the
+        WebProcess class.
+
+        * WebProcess/WebProcess.cpp:
+        (WebKit::m_webSQLiteDatabaseTracker):
+        (WebKit::WebProcess::statisticsChangedTimerFired): Deleted.
+        * WebProcess/WebProcess.h:
+
 2017-07-06  Chris Dumez  <cdumez@apple.com>
 

trunk/Source/WebKit2/WebProcess/WebProcess.cpp

@@ -171 +171 @@
 #endif
     , m_nonVisibleProcessCleanupTimer(*this, &WebProcess::nonVisibleProcessCleanupTimerFired)
-    , m_statisticsChangedTimer(*this, &WebProcess::statisticsChangedTimerFired)
 #if PLATFORM(IOS)
     , m_webSQLiteDatabaseTracker(*this)
@@ -200 +199 @@
     m_plugInAutoStartOriginHashes.add(SessionID::defaultSessionID(), HashMap<unsigned, double>());
 
-    ResourceLoadObserver::shared().setNotificationCallback([this] {
-        if (m_statisticsChangedTimer.isActive())
-            return;
-        m_statisticsChangedTimer.startOneShot(5_s);
+    ResourceLoadObserver::shared().setNotificationCallback([this] (Vector<ResourceLoadStatistics>&& statistics) {
+        ASSERT(!statistics.isEmpty());
+        parentProcessConnection()->send(Messages::WebResourceLoadStatisticsStore::ResourceLoadStatisticsUpdated(WTFMove(statistics)), 0);
     });
 }
@@ -1458 +1456 @@
 }
 
-void WebProcess::statisticsChangedTimerFired()
-{
-    auto statistics = ResourceLoadObserver::shared().takeStatistics();
-    if (statistics.isEmpty())
-        return;
-
-    parentProcessConnection()->send(Messages::WebResourceLoadStatisticsStore::ResourceLoadStatisticsUpdated(WTFMove(statistics)), 0);
-}
-
 void WebProcess::setResourceLoadStatisticsEnabled(bool enabled)
 {

trunk/Source/WebKit2/WebProcess/WebProcess.h

@@ -185 +185 @@
 
     void nonVisibleProcessCleanupTimerFired();
-    void statisticsChangedTimerFired();
 
 #if PLATFORM(COCOA)
@@ -410 +409 @@
     HashSet<uint64_t> m_pagesInWindows;
     WebCore::Timer m_nonVisibleProcessCleanupTimer;
-    WebCore::Timer m_statisticsChangedTimer;
 
     RefPtr<WebCore::ApplicationCacheStorage> m_applicationCacheStorage;