Trace_event upgrades

chrome/gpu/gpu_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/gpu/gpu_thread.h"
 
 #include <string>
 #include <vector>
 
 #include "app/gfx/gl/gl_context.h"
 #include "app/gfx/gl/gl_implementation.h"
 #include "app/win/scoped_com_initializer.h"
 #include "base/command_line.h"
+#include "base/debug/trace_event.h"
 #include "base/threading/worker_pool.h"
 #include "build/build_config.h"
 #include "chrome/common/child_process.h"
 #include "chrome/common/child_process_logging.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/gpu_messages.h"
 #include "chrome/gpu/gpu_info_collector.h"
 #include "chrome/gpu/gpu_watchdog_thread.h"
 #include "ipc/ipc_channel_handle.h"
 
@@ skipping 21 matching lines @@
 }  // namespace
 
 GpuThread::GpuThread() {
 }
 
 GpuThread::GpuThread(const std::string& channel_id)
     : ChildThread(channel_id) {
 }
 
 GpuThread::~GpuThread() {
-  logging::SetLogMessageHandler(NULL);
+  bool single_process = CommandLine::ForCurrentProcess()->HasSwitch(
+      switches::kSingleProcess);
+  if (!single_process) {
+    logging::SetLogMessageHandler(NULL);
+    base::debug::TraceLog::GetInstance()->SetOutputCallback(NULL);
+  }
 }
 
 void GpuThread::Init(const base::Time& process_start_time) {
   process_start_time_ = process_start_time;
 }
 
 void GpuThread::RemoveChannel(int renderer_id) {
   gpu_channels_.erase(renderer_id);
 }
 
 bool GpuThread::OnControlMessageReceived(const IPC::Message& msg) {
   bool msg_is_ok = true;
   bool handled = true;
   IPC_BEGIN_MESSAGE_MAP_EX(GpuThread, msg, msg_is_ok)
     IPC_MESSAGE_HANDLER(GpuMsg_Initialize, OnInitialize)
     IPC_MESSAGE_HANDLER(GpuMsg_EstablishChannel, OnEstablishChannel)
     IPC_MESSAGE_HANDLER(GpuMsg_CloseChannel, OnCloseChannel)
     IPC_MESSAGE_HANDLER(GpuMsg_CreateViewCommandBuffer,
                         OnCreateViewCommandBuffer);
     IPC_MESSAGE_HANDLER(GpuMsg_Synchronize, OnSynchronize)
     IPC_MESSAGE_HANDLER(GpuMsg_CollectGraphicsInfo, OnCollectGraphicsInfo)
+    IPC_MESSAGE_HANDLER(GpuMsg_SetTraceEnabled,
+                        OnSetTraceEnabled)
 #if defined(OS_MACOSX)
     IPC_MESSAGE_HANDLER(GpuMsg_AcceleratedSurfaceBuffersSwappedACK,
                         OnAcceleratedSurfaceBuffersSwappedACK)
     IPC_MESSAGE_HANDLER(GpuMsg_DidDestroyAcceleratedSurface,
                         OnDidDestroyAcceleratedSurface)
 #endif
     IPC_MESSAGE_HANDLER(GpuMsg_Crash, OnCrash)
     IPC_MESSAGE_HANDLER(GpuMsg_Hang, OnHang)
     IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP_EX()
   return handled;
 }
 
 namespace {
 
 bool GpuProcessLogMessageHandler(int severity,
                                  const char* file, int line,
                                  size_t message_start,
                                  const std::string& str) {
   std::string header = str.substr(0, message_start);
   std::string message = str.substr(message_start);
   ChildThread::current()->Send(
       new GpuHostMsg_OnLogMessage(severity, header, message));
   return false;
 }
 
 }  // namespace
 
 void GpuThread::OnInitialize() {
-  // Redirect LOG messages to the GpuProcessHost
+
   bool single_process = CommandLine::ForCurrentProcess()->HasSwitch(
       switches::kSingleProcess);
-  if (!single_process)
+  if (!single_process) {
+    // Redirect LOG messages to the GpuProcessHost
     logging::SetLogMessageHandler(GpuProcessLogMessageHandler);
 
+    // Forward trace data
+    base::debug::TraceLog::GetInstance()->SetOutputCallback(NewCallback(this,
+        &GpuThread::OnTraceDataCollected));
+  }
+
   // Load the GL implementation and locate the bindings before starting the GPU
   // watchdog because this can take a lot of time and the GPU watchdog might
   // terminate the GPU process.
   if (!gfx::GLContext::InitializeOneOff()) {
     LOG(INFO) << "GLContext::InitializeOneOff failed";
     MessageLoop::current()->Quit();
     return;
   }
+
   gpu_info_collector::CollectGraphicsInfo(&gpu_info_);
   child_process_logging::SetGpuInfo(gpu_info_);
   LOG(INFO) << "gpu_info_collector::CollectGraphicsInfo complete";
 
   // Record initialization only after collecting the GPU info because that can
   // take a significant amount of time.
   gpu_info_.SetInitializationTime(base::Time::Now() - process_start_time_);
 
   // Note that kNoSandbox will also disable the GPU sandbox.
   bool no_gpu_sandbox = CommandLine::ForCurrentProcess()->HasSwitch(
@@ skipping 81 matching lines @@
 void GpuThread::OnCloseChannel(const IPC::ChannelHandle& channel_handle) {
   for (GpuChannelMap::iterator iter = gpu_channels_.begin();
        iter != gpu_channels_.end(); ++iter) {
     if (iter->second->GetChannelName() == channel_handle.name) {
       gpu_channels_.erase(iter);
       return;
     }
   }
 }
 
+void GpuThread::OnSetTraceEnabled(bool enabled) {
+  base::debug::TraceLog::GetInstance()->SetEnabled(enabled);
+  if(!enabled) {
+    std::string json_complete("['TRACE_ENDED']");
+    Send(new GpuHostMsg_TraceDataCollectedRemotely(json_complete));
+  }
+}
+
 void GpuThread::OnSynchronize() {
   Send(new GpuHostMsg_SynchronizeReply());
 }
 
 void GpuThread::OnCollectGraphicsInfo(GPUInfo::Level level) {
 #if defined(OS_WIN)
   if (level == GPUInfo::kComplete && gpu_info_.level() <= GPUInfo::kPartial) {
     // Prevent concurrent collection of DirectX diagnostics.
     gpu_info_.SetLevel(GPUInfo::kCompleting);
 
@@ skipping 43 matching lines @@
   GpuChannelMap::const_iterator iter = gpu_channels_.find(renderer_id);
   if (iter == gpu_channels_.end())
     return;
   scoped_refptr<GpuChannel> channel = iter->second;
   channel->DidDestroySurface(renderer_route_id);
 }
 #endif
 
 void GpuThread::OnCrash() {
   LOG(INFO) << "GPU: Simulating GPU crash";
+  TRACE_EVENT_INSTANT0("GPU_CRITICAL", "GpuThread::OnCrash");
+
   // Good bye, cruel world.
   volatile int* it_s_the_end_of_the_world_as_we_know_it = NULL;
   *it_s_the_end_of_the_world_as_we_know_it = 0xdead;
 }
 
 void GpuThread::OnHang() {
   LOG(INFO) << "GPU: Simulating GPU hang";
+  TRACE_EVENT_INSTANT0("GPU_CRITICAL", "GpuThread::OnHang");
   for (;;) {
     // Do not sleep here. The GPU watchdog timer tracks the amount of user
     // time this thread is using and it doesn't use much while calling Sleep.
   }
 }
 
+void GpuThread::OnTraceDataCollected(const std::string& json_events) {
+  Send(new GpuHostMsg_TraceDataCollectedRemotely(json_events));
+}
+
 #if defined(OS_WIN)
 
 // Runs on a worker thread. The GpuThread never terminates voluntarily so it is
 // safe to assume that its message loop is valid.
 void GpuThread::CollectDxDiagnostics(GpuThread* thread) {
   app::win::ScopedCOMInitializer com_initializer;
 
   DxDiagNode node;
   gpu_info_collector::GetDxDiagnostics(&node);
 
   thread->message_loop()->PostTask(
       FROM_HERE,
       NewRunnableFunction(&GpuThread::SetDxDiagnostics, thread, node));
 }
 
 // Runs on the GPU thread.
 void GpuThread::SetDxDiagnostics(GpuThread* thread, const DxDiagNode& node) {
   thread->gpu_info_.SetDxDiagnostics(node);
   thread->gpu_info_.SetLevel(GPUInfo::kComplete);
 }
 
 #endif