diff options
| author | sergeyv <sergeyv@chromium.org> | 2015-08-28 12:12:13 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-08-28 19:13:02 +0000 |
| commit | 1eab556bee2e0ff9c2d2cec7983253d52bc998d9 (patch) | |
| tree | 770b915c953392b732b58ccdfb00f79110a2e068 /mojo | |
| parent | cc85bbd51f2dd545ffeadde5b0c739aceca5443b (diff) | |
| download | chromium_src-1eab556bee2e0ff9c2d2cec7983253d52bc998d9.zip chromium_src-1eab556bee2e0ff9c2d2cec7983253d52bc998d9.tar.gz chromium_src-1eab556bee2e0ff9c2d2cec7983253d52bc998d9.tar.bz2 | |
Revert of Reland [Startup Tracing] Add --trace-config-file flag (patchset #2 id:20001 of https://codereview.chromium.org/1317333002/ )
Reason for revert:
Broke build at Win x64 GN. Failure sample:
http://build.chromium.org/p/chromium.win/builders/Win%20x64%20GN%20%28dbg%29/builds/8575
Original issue's description:
> Reland [Startup Tracing] Add --trace-config-file flag
>
> Original CL: https://codereview.chromium.org/1315463002/
>
> This CL adds --trace-config-file flag. Please see trace_config_file.h for details.
>
> Design doc:
> https://docs.google.com/document/d/1PgdXUOJF3WtEmYWUyGRbC2Fz2ICCZKO9jPvpLPRSHH8/edit?usp=sharing
>
> BUG=317481, 482098
> TBR=dsinclair@chromium.org,blundell@chromium.org,sievers@chromium.org,sky@chromium.org,msw@chromium.org
>
> Committed: https://crrev.com/a556ab616a3817468a9bd2163383dafe24ffdc96
> Cr-Commit-Position: refs/heads/master@{#346189}
TBR=dsinclair@chromium.org,blundell@chromium.org,sievers@chromium.org,msw@chromium.org,sky@chromium.org,zhenw@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=317481, 482098
Review URL: https://codereview.chromium.org/1312833007
Cr-Commit-Position: refs/heads/master@{#346206}
Diffstat (limited to 'mojo')
| -rw-r--r-- | mojo/runner/desktop/launcher_process.cc | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/mojo/runner/desktop/launcher_process.cc b/mojo/runner/desktop/launcher_process.cc index c2ed3c3..946f61f 100644 --- a/mojo/runner/desktop/launcher_process.cc +++ b/mojo/runner/desktop/launcher_process.cc @@ -15,7 +15,7 @@ #include "base/message_loop/message_loop.h" #include "base/synchronization/waitable_event.h" #include "base/trace_event/trace_event.h" -#include "components/tracing/trace_config_file.h" +#include "components/tracing/startup_tracing.h" #include "components/tracing/tracing_switches.h" #include "mojo/runner/context.h" #include "mojo/runner/switches.h" @@ -89,11 +89,10 @@ int LauncherProcessMain(int argc, char** argv) { base::trace_event::RECORD_UNTIL_FULL); base::trace_event::TraceLog::GetInstance()->SetEnabled( trace_config, base::trace_event::TraceLog::RECORDING_MODE); - } else if (tracing::TraceConfigFile::GetInstance()->IsEnabled()) { - g_tracing = true; - base::trace_event::TraceLog::GetInstance()->SetEnabled( - tracing::TraceConfigFile::GetInstance()->GetTraceConfig(), - base::trace_event::TraceLog::RECORDING_MODE); + } else { + // |g_tracing| is not touched in this case and Telemetry will stop tracing + // on demand later. + tracing::EnableStartupTracingIfConfigFileExists(); } // We want the shell::Context to outlive the MessageLoop so that pipes are |