Changeset 220780 in webkit

Timestamp:

Aug 15, 2017, 6:37:30 PM (9 years ago)

Author:

Simon Fraser

Message:

Allow WebCore logging channels to be set from the UI process
​https://bugs.webkit.org/show_bug.cgi?id=175608

Reviewed by Tim Horton.

Source/WebCore:

Change initializeLogChannelsIfNecessary() to take an optional String, which can
be a list of log channels passed from the UI process.

• platform/LogInitialization.h:
• platform/Logging.cpp:

(WebCore::initializeLogChannelsIfNecessary):

Source/WebKit:

The UI process can now read the "WebCoreLogging" default, and pass it to the web process
via WebProcessCreationParameters, where WebProcess::platformInitializeWebProcess() uses
it to set up WebCore logging channels. Note that these will override channels read from
the web process user defaults domain (but those are hard to set anyway).

• Shared/WebProcessCreationParameters.cpp:

(WebKit::WebProcessCreationParameters::encode const):
(WebKit::WebProcessCreationParameters::decode):

• Shared/WebProcessCreationParameters.h:
• UIProcess/Cocoa/WebProcessPoolCocoa.mm:

(WebKit::WebProcessPool::platformInitializeWebProcess):

• WebProcess/cocoa/WebProcessCocoa.mm:

(WebKit::WebProcess::platformInitializeWebProcess):

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/platform/LogInitialization.h (modified) (2 diffs)
• WebCore/platform/Logging.cpp (modified) (1 diff)
• WebKit/ChangeLog (modified) (1 diff)
• WebKit/Shared/WebProcessCreationParameters.cpp (modified) (2 diffs)
• WebKit/Shared/WebProcessCreationParameters.h (modified) (1 diff)
• WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm (modified) (1 diff)
• WebKit/WebProcess/cocoa/WebProcessCocoa.mm (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2017-08-15  Simon Fraser  <simon.fraser@apple.com>
+
+        Allow WebCore logging channels to be set from the UI process
+        https://bugs.webkit.org/show_bug.cgi?id=175608
+
+        Reviewed by Tim Horton.
+
+        Change initializeLogChannelsIfNecessary() to take an optional String, which can
+        be a list of log channels passed from the UI process.
+
+        * platform/LogInitialization.h:
+        * platform/Logging.cpp:
+        (WebCore::initializeLogChannelsIfNecessary):
+
 2017-08-15  Chris Dumez  <cdumez@apple.com>
 

trunk/Source/WebCore/platform/LogInitialization.h

@@ -28 +28 @@
 #include <wtf/Assertions.h>
 #include <wtf/Forward.h>
+#include <wtf/Optional.h>
+#include <wtf/text/WTFString.h>
 
 namespace WebCore {
@@ -36 +38 @@
 bool isLogChannelEnabled(const String& name);
 WEBCORE_EXPORT void setLogChannelToAccumulate(const String& name);
-WEBCORE_EXPORT void initializeLogChannelsIfNecessary();
+WEBCORE_EXPORT void initializeLogChannelsIfNecessary(std::optional<String> = std::nullopt);
 
 #endif // !LOG_DISABLED || !RELEASE_LOG_DISABLED

trunk/Source/WebCore/platform/Logging.cpp

@@ -70 +70 @@
 }
 
-void initializeLogChannelsIfNecessary()
+void initializeLogChannelsIfNecessary(std::optional<String> logChannelString)
 {
-    if (!logChannelsNeedInitialization)
+    if (!logChannelsNeedInitialization && !logChannelString)
         return;
 
     logChannelsNeedInitialization = false;
 
-    WTFInitializeLogChannelStatesFromString(logChannels, logChannelCount, logLevelString().utf8().data());
+    String enabledChannelsString = logChannelString ? logChannelString.value() : logLevelString();
+    WTFInitializeLogChannelStatesFromString(logChannels, logChannelCount, enabledChannelsString.utf8().data());
 }
 

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2017-08-15  Simon Fraser  <simon.fraser@apple.com>
+
+        Allow WebCore logging channels to be set from the UI process
+        https://bugs.webkit.org/show_bug.cgi?id=175608
+
+        Reviewed by Tim Horton.
+
+        The UI process can now read the "WebCoreLogging" default, and pass it to the web process
+        via WebProcessCreationParameters, where WebProcess::platformInitializeWebProcess() uses
+        it to set up WebCore logging channels. Note that these will override channels read from
+        the web process user defaults domain (but those are hard to set anyway).
+
+        * Shared/WebProcessCreationParameters.cpp:
+        (WebKit::WebProcessCreationParameters::encode const):
+        (WebKit::WebProcessCreationParameters::decode):
+        * Shared/WebProcessCreationParameters.h:
+        * UIProcess/Cocoa/WebProcessPoolCocoa.mm:
+        (WebKit::WebProcessPool::platformInitializeWebProcess):
+        * WebProcess/cocoa/WebProcessCocoa.mm:
+        (WebKit::WebProcess::platformInitializeWebProcess):
+
 2017-08-15  Don Olmstead  <don.olmstead@sony.com>
 

trunk/Source/WebKit/Shared/WebProcessCreationParameters.cpp

@@ -67 +67 @@
 #endif
     encoder << mediaKeyStorageDirectory;
+    encoder << webCoreLoggingChannels;
     encoder << mediaKeyStorageDirectoryExtensionHandle;
 #if ENABLE(MEDIA_STREAM)
@@ -188 +189 @@
     if (!decoder.decode(parameters.mediaKeyStorageDirectory))
         return false;
+    if (!decoder.decode(parameters.webCoreLoggingChannels))
+        return false;
     if (!decoder.decode(parameters.mediaKeyStorageDirectoryExtensionHandle))
         return false;

trunk/Source/WebKit/Shared/WebProcessCreationParameters.h

@@ -94 +94 @@
     String mediaKeyStorageDirectory;
 
+    String webCoreLoggingChannels;
+
     Vector<String> urlSchemesRegisteredAsEmptyDocument;
     Vector<String> urlSchemesRegisteredAsSecure;

trunk/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm

@@ -257 +257 @@
 #endif
 
+#if !LOG_DISABLED || !RELEASE_LOG_DISABLED
+    parameters.webCoreLoggingChannels = [[NSUserDefaults standardUserDefaults] stringForKey:@"WebCoreLogging"];
+#endif
+
     // FIXME: Remove this and related parameter when <rdar://problem/29448368> is fixed.
     if (isSafari && !parameters.shouldCaptureAudioInUIProcess && mediaDevicesEnabled)

trunk/Source/WebKit/WebProcess/cocoa/WebProcessCocoa.mm

@@ -53 +53 @@
 #import <WebCore/FontCascade.h>
 #import <WebCore/LocalizedStrings.h>
+#import <WebCore/LogInitialization.h>
 #import <WebCore/MemoryRelease.h>
 #import <WebCore/NSAccessibilitySPI.h>
@@ -113 +114 @@
 void WebProcess::platformInitializeWebProcess(WebProcessCreationParameters&& parameters)
 {
+#if !LOG_DISABLED || !RELEASE_LOG_DISABLED
+    WebCore::initializeLogChannelsIfNecessary(parameters.webCoreLoggingChannels);
+#endif
+
     WebCore::setApplicationBundleIdentifier(parameters.uiProcessBundleIdentifier);
     SessionTracker::setIdentifierBase(parameters.uiProcessBundleIdentifier);