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

Unified Diff: tools/telemetry/telemetry/core/chrome/tracing_backend.py

Issue 18440003: telemetry: Added timeout parameter to StartTracing. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Changed default timeout to DEFAULT_WEB_CONTENTS_TIMEOUT Created 7 years, 6 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
« no previous file with comments | « tools/telemetry/telemetry/core/chrome/browser_backend.py ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: tools/telemetry/telemetry/core/chrome/tracing_backend.py
diff --git a/tools/telemetry/telemetry/core/chrome/tracing_backend.py b/tools/telemetry/telemetry/core/chrome/tracing_backend.py
index 633afb2a76b34ac6e07bae06a72cd0960d05c33c..644544c8b75499c037b6ba4e7cb75459d5d0df99 100644
--- a/tools/telemetry/telemetry/core/chrome/tracing_backend.py
+++ b/tools/telemetry/telemetry/core/chrome/tracing_backend.py
@@ -54,12 +54,12 @@ class TracingBackend(object):
self._thread = None
self._tracing_data = []
- def BeginTracing(self, custom_categories=None):
+ def BeginTracing(self, custom_categories=None, timeout=10):
self._CheckNotificationSupported()
req = {'method': 'Tracing.start'}
if custom_categories:
req['params'] = {'categories': custom_categories}
- self._SyncRequest(req)
+ self._SyncRequest(req, timeout)
# Tracing.start will send asynchronous notifications containing trace
# data, until Tracing.end is called.
self._thread = threading.Thread(target=self._TracingReader)
« no previous file with comments | « tools/telemetry/telemetry/core/chrome/browser_backend.py ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698