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

Unified Diff: tools/telemetry/telemetry/internal/backends/chrome_inspector/devtools_client_backend.py

Issue 1343883002: Revert of [Telemetry] Refactor Chrome devtools tracing (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 3 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 | « no previous file | tools/telemetry/telemetry/internal/platform/tracing_agent/chrome_devtools_tracing_backend.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: tools/telemetry/telemetry/internal/backends/chrome_inspector/devtools_client_backend.py
diff --git a/tools/telemetry/telemetry/internal/backends/chrome_inspector/devtools_client_backend.py b/tools/telemetry/telemetry/internal/backends/chrome_inspector/devtools_client_backend.py
index 36d12016d23b7ac57b46a173b981f03be2a8a6a4..a75a2af0bdf5d9cb26df5c884ac45129f366ba00 100644
--- a/tools/telemetry/telemetry/internal/backends/chrome_inspector/devtools_client_backend.py
+++ b/tools/telemetry/telemetry/internal/backends/chrome_inspector/devtools_client_backend.py
@@ -11,8 +11,7 @@
from telemetry.internal.backends.chrome_inspector import devtools_http
from telemetry.internal.backends.chrome_inspector import inspector_backend
from telemetry.internal.backends.chrome_inspector import tracing_backend
-from telemetry.internal.platform.tracing_agent import (
- chrome_tracing_devtools_manager)
+from telemetry.internal.platform.tracing_agent import chrome_tracing_agent
from telemetry.timeline import trace_data as trace_data_module
@@ -62,21 +61,17 @@
self._devtools_port = devtools_port
self._remote_devtools_port = remote_devtools_port
self._devtools_http = devtools_http.DevToolsHttp(devtools_port)
- self._tracing_backend = tracing_backend.TracingBackend(self._devtools_port)
+ self._tracing_backend = None
self._app_backend = app_backend
self._devtools_context_map_backend = _DevToolsContextMapBackend(
self._app_backend, self)
- chrome_tracing_devtools_manager.RegisterDevToolsClient(
- self, self._app_backend.platform_backend)
+ chrome_tracing_agent.ChromeTracingAgent.RegisterDevToolsClient(
+ self, self._app_backend.platform_backend)
@property
def remote_port(self):
return self._remote_devtools_port
-
- @property
- def is_tracing_running(self):
- return self._tracing_backend.is_tracing_running
def IsAlive(self):
"""Whether the DevTools server is available and connectable."""
@@ -175,7 +170,13 @@
self._devtools_context_map_backend._Update(contexts)
return self._devtools_context_map_backend
+ def _CreateTracingBackendIfNeeded(self):
+ if not self._tracing_backend:
+ self._tracing_backend = tracing_backend.TracingBackend(
+ self._devtools_port)
+
def IsChromeTracingSupported(self):
+ self._CreateTracingBackendIfNeeded()
return self._tracing_backend.IsTracingSupported()
def StartChromeTracing(
@@ -190,6 +191,7 @@
those three event categories.
"""
assert trace_options and trace_options.enable_chrome_trace
+ self._CreateTracingBackendIfNeeded()
return self._tracing_backend.StartTracing(
trace_options, custom_categories, timeout)
@@ -225,6 +227,7 @@
TracingUnexpectedResponseException: If the response contains an error
or does not contain the expected result.
"""
+ self._CreateTracingBackendIfNeeded()
return self._tracing_backend.DumpMemory(timeout)
« no previous file with comments | « no previous file | tools/telemetry/telemetry/internal/platform/tracing_agent/chrome_devtools_tracing_backend.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698