Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(402)

Unified Diff: content/renderer/renderer_main.cc

Issue 1386193002: Stop using the TRACE_EVENT_*_ETW macros. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« content/browser/browser_main.cc ('K') | « content/renderer/render_thread_impl.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/renderer_main.cc
diff --git a/content/renderer/renderer_main.cc b/content/renderer/renderer_main.cc
index 3a463eaffcc4f9734ea2a227f10427ef95debfc2..0f44527057216b3d05a7a47b1d316e739f2894a1 100644
--- a/content/renderer/renderer_main.cc
+++ b/content/renderer/renderer_main.cc
@@ -78,7 +78,10 @@ base::LazyInstance<scoped_ptr<ui::ClientNativePixmapFactory>> g_pixmap_factory =
// mainline routine for running as the Renderer process
int RendererMain(const MainFunctionParams& parameters) {
- TRACE_EVENT_BEGIN_ETW("RendererMain", 0, "");
+ // Don't use the TRACE_EVENT0 macro because the tracing infrastructure doesn't
+ // expect synchronous events around the main loop of a thread.
+ TRACE_EVENT_ASYNC_BEGIN0("startup", "RendererMain", 0);
+
base::trace_event::TraceLog::GetInstance()->SetProcessName("Renderer");
base::trace_event::TraceLog::GetInstance()->SetProcessSortIndex(
kTraceEventRendererProcessSortIndex);
@@ -204,9 +207,9 @@ int RendererMain(const MainFunctionParams& parameters) {
if (pool)
pool->Recycle();
#endif
- TRACE_EVENT_BEGIN_ETW("RendererMain.START_MSG_LOOP", 0, 0);
+ TRACE_EVENT_ASYNC_BEGIN0("toplevel", "RendererMain.START_MSG_LOOP", 0);
base::MessageLoop::current()->Run();
- TRACE_EVENT_END_ETW("RendererMain.START_MSG_LOOP", 0, 0);
+ TRACE_EVENT_ASYNC_END0("toplevel", "RendererMain.START_MSG_LOOP", 0);
}
#if defined(LEAK_SANITIZER)
// Run leak detection before RenderProcessImpl goes out of scope. This helps
@@ -215,7 +218,7 @@ int RendererMain(const MainFunctionParams& parameters) {
#endif
}
platform.PlatformUninitialize();
- TRACE_EVENT_END_ETW("RendererMain", 0, "");
+ TRACE_EVENT_ASYNC_END0("startup", "RendererMain", 0);
return 0;
}
« content/browser/browser_main.cc ('K') | « content/renderer/render_thread_impl.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698