Simplify tracing of gpu memory

BUG=128502

Review URL: https://chromiumcodereview.appspot.com/10915293

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@157071 0039d316-1c4b-4281-b951-d872f2087c98

6 files changed, 7 insertions, 45 deletions

diff --git a/gpu/command_buffer/service/buffer_manager.cc b/gpu/command_buffer/service/buffer_manager.cc
index 1fbf6b3..cac64d5 100644
--- a/gpu/command_buffer/service/buffer_manager.cc
+++ b/gpu/command_buffer/service/buffer_manager.cc
@@ -13,10 +13,7 @@ namespace gpu {
 namespace gles2 {
 
 BufferManager::BufferManager(MemoryTracker* memory_tracker)
-    : buffer_memory_tracker_(new MemoryTypeTracker(
-        memory_tracker,
-        "BufferManager",
-        "BufferMemory")),
+    : buffer_memory_tracker_(new MemoryTypeTracker(memory_tracker)),
       allow_buffers_on_multiple_targets_(false),
       mem_represented_(0),
       buffer_info_count_(0),
diff --git a/gpu/command_buffer/service/gles2_cmd_decoder.cc b/gpu/command_buffer/service/gles2_cmd_decoder.cc
index b1af943..7074606 100644
--- a/gpu/command_buffer/service/gles2_cmd_decoder.cc
+++ b/gpu/command_buffer/service/gles2_cmd_decoder.cc
@@ -62,11 +62,6 @@
 #define GL_DEPTH24_STENCIL8 0x88F0
 #endif
 
-#define TRACE_BACKBUFFER_MEMORY_TOTAL(decoder) \
-    TRACE_COUNTER_ID1( \
-      "GLES2DecoderImpl", "BackbufferMemory", decoder, \
-      decoder->GetBackbufferMemoryTotal())
-
 namespace gpu {
 namespace gles2 {
 
@@ -1735,8 +1730,7 @@ ScopedTextureUploadTimer::~ScopedTextureUploadTimer() {
 
 Texture::Texture(GLES2DecoderImpl* decoder)
     : decoder_(decoder),
-      memory_tracker_(decoder->GetContextGroup()->memory_tracker(),
-                      NULL, NULL),
+      memory_tracker_(decoder->GetContextGroup()->memory_tracker()),
       id_(0) {
 }
 
@@ -1766,7 +1760,6 @@ void Texture::Create() {
   glTexImage2D(
       GL_TEXTURE_2D, 0, GL_RGBA, 16, 16, 0, GL_RGBA, GL_UNSIGNED_BYTE, NULL);
   memory_tracker_.UpdateMemRepresented(16u * 16u * 4u);
-  TRACE_BACKBUFFER_MEMORY_TOTAL(decoder_);
 }
 
 bool Texture::AllocateStorage(const gfx::Size& size, GLenum format) {
@@ -1793,7 +1786,6 @@ bool Texture::AllocateStorage(const gfx::Size& size, GLenum format) {
         size.width(), size.height(), format, GL_UNSIGNED_BYTE, 4, &image_size,
         NULL, NULL);
     memory_tracker_.UpdateMemRepresented(image_size);
-    TRACE_BACKBUFFER_MEMORY_TOTAL(decoder_);
   }
   return success;
 }
@@ -1817,7 +1809,6 @@ void Texture::Destroy() {
     glDeleteTextures(1, &id_);
     id_ = 0;
     memory_tracker_.UpdateMemRepresented(0);
-    TRACE_BACKBUFFER_MEMORY_TOTAL(decoder_);
   }
 }
 
@@ -1827,8 +1818,7 @@ void Texture::Invalidate() {
 
 RenderBuffer::RenderBuffer(GLES2DecoderImpl* decoder)
     : decoder_(decoder),
-      memory_tracker_(decoder->GetContextGroup()->memory_tracker(),
-                      NULL, NULL),
+      memory_tracker_(decoder->GetContextGroup()->memory_tracker()),
       id_(0) {
 }
 
@@ -1874,7 +1864,6 @@ bool RenderBuffer::AllocateStorage(const gfx::Size& size, GLenum format,
     memory_tracker_.UpdateMemRepresented(
         size.width() * size.height() * samples *
         GLES2Util::RenderbufferBytesPerPixel(format));
-    TRACE_BACKBUFFER_MEMORY_TOTAL(decoder_);
   }
   return success;
 }
@@ -1885,7 +1874,6 @@ void RenderBuffer::Destroy() {
     glDeleteRenderbuffersEXT(1, &id_);
     id_ = 0;
     memory_tracker_.UpdateMemRepresented(0);
-    TRACE_BACKBUFFER_MEMORY_TOTAL(decoder_);
   }
 }
 
@@ -3147,7 +3135,6 @@ bool GLES2DecoderImpl::ResizeOffscreenFrameBuffer(const gfx::Size& size) {
                << "to allocate storage for offscreen target stencil buffer.";
     return false;
   }
-  TRACE_BACKBUFFER_MEMORY_TOTAL(this);
 
   // Attach the offscreen target buffers to the target frame buffer.
   if (IsOffscreenBufferMultisampled()) {
@@ -3238,8 +3225,6 @@ error::Error GLES2DecoderImpl::HandleResizeCHROMIUM(
     }
   }
 
-  TRACE_BACKBUFFER_MEMORY_TOTAL(this);
-
   return error::kNoError;
 }
 
@@ -8334,7 +8319,6 @@ error::Error GLES2DecoderImpl::HandleSwapBuffers(
       DCHECK(offscreen_saved_color_format_);
       offscreen_saved_color_texture_->AllocateStorage(
           offscreen_size_, offscreen_saved_color_format_);
-      TRACE_BACKBUFFER_MEMORY_TOTAL(this);
 
       offscreen_saved_frame_buffer_->AttachRenderTexture(
           offscreen_saved_color_texture_.get());
diff --git a/gpu/command_buffer/service/memory_tracking.h b/gpu/command_buffer/service/memory_tracking.h
index db748e9..35ba950 100644
--- a/gpu/command_buffer/service/memory_tracking.h
+++ b/gpu/command_buffer/service/memory_tracking.h
@@ -32,13 +32,8 @@ class MemoryTracker : public base::RefCounted<MemoryTracker> {
 // MemoryTracker.
 class MemoryTypeTracker {
  public:
-  MemoryTypeTracker(
-    MemoryTracker* memory_tracker,
-    const char* trace_category,
-    const char* trace_name)
+  MemoryTypeTracker(MemoryTracker* memory_tracker)
     : memory_tracker_(memory_tracker),
-      trace_category_(trace_category),
-      trace_name_(trace_name),
       has_updated_mem_represented_(false),
       last_updated_mem_represented_(0) {
   }
@@ -55,12 +50,6 @@ class MemoryTypeTracker {
     }
     has_updated_mem_represented_ = true;
     last_updated_mem_represented_ = mem_represented;
-    if (trace_category_ && trace_name_ && memory_tracker_) {
-      TRACE_COUNTER_ID1(trace_category_,
-                        trace_name_,
-                        memory_tracker_,
-                        last_updated_mem_represented_);
-    }
   }
 
   size_t GetMemRepresented() const {
@@ -69,8 +58,6 @@ class MemoryTypeTracker {
 
  private:
   MemoryTracker* memory_tracker_;
-  const char* trace_category_;
-  const char* trace_name_;
   bool has_updated_mem_represented_;
   size_t last_updated_mem_represented_;
 
diff --git a/gpu/command_buffer/service/renderbuffer_manager.cc b/gpu/command_buffer/service/renderbuffer_manager.cc
index 2f1d3c3..7169027 100644
--- a/gpu/command_buffer/service/renderbuffer_manager.cc
+++ b/gpu/command_buffer/service/renderbuffer_manager.cc
@@ -16,10 +16,7 @@ RenderbufferManager::RenderbufferManager(
     MemoryTracker* memory_tracker,
     GLint max_renderbuffer_size,
     GLint max_samples)
-    : renderbuffer_memory_tracker_(new MemoryTypeTracker(
-        memory_tracker,
-        "RenderbufferManager",
-        "RenderbufferMemory")),
+    : renderbuffer_memory_tracker_(new MemoryTypeTracker(memory_tracker)),
       max_renderbuffer_size_(max_renderbuffer_size),
       max_samples_(max_samples),
       num_uncleared_renderbuffers_(0),
diff --git a/gpu/command_buffer/service/texture_manager.cc b/gpu/command_buffer/service/texture_manager.cc
index 41fea80..3c30519 100644
--- a/gpu/command_buffer/service/texture_manager.cc
+++ b/gpu/command_buffer/service/texture_manager.cc
@@ -621,10 +621,7 @@ TextureManager::TextureManager(
     FeatureInfo* feature_info,
     GLint max_texture_size,
     GLint max_cube_map_texture_size)
-    : texture_memory_tracker_(new MemoryTypeTracker(
-        memory_tracker,
-        "TextureManager",
-        "TextureMemory")),
+    : texture_memory_tracker_(new MemoryTypeTracker(memory_tracker)),
       feature_info_(feature_info),
       max_texture_size_(max_texture_size),
       max_cube_map_texture_size_(max_cube_map_texture_size),
diff --git a/gpu/command_buffer/service/transfer_buffer_manager.cc b/gpu/command_buffer/service/transfer_buffer_manager.cc
index 6641038..7bde12a 100644
--- a/gpu/command_buffer/service/transfer_buffer_manager.cc
+++ b/gpu/command_buffer/service/transfer_buffer_manager.cc
@@ -80,7 +80,7 @@ int32 TransferBufferManager::RegisterTransferBuffer(
 
   shared_memory_bytes_allocated_ += size;
   TRACE_COUNTER_ID1(
-      "CommandBuffer", "SharedMemory", this, shared_memory_bytes_allocated_);
+      "gpu", "GpuTransferBufferMemory", this, shared_memory_bytes_allocated_);
 
   // If caller requested specific id, first try to use id_request.
   if (id_request != -1) {