Changeset 276682 in webkit

Timestamp:

Apr 27, 2021, 5:18:19 PM (5 years ago)

Author:

Ben Nham

Message:

Memory pressure events should be logged to com.apple.WebKit subsystem
​https://bugs.webkit.org/show_bug.cgi?id=225112

Reviewed by Chris Dumez.

Currently memory pressure events are logged to the default os_log subsystem instead of the
com.apple.WebKit subsystem. This makes it hard to capture such events using common logging
prefs (e.g. a pref that persists all logs from the WebKit subsystem).

To fix this, call WTFInitializeLogChannelStatesFromString at init time. This associates the
WTFLogChannel with an os_log object that sends the messages to the WebKit subsystem.

• wtf/MemoryPressureHandler.cpp:

(WTF::MemoryPressureHandler::singleton):

• wtf/cocoa/MemoryPressureHandlerCocoa.mm:

(WTF::MemoryPressureHandler::install):

Location:

trunk/Source/WTF

Files:

• ChangeLog (modified) (1 diff)
• wtf/MemoryPressureHandler.cpp (modified) (2 diffs)
• wtf/cocoa/MemoryPressureHandlerCocoa.mm (modified) (2 diffs)

trunk/Source/WTF/ChangeLog

@@ +1 @@
+2021-04-27  Ben Nham  <nham@apple.com>
+
+        Memory pressure events should be logged to com.apple.WebKit subsystem
+        https://bugs.webkit.org/show_bug.cgi?id=225112
+
+        Reviewed by Chris Dumez.
+
+        Currently memory pressure events are logged to the default os_log subsystem instead of the
+        com.apple.WebKit subsystem. This makes it hard to capture such events using common logging
+        prefs (e.g. a pref that persists all logs from the WebKit subsystem).
+
+        To fix this, call WTFInitializeLogChannelStatesFromString at init time. This associates the
+        WTFLogChannel with an os_log object that sends the messages to the WebKit subsystem.
+
+        * wtf/MemoryPressureHandler.cpp:
+        (WTF::MemoryPressureHandler::singleton):
+        * wtf/cocoa/MemoryPressureHandlerCocoa.mm:
+        (WTF::MemoryPressureHandler::install):
+
 2021-04-27  Alex Christensen  <achristensen@webkit.org>
 

trunk/Source/WTF/wtf/MemoryPressureHandler.cpp

@@ -35 +35 @@
 namespace WTF {
 
-#if RELEASE_LOG_DISABLED
-WTFLogChannel LogMemoryPressure = { WTFLogChannelState::On, "MemoryPressure", WTFLogLevel::Error };
-#endif
-#if USE(OS_LOG) && !RELEASE_LOG_DISABLED
-WTFLogChannel LogMemoryPressure = { WTFLogChannelState::On, "MemoryPressure", WTFLogLevel::Error, LOG_CHANNEL_WEBKIT_SUBSYSTEM, OS_LOG_DEFAULT };
-#endif
-#if USE(JOURNALD) && !RELEASE_LOG_DISABLED
-WTFLogChannel LogMemoryPressure = { WTFLogChannelState::On, "MemoryPressure", WTFLogLevel::Error, LOG_CHANNEL_WEBKIT_SUBSYSTEM };
-#endif
+DEFINE_LOG_CHANNEL(MemoryPressure, LOG_CHANNEL_WEBKIT_SUBSYSTEM);
 
 WTF_EXPORT_PRIVATE bool MemoryPressureHandler::ReliefLogger::s_loggingEnabled = false;
@@ -52 +44 @@
     static std::once_flag onceKey;
     std::call_once(onceKey, [&] {
+        WTFLogChannel* channels[] = { &LogMemoryPressure };
+        WTFInitializeLogChannelStatesFromString(channels, 1, "");
+
         memoryPressureHandler.construct();
     });

trunk/Source/WTF/wtf/cocoa/MemoryPressureHandlerCocoa.mm

@@ -42 +42 @@
 namespace WTF {
 
-#if RELEASE_LOG_DISABLED
-WTFLogChannel LogPerformanceLogging = { WTFLogChannelState::On, "PerformanceLogging", WTFLogLevel::Error };
-#else
-WTFLogChannel LogPerformanceLogging = { WTFLogChannelState::On, "PerformanceLogging", WTFLogLevel::Error, LOG_CHANNEL_WEBKIT_SUBSYSTEM, OS_LOG_DEFAULT };
-#endif
-
 void MemoryPressureHandler::platformReleaseMemory(Critical critical)
 {
@@ -105 +99 @@
             }
             if (m_shouldLogMemoryMemoryPressureEvents)
-                RELEASE_LOG(PerformanceLogging, "Received memory pressure event %lu vm pressure %d", status, isUnderMemoryPressure());
+                RELEASE_LOG(MemoryPressure, "Received memory pressure event %lu vm pressure %d", status, isUnderMemoryPressure());
         });
         dispatch_resume(memoryPressureEventSource);