Changeset 284823 in webkit

Timestamp:

Oct 25, 2021, 2:33:50 PM (5 years ago)

Author:

achristensen@apple.com

Message:

Use xpc_connection_copy_invalidation_reason where available for debugging daemon connection failures
​https://bugs.webkit.org/show_bug.cgi?id=232152

Reviewed by Brady Eidson.

Source/WebKit:

• Platform/IPC/cocoa/DaemonConnectionCocoa.mm:

(WebKit::Daemon::ConnectionToMachService<Traits>::initializeConnectionIfNeeded const):

• Shared/Daemon/DaemonUtilities.mm:

(WebKit::startListeningForMachServiceConnections):

Source/WTF:

• wtf/PlatformHave.h:
• wtf/spi/darwin/XPCSPI.h:

Location:

trunk/Source

Files:

• WTF/ChangeLog (modified) (1 diff)
• WTF/wtf/PlatformHave.h (modified) (1 diff)
• WTF/wtf/spi/darwin/XPCSPI.h (modified) (1 diff)
• WebKit/ChangeLog (modified) (1 diff)
• WebKit/Platform/IPC/cocoa/DaemonConnectionCocoa.mm (modified) (1 diff)
• WebKit/Shared/Daemon/DaemonUtilities.mm (modified) (1 diff)

trunk/Source/WTF/ChangeLog

@@ +1 @@
+2021-10-25  Alex Christensen  <achristensen@webkit.org>
+
+        Use xpc_connection_copy_invalidation_reason where available for debugging daemon connection failures
+        https://bugs.webkit.org/show_bug.cgi?id=232152
+
+        Reviewed by Brady Eidson.
+
+        * wtf/PlatformHave.h:
+        * wtf/spi/darwin/XPCSPI.h:
+
 2021-10-25  Ayumi Kojima  <ayumi_kojima@apple.com>
 

trunk/Source/WTF/wtf/PlatformHave.h

@@ -950 +950 @@
 #define HAVE_AUDIO_OBJECT_PROPERTY_ELEMENT_MAIN 1
 #define HAVE_IMAGE_RESTRICTED_DECODING 1
+#define HAVE_XPC_CONNECTION_COPY_INVALIDATION_REASON 1
 #endif
 

trunk/Source/WTF/wtf/spi/darwin/XPCSPI.h

@@ -138 +138 @@
 extern "C" const char * const XPC_ACTIVITY_RANDOM_INITIAL_DELAY;
 extern "C" const char * const XPC_ACTIVITY_REQUIRE_NETWORK_CONNECTIVITY;
+
+#if HAVE(XPC_CONNECTION_COPY_INVALIDATION_REASON)
+extern "C" char * xpc_connection_copy_invalidation_reason(xpc_connection_t connection);
+#endif
 
 #if OS_OBJECT_USE_OBJC

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2021-10-25  Alex Christensen  <achristensen@webkit.org>
+
+        Use xpc_connection_copy_invalidation_reason where available for debugging daemon connection failures
+        https://bugs.webkit.org/show_bug.cgi?id=232152
+
+        Reviewed by Brady Eidson.
+
+        * Platform/IPC/cocoa/DaemonConnectionCocoa.mm:
+        (WebKit::Daemon::ConnectionToMachService<Traits>::initializeConnectionIfNeeded const):
+        * Shared/Daemon/DaemonUtilities.mm:
+        (WebKit::startListeningForMachServiceConnections):
+
 2021-10-25  Kate Cheney  <katherine_cheney@apple.com>
 

trunk/Source/WebKit/Platform/IPC/cocoa/DaemonConnectionCocoa.mm

@@ -64 +64 @@
         if (!weakThis)
             return;
-        if (event == XPC_ERROR_CONNECTION_INVALID)
+        if (event == XPC_ERROR_CONNECTION_INVALID) {
+#if HAVE(XPC_CONNECTION_COPY_INVALIDATION_REASON)
+            auto reason = std::unique_ptr<char[]>(xpc_connection_copy_invalidation_reason(weakThis->m_connection.get()));
+            WTFLogAlways("Failed to connect to mach service %s, reason: %s", weakThis->m_machServiceName.data(), reason.get());
+#else
             WTFLogAlways("Failed to connect to mach service %s, likely because it is not registered with launchd", weakThis->m_machServiceName.data());
+#endif
+        }
         if (event == XPC_ERROR_CONNECTION_INTERRUPTED) {
             // Daemon crashed, we will need to make a new connection to a new instance of the daemon.

trunk/Source/WebKit/Shared/Daemon/DaemonUtilities.mm

@@ -48 +48 @@
 
         xpc_connection_set_event_handler(peer, ^(xpc_object_t event) {
-            if (event == XPC_ERROR_CONNECTION_INVALID)
+            if (event == XPC_ERROR_CONNECTION_INVALID) {
+#if HAVE(XPC_CONNECTION_COPY_INVALIDATION_REASON)
+                auto reason = std::unique_ptr<char[]>(xpc_connection_copy_invalidation_reason(peer));
+                NSLog(@"Failed to start listening for connections to mach service %s, reason: %s", serviceName, reason.get());
+#else
                 NSLog(@"Failed to start listening for connections to mach service %s, likely because it is not registered with launchd", serviceName);
+#endif
+            }
             if (event == XPC_ERROR_CONNECTION_INTERRUPTED) {
                 NSLog(@"Removing peer connection %p", peer);