Changeset 208607 in webkit

Timestamp:

Nov 11, 2016, 1:50:11 PM (9 years ago)

Author:

Keith Rollin

Message:

Reduce number of platformMemoryUsage calls
​https://bugs.webkit.org/show_bug.cgi?id=164375

Reviewed by Andreas Kling.

platformMemoryUsage was being called all the time while logging the
results of various memory-purging operations. This logging is
subordinate to the needs of performance and so can be removed.
Behavior is now as follows:

• If memory-pressure relief logging is enabled, logging includes

memory usage information. On Cocoa, this logging is disabled by
default but can be enabled by setting LogMemoryJetsamDetails in
defaults.

• Otherwise, if release-logging is enabled (as it is on Cocoa),

abbreviated memory pressure relief logging is performed: the logging
lines are printed but without any memory usage information.

• Otherwise, no logging is performed.

No new tests -- no tests for logging.

• platform/MemoryPressureHandler.cpp:

(WebCore::MemoryPressureHandler::ReliefLogger::logMemoryUsageChange):

• platform/MemoryPressureHandler.h:

(WebCore::MemoryPressureHandler::ReliefLogger::ReliefLogger):
(WebCore::MemoryPressureHandler::ReliefLogger::~ReliefLogger):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/MemoryPressureHandler.cpp (modified) (1 diff)
• platform/MemoryPressureHandler.h (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2016-11-11  Keith Rollin  <krollin@apple.com>
+
+        Reduce number of platformMemoryUsage calls
+        https://bugs.webkit.org/show_bug.cgi?id=164375
+
+        Reviewed by Andreas Kling.
+
+        platformMemoryUsage was being called all the time while logging the
+        results of various memory-purging operations. This logging is
+        subordinate to the needs of performance and so can be removed.
+        Behavior is now as follows:
+
+        - If memory-pressure relief logging is enabled, logging includes
+        memory usage information. On Cocoa, this logging is disabled by
+        default but can be enabled by setting LogMemoryJetsamDetails in
+        `defaults`.
+        - Otherwise, if release-logging is enabled (as it is on Cocoa),
+        abbreviated memory pressure relief logging is performed: the logging
+        lines are printed but without any memory usage information.
+        - Otherwise, no logging is performed.
+
+        No new tests -- no tests for logging.
+
+        * platform/MemoryPressureHandler.cpp:
+        (WebCore::MemoryPressureHandler::ReliefLogger::logMemoryUsageChange):
+        * platform/MemoryPressureHandler.h:
+        (WebCore::MemoryPressureHandler::ReliefLogger::ReliefLogger):
+        (WebCore::MemoryPressureHandler::ReliefLogger::~ReliefLogger):
+
 2016-11-11  Eric Carlson  <eric.carlson@apple.com>
 

trunk/Source/WebCore/platform/MemoryPressureHandler.cpp

@@ -76 +76 @@
 #endif
 
-    size_t currentMemory = platformMemoryUsage();
-    if (currentMemory == static_cast<size_t>(-1) || m_initialMemory == static_cast<size_t>(-1)) {
-        MEMORYPRESSURE_LOG("Memory pressure relief: " STRING_SPECIFICATION ": (Unable to get dirty memory information for process)", m_logString);
-        return;
+    if (s_loggingEnabled) {
+        size_t currentMemory = platformMemoryUsage();
+        if (currentMemory == static_cast<size_t>(-1) || m_initialMemory == static_cast<size_t>(-1)) {
+            MEMORYPRESSURE_LOG("Memory pressure relief: " STRING_SPECIFICATION ": (Unable to get dirty memory information for process)", m_logString);
+            return;
+        }
+
+        long memoryDiff = currentMemory - m_initialMemory;
+        if (memoryDiff < 0)
+            MEMORYPRESSURE_LOG("Memory pressure relief: " STRING_SPECIFICATION ": -dirty %ld bytes (from %zu to %zu)", m_logString, (memoryDiff * -1), m_initialMemory, currentMemory);
+        else if (memoryDiff > 0)
+            MEMORYPRESSURE_LOG("Memory pressure relief: " STRING_SPECIFICATION ": +dirty %ld bytes (from %zu to %zu)", m_logString, memoryDiff, m_initialMemory, currentMemory);
+        else
+            MEMORYPRESSURE_LOG("Memory pressure relief: " STRING_SPECIFICATION ": =dirty (at %zu bytes)", m_logString, currentMemory);
+#if !RELEASE_LOG_DISABLED
+    } else {
+        MEMORYPRESSURE_LOG("Memory pressure relief: " STRING_SPECIFICATION, m_logString);
+#endif
     }
-
-    long memoryDiff = currentMemory - m_initialMemory;
-    if (memoryDiff < 0)
-        MEMORYPRESSURE_LOG("Memory pressure relief: " STRING_SPECIFICATION ": -dirty %ld bytes (from %zu to %zu)", m_logString, (memoryDiff * -1), m_initialMemory, currentMemory);
-    else if (memoryDiff > 0)
-        MEMORYPRESSURE_LOG("Memory pressure relief: " STRING_SPECIFICATION ": +dirty %ld bytes (from %zu to %zu)", m_logString, memoryDiff, m_initialMemory, currentMemory);
-    else
-        MEMORYPRESSURE_LOG("Memory pressure relief: " STRING_SPECIFICATION ": =dirty (at %zu bytes)", m_logString, currentMemory);
 }
 

trunk/Source/WebCore/platform/MemoryPressureHandler.h

@@ -92 +92 @@
         explicit ReliefLogger(const char *log)
             : m_logString(log)
-#if !RELEASE_LOG_DISABLED
-            , m_initialMemory(platformMemoryUsage())
-#else
             , m_initialMemory(s_loggingEnabled ? platformMemoryUsage() : 0)
-#endif
         {
         }
@@ -102 +98 @@
         ~ReliefLogger()
         {
-#if !RELEASE_LOG_DISABLED
             logMemoryUsageChange();
-#else
-            if (s_loggingEnabled)
-                logMemoryUsageChange();
-#endif
         }