summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorthakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-01-13 03:28:24 +0000
committerthakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-01-13 03:28:24 +0000
commitc2512ebf137db36ae11811813554c02602e73b3e (patch)
tree279e54c2e7f87e2dc53835900c716f91f9f52e65
parent15be81387f3ab40242d28f3ee53adc3d6a1fac1c (diff)
downloadchromium_src-c2512ebf137db36ae11811813554c02602e73b3e.zip
chromium_src-c2512ebf137db36ae11811813554c02602e73b3e.tar.gz
chromium_src-c2512ebf137db36ae11811813554c02602e73b3e.tar.bz2
Mac: Remove some unneccesary IPC from fork_and_get_task.
This was a left-over from the previous swap-bootstrap-port-based approach. BUG=13156 TEST=Open task manager. Should still work. Review URL: http://codereview.chromium.org/551004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@36088 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--base/process_util_posix.cc45
1 files changed, 0 insertions, 45 deletions
diff --git a/base/process_util_posix.cc b/base/process_util_posix.cc
index a771fa2..d92a4fa 100644
--- a/base/process_util_posix.cc
+++ b/base/process_util_posix.cc
@@ -312,19 +312,11 @@ static pid_t fork_and_get_task(task_t* child_task) {
case -1:
return pid;
case 0: { // child
- ReceivePort child_recv_port;
-
MachSendMessage child_message(/* id= */0);
if (!child_message.AddDescriptor(mach_task_self())) {
LOG(ERROR) << "child AddDescriptor(mach_task_self()) failed.";
return pid;
}
- mach_port_t raw_child_recv_port = child_recv_port.GetPort();
- if (!child_message.AddDescriptor(raw_child_recv_port)) {
- LOG(ERROR) << "child AddDescriptor(" << raw_child_recv_port
- << ") failed.";
- return pid;
- }
MachPortSender child_sender(mach_connection_name.c_str());
err = child_sender.SendMessage(child_message, kTimeoutMs);
@@ -332,25 +324,6 @@ static pid_t fork_and_get_task(task_t* child_task) {
LOG(ERROR) << "child SendMessage() failed: " << MachErrorCode(err);
return pid;
}
-
- MachReceiveMessage parent_message;
- err = child_recv_port.WaitForMessage(&parent_message, kTimeoutMs);
- if (err != KERN_SUCCESS) {
- LOG(ERROR) << "child WaitForMessage() failed: " << MachErrorCode(err);
- return pid;
- }
-
- if (parent_message.GetTranslatedPort(0) == MACH_PORT_NULL) {
- LOG(ERROR) << "child GetTranslatedPort(0) failed.";
- return pid;
- }
- err = task_set_bootstrap_port(mach_task_self(),
- parent_message.GetTranslatedPort(0));
- if (err != KERN_SUCCESS) {
- LOG(ERROR) << "child task_set_bootstrap_port() failed: "
- << MachErrorCode(err);
- return pid;
- }
break;
}
default: { // parent
@@ -366,24 +339,6 @@ static pid_t fork_and_get_task(task_t* child_task) {
return pid;
}
*child_task = child_message.GetTranslatedPort(0);
-
- if (child_message.GetTranslatedPort(1) == MACH_PORT_NULL) {
- LOG(ERROR) << "parent GetTranslatedPort(1) failed.";
- return pid;
- }
- MachPortSender parent_sender(child_message.GetTranslatedPort(1));
-
- MachSendMessage parent_message(/* id= */0);
- if (!parent_message.AddDescriptor(bootstrap_port)) {
- LOG(ERROR) << "parent AddDescriptor(" << bootstrap_port << ") failed.";
- return pid;
- }
-
- err = parent_sender.SendMessage(parent_message, kTimeoutMs);
- if (err != KERN_SUCCESS) {
- LOG(ERROR) << "parent SendMessage() failed: " << MachErrorCode(err);
- return pid;
- }
break;
}
}