Changeset 181689 in webkit

Timestamp:

Mar 18, 2015, 12:27:53 AM (11 years ago)

Author:

Chris Dumez

Message:

[WK2] Log total number of network cache queries using diagnostic logging
​https://bugs.webkit.org/show_bug.cgi?id=142803
<rdar://problem/19632130>

Reviewed by Antti Koivisto.

Source/WebCore:

Add diagnostic logging key needed for network efficacy logging.

• page/DiagnosticLoggingKeys.cpp:

(WebCore::DiagnosticLoggingKeys::retrievalRequestKey):

• page/DiagnosticLoggingKeys.h:

Source/WebKit2:

Log total number of network cache queries using diagnostic logging.

• NetworkProcess/cache/NetworkCache.cpp:

(WebKit::NetworkCache::Cache::retrieve):

• NetworkProcess/cache/NetworkCacheStatistics.h:
• NetworkProcess/cache/NetworkCacheStatisticsCocoa.mm:

(WebKit::NetworkCache::Statistics::recordCacheRetrievalRequest):

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/page/DiagnosticLoggingKeys.cpp (modified) (1 diff)
• WebCore/page/DiagnosticLoggingKeys.h (modified) (1 diff)
• WebKit2/ChangeLog (modified) (1 diff)
• WebKit2/NetworkProcess/cache/NetworkCache.cpp (modified) (1 diff)
• WebKit2/NetworkProcess/cache/NetworkCacheStatistics.h (modified) (1 diff)
• WebKit2/NetworkProcess/cache/NetworkCacheStatisticsCocoa.mm (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2015-03-18  Chris Dumez  <cdumez@apple.com>
+
+        [WK2] Log total number of network cache queries using diagnostic logging
+        https://bugs.webkit.org/show_bug.cgi?id=142803
+        <rdar://problem/19632130>
+
+        Reviewed by Antti Koivisto.
+
+        Add diagnostic logging key needed for network efficacy logging.
+
+        * page/DiagnosticLoggingKeys.cpp:
+        (WebCore::DiagnosticLoggingKeys::retrievalRequestKey):
+        * page/DiagnosticLoggingKeys.h:
+
 2015-03-18  Tim Horton  <timothy_horton@apple.com>
 

trunk/Source/WebCore/page/DiagnosticLoggingKeys.cpp

@@ -314 +314 @@
 }
 
+String DiagnosticLoggingKeys::retrievalRequestKey()
+{
+    return ASCIILiteral("retrievalRequest");
+}
+
 String DiagnosticLoggingKeys::resourceKey()
 {

trunk/Source/WebCore/page/DiagnosticLoggingKeys.h

@@ -100 +100 @@
     static String resourceResponseKey();
     WEBCORE_EXPORT static String retrievalKey();
+    WEBCORE_EXPORT static String retrievalRequestKey();
     static String revalidatingKey();
     static String sameLoadKey();

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2015-03-18  Chris Dumez  <cdumez@apple.com>
+
+        [WK2] Log total number of network cache queries using diagnostic logging
+        https://bugs.webkit.org/show_bug.cgi?id=142803
+        <rdar://problem/19632130>
+
+        Reviewed by Antti Koivisto.
+
+        Log total number of network cache queries using diagnostic logging.
+
+        * NetworkProcess/cache/NetworkCache.cpp:
+        (WebKit::NetworkCache::Cache::retrieve):
+        * NetworkProcess/cache/NetworkCacheStatistics.h:
+        * NetworkProcess/cache/NetworkCacheStatisticsCocoa.mm:
+        (WebKit::NetworkCache::Statistics::recordCacheRetrievalRequest):
+
 2015-03-18  Chris Dumez  <cdumez@apple.com>
 

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

@@ -263 +263 @@
 
     LOG(NetworkCache, "(NetworkProcess) retrieving %s priority %u", originalRequest.url().string().ascii().data(), originalRequest.priority());
+
+    if (m_statistics)
+        m_statistics->recordRetrievalRequest(webPageID);
 
     Key storageKey = makeCacheKey(originalRequest);

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

@@ -48 +48 @@
     void clear();
 
+    void recordRetrievalRequest(uint64_t webPageID);
     void recordNotCachingResponse(const Key&, StoreDecision);
     void recordNotUsingCacheForRequest(uint64_t webPageID, const Key&, const WebCore::ResourceRequest&, RetrieveDecision);

trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheStatisticsCocoa.mm

@@ -177 +177 @@
         LOG(NetworkCache, "(NetworkProcess) statistics cache shrink completed m_approximateEntryCount=%lu", static_cast<size_t>(m_approximateEntryCount));
     });
+}
+
+void Statistics::recordRetrievalRequest(uint64_t webPageID)
+{
+    NetworkProcess::singleton().logDiagnosticMessage(webPageID, WebCore::DiagnosticLoggingKeys::networkCacheKey(), WebCore::DiagnosticLoggingKeys::retrievalRequestKey(), WebCore::ShouldSample::Yes);
 }