Instrumenting GPU initialization for jank

content/browser/gpu/browser_gpu_channel_host_factory.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 "content/browser/gpu/browser_gpu_channel_host_factory.h"
 
 #include <set>
 
 #include "base/bind.h"
+#include "base/profiler/scoped_tracker.h"
 #include "base/synchronization/waitable_event.h"
 #include "base/threading/thread_restrictions.h"
 #include "base/trace_event/trace_event.h"
-#include "base/tracked_objects.h"
 #include "content/browser/gpu/browser_gpu_memory_buffer_manager.h"
 #include "content/browser/gpu/gpu_data_manager_impl.h"
 #include "content/browser/gpu/gpu_process_host.h"
 #include "content/browser/gpu/gpu_surface_tracker.h"
 #include "content/common/child_process_host_impl.h"
 #include "content/common/gpu/gpu_memory_buffer_factory.h"
 #include "content/common/gpu/gpu_messages.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/gpu_data_manager.h"
 #include "content/public/common/content_client.h"
@@ skipping 163 matching lines @@
     BrowserGpuChannelHostFactory* factory =
         BrowserGpuChannelHostFactory::instance();
     factory->GpuChannelEstablished();
     finished_ = true;
   }
 }
 
 void BrowserGpuChannelHostFactory::EstablishRequest::Wait() {
   DCHECK(main_loop_->BelongsToCurrentThread());
   {
-    // Since the current task synchronously waits for establishing a GPU
-    // channel, it shouldn't be tallied because its execution time has nothing
-    // to do with its efficiency. Using task stopwatch to exclude the waiting
-    // time from the current task run time.
-    tracked_objects::TaskStopwatch stopwatch;
-    stopwatch.Start();
+    // TODO(vadimt): Remove ScopedTracker below once crbug.com/125248 is fixed.
+    tracked_objects::ScopedTracker tracking_profile(
+        FROM_HERE_WITH_EXPLICIT_FUNCTION(
+            "125248 BrowserGpuChannelHostFactory::EstablishRequest::Wait"));
 
     // We're blocking the UI thread, which is generally undesirable.
     // In this case we need to wait for this before we can show any UI
     // /anyway/, so it won't cause additional jank.
     // TODO(piman): Make this asynchronous (http://crbug.com/125248).
     TRACE_EVENT0("browser",
                  "BrowserGpuChannelHostFactory::EstablishGpuChannelSync");
     base::ThreadRestrictions::ScopedAllowWait allow_wait;
     event_.Wait();
-
-    stopwatch.Stop();
   }
   FinishOnMain();
 }
 
 void BrowserGpuChannelHostFactory::EstablishRequest::Cancel() {
   DCHECK(main_loop_->BelongsToCurrentThread());
   finished_ = true;
 }
 
 bool BrowserGpuChannelHostFactory::CanUseForTesting() {
@@ skipping 100 matching lines @@
       int32 surface_id,
       const GPUCreateCommandBufferConfig& init_params,
       int32 route_id) {
   CreateRequest request(route_id);
   GetIOLoopProxy()->PostTask(FROM_HERE, base::Bind(
         &BrowserGpuChannelHostFactory::CreateViewCommandBufferOnIO,
         base::Unretained(this),
         &request,
         surface_id,
         init_params));
+  // TODO(vadimt): Remove ScopedTracker below once crbug.com/125248 is fixed.
+  tracked_objects::ScopedTracker tracking_profile(
+      FROM_HERE_WITH_EXPLICIT_FUNCTION(
+          "125248 BrowserGpuChannelHostFactory::CreateViewCommandBuffer"));
+
   // We're blocking the UI thread, which is generally undesirable.
   // In this case we need to wait for this before we can show any UI /anyway/,
   // so it won't cause additional jank.
   // TODO(piman): Make this asynchronous (http://crbug.com/125248).
   TRACE_EVENT0("browser",
                "BrowserGpuChannelHostFactory::CreateViewCommandBuffer");
   base::ThreadRestrictions::ScopedAllowWait allow_wait;
   request.event.Wait();
   return request.result;
 }
@@ skipping 194 matching lines @@
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
 
   CreateGpuMemoryBufferCallbackMap::iterator iter =
       create_gpu_memory_buffer_requests_.find(request_id);
   DCHECK(iter != create_gpu_memory_buffer_requests_.end());
   iter->second.Run(handle);
   create_gpu_memory_buffer_requests_.erase(iter);
 }
 
 }  // namespace content