Simplified GPU Tracer by removing parent base class.

gpu/command_buffer/service/gpu_tracer.h

 // 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.
 
 // This file contains the GPUTrace class.
 #ifndef GPU_COMMAND_BUFFER_SERVICE_GPU_TRACER_H_
 #define GPU_COMMAND_BUFFER_SERVICE_GPU_TRACER_H_
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/threading/thread.h"
 #include "gpu/command_buffer/service/gles2_cmd_decoder.h"
 #include "gpu/gpu_export.h"
 #include "ui/gl/gl_bindings.h"
 
 namespace gpu {
 namespace gles2 {
 
+class Outputter;
+class GPUTrace;
+
 // Id used to keep trace namespaces separate
 enum GpuTracerSource {
+  kTraceGroupInvalid = -1,
+
   kTraceGroupMarker = 0,
   kTraceCHROMIUM = 1,
   kTraceDecoder = 2,
+
+  NUM_TRACER_SOURCES
+};
+
+// Marker structure for a Trace.
+struct TraceMarker {
+  TraceMarker(const std::string& name);
+  ~TraceMarker();
+
+  std::string name_;
+  scoped_refptr<GPUTrace> trace_;
 };
 
 // Traces GPU Commands.
-class GPUTracer {
+class GPUTracer : public base::SupportsWeakPtr<GPUTracer> {
  public:
-  static scoped_ptr<GPUTracer> Create(gles2::GLES2Decoder* decoder);
-
-  GPUTracer();
-  virtual ~GPUTracer();
+  GPUTracer(gles2::GLES2Decoder* decoder);

[vmiura, 2014/08/14 19:43:05]

nit: explicit

[David Yen, 2014/08/19 20:01:30]

Done.

+  ~GPUTracer();
 
   // Scheduled processing in decoder begins.
-  virtual bool BeginDecoding() = 0;
+  bool BeginDecoding();
 
   // Scheduled processing in decoder ends.
-  virtual bool EndDecoding() = 0;
+  bool EndDecoding();
 
   // Begin a trace marker.
-  virtual bool Begin(const std::string& name, GpuTracerSource source) = 0;
+  bool Begin(const std::string& name, GpuTracerSource source);
 
   // End the last started trace marker.
-  virtual bool End(GpuTracerSource source) = 0;
+  bool End(GpuTracerSource source);
 
-  virtual bool IsTracing() = 0;
+  bool IsTracing();
 
   // Retrieve the name of the current open trace.
   // Returns empty string if no current open trace.
-  virtual const std::string& CurrentName() const = 0;
+  const std::string& CurrentName() const;
 
  private:
+  // Trace Processing.
+  void Process();
+  void ProcessTraces();
+
+  void CalculateTimerOffset();
+  void IssueProcessTask();
+
+  scoped_refptr<Outputter> outputter_;
+  std::vector<TraceMarker> markers_[NUM_TRACER_SOURCES];
+  std::deque<scoped_refptr<GPUTrace> > traces_;
+
+  const unsigned char* gpu_trace_srv_category;
+  const unsigned char* gpu_trace_dev_category;
+  gles2::GLES2Decoder* decoder_;
+
+  int64 timer_offset_;
+  GpuTracerSource last_tracer_source_;
+
+  bool enabled_;
+  bool gpu_timing_synced_;
+  bool gpu_executing_;
+  bool process_posted_;
+
   DISALLOW_COPY_AND_ASSIGN(GPUTracer);
 };
 
 class Outputter : public base::RefCounted<Outputter> {
  public:
   virtual void Trace(const std::string& name,
                      int64 start_time,
                      int64 end_time) = 0;
 
  protected:
@@ skipping 53 matching lines @@
 
   GLuint queries_[2];
 
   DISALLOW_COPY_AND_ASSIGN(GPUTrace);
 };
 
 }  // namespace gles2
 }  // namespace gpu
 
 #endif  // GPU_COMMAND_BUFFER_SERVICE_GPU_TRACER_H_