summaryrefslogtreecommitdiffstats
path: root/components/tracing
diff options
context:
space:
mode:
authorharaken@chromium.org <haraken@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-12-28 06:04:28 +0000
committerharaken@chromium.org <haraken@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-12-28 06:04:28 +0000
commit462ceb0a79acbd01421795bf2391643ca6d73f78 (patch)
tree5524511c651043c49986d3b5669b7d9305cc6c98 /components/tracing
parentf5f22386b9413ce39b7e3cc7e718f652969f01e2 (diff)
downloadchromium_src-462ceb0a79acbd01421795bf2391643ca6d73f78.zip
chromium_src-462ceb0a79acbd01421795bf2391643ca6d73f78.tar.gz
chromium_src-462ceb0a79acbd01421795bf2391643ca6d73f78.tar.bz2
Implement sampling profiler (chromium side change)
Trace-viewer side change is here: https://codereview.appspot.com/39310043 Screenshot of the profiler: http://haraken.info/null/sampling_tracing.png Design document: https://docs.google.com/a/google.com/document/d/1j39sbA9ECTwFFlxbhSD1EvJnGfYeS5EUJ05yxuku6VY/edit TBR=phajdan.jr NOTRY=true Review URL: https://codereview.chromium.org/109933006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@242671 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'components/tracing')
-rw-r--r--components/tracing/child_trace_message_filter.cc2
1 files changed, 2 insertions, 0 deletions
diff --git a/components/tracing/child_trace_message_filter.cc b/components/tracing/child_trace_message_filter.cc
index d3875c7..847ff9a 100644
--- a/components/tracing/child_trace_message_filter.cc
+++ b/components/tracing/child_trace_message_filter.cc
@@ -61,6 +61,7 @@ void ChildTraceMessageFilter::OnBeginTracing(
TraceLog::GetInstance()->SetEnabled(
base::debug::CategoryFilter(category_filter_str),
+ base::debug::TraceLog::RECORDING_MODE,
static_cast<base::debug::TraceLog::Options>(options));
}
@@ -81,6 +82,7 @@ void ChildTraceMessageFilter::OnEnableMonitoring(
int options) {
TraceLog::GetInstance()->SetEnabled(
base::debug::CategoryFilter(category_filter_str),
+ base::debug::TraceLog::MONITORING_MODE,
static_cast<base::debug::TraceLog::Options>(options));
}