Trace_event upgrades

chrome/renderer/render_thread.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.
 
 #include "chrome/renderer/render_thread.h"
 
 #include <algorithm>
 #include <limits>
 #include <map>
 #include <vector>
@@ skipping 212 matching lines @@
 RenderThread::RenderThread() {
   Init();
 }
 
 RenderThread::RenderThread(const std::string& channel_name)
     : ChildThread(channel_name) {
   Init();
 }
 
 void RenderThread::Init() {
-  TRACE_EVENT_BEGIN("RenderThread::Init", 0, "");
+  // Forward GPU trace data unless we are in single-process mode.

[Ken Russell (switch to Gerrit), 2011/02/25 00:56:36]

I'd avoid the reference to the GPU here -- the tracing mechanism is general.

+  if (!CommandLine::ForCurrentProcess()->HasSwitch(switches::kSingleProcess))
+    base::debug::TraceLog::GetInstance()->SetOutputCallback(NewCallback(this,
+        &RenderThread::OnTraceDataCollected));
+
+  TRACE_EVENT_BEGIN_LEGACY("RenderThread::Init", 0, "");
 
   lazy_tls.Pointer()->Set(this);
 #if defined(OS_WIN)
   // If you are running plugins in this thread you need COM active but in
   // the normal case you don't.
   if (RenderProcessImpl::InProcessPlugins())
     CoInitialize(0);
 #endif
 
   std::string type_str = CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
@@ skipping 28 matching lines @@
   AddFilter(db_message_filter_.get());
 
   cookie_message_filter_ = new CookieMessageFilter();
   AddFilter(cookie_message_filter_.get());
 
 #if defined(OS_POSIX)
   suicide_on_channel_error_filter_ = new SuicideOnChannelErrorFilter;
   AddFilter(suicide_on_channel_error_filter_.get());
 #endif
 
-  TRACE_EVENT_END("RenderThread::Init", 0, "");
+  TRACE_EVENT_END_LEGACY("RenderThread::Init", 0, "");
 }
 
 RenderThread::~RenderThread() {
   // Wait for all databases to be closed.
   if (web_database_observer_impl_.get())
     web_database_observer_impl_->WaitForAllDatabasesToClose();
 
   // Shutdown in reverse of the initialization order.
   RemoveFilter(db_message_filter_.get());
   db_message_filter_ = NULL;
   RemoveFilter(devtools_agent_filter_.get());
 
   // Shutdown the file thread if it's running.
   if (file_thread_.get())
     file_thread_->Stop();
 
   if (webkit_client_.get())
     WebKit::shutdown();
 
   lazy_tls.Pointer()->Set(NULL);
 
+  // Clean up GPU_TRACE

[Ken Russell (switch to Gerrit), 2011/02/25 00:56:36]

Remove apparently obsolete comment.

+  if (!CommandLine::ForCurrentProcess()->HasSwitch(switches::kSingleProcess))
+    base::debug::TraceLog::GetInstance()->SetOutputCallback(NULL);
+
   // TODO(port)
 #if defined(OS_WIN)
   // Clean up plugin channels before this thread goes away.
   PluginChannelBase::CleanupChannels();
   // Don't call COM if the renderer is in the sandbox.
   if (RenderProcessImpl::InProcessPlugins())
     CoUninitialize();
 #endif
 }
 
@@ skipping 323 matching lines @@
     IPC_MESSAGE_HANDLER(ViewMsg_SetIPCLoggingEnabled,
                         OnSetIPCLoggingEnabled)
 #endif
     IPC_MESSAGE_HANDLER(ViewMsg_SpellChecker_Init,
                         OnInitSpellChecker)
     IPC_MESSAGE_HANDLER(ViewMsg_SpellChecker_WordAdded,
                         OnSpellCheckWordAdded)
     IPC_MESSAGE_HANDLER(ViewMsg_SpellChecker_EnableAutoSpellCorrect,
                         OnSpellCheckEnableAutoSpellCorrect)
     IPC_MESSAGE_HANDLER(ViewMsg_GpuChannelEstablished, OnGpuChannelEstablished)
+    IPC_MESSAGE_HANDLER(ViewMsg_SetTraceEnabled, OnSetTraceEnabled)
     IPC_MESSAGE_HANDLER(ViewMsg_SetPhishingModel, OnSetPhishingModel)
     IPC_MESSAGE_HANDLER(ViewMsg_SpeechInput_SetFeatureEnabled,
                         OnSetSpeechInputEnabled)
     IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP()
   return handled;
 }
 
 void RenderThread::OnSetSpeechInputEnabled(bool enabled) {
   DCHECK(!webkit_client_.get());
@@ skipping 433 matching lines @@
 
   if (channel_handle.name.size() != 0) {
     // Connect to the GPU process if a channel name was received.
     gpu_channel_->Connect(channel_handle);
   } else {
     // Otherwise cancel the connection.
     gpu_channel_ = NULL;
   }
 }
 
+void RenderThread::OnTraceDataCollected(const std::string& json_events) {
+  Send(new ViewHostMsg_TraceDataCollectedRemotely(json_events));
+}
+
+void RenderThread::OnSetTraceEnabled(bool enabled) {
+  base::debug::TraceLog::GetInstance()->SetEnabled(enabled);
+  if (!enabled) {
+    std::string json_complete("['TRACE_ENDED']");
+    Send(new ViewHostMsg_TraceDataCollectedRemotely(json_complete));
+  }
+}
+
 void RenderThread::OnSetPhishingModel(IPC::PlatformFileForTransit model_file) {
   safe_browsing::PhishingClassifierDelegate::SetPhishingModel(model_file);
 }
 
 scoped_refptr<base::MessageLoopProxy>
 RenderThread::GetFileThreadMessageLoopProxy() {
   DCHECK(message_loop() == MessageLoop::current());
   if (!file_thread_.get()) {
     file_thread_.reset(new base::Thread("Renderer::FILE"));
     file_thread_->Start();
@@ skipping 21 matching lines @@
   }
 
   return false;
 }
 
 void RenderThread::RegisterExtension(v8::Extension* extension,
                                      bool restrict_to_extensions) {
   WebScriptController::registerExtension(extension);
   v8_extensions_[extension->name()] = restrict_to_extensions;
 }