GPU Tracer no longer issue device traces when device category is off.

gpu/command_buffer/service/gpu_tracer.cc

 // Copyright (c) 2012 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 "gpu/command_buffer/service/gpu_tracer.h"
 
 #include <deque>
 
 #include "base/bind.h"
 #include "base/strings/string_util.h"
@@ skipping 67 matching lines @@
 void TraceOutputter::TraceServiceEnd(const std::string& category,
                                      const std::string& name) {
   TRACE_EVENT_COPY_END1(TRACE_DISABLED_BY_DEFAULT("gpu.service"),
                         name.c_str(), "gl_category", category.c_str());
 }
 
 GPUTrace::GPUTrace(scoped_refptr<Outputter> outputter,
                    gfx::GPUTimingClient* gpu_timing_client,
                    const std::string& category,
                    const std::string& name,
-                   const bool enabled)
+                   const bool tracing_service,
+                   const bool tracing_device)
     : category_(category),
       name_(name),
       outputter_(outputter),
-      enabled_(enabled) {
-  if (gpu_timing_client->IsAvailable() &&
+      service_enabled_(tracing_service),
+      device_enabled_(tracing_device) {
+  if (tracing_device &&
+      gpu_timing_client->IsAvailable() &&
       gpu_timing_client->IsTimerOffsetAvailable()) {
     gpu_timer_ = gpu_timing_client->CreateGPUTimer();
   }
 }
 
 GPUTrace::~GPUTrace() {
 }
 
 void GPUTrace::Destroy(bool have_context) {
   if (gpu_timer_.get()) {
     gpu_timer_->Destroy(have_context);
   }
 }
 
-void GPUTrace::Start(bool trace_service) {
-  if (trace_service) {
+void GPUTrace::Start() {
+  if (service_enabled_) {
     outputter_->TraceServiceBegin(category_, name_);
   }
   if (gpu_timer_.get()) {
     gpu_timer_->Start();
   }
 }
 
-void GPUTrace::End(bool tracing_service) {
+void GPUTrace::End() {
   if (gpu_timer_.get()) {
     gpu_timer_->End();
   }
-  if (tracing_service) {
+  if (service_enabled_) {
     outputter_->TraceServiceEnd(category_, name_);
   }
 }
 
 bool GPUTrace::IsAvailable() {
   return !gpu_timer_.get() || gpu_timer_->IsAvailable();
 }
 
 void GPUTrace::Process() {
   if (gpu_timer_.get()) {
@@ skipping 56 matching lines @@
   gpu_executing_ = true;
   if (IsTracing()) {
     gpu_timing_client_->CheckAndResetTimerErrors();
     // Begin a Trace for all active markers
     for (int n = 0; n < NUM_TRACER_SOURCES; n++) {
       for (size_t i = 0; i < markers_[n].size(); i++) {
         TraceMarker& trace_marker = markers_[n][i];
         trace_marker.trace_ =
             new GPUTrace(outputter_, gpu_timing_client_.get(),
                          trace_marker.category_, trace_marker.name_,
+                         *gpu_trace_srv_category != 0,
                          *gpu_trace_dev_category != 0);
-        trace_marker.trace_->Start(*gpu_trace_srv_category != 0);
+        trace_marker.trace_->Start();
       }
     }
   }
   return true;
 }
 
 bool GPUTracer::EndDecoding() {
   if (!gpu_executing_)
     return false;
 
   // End Trace for all active markers
   if (IsTracing()) {
     for (int n = 0; n < NUM_TRACER_SOURCES; n++) {
       for (size_t i = 0; i < markers_[n].size(); i++) {
         TraceMarker& marker = markers_[n][i];
         if (marker.trace_.get()) {
-          marker.trace_->End(*gpu_trace_srv_category != 0);
+          marker.trace_->End();
 
           finished_traces_.push_back(marker.trace_);
           marker.trace_ = 0;
         }
       }
     }
     IssueProcessTask();
   }
 
   gpu_executing_ = false;
@@ skipping 10 matching lines @@
 
   DCHECK(source >= 0 && source < NUM_TRACER_SOURCES);
 
   // Push new marker from given 'source'
   markers_[source].push_back(TraceMarker(category, name));
 
   // Create trace
   if (IsTracing()) {
     scoped_refptr<GPUTrace> trace = new GPUTrace(
         outputter_, gpu_timing_client_.get(), category, name,
+        *gpu_trace_srv_category != 0,
         *gpu_trace_dev_category != 0);
-    trace->Start(*gpu_trace_srv_category != 0);
+    trace->Start();
     markers_[source].back().trace_ = trace;
   }
 
   return true;
 }
 
 bool GPUTracer::End(GpuTracerSource source) {
   if (!gpu_executing_)
     return false;
 
   DCHECK(source >= 0 && source < NUM_TRACER_SOURCES);
 
   // Pop last marker with matching 'source'
   if (!markers_[source].empty()) {
     scoped_refptr<GPUTrace> trace = markers_[source].back().trace_;
     if (trace.get()) {
       if (IsTracing()) {
-        trace->End(*gpu_trace_srv_category != 0);
+        trace->End();
       }
 
       finished_traces_.push_back(trace);
       IssueProcessTask();
     }
 
     markers_[source].pop_back();
     return true;
   }
   return false;
@@ skipping 54 matching lines @@
   }
 
   // Check if timers are still valid (e.g: a disjoint operation
   // might have occurred.)
   if (gpu_timing_client_->CheckAndResetTimerErrors()) {
     ClearFinishedTraces(true);
   }
 
   while (!finished_traces_.empty()) {
     scoped_refptr<GPUTrace>& trace = finished_traces_.front();
-    if (trace->IsEnabled()) {
+    if (trace->IsDeviceTraceEnabled()) {
       if (!finished_traces_.front()->IsAvailable())
         break;
       finished_traces_.front()->Process();
     }
     finished_traces_.front()->Destroy(true);
     finished_traces_.pop_front();
   }
 
   // Clear pending traces if there were are any errors
   GLenum err = glGetError();
@@ skipping 11 matching lines @@
 void GPUTracer::IssueProcessTask() {
   if (finished_traces_.empty() || process_posted_)
     return;
 
   process_posted_ = true;
   PostTask();
 }
 
 }  // namespace gles2
 }  // namespace gpu