diff options
author | wangxianzhu@chromium.org <wangxianzhu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-31 01:26:09 +0000 |
---|---|---|
committer | wangxianzhu@chromium.org <wangxianzhu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-31 01:26:09 +0000 |
commit | 3b8c933e27be80f9e8ef2cee25df431b0983c1ab (patch) | |
tree | 8e5cf6bb6e5a870f326e535c7922958dcec65ea0 /components/tracing/tracing_messages.h | |
parent | 586f891d1414c2b68908cc7c154d0cb9db0bd084 (diff) | |
download | chromium_src-3b8c933e27be80f9e8ef2cee25df431b0983c1ab.zip chromium_src-3b8c933e27be80f9e8ef2cee25df431b0983c1ab.tar.gz chromium_src-3b8c933e27be80f9e8ef2cee25df431b0983c1ab.tar.bz2 |
Fix --trace-startup.
Some subprocesses handle --trace-startup by themselves to start
tracing as early as possible if the switch presents. However, previously
TraceController would enable tracing of the subprocess again by sending
TracingMsg_BeginTracing when it knew a new subprocess has been started.
This caused tracing of the subprocess not to be properly stopped and
flushed when startup tracing is ended.
Changes:
- Pass tracing_startup parameter through TracingMsg_BeginTracing;
subprocess won't start tracing again if tracing_startup is true
and tracing has already been started;
- Don't pass --trace-startup to renderer if startup tracing has
already finished.
BUG=310395
Review URL: https://codereview.chromium.org/48903003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@231971 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'components/tracing/tracing_messages.h')
-rw-r--r-- | components/tracing/tracing_messages.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/components/tracing/tracing_messages.h b/components/tracing/tracing_messages.h index 25b45bd..2b491ba 100644 --- a/components/tracing/tracing_messages.h +++ b/components/tracing/tracing_messages.h @@ -16,10 +16,11 @@ #define IPC_MESSAGE_START TracingMsgStart // Sent to all child processes to enable trace event recording. -IPC_MESSAGE_CONTROL3(TracingMsg_BeginTracing, +IPC_MESSAGE_CONTROL4(TracingMsg_BeginTracing, std::string /* category_filter_str */, base::TimeTicks /* browser_time */, - int /* base::debug::TraceLog::Options */) + int /* base::debug::TraceLog::Options */, + bool /* tracing_startup */) // Sent to all child processes to disable trace event recording. IPC_MESSAGE_CONTROL0(TracingMsg_EndTracing) |