Changeset 268570 in webkit

Timestamp:

Oct 15, 2020 6:45:03 PM (4 years ago)

Author:

ddkilzer@apple.com

Message:

v2: WebKit::XPCServiceEventHandler block should call exit() on the main thread
<​https://webkit.org/b/217773>
<rdar://problem/70275659>

Reviewed by Geoff Garen.

• Shared/EntryPointUtilities/Cocoa/XPCService/XPCServiceMain.mm:

(WebKit::XPCServiceEventHandler):

• Use NSRunLoop instead of libdispatch to run code on the main thread since libdispatch can randomly pick a new main thread when exit() is called on the original main thread.

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• Shared/EntryPointUtilities/Cocoa/XPCService/XPCServiceMain.mm (modified) (2 diffs)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2020-10-15  David Kilzer  <ddkilzer@apple.com>
+
+        v2: WebKit::XPCServiceEventHandler block should call exit() on the main thread
+        <https://webkit.org/b/217773>
+        <rdar://problem/70275659>
+
+        Reviewed by Geoff Garen.
+
+        * Shared/EntryPointUtilities/Cocoa/XPCService/XPCServiceMain.mm:
+        (WebKit::XPCServiceEventHandler):
+        - Use NSRunLoop instead of libdispatch to run code on the main
+          thread since libdispatch can randomly pick a new main thread when
+          exit() is called on the original main thread.
+
 2020-10-15  Tim Horton  <timothy_horton@apple.com>
 

trunk/Source/WebKit/Shared/EntryPointUtilities/Cocoa/XPCService/XPCServiceMain.mm

@@ -51 +51 @@
                 RELEASE_LOG_FAULT(IPC, "Exiting: Received XPC event type: %s", event == XPC_ERROR_CONNECTION_INVALID ? "XPC_ERROR_CONNECTION_INVALID" : "XPC_ERROR_TERMINATION_IMMINENT");
                 // FIXME: Handle this case more gracefully.
-                dispatch_sync(dispatch_get_main_queue(), ^{
+                [[NSRunLoop mainRunLoop] performBlock:^{
                     exit(EXIT_FAILURE);
-                });
+                }];
             }
         } else {
@@ -78 +78 @@
                 if (!initializerFunctionPtr) {
                     RELEASE_LOG_FAULT(IPC, "Exiting: Unable to find entry point in WebKit.framework with name: %s", [(__bridge NSString *)entryPointFunctionName UTF8String]);
-                    dispatch_sync(dispatch_get_main_queue(), ^{
+                    [[NSRunLoop mainRunLoop] performBlock:^{
                         exit(EXIT_FAILURE);
-                    });
+                    }];
                 }