Changeset 179732 in webkit

Timestamp:

Feb 5, 2015 5:24:25 PM (9 years ago)

Author:

ap@apple.com

Message:

Don't pass architecture to development plug-in XPC services
​https://bugs.webkit.org/show_bug.cgi?id=141309

Reviewed by Anders Carlsson.

We now have separate services for 32-bit and 64-bit.

• Shared/EntryPointUtilities/mac/XPCService/XPCServiceMain.Development.mm:

(WebKit::reexec):
(WebKit::XPCServiceEventHandler):

• UIProcess/Launcher/mac/ProcessLauncherMac.mm:

(WebKit::connectToReExecService):

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• Shared/EntryPointUtilities/mac/XPCService/XPCServiceMain.Development.mm (modified) (3 diffs)
• UIProcess/Launcher/mac/ProcessLauncherMac.mm (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2015-02-05  Alexey Proskuryakov  <ap@apple.com>
+
+        Don't pass architecture to development plug-in XPC services
+        https://bugs.webkit.org/show_bug.cgi?id=141309
+
+        Reviewed by Anders Carlsson.
+
+        We now have separate services for 32-bit and 64-bit.
+
+        * Shared/EntryPointUtilities/mac/XPCService/XPCServiceMain.Development.mm:
+        (WebKit::reexec):
+        (WebKit::XPCServiceEventHandler):
+        * UIProcess/Launcher/mac/ProcessLauncherMac.mm:
+        (WebKit::connectToReExecService):
+
 2015-02-05  Chris Dumez  <cdumez@apple.com>
 

trunk/Source/WebKit2/Shared/EntryPointUtilities/mac/XPCService/XPCServiceMain.Development.mm

@@ -40 +40 @@
     bool executableHeap;
     char** environment;
-    cpu_type_t cpuType;
 };
 
@@ -65 +64 @@
 
     posix_spawnattr_setflags(&attr, flags);
-
-    size_t outCount = 0;
-    posix_spawnattr_setbinpref_np(&attr, 1, &info->cpuType, &outCount);
 
     char path[4 * PATH_MAX];
@@ -108 +104 @@
 
                 info->executableHeap = xpc_dictionary_get_bool(event, "executable-heap");
-                info->cpuType = (cpu_type_t)xpc_dictionary_get_uint64(event, "architecture");
 
                 xpc_object_t environmentArray = xpc_dictionary_get_value(event, "environment");

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

@@ -346 +346 @@
     xpc_dictionary_set_string(reExecMessage, "message-name", "re-exec");
 
-    cpu_type_t architecture = launchOptions.architecture == ProcessLauncher::LaunchOptions::MatchCurrentArchitecture ? _NSGetMachExecuteHeader()->cputype : launchOptions.architecture;
-    xpc_dictionary_set_uint64(reExecMessage, "architecture", (uint64_t)architecture);
-    
     xpc_object_t environment = xpc_array_create(0, 0);
     char** environmentPointer = environmentVariables.environmentPointer();