Changeset 230415 in webkit


Ignore:
Timestamp:
Apr 9, 2018 5:59:33 AM (6 years ago)
Author:
Carlos Garcia Campos
Message:

Merge r229965 - WebProcess memory monitor: use %zu format specifier for size_t
https://bugs.webkit.org/show_bug.cgi?id=183997

Reviewed by Michael Catanzaro.

usse %zu format specifier for size_t instead of %lu.

  • wtf/MemoryPressureHandler.cpp:

(WTF::MemoryPressureHandler::shrinkOrDie):
(WTF::MemoryPressureHandler::measurementTimerFired):

Location:
releases/WebKitGTK/webkit-2.20/Source/WTF
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • releases/WebKitGTK/webkit-2.20/Source/WTF/ChangeLog

    r230413 r230415  
     12018-03-25  Carlos Alberto Lopez Perez  <clopez@igalia.com>
     2
     3        WebProcess memory monitor: use %zu format specifier for size_t
     4        https://bugs.webkit.org/show_bug.cgi?id=183997
     5
     6        Reviewed by Michael Catanzaro.
     7
     8        usse %zu format specifier for size_t instead of %lu.
     9
     10        * wtf/MemoryPressureHandler.cpp:
     11        (WTF::MemoryPressureHandler::shrinkOrDie):
     12        (WTF::MemoryPressureHandler::measurementTimerFired):
     13
    1142018-03-23  Carlos Alberto Lopez Perez  <clopez@igalia.com>
    215
  • releases/WebKitGTK/webkit-2.20/Source/WTF/wtf/MemoryPressureHandler.cpp

    r230413 r230415  
    142142    auto footprint = memoryFootprint();
    143143    RELEASE_ASSERT(footprint);
    144     RELEASE_LOG(MemoryPressure, "New memory footprint: %lu MB", footprint.value() / MB);
     144    RELEASE_LOG(MemoryPressure, "New memory footprint: %zu MB", footprint.value() / MB);
    145145
    146146    if (footprint.value() < thresholdForMemoryKill()) {
     
    150150    }
    151151
    152     WTFLogAlways("Unable to shrink memory footprint of process (%lu MB) below the kill thresold (%lu MB). Killed\n", footprint.value() / MB, thresholdForMemoryKill() / MB);
     152    WTFLogAlways("Unable to shrink memory footprint of process (%zu MB) below the kill thresold (%zu MB). Killed\n", footprint.value() / MB, thresholdForMemoryKill() / MB);
    153153    RELEASE_ASSERT(m_memoryKillCallback);
    154154    m_memoryKillCallback();
     
    172172        return;
    173173
    174     RELEASE_LOG(MemoryPressure, "Current memory footprint: %lu MB", footprint.value() / MB);
     174    RELEASE_LOG(MemoryPressure, "Current memory footprint: %zu MB", footprint.value() / MB);
    175175    if (footprint.value() >= thresholdForMemoryKill()) {
    176176        shrinkOrDie();
Note: See TracChangeset for help on using the changeset viewer.