summaryrefslogtreecommitdiffstats
path: root/content/gpu/gpu_main.cc
diff options
context:
space:
mode:
authorfdoray <fdoray@chromium.org>2015-10-28 14:47:00 -0700
committerCommit bot <commit-bot@chromium.org>2015-10-28 21:47:36 +0000
commitf30bf3a2475caa88472bfc2b090be289b2c07ccf (patch)
treee143402785ae6a34ce066782e3de84f5a8c1e0f6 /content/gpu/gpu_main.cc
parent0d797bcaede9cad87da956ca26e8a0159a71732a (diff)
downloadchromium_src-f30bf3a2475caa88472bfc2b090be289b2c07ccf.zip
chromium_src-f30bf3a2475caa88472bfc2b090be289b2c07ccf.tar.gz
chromium_src-f30bf3a2475caa88472bfc2b090be289b2c07ccf.tar.bz2
Add GPU process initialization events to the startup category.
We receive startup traces from our users (bulk reports). Events from the "gpu" category are not visible in these traces. This CL adds some trace events generated during the GPU process startup to the "startup" category, so that we can see them in traces that we receive from users. BUG=548805 Review URL: https://codereview.chromium.org/1420283005 Cr-Commit-Position: refs/heads/master@{#356656}
Diffstat (limited to 'content/gpu/gpu_main.cc')
-rw-r--r--content/gpu/gpu_main.cc6
1 files changed, 4 insertions, 2 deletions
diff --git a/content/gpu/gpu_main.cc b/content/gpu/gpu_main.cc
index 60f605b..4344f04 100644
--- a/content/gpu/gpu_main.cc
+++ b/content/gpu/gpu_main.cc
@@ -439,6 +439,8 @@ bool WarmUpSandbox(const base::CommandLine& command_line) {
#if !defined(OS_MACOSX)
bool CollectGraphicsInfo(gpu::GPUInfo& gpu_info) {
+ TRACE_EVENT0("gpu,startup", "Collect Graphics Info");
+
bool res = true;
gpu::CollectInfoResult result = gpu::CollectContextGraphicsInfo(&gpu_info);
switch (result) {
@@ -513,7 +515,7 @@ void WarmUpSandboxNvidia(const gpu::GPUInfo& gpu_info,
bool StartSandboxLinux(const gpu::GPUInfo& gpu_info,
GpuWatchdogThread* watchdog_thread,
bool should_initialize_gl_context) {
- TRACE_EVENT0("gpu", "Initialize sandbox");
+ TRACE_EVENT0("gpu,startup", "Initialize sandbox");
bool res = false;
@@ -550,7 +552,7 @@ bool StartSandboxLinux(const gpu::GPUInfo& gpu_info,
#if defined(OS_WIN)
bool StartSandboxWindows(const sandbox::SandboxInterfaceInfo* sandbox_info) {
- TRACE_EVENT0("gpu", "Lower token");
+ TRACE_EVENT0("gpu,startup", "Lower token");
// For Windows, if the target_services interface is not zero, the process
// is sandboxed and we must call LowerToken() before rendering untrusted