Changeset 282236 in webkit

Timestamp:

Sep 9, 2021, 12:59:07 PM (5 years ago)

Author:

Fujii Hironori

Message:

Enable IPCMessages debug logging for non-Cocoa ports
​https://bugs.webkit.org/show_bug.cgi?id=230081

Reviewed by Alex Christensen.

r282177 temporarily disabled IPCMessages debug logging for
non-Cocoa ports because the generated
MessageArgumentDescriptions.cpp couldn't compile for them. Then,
r282190 fixed the problem. Enable it.

• Platform/IPC/HandleMessage.h:

(IPC::logMessageImpl): Reverted the change of r282177 to enable the logging.
(IPC::logReply): Ditto.

• Scripts/webkit/messages.py:

(generate_message_argument_description_implementation):
ENABLE(IPC_TESTING_API) isn't enabled for non-Cocoa ports yet.
Changed the condition.

• Scripts/webkit/tests/MessageArgumentDescriptions.cpp: Updated

this test expectation.

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• Platform/IPC/HandleMessage.h (modified) (3 diffs)
• Scripts/webkit/messages.py (modified) (4 diffs)
• Scripts/webkit/tests/MessageArgumentDescriptions.cpp (modified) (4 diffs)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2021-09-09  Fujii Hironori  <Hironori.Fujii@sony.com>
+
+        Enable IPCMessages debug logging for non-Cocoa ports
+        https://bugs.webkit.org/show_bug.cgi?id=230081
+
+        Reviewed by Alex Christensen.
+
+        r282177 temporarily disabled IPCMessages debug logging for
+        non-Cocoa ports because the generated
+        MessageArgumentDescriptions.cpp couldn't compile for them. Then,
+        r282190 fixed the problem. Enable it.
+
+        * Platform/IPC/HandleMessage.h:
+        (IPC::logMessageImpl): Reverted the change of r282177 to enable the logging.
+        (IPC::logReply): Ditto.
+        * Scripts/webkit/messages.py:
+        (generate_message_argument_description_implementation):
+        ENABLE(IPC_TESTING_API) isn't enabled for non-Cocoa ports yet.
+        Changed the condition.
+        * Scripts/webkit/tests/MessageArgumentDescriptions.cpp: Updated
+        this test expectation.
+
 2021-09-09  Alex Christensen  <achristensen@webkit.org>
 

trunk/Source/WebKit/Platform/IPC/HandleMessage.h

@@ -48 +48 @@
 constexpr unsigned loggingContainerSizeLimit = 200;
 
-#if !LOG_DISABLED && ENABLE(IPC_TESTING_API)
+#if !LOG_DISABLED
 enum class ForReply : bool { No, Yes };
 
@@ -74 +74 @@
 void logMessageImpl(const Connection& connection, MessageName messageName, const ArgsTuple& args, std::index_sequence<ArgsIndex...>)
 {
-#if !LOG_DISABLED && ENABLE(IPC_TESTING_API)
+#if !LOG_DISABLED
     auto stream = textStreamForLogging(connection, messageName, ForReply::No);
 
@@ -97 +97 @@
 void logReply(const Connection& connection, MessageName messageName, const T&... args)
 {
-#if !LOG_DISABLED && ENABLE(IPC_TESTING_API)
+#if !LOG_DISABLED
     if (!sizeof...(T))
         return;

trunk/Source/WebKit/Scripts/webkit/messages.py

@@ -1237 +1237 @@
     result.append('#include "MessageArgumentDescriptions.h"\n')
     result.append('\n')
-    result.append('#if ENABLE(IPC_TESTING_API)\n')
+    result.append('#if ENABLE(IPC_TESTING_API) || !LOG_DISABLED\n')
     result.append('\n')
     result.append('#include "JSIPCBinding.h"\n')
@@ -1258 +1258 @@
     result.append('namespace IPC {\n')
     result.append('\n')
+    result.append('#if ENABLE(IPC_TESTING_API)\n')
+    result.append('\n')
 
     generate_js_value_conversion_function(result, receivers, 'jsValueForArguments', 'Arguments')
@@ -1266 +1268 @@
 
     result.append('\n')
+    result.append('#endif // ENABLE(IPC_TESTING_API)\n')
+    result.append('\n')
 
     result += generate_js_argument_descriptions(receivers, 'messageArgumentDescriptions', lambda message: message.parameters)
@@ -1277 +1281 @@
     result.append('} // namespace WebKit\n')
     result.append('\n')
-    result.append('#endif\n')
+    result.append('#endif // ENABLE(IPC_TESTING_API) || !LOG_DISABLED\n')
     return ''.join(result)

trunk/Source/WebKit/Scripts/webkit/tests/MessageArgumentDescriptions.cpp

@@ -26 +26 @@
 #include "MessageArgumentDescriptions.h"
 
-#if ENABLE(IPC_TESTING_API)
+#if ENABLE(IPC_TESTING_API) || !LOG_DISABLED
 
 #include "JSIPCBinding.h"
@@ -132 +132 @@
 
 namespace IPC {
+
+#if ENABLE(IPC_TESTING_API)
 
 std::optional<JSC::JSValue> jsValueForArguments(JSC::JSGlobalObject* globalObject, MessageName name, Decoder& decoder)
@@ -349 +351 @@
 }
 
+#endif // ENABLE(IPC_TESTING_API)
+
 std::optional<Vector<ArgumentDescription>> messageArgumentDescriptions(MessageName name)
 {
@@ -711 +715 @@
 } // namespace WebKit
 
-#endif
+#endif // ENABLE(IPC_TESTING_API) || !LOG_DISABLED