Changeset 63917 in webkit

Timestamp:

Jul 22, 2010 3:18:50 PM (14 years ago)

Author:

andersca@apple.com

Message:

It should be possible to attach to the WebProcess in gdb during startup
​https://bugs.webkit.org/show_bug.cgi?id=42853

Reviewed by Adam Roben.

Create an unique bootstrap service name and pass it to the web process, instead of registering a per process
name (which was incorrect anyway). This lets us get rid of the requirement that the UI process always should be
the parent process of the web process, something which is false when running under the debugger.

• UIProcess/Launcher/mac/ProcessLauncherMac.mm:

(WebKit::ProcessLauncher::launchProcess):

• WebProcess/mac/WebProcessMainMac.mm:

(WebKit::WebProcessMain):

Location:

trunk/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/Launcher/mac/ProcessLauncherMac.mm (modified) (3 diffs)
• WebProcess/mac/WebProcessMainMac.mm (modified) (3 diffs)

trunk/WebKit2/ChangeLog

@@ +1 @@
+2010-07-22  Anders Carlsson  <andersca@apple.com>
+
+        Reviewed by Adam Roben.
+
+        It should be possible to attach to the WebProcess in gdb during startup
+        https://bugs.webkit.org/show_bug.cgi?id=42853
+
+        Create an unique bootstrap service name and pass it to the web process, instead of registering a per process
+        name (which was incorrect anyway). This lets us get rid of the requirement that the UI process always should be
+        the parent process of the web process, something which is false when running under the debugger.
+
+        * UIProcess/Launcher/mac/ProcessLauncherMac.mm:
+        (WebKit::ProcessLauncher::launchProcess):
+        * WebProcess/mac/WebProcessMainMac.mm:
+        (WebKit::WebProcessMain):
+
 2010-07-22  Anders Carlsson  <andersca@apple.com>
 

trunk/WebKit2/UIProcess/Launcher/mac/ProcessLauncherMac.mm

@@ -29 +29 @@
 #include "WebProcess.h"
 #include "WebSystemInterface.h"
-
+#include <WebCore/PlatformString.h>
 #include <crt_externs.h>
 #include <runtime/InitializeThreading.h>
@@ -36 +36 @@
 #include <wtf/PassRefPtr.h>
 #include <wtf/Threading.h>
+#include <wtf/text/CString.h>
+
+using namespace WebCore;
 
 // FIXME: We should be doing this another way.
@@ -54 +57 @@
     NSString *webProcessAppExecutablePath = [[NSBundle bundleWithPath:webProcessAppPath] executablePath];
 
+    // Make a unique, per pid, per process launcher web process service name.
+    CString serviceName = String::format("com.apple.WebKit.WebProcess-%d-%p", getpid(), this).utf8();
+
     const char* path = [webProcessAppExecutablePath fileSystemRepresentation];
-    const char* args[] = { path, "-mode", "legacywebprocess", 0 };
+    const char* args[] = { path, "-mode", "legacywebprocess", "-servicename", serviceName.data(), 0 };
 
     // Register ourselves.
-    kern_return_t kr = bootstrap_register2(bootstrap_port, (char*)"com.apple.WebKit.WebProcess", listeningPort, /* BOOTSTRAP_PER_PID_SERVICE */ 1);
+    kern_return_t kr = bootstrap_register2(bootstrap_port, const_cast<char*>(serviceName.data()), listeningPort, 0);
     if (kr)
         NSLog(@"bootstrap_register2 result: %x", kr);

trunk/WebKit2/WebProcess/mac/WebProcessMainMac.mm

@@ -39 +39 @@
 #import <unistd.h>
 #import <wtf/Threading.h>
+#import <wtf/text/CString.h>
 
 #if ENABLE(WEB_PROCESS_SANDBOX)
@@ -53 +54 @@
 namespace WebKit {
 
-int WebProcessMain(CommandLine*)
+int WebProcessMain(CommandLine* commandLine)
 {
     NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
@@ -69 +70 @@
 #endif
 
+    String serviceName = (*commandLine)["servicename"];
+    if (serviceName.isEmpty())
+        return EXIT_FAILURE;
+
+    // Get the server port.
     mach_port_t serverPort;
-    kern_return_t kr = bootstrap_look_up2(bootstrap_port, "com.apple.WebKit.WebProcess", &serverPort, getppid(), /* BOOTSTRAP_PER_PID_SERVICE */ 1);
+    kern_return_t kr = bootstrap_look_up2(bootstrap_port, serviceName.utf8().data(), &serverPort, 0, 0);
     if (kr) {
         printf("bootstrap_look_up2 result: %x", kr);