systrace/systrace/tracing_agents/battor_trace_agent.py - Issue 2162963002: [polymer] Merge of master into polymer10-migration

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: systrace/systrace/tracing_agents/battor_trace_agent.py

Issue 2162963002: [polymer] Merge of master into polymer10-migration (Closed) Base URL: git@github.com:catapult-project/catapult.git@polymer10-migration

Patch Set: Merge polymer10-migration int polymer10-merge Created 4 years, 5 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 unified diff | Download patch

OLD	NEW
1 # Copyright 2016 The Chromium Authors. All rights reserved.	1 # Copyright 2016 The Chromium Authors. All rights reserved.

2 # Use of this source code is governed by a BSD-style license that can be	2 # Use of this source code is governed by a BSD-style license that can be

3 # found in the LICENSE file.	3 # found in the LICENSE file.

4	4

5 from os import path	5 from os import path

6 import atexit	6 import atexit

7 import logging	7 import logging

8 import py_utils	8 import py_utils

9	9

10 from battor import battor_wrapper	10 from battor import battor_wrapper

(...skipping 93 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
104 during that sample.	104 during that sample.

105	105

106 time = time since start of trace (ms)	106 time = time since start of trace (ms)

107 current = current through battery (mA) - this can be negative if the	107 current = current through battery (mA) - this can be negative if the

108 battery is charging	108 battery is charging

109 voltage = voltage of battery (mV)	109 voltage = voltage of battery (mV)

110	110

111 Returns:	111 Returns:

112 The trace data.	112 The trace data.

113 """	113 """

114 return tracing_agents.TraceResult('powerTraceAsString',	114 return tracing_agents.TraceResult(

115 '\n'.join(self._battor_wrapper.CollectTraceData()))	115 'powerTraceAsString', self._battor_wrapper.CollectTraceData())

OLD	NEW