Skip to content

Commit

Permalink
Telemetry: Check in PrintPerfResult that the flattened list is also n…
Browse files Browse the repository at this point in the history
…on-zero.

BUG=304335

Review URL: https://codereview.chromium.org/25999004

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@227271 0039d316-1c4b-4281-b951-d872f2087c98
  • Loading branch information
rmcilroy@chromium.org committed Oct 7, 2013
1 parent f9d3bcb commit d3ee991
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 6 deletions.
9 changes: 5 additions & 4 deletions build/util/lib/common/perf_tests_results_helper.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,12 @@ def _EscapePerfResult(s):
return re.sub('[\:|=/#&,]', '_', s)


def _Flatten(values):
def FlattenList(values):
"""Returns a simple list without sub-lists."""
ret = []
for entry in values:
if isinstance(entry, list):
ret.extend(_Flatten(entry))
ret.extend(FlattenList(entry))
else:
ret.append(entry)
return ret
Expand Down Expand Up @@ -120,9 +120,10 @@ def PrintPerfResult(measurement, trace, values, units,
result_type == perf_result_data_type.DEFAULT or
result_type == perf_result_data_type.INFORMATIONAL):
assert isinstance(values, list)
assert len(values)
assert '/' not in measurement
value, avg, sd = _MeanAndStdDevFromList(_Flatten(values))
flattened_values = FlattenList(values)
assert len(flattened_values)
value, avg, sd = _MeanAndStdDevFromList(flattened_values)
output = '%s%s: %s%s%s %s' % (
RESULT_TYPES[result_type],
_EscapePerfResult(measurement),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -89,10 +89,11 @@ def PrintSummary(self):
continue
name_value_map[name].append(value)
for name in unique_pages:
if not len(name_value_map[name]):
values = perf_tests_helper.FlattenList(name_value_map[name])
if not len(values):
continue
self._PrintPerfResult(measurement + '_by_url', name,
name_value_map[name], units, by_name_data_type)
values, units, by_name_data_type)

# If there were no page failures, print the average data.
# For histograms, we don't print the average data, only the _by_name,
Expand Down
2 changes: 2 additions & 0 deletions tools/telemetry/telemetry/page/perf_tests_helper.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@
import perf_tests_results_helper # pylint: disable=F0401


FlattenList = \
perf_tests_results_helper.FlattenList
GeomMeanAndStdDevFromHistogram = \
perf_tests_results_helper.GeomMeanAndStdDevFromHistogram
PrintPerfResult = \
Expand Down

0 comments on commit d3ee991

Please sign in to comment.