Changeset 243528 in webkit

Timestamp:

Mar 26, 2019, 4:54:11 PM (7 years ago)

Author:

Chris Dumez

Message:

[macOS] The network process is not exiting reliably when the WebProcessPool is destroyed
​https://bugs.webkit.org/show_bug.cgi?id=196277
<rdar://problem/49127581>

Reviewed by Alex Christensen.

When, an AuxiliaryProcess receives the AuxiliaryProcess::Terminate IPC, it calls stopRunLoop()
to exit. WebProcess overrides AuxiliaryProcess::stopRunLoop() to call exit(0) on the main
thread. Other auxiliary processes such as the NetworkProcess would end up calling
platformStopRunLoop(). On iOS and iOSMac, platformStopRunLoop() calls XPCServiceExit(), which
makes sense since auxiliary processes run their run loop by calling xpc_main(). However, on
macOS, platformStopRunLoop() was calling RunLoop::main().stop() to exit instead, which was
unreliable as demonstrated by the test app attached to the radar.

Updating platformStopRunLoop() to call XPCServiceExit() on macOS fixes the problem and I now
see the NetworkProcess exiting reliably there. This is the approach I have chosen in this
patch since it appears to be reliable and it makes the code consistent on all Cocoa platforms.

• Shared/AuxiliaryProcess.cpp:
• Shared/Cocoa/AuxiliaryProcessCocoa.mm:

(WebKit::AuxiliaryProcess::platformStopRunLoop):

• Shared/ios/AuxiliaryProcessIOS.mm:

(WebKit::AuxiliaryProcess::platformStopRunLoop): Deleted.

• Shared/mac/AuxiliaryProcessMac.mm:

(WebKit::AuxiliaryProcess::platformStopRunLoop): Deleted.

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• Shared/AuxiliaryProcess.cpp (modified) (1 diff)
• Shared/Cocoa/AuxiliaryProcessCocoa.mm (modified) (2 diffs)
• Shared/ios/AuxiliaryProcessIOS.mm (modified) (1 diff)
• Shared/mac/AuxiliaryProcessMac.mm (modified) (1 diff)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2019-03-26  Chris Dumez  <cdumez@apple.com>
+
+        [macOS] The network process is not exiting reliably when the WebProcessPool is destroyed
+        https://bugs.webkit.org/show_bug.cgi?id=196277
+        <rdar://problem/49127581>
+
+        Reviewed by Alex Christensen.
+
+        When, an AuxiliaryProcess receives the AuxiliaryProcess::Terminate IPC, it calls stopRunLoop()
+        to exit. WebProcess overrides AuxiliaryProcess::stopRunLoop() to call exit(0) on the main
+        thread. Other auxiliary processes such as the NetworkProcess would end up calling
+        platformStopRunLoop(). On iOS and iOSMac, platformStopRunLoop() calls XPCServiceExit(), which
+        makes sense since auxiliary processes run their run loop by calling xpc_main(). However, on
+        macOS, platformStopRunLoop() was calling RunLoop::main().stop() to exit instead, which was
+        unreliable as demonstrated by the test app attached to the radar.
+
+        Updating platformStopRunLoop() to call XPCServiceExit() on macOS fixes the problem and I now
+        see the NetworkProcess exiting reliably there. This is the approach I have chosen in this
+        patch since it appears to be reliable and it makes the code consistent on all Cocoa platforms.
+
+        * Shared/AuxiliaryProcess.cpp:
+        * Shared/Cocoa/AuxiliaryProcessCocoa.mm:
+        (WebKit::AuxiliaryProcess::platformStopRunLoop):
+        * Shared/ios/AuxiliaryProcessIOS.mm:
+        (WebKit::AuxiliaryProcess::platformStopRunLoop): Deleted.
+        * Shared/mac/AuxiliaryProcessMac.mm:
+        (WebKit::AuxiliaryProcess::platformStopRunLoop): Deleted.
+
 2019-03-26  Keith Rollin  <krollin@apple.com>
 

trunk/Source/WebKit/Shared/AuxiliaryProcess.cpp

@@ -175 +175 @@
 }
 
-#if !PLATFORM(IOS_FAMILY)
+#if !PLATFORM(COCOA)
 void AuxiliaryProcess::platformStopRunLoop()
 {

trunk/Source/WebKit/Shared/Cocoa/AuxiliaryProcessCocoa.mm

@@ -28 +28 @@
 
 #import "WKCrashReporter.h"
+#import "XPCServiceEntryPoint.h"
 #import <wtf/cocoa/Entitlements.h>
 
@@ -43 +44 @@
 }
 
+void AuxiliaryProcess::platformStopRunLoop()
+{
+    XPCServiceExit(WTFMove(m_priorityBoostMessage));
 }
+
+}

trunk/Source/WebKit/Shared/ios/AuxiliaryProcessIOS.mm

@@ -114 +114 @@
 }
 
-void AuxiliaryProcess::platformStopRunLoop()
-{
-    XPCServiceExit(WTFMove(m_priorityBoostMessage));
-}
-
 } // namespace WebKit
 

trunk/Source/WebKit/Shared/mac/AuxiliaryProcessMac.mm

@@ -696 +696 @@
 #endif
 
-#if PLATFORM(IOSMAC)
-void AuxiliaryProcess::platformStopRunLoop()
-{
-    XPCServiceExit(WTFMove(m_priorityBoostMessage));
-}
-#endif
-
 void AuxiliaryProcess::setQOS(int latencyQOS, int throughputQOS)
 {