[Mac] Replace the existing browser-child mach ipc with a long-lived listener ...

chrome/app/chrome_dll_main.cc

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // TODO(port): the ifdefs in here are a first step towards trying to determine
 // the correct abstraction for all the OS functionality required at this
 // stage of process initialization. It should not be taken as a final
 // abstraction.
 
 #include "build/build_config.h"
@@ skipping 62 matching lines @@
 #endif
 
 #if defined(OS_LINUX)
 #include "chrome/browser/renderer_host/render_sandbox_host_linux.h"
 #include "chrome/browser/zygote_host_linux.h"
 #endif
 
 #if defined(OS_MACOSX)
 #include "app/l10n_util_mac.h"
 #include "base/mac_util.h"
+#include "base/mach_ipc_mac.h"
+#include "chrome/app/breakpad_mac.h"
+#include "chrome/browser/mach_broker_mac.h"
 #include "chrome/common/chrome_paths_internal.h"
-#include "chrome/app/breakpad_mac.h"
 #include "grit/chromium_strings.h"
 #include "third_party/WebKit/WebKit/mac/WebCoreSupport/WebSystemInterface.h"
 #endif
 
 #if defined(OS_POSIX)
 #include "base/global_descriptors_posix.h"
 #endif
 
 #if defined(OS_WIN)
 #include "sandbox/src/sandbox.h"
@@ skipping 307 matching lines @@
   } else if (process_type == switches::kExtensionProcess) {
     name_id = IDS_WORKER_APP_NAME;
   } else if (process_type == switches::kUtilityProcess) {
     name_id = IDS_UTILITY_APP_NAME;
   }
   if (name_id) {
     NSString* app_name = l10n_util::GetNSString(name_id);
     mac_util::SetProcessName(reinterpret_cast<CFStringRef>(app_name));
   }
 }
+
+// Completes the Mach IPC handshake by sending this process' task port to the
+// parent process.  The parent is listening on the Mach port given by
+// |GetMachPortName()|.  The task port is used by the parent to get CPU/memory
+// stats to display in the task manager.
+void SendTaskPortToParentProcess() {
+  const mach_msg_timeout_t kTimeoutMs = 100;
+  const int32_t kMessageId = 0;
+  std::string mach_port_name = MachBroker::GetMachPortName();
+
+  base::MachSendMessage child_message(kMessageId);
+  if (!child_message.AddDescriptor(mach_task_self())) {
+    LOG(ERROR) << "child AddDescriptor(mach_task_self()) failed.";
+    return;
+  }
+
+  base::MachPortSender child_sender(mach_port_name.c_str());
+  kern_return_t err = child_sender.SendMessage(child_message, kTimeoutMs);
+  if (err != KERN_SUCCESS) {
+    LOG(ERROR) << StringPrintf("child SendMessage() failed: 0x%x %s", err,
+                               mach_error_string(err));
+  }
+}
 #endif  // defined(OS_MACOSX)
 
 void InitializeStatsTable(base::ProcessId browser_pid,
                           const CommandLine & parsed_command_line) {
   // Initialize the Stats Counters table.  With this initialized,
   // the StatsViewer can be utilized to read counters outside of
   // Chrome.  These lines can be commented out to effectively turn
   // counters 'off'.  The table is created and exists for the life
   // of the process.  It is not cleaned up.
   if (parsed_command_line.HasSwitch(switches::kEnableStatsTable) ||
@@ skipping 159 matching lines @@
 #if defined(OS_WIN)
     std::string channel_name =
         parsed_command_line.GetSwitchValueASCII(switches::kProcessChannelID);
 
     int browser_pid_int;
     base::StringToInt(channel_name, &browser_pid_int);
     browser_pid = static_cast<base::ProcessId>(browser_pid_int);
     DCHECK_NE(browser_pid, 0u);
 #elif defined(OS_MACOSX)
     browser_pid = base::GetCurrentProcId();
+    SendTaskPortToParentProcess();
 #elif defined(OS_POSIX)
     // On linux, we're in the zygote here; so we need the parent process' id.
     browser_pid = base::GetParentProcessId(base::GetCurrentProcId());
 #endif
 
 #if defined(OS_POSIX)
     // When you hit Ctrl-C in a terminal running the browser
     // process, a SIGINT is delivered to the entire process group.
     // When debugging the browser process via gdb, gdb catches the
     // SIGINT for the browser process (and dumps you back to the gdb
@@ skipping 335 matching lines @@
 
   logging::CleanupChromeLogging();
 
 #if defined(OS_MACOSX) && defined(GOOGLE_CHROME_BUILD)
   // TODO(mark): See the TODO(mark) above at InitCrashReporter.
   DestructCrashReporter();
 #endif  // OS_MACOSX && GOOGLE_CHROME_BUILD
 
   return rv;
 }