Title: [230415] releases/WebKitGTK/webkit-2.20/Source/WTF
- Revision
- 230415
- Author
- carlo...@webkit.org
- Date
- 2018-04-09 05:59:33 -0700 (Mon, 09 Apr 2018)
Log 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):
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.20/Source/WTF/ChangeLog (230414 => 230415)
--- releases/WebKitGTK/webkit-2.20/Source/WTF/ChangeLog 2018-04-09 12:59:29 UTC (rev 230414)
+++ releases/WebKitGTK/webkit-2.20/Source/WTF/ChangeLog 2018-04-09 12:59:33 UTC (rev 230415)
@@ -1,3 +1,16 @@
+2018-03-25 Carlos Alberto Lopez Perez <clo...@igalia.com>
+
+ 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):
+
2018-03-23 Carlos Alberto Lopez Perez <clo...@igalia.com>
WebProcess memory monitor thresholds should be better tuned for embedded systems.
Modified: releases/WebKitGTK/webkit-2.20/Source/WTF/wtf/MemoryPressureHandler.cpp (230414 => 230415)
--- releases/WebKitGTK/webkit-2.20/Source/WTF/wtf/MemoryPressureHandler.cpp 2018-04-09 12:59:29 UTC (rev 230414)
+++ releases/WebKitGTK/webkit-2.20/Source/WTF/wtf/MemoryPressureHandler.cpp 2018-04-09 12:59:33 UTC (rev 230415)
@@ -141,7 +141,7 @@
auto footprint = memoryFootprint();
RELEASE_ASSERT(footprint);
- RELEASE_LOG(MemoryPressure, "New memory footprint: %lu MB", footprint.value() / MB);
+ RELEASE_LOG(MemoryPressure, "New memory footprint: %zu MB", footprint.value() / MB);
if (footprint.value() < thresholdForMemoryKill()) {
RELEASE_LOG(MemoryPressure, "Shrank below memory kill threshold. Process gets to live.");
@@ -149,7 +149,7 @@
return;
}
- WTFLogAlways("Unable to shrink memory footprint of process (%lu MB) below the kill thresold (%lu MB). Killed\n", footprint.value() / MB, thresholdForMemoryKill() / MB);
+ WTFLogAlways("Unable to shrink memory footprint of process (%zu MB) below the kill thresold (%zu MB). Killed\n", footprint.value() / MB, thresholdForMemoryKill() / MB);
RELEASE_ASSERT(m_memoryKillCallback);
m_memoryKillCallback();
}
@@ -171,7 +171,7 @@
if (!footprint)
return;
- RELEASE_LOG(MemoryPressure, "Current memory footprint: %lu MB", footprint.value() / MB);
+ RELEASE_LOG(MemoryPressure, "Current memory footprint: %zu MB", footprint.value() / MB);
if (footprint.value() >= thresholdForMemoryKill()) {
shrinkOrDie();
return;
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
