aboutsummaryrefslogtreecommitdiff
path: root/catapult/devil/devil/android/device_errors.py
diff options
context:
space:
mode:
authorJesse Hall <jessehall@google.com>2018-08-02 09:53:01 -0700
committerJesse Hall <jessehall@google.com>2018-08-02 09:53:11 -0700
commit367b65a310a72ba207744182de04a89d520b31ee (patch)
tree5403cd3328083d432256bfa11db542fc1b5ffa48 /catapult/devil/devil/android/device_errors.py
parent9aec9e439bb7850a740a13add9cfeb2ef45e9868 (diff)
downloadchromium-trace-367b65a310a72ba207744182de04a89d520b31ee.tar.gz
Update to latest catapult (eae13a4)
$ git log --oneline --no-merges 3fe65c60..eae13a4b tracing systrace 7110f0868 rendering: Add pipeline:draw in the report. 3a995feda [systrace] Fix update_systrace_trace_viewer 2acd8e035 Removed an old restriction on timestamp ordering of trace events 134364159 [mali importer] Add Exynos Mali job event parser 5c2d9e757 renderer: Add breakdown metrics for compositor pipeline. 94294baed Reland "rendering: Add pipeline metrics." 600cb5aa8 tabs: Report tab-switching request delay. e05f902a6 Revert "rendering: Add pipeline metrics." b9813d2fd Attempt to fix flakiness in webview_startup perf tests d8072e683 Fix lint errors for systrace 6a67dd77d Tracing: Fix native library stats for pre-N devices. 787a37892 rendering: Add pipeline metrics. f07f60ef0 Drop Scheduler and FrameScheduler prefixes to save space. 0ddcb32d1 [TBMv2] Add POINT_ID reserved diagnostic 557d8dca5 [Systrace] Raise error when specified device is not found be45355b4 Dashboard - Fix fast path in ReplaceSharedDiagnostic 66447ba64 trace-viewer: Show a link to codesearch. 68c3b1d86 Dashboard - Optimize histogram_set.ReplaceSharedDiagnostic 10041796a [ftrace importer] Use tid instead of pid for kernel threads 4c6f5a25f [ftrace importer] Fix recursive binder reply arguments 9e83c9e3c [TBMv2] Implement deduplication fast path for GenericSet 685c633d5 [TBMv2] Make timeInMsAutoFormat available in Python 0c92958e3 Refactor systrace/systrace/util.py to use device_utils 21acb2a82 Throw exception instead of dying in get_device_sdk_version 647cee134 Telemetry: frame times in TBMv2 0e9eb2f5c Android systrace: Fix printf/scanf format compiler warnings bea867a76 Android systrace: Fix undeclared use of strerr 3766fc728 Android systrace: Fix undeclared references to POSIX APIs d8e6a8203 [Telemetry] Remove GetRendererThreadFromTabId 7439a1c6b trace-recorder: Include 'viz' category for rendering. 3eb704bab Remove BattOr support from systrace 9f46241c6 Add documentation_link diagnostic 3836c556c androidStartupMetric: Allow multiple FCP events f76f0b440 [Systrace] remove duplicate --target option. 7ddf0ed7f Add 90th percentile to results.html. f989b6282 tracing: Add binder transaction size to events fdc825f43 androidStartupMetric: support multiple browser starts 11513e359 Add convenient method for running trace processing code in python 87eefd4f1 [fuchsia] Add thread priority to fuchsia importer 32a31d2e9 Do not compute TTI without ResourceLoad edf6c000f Add default bin boundaries for timeInMsAutoFormat. c87e4baed Support multiple story tags in ChartJsonConverter. 09b82f4a5 Plumb story tags through Telemetry Values. 63f44ee35 tabs: Ignore the duration for the new metric. 6160b40d1 HistogramSet - Merge TagMap diagnostics in add_reserved_diagnostics 9861a71fa tabs: Switch back to async trace events. 4c1bea249 [ftrace importer] Add fence parser a9d8c2947 tabs: Update the measurements. a7d578a29 tabs: Fix tabs metric. bf32270b0 Clean up telemetry/timeline/trace_data* caee0de0e [TBMv2] Add 'tasks' legacy_unit_info 385d3dd26 Add comments to document that variance/stddev use Bessel's correction c36ea2490 Remove deprecated trace event name for BlinkSchedulerAsyncSlice. 8fbdf9f10 Fix blink-gc metrics 0043a4a25 [Tracing UI] Fix raster task view 0111e13d0 [Tracing UI] Don't show "View in Picture Debugger" when not available 393b0fd9c [Tracing UI] Use ResizeObserver for picture chart resizing 0ceb1ecce [Tracing UI] Fix drag_handle when there are size constraints 0e9738361 [Tracing] Remove unused resize_sensor.html and css-element-queries 1986f5a95 Change "minutes" legacy unit to timeInMsAutoFormat. f1e34db09 Fix frame viewer ui issues 8dd790d49 Allow passing timestamps to Timing.mark. 49edbd3a2 Measure TBM2 runMetrics. 9aa395965 [trace-viewer] Update according to chrome side Frame Viewer trace format 5b4ef865e Roll eslint to 4.0. 183509ba6 Shorten normalizedPercentage units to a single decimal digit. 669dcb14a [trace-viewer] Fix "no tree" error in layer quad stack view a6ccbcf12 [trace-viewer] Fix exception when rasterizing zero-sized picture bc894f56c [vr] Add post_submit_draw_on_gpu metric a07c6a933 Histogram - Cache info types 3d2afdf63 [CSMMerging] Refactor breakdown_tree_helper with findEmptyRangesBetweenRanges 075ca3000 Support fuchsia project revisions in tooltips. b6e96e16f Introduce sequence_manager tracing category. 2048c078d [Dashboard] Fix stdio URLs for histogram uploads 504f52bbe Fix symbolization of heap profiles when so is mapped from apk 86d3e79d8 [Tracing] Android native library resident size statistics. 846cec5c4 HtmlEscape histogram json when rendering results.html 055c03395 Use top-level scheduler tasks in EQT metric. 59aabe8d4 Generate brighter color palette using SinebowColorGenerator. 222de1a4f [TBMv2] Add HAD_FAILURES diagnostic and use it to avoid merging a22719853 [vr] Increase VR Response UE to 1s 516a69786 HistogramSet - Merge by test paths in add_reserved_diagnostics. 1bae362e7 HistogramSet - Merge by only a subset of tags. 8ddb78550 [Dashboard] Merge histograms by tags in add_reserved_diagnostics 10232e9c9 Histogram - Missing json import in bin/add_reserved_diagnostics 71fd6b902 Revert "Do not add zero values to breakdown diagnostics" 7c43e1be4 Do not add zero values to breakdown diagnostics 1c69b2f42 androidStartupMetric: add first_contentful_paint_time b5e636db8 HistogramSet - Only merge histograms with stories. 0ad14f9aa [TBMv2] Test add_reserved_diagnostics 72c05e713 Fix frame grouping for [Web]FrameScheduler since it was renamed. 6b8f67cc1 VR: Remove UpdateTexturesAndSizes metric 5d35a2c71 Get navigation info without using FrameLoader snapshots 8b153cc7d Revert "HistogramSet - Only merge histograms with stories." bffbf166f HistogramSet - Only merge histograms with stories. 85462f12f [TBMv2] Add GenericSet.GetOnlyElement in Python fe230b673 [Build] Fix tracing Python tests 7e3fcbe35 Reland "More precise self time calculation" 1dfd083b6 Fix sorting results.html 718296623 First set of thread times metrics in TBMv2 17fc85e9c Replace --enable-heap-profiling with --memlog equivalent. f9a1ae1b3 Fix visual rect support for cc::DisplayItemList 580f1ca28 [Dashboard] Add IS_SUMMARY diagnostic b3d01529c [fuchsia] Add thread state to fuchsia importer. 1446cf3fe [vr] Fix draw metrics in frameCycleDurationMetric f73167a68 Ignore i-frame navigationStart events when computing LoadExpectation 4d4ed66a7 Revert "More precise self time calculation" 548a5bc4b androidStartupMetric: add request_start_time df668c312 Disable failing Snap-It test 27e44012b [Tracing] Fix merge_traces.py script a0688890f [results.html] Show All by default. 900b947e1 [vr] Add metrics for render step to frameCycleDurationMetric 2210f05b4 More precise self time calculation 875a659c7 Remove the 'deleted' suffix on path name 5c590a9bf Tracing: CPU time computation clean up b18c0b5df [vr] Fix submit_frame of frameCycleDuration metric 1c706a34f [TBMv2] Allow nulls to be stably stringified 0ac0bb6d1 [TBMv2] Factor mergeHistograms out in merge_histograms_cmdline Test: ./systrace.py -b 65536 gfx sync sched -t 5
Diffstat (limited to 'catapult/devil/devil/android/device_errors.py')
-rw-r--r--catapult/devil/devil/android/device_errors.py30
1 files changed, 14 insertions, 16 deletions
diff --git a/catapult/devil/devil/android/device_errors.py b/catapult/devil/devil/android/device_errors.py
index 57f36150..cd0266c8 100644
--- a/catapult/devil/devil/android/device_errors.py
+++ b/catapult/devil/devil/android/device_errors.py
@@ -55,15 +55,15 @@ class _BaseCommandFailedError(CommandFailedError):
self.status = status
if not message:
adb_cmd = ' '.join(cmd_helper.SingleQuote(arg) for arg in self.args)
- message = ['adb %s: failed ' % adb_cmd]
+ segments = ['adb %s: failed ' % adb_cmd]
if status:
- message.append('with exit status %s ' % self.status)
+ segments.append('with exit status %s ' % self.status)
if output:
- message.append('and output:\n')
- message.extend('- %s\n' % line for line in output.splitlines())
+ segments.append('and output:\n')
+ segments.extend('- %s\n' % line for line in output.splitlines())
else:
- message.append('and no output.')
- message = ''.join(message)
+ segments.append('and no output.')
+ message = ''.join(segments)
super(_BaseCommandFailedError, self).__init__(message, device_serial)
def __eq__(self, other):
@@ -79,8 +79,7 @@ class _BaseCommandFailedError(CommandFailedError):
"""Support pickling."""
result = [None, None, None, None, None]
super_result = super(_BaseCommandFailedError, self).__reduce__()
- for i in range(len(super_result)):
- result[i] = super_result[i]
+ result[:len(super_result)] = super_result
# Update the args used to reconstruct this exception.
result[1] = (
@@ -120,19 +119,19 @@ class AdbShellCommandFailedError(AdbCommandFailedError):
def __init__(self, command, output, status, device_serial=None):
self.command = command
- message = ['shell command run via adb failed on the device:\n',
+ segments = ['shell command run via adb failed on the device:\n',
' command: %s\n' % command]
- message.append(' exit status: %s\n' % status)
+ segments.append(' exit status: %s\n' % status)
if output:
- message.append(' output:\n')
+ segments.append(' output:\n')
if isinstance(output, basestring):
output_lines = output.splitlines()
else:
output_lines = output
- message.extend(' - %s\n' % line for line in output_lines)
+ segments.extend(' - %s\n' % line for line in output_lines)
else:
- message.append(" output: ''\n")
- message = ''.join(message)
+ segments.append(" output: ''\n")
+ message = ''.join(segments)
super(AdbShellCommandFailedError, self).__init__(
['shell', command], output, status, device_serial, message)
@@ -140,8 +139,7 @@ class AdbShellCommandFailedError(AdbCommandFailedError):
"""Support pickling."""
result = [None, None, None, None, None]
super_result = super(AdbShellCommandFailedError, self).__reduce__()
- for i in range(len(super_result)):
- result[i] = super_result[i]
+ result[:len(super_result)] = super_result
# Update the args used to reconstruct this exception.
result[1] = (self.command, self.output, self.status, self.device_serial)