Collect profiler stats from browser child processes.

content/common/child_thread.cc

 // Copyright (c) 2011 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.
 
 #include "content/common/child_thread.h"
 
+#include "base/bind.h"

[jam, 2011/11/28 15:17:34]

nit: not needed?

[ramant (doing other things), 2011/11/29 01:32:20]

Done.

+#include "base/command_line.h"
+#include "base/json/json_writer.h"

[jam, 2011/11/28 15:17:34]

nit: not needed

[ramant (doing other things), 2011/11/29 01:32:20]

Done.

 #include "base/message_loop.h"
+#include "base/process.h"
+#include "base/process_util.h"
 #include "base/string_util.h"
-#include "base/command_line.h"
+#include "base/tracked_objects.h"
 #include "content/common/child_process.h"
 #include "content/common/child_process_messages.h"
 #include "content/common/child_trace_message_filter.h"
 #include "content/common/file_system/file_system_dispatcher.h"
 #include "content/common/quota_dispatcher.h"
 #include "content/common/resource_dispatcher.h"
 #include "content/common/socket_stream_dispatcher.h"
 #include "content/public/common/content_switches.h"
 #include "ipc/ipc_logging.h"
 #include "ipc/ipc_sync_channel.h"
@@ skipping 156 matching lines @@
     return true;
 
   bool handled = true;
   IPC_BEGIN_MESSAGE_MAP(ChildThread, msg)
     IPC_MESSAGE_HANDLER(ChildProcessMsg_AskBeforeShutdown, OnAskBeforeShutdown)
     IPC_MESSAGE_HANDLER(ChildProcessMsg_Shutdown, OnShutdown)
 #if defined(IPC_MESSAGE_LOG_ENABLED)
     IPC_MESSAGE_HANDLER(ChildProcessMsg_SetIPCLoggingEnabled,
                         OnSetIPCLoggingEnabled)
 #endif
+    IPC_MESSAGE_HANDLER(ChildProcessMsg_SetProfilerStatus,
+                        OnSetProfilerStatus)
+    IPC_MESSAGE_HANDLER(ChildProcessMsg_GetChildProfilerData,
+                        OnGetChildProfilerData)
     IPC_MESSAGE_HANDLER(ChildProcessMsg_DumpHandles, OnDumpHandles)
     IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP()
 
   if (handled)
     return true;
 
   if (msg.routing_id() == MSG_ROUTING_CONTROL)
     return OnControlMessageReceived(msg);
 
@@ skipping 14 matching lines @@
 
 #if defined(IPC_MESSAGE_LOG_ENABLED)
 void ChildThread::OnSetIPCLoggingEnabled(bool enable) {
   if (enable)
     IPC::Logging::GetInstance()->Enable();
   else
     IPC::Logging::GetInstance()->Disable();
 }
 #endif  //  IPC_MESSAGE_LOG_ENABLED
 
+void ChildThread::OnSetProfilerStatus(bool enable) {
+  tracked_objects::ThreadData::InitializeAndSetTrackingStatus(enable);
+}
+
+void ChildThread::OnGetChildProfilerData(
+    int sequence_number,
+    const std::string& process_type) {
+  base::DictionaryValue* value = tracked_objects::ThreadData::ToValue();

[jam, 2011/11/28 15:17:34]

memory leak of value here 

[ramant (doing other things), 2011/11/29 01:32:20]

many many thanks for catching this (made the mistake when I converted to not use
json string).

Done.

+  value->SetString("process_type", process_type);
+  value->SetInteger("process_id", base::GetCurrentProcId());
+
+  Send(new ChildProcessHostMsg_ChildProfilerData(sequence_number, *value));
+}
+
 void ChildThread::OnDumpHandles() {
 #if defined(OS_WIN)
   scoped_refptr<content::HandleEnumerator> handle_enum(
       new content::HandleEnumerator(
           CommandLine::ForCurrentProcess()->HasSwitch(
               switches::kAuditAllHandles)));
   handle_enum->EnumerateHandles();
   Send(new ChildProcessHostMsg_DumpHandlesDone);
   return;
 #endif
@@ skipping 10 matching lines @@
     MessageLoop::current()->Quit();
     return;
   }
 
   // The child process shutdown sequence is a request response based mechanism,
   // where we send out an initial feeler request to the child process host
   // instance in the browser to verify if it's ok to shutdown the child process.
   // The browser then sends back a response if it's ok to shutdown.
   Send(new ChildProcessHostMsg_ShutdownRequest);
 }