Changeset 211291 in webkit


Ignore:
Timestamp:
Jan 27, 2017 11:14:57 AM (7 years ago)
Author:
Chris Dumez
Message:

Fix PageCache diagnostic logging
https://bugs.webkit.org/show_bug.cgi?id=167508

Reviewed by Sam Weinig.

Fix PageCache diagnostic logging. It should not call logDiagnosticMessageWithValue()
with a non-numeric value. Use logDiagnosticMessage() instead.

  • history/PageCache.cpp:

(WebCore::logPageCacheFailureDiagnosticMessage):
(WebCore::canCacheFrame):

  • page/DiagnosticLoggingKeys.cpp:

(WebCore::DiagnosticLoggingKeys::pageCacheFailureKey):
(WebCore::DiagnosticLoggingKeys::successKey): Deleted.
(WebCore::DiagnosticLoggingKeys::failureKey): Deleted.

  • page/DiagnosticLoggingKeys.h:
Location:
trunk/Source/WebCore
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/WebCore/ChangeLog

    r211289 r211291  
     12017-01-27  Chris Dumez  <cdumez@apple.com>
     2
     3        Fix PageCache diagnostic logging
     4        https://bugs.webkit.org/show_bug.cgi?id=167508
     5
     6        Reviewed by Sam Weinig.
     7
     8        Fix PageCache diagnostic logging. It should not call logDiagnosticMessageWithValue()
     9        with a non-numeric value. Use logDiagnosticMessage() instead.
     10
     11        * history/PageCache.cpp:
     12        (WebCore::logPageCacheFailureDiagnosticMessage):
     13        (WebCore::canCacheFrame):
     14        * page/DiagnosticLoggingKeys.cpp:
     15        (WebCore::DiagnosticLoggingKeys::pageCacheFailureKey):
     16        (WebCore::DiagnosticLoggingKeys::successKey): Deleted.
     17        (WebCore::DiagnosticLoggingKeys::failureKey): Deleted.
     18        * page/DiagnosticLoggingKeys.h:
     19
    1202017-01-27  Devin Rousso  <dcrousso+webkit@gmail.com>
    221
  • trunk/Source/WebCore/history/PageCache.cpp

    r211254 r211291  
    6565static inline void logPageCacheFailureDiagnosticMessage(DiagnosticLoggingClient& client, const String& reason)
    6666{
    67     client.logDiagnosticMessageWithValue(DiagnosticLoggingKeys::pageCacheKey(), DiagnosticLoggingKeys::failureKey(), reason, ShouldSample::Yes);
     67    client.logDiagnosticMessage(DiagnosticLoggingKeys::pageCacheFailureKey(), reason, ShouldSample::Yes);
    6868}
    6969
     
    155155        for (auto* activeDOMObject : unsuspendableObjects) {
    156156            PCLOG("    - Unsuspendable: ", activeDOMObject->activeDOMObjectName());
    157             diagnosticLoggingClient.logDiagnosticMessageWithValue(DiagnosticLoggingKeys::pageCacheKey(), DiagnosticLoggingKeys::unsuspendableDOMObjectKey(), activeDOMObject->activeDOMObjectName(), ShouldSample::Yes);
     157            diagnosticLoggingClient.logDiagnosticMessage(DiagnosticLoggingKeys::unsuspendableDOMObjectKey(), activeDOMObject->activeDOMObjectName(), ShouldSample::Yes);
    158158            UNUSED_PARAM(activeDOMObject);
    159159        }
  • trunk/Source/WebCore/page/DiagnosticLoggingKeys.cpp

    r211254 r211291  
    104104}
    105105
    106 String DiagnosticLoggingKeys::successKey()
    107 {
    108     return ASCIILiteral("success");
    109 }
    110 
    111 String DiagnosticLoggingKeys::failureKey()
    112 {
    113     return ASCIILiteral("failure");
    114 }
    115 
    116106String DiagnosticLoggingKeys::pageLoadedKey()
    117107{
     
    197187{
    198188    return ASCIILiteral("pageCache");
     189}
     190
     191String DiagnosticLoggingKeys::pageCacheFailureKey()
     192{
     193    return ASCIILiteral("pageCacheFailure");
    199194}
    200195
  • trunk/Source/WebCore/page/DiagnosticLoggingKeys.h

    r211254 r211291  
    9898    WEBCORE_EXPORT static String otherKey();
    9999    static String pageCacheKey();
     100    static String pageCacheFailureKey();
    100101    static String pageContainsAtLeastOneMediaEngineKey();
    101102    static String pageContainsAtLeastOnePluginKey();
     
    169170    WEBCORE_EXPORT static String foregroundCPUUsageToDiagnosticLoggingKey(double cpuUsage);
    170171    WEBCORE_EXPORT static String backgroundCPUUsageToDiagnosticLoggingKey(double cpuUsage);
    171 
    172     // Success / Failure keys.
    173     static String successKey();
    174     static String failureKey();
    175172};
    176173
Note: See TracChangeset for help on using the changeset viewer.