Diff
Modified: trunk/Source/WebCore/ChangeLog (181688 => 181689)
--- trunk/Source/WebCore/ChangeLog 2015-03-18 07:26:27 UTC (rev 181688)
+++ trunk/Source/WebCore/ChangeLog 2015-03-18 07:27:53 UTC (rev 181689)
@@ -1,3 +1,17 @@
+2015-03-18 Chris Dumez <[email protected]>
+
+ [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 <[email protected]>
Fix the build after r181660
Modified: trunk/Source/WebCore/page/DiagnosticLoggingKeys.cpp (181688 => 181689)
--- trunk/Source/WebCore/page/DiagnosticLoggingKeys.cpp 2015-03-18 07:26:27 UTC (rev 181688)
+++ trunk/Source/WebCore/page/DiagnosticLoggingKeys.cpp 2015-03-18 07:27:53 UTC (rev 181689)
@@ -313,6 +313,11 @@
return ASCIILiteral("reload");
}
+String DiagnosticLoggingKeys::retrievalRequestKey()
+{
+ return ASCIILiteral("retrievalRequest");
+}
+
String DiagnosticLoggingKeys::resourceKey()
{
return ASCIILiteral("resource");
Modified: trunk/Source/WebCore/page/DiagnosticLoggingKeys.h (181688 => 181689)
--- trunk/Source/WebCore/page/DiagnosticLoggingKeys.h 2015-03-18 07:26:27 UTC (rev 181688)
+++ trunk/Source/WebCore/page/DiagnosticLoggingKeys.h 2015-03-18 07:27:53 UTC (rev 181689)
@@ -99,6 +99,7 @@
static String resourceRequestKey();
static String resourceResponseKey();
WEBCORE_EXPORT static String retrievalKey();
+ WEBCORE_EXPORT static String retrievalRequestKey();
static String revalidatingKey();
static String sameLoadKey();
static String scriptKey();
Modified: trunk/Source/WebKit2/ChangeLog (181688 => 181689)
--- trunk/Source/WebKit2/ChangeLog 2015-03-18 07:26:27 UTC (rev 181688)
+++ trunk/Source/WebKit2/ChangeLog 2015-03-18 07:27:53 UTC (rev 181689)
@@ -1,5 +1,21 @@
2015-03-18 Chris Dumez <[email protected]>
+ [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 <[email protected]>
+
[WK2] We should not even try the network cache for non-HTTP protocol requests
https://bugs.webkit.org/show_bug.cgi?id=142802
<rdar://problem/19632130>
Modified: trunk/Source/WebKit2/NetworkProcess/cache/NetworkCache.cpp (181688 => 181689)
--- trunk/Source/WebKit2/NetworkProcess/cache/NetworkCache.cpp 2015-03-18 07:26:27 UTC (rev 181688)
+++ trunk/Source/WebKit2/NetworkProcess/cache/NetworkCache.cpp 2015-03-18 07:27:53 UTC (rev 181689)
@@ -263,6 +263,9 @@
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);
RetrieveDecision retrieveDecision = canRetrieve(originalRequest);
if (retrieveDecision != RetrieveDecision::Yes) {
Modified: trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheStatistics.h (181688 => 181689)
--- trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheStatistics.h 2015-03-18 07:26:27 UTC (rev 181688)
+++ trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheStatistics.h 2015-03-18 07:27:53 UTC (rev 181689)
@@ -47,6 +47,7 @@
void clear();
+ void recordRetrievalRequest(uint64_t webPageID);
void recordNotCachingResponse(const Key&, StoreDecision);
void recordNotUsingCacheForRequest(uint64_t webPageID, const Key&, const WebCore::ResourceRequest&, RetrieveDecision);
void recordRetrievalFailure(uint64_t webPageID, const Key&, const WebCore::ResourceRequest&);
Modified: trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheStatisticsCocoa.mm (181688 => 181689)
--- trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheStatisticsCocoa.mm 2015-03-18 07:26:27 UTC (rev 181688)
+++ trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheStatisticsCocoa.mm 2015-03-18 07:27:53 UTC (rev 181689)
@@ -178,6 +178,11 @@
});
}
+void Statistics::recordRetrievalRequest(uint64_t webPageID)
+{
+ NetworkProcess::singleton().logDiagnosticMessage(webPageID, WebCore::DiagnosticLoggingKeys::networkCacheKey(), WebCore::DiagnosticLoggingKeys::retrievalRequestKey(), WebCore::ShouldSample::Yes);
+}
+
void Statistics::recordNotCachingResponse(const Key& key, StoreDecision storeDecision)
{
ASSERT(storeDecision != StoreDecision::Yes);
