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

Unified Diff: build/android/pylib/local/device/local_device_perf_test_run.py

Issue 2583613002: [Android] Add ability to generate test trace json for perf tests runs. (Closed)
Patch Set: Move to context manager Created 4 years 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 | « build/android/pylib/__init__.py ('k') | build/android/pylib/perf/perf_test_instance.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/android/pylib/local/device/local_device_perf_test_run.py
diff --git a/build/android/pylib/local/device/local_device_perf_test_run.py b/build/android/pylib/local/device/local_device_perf_test_run.py
index efb00017c2eb61e1619a062266cf28d2ecf9e573..afbd4e9c4dbffe81b93ea5ad464d7bd0e348c7e4 100644
--- a/build/android/pylib/local/device/local_device_perf_test_run.py
+++ b/build/android/pylib/local/device/local_device_perf_test_run.py
@@ -3,6 +3,7 @@
# found in the LICENSE file.
import collections
+import contextlib
import io
import json
import logging
@@ -29,6 +30,7 @@ from pylib.base import base_test_result
from pylib.constants import host_paths
from pylib.local.device import local_device_environment
from pylib.local.device import local_device_test_run
+from py_trace_event import trace_event
class HeartBeat(object):
@@ -94,10 +96,22 @@ class TestShard(object):
self._LogTest(test, cmd, timeout)
+ @contextlib.contextmanager
+ def trace_if_enabled(test):
+ try:
+ if self._test_instance.trace_output:
+ trace_event.trace_begin(test)
+ yield
+ finally:
+ if self._test_instance.trace_output:
+ trace_event.trace_end(test)
+
try:
start_time = time.time()
- exit_code, output = cmd_helper.GetCmdStatusAndOutputWithTimeout(
- cmd, timeout, cwd=cwd, shell=True)
+
+ with trace_if_enabled(test):
+ exit_code, output = cmd_helper.GetCmdStatusAndOutputWithTimeout(
+ cmd, timeout, cwd=cwd, shell=True)
end_time = time.time()
json_output = self._test_instance.ReadChartjsonOutput(self._output_dir)
if exit_code == 0:
@@ -110,7 +124,6 @@ class TestShard(object):
output = e.output
json_output = ''
result_type = base_test_result.ResultType.TIMEOUT
-
return self._ProcessTestResult(test, cmd, start_time, end_time, exit_code,
output, json_output, result_type)
@@ -410,6 +423,9 @@ class LocalDevicePerfTestRun(local_device_test_run.LocalDeviceTestRun):
#override
def RunTests(self):
# Affinitize the tests.
+ if self._test_instance.trace_output:
+ assert not trace_event.trace_is_enabled(), 'Tracing already running.'
+ trace_event.trace_enable(self._test_instance.trace_output)
self._SplitTestsByAffinity()
if not self._test_buckets and not self._no_device_tests:
raise local_device_test_run.NoTestsError()
@@ -447,6 +463,9 @@ class LocalDevicePerfTestRun(local_device_test_run.LocalDeviceTestRun):
host_test_results, device_test_results = reraiser_thread.RunAsync(
[run_no_devices_tests, run_devices_tests])
+ if self._test_instance.trace_output:
+ assert trace_event.trace_is_enabled(), 'Tracing not running.'
+ trace_event.trace_disable()
return host_test_results + device_test_results
# override
« no previous file with comments | « build/android/pylib/__init__.py ('k') | build/android/pylib/perf/perf_test_instance.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698