Changeset 268838 in webkit

Timestamp:

Oct 21, 2020, 3:16:08 PM (6 years ago)

Author:

Alan Coon

Message:

Cherry-pick r268570. rdar://problem/70541887

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.

git-svn-id: ​https://svn.webkit.org/repository/webkit/trunk@268570 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Location:

branches/safari-610-branch/Source/WebKit

Files:

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

branches/safari-610-branch/Source/WebKit/ChangeLog

@@ +1 @@
+2020-10-21  Russell Epstein  <repstein@apple.com>
+
+        Cherry-pick r268570. rdar://problem/70541887
+
+    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.
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@268570 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    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-21  Russell Epstein  <repstein@apple.com>
 

branches/safari-610-branch/Source/WebKit/Shared/EntryPointUtilities/Cocoa/XPCService/XPCServiceMain.mm

@@ -49 +49 @@
             if (event == XPC_ERROR_CONNECTION_INVALID || event == XPC_ERROR_TERMINATION_IMMINENT) {
                 // FIXME: Handle this case more gracefully.
-                exit(EXIT_FAILURE);
+                [[NSRunLoop mainRunLoop] performBlock:^{
+                    exit(EXIT_FAILURE);
+                }];
             }
         } else {
@@ -74 +76 @@
                 if (!initializerFunctionPtr) {
                     NSLog(@"Unable to find entry point in WebKit.framework with name: %@", (__bridge NSString *)entryPointFunctionName);
-                    exit(EXIT_FAILURE);
+                    [[NSRunLoop mainRunLoop] performBlock:^{
+                        exit(EXIT_FAILURE);
+                    }];
                 }