| Index: chrome/test/media_router/telemetry/benchmarks/media_router_cpu_memory_metric.py
|
| diff --git a/chrome/test/media_router/telemetry/benchmarks/media_router_cpu_memory_metric.py b/chrome/test/media_router/telemetry/benchmarks/media_router_cpu_memory_metric.py
|
| index b7ca295cda986adfbebe03302160d2a0f4b6d940..c44a8431c8622f79200d168df575ebfd30b7649a 100644
|
| --- a/chrome/test/media_router/telemetry/benchmarks/media_router_cpu_memory_metric.py
|
| +++ b/chrome/test/media_router/telemetry/benchmarks/media_router_cpu_memory_metric.py
|
| @@ -12,7 +12,7 @@ from metrics import Metric
|
|
|
|
|
| METRICS = {'privateMemory': {'units': 'MB', 'display_name': 'private_memory'},
|
| - 'cpu': {'units': '%', 'display_name': 'cpu_utilization'}}
|
| + 'cpu': {'units': '%', 'display_name': 'cpu_utilization'}}
|
|
|
|
|
| class MediaRouterCPUMemoryMetric(Metric):
|
| @@ -41,11 +41,21 @@ class MediaRouterCPUMemoryMetric(Metric):
|
| for (process, process_results) in metric_results.iteritems():
|
| if not process_results:
|
| continue
|
| - avg_result = round(sum(process_results)/len(process_results), 4)
|
| + # Get rid of 0 values
|
| + non_zero_results = [result for result in process_results if result]
|
| + avg_result = round(sum(non_zero_results)/len(non_zero_results), 4)
|
| if metric == 'privateMemory':
|
| avg_result = round(avg_result/(1024 * 1024), 2)
|
| results.AddValue(scalar.ScalarValue(
|
| results.current_page,
|
| - '%s.%s' % (METRICS.get(metric).get('display_name'), process),
|
| + '%s_%s' % (METRICS.get(metric).get('display_name'), process),
|
| METRICS.get(metric).get('units'),
|
| avg_result))
|
| +
|
| + # Calculate MR extension wakeup time
|
| + wakeup_percentage = round(
|
| + (len(perf_results['cpu']['mr_extension']) * 100 /
|
| + len(perf_results['cpu']['browser'])), 2)
|
| + results.AddValue(scalar.ScalarValue(
|
| + results.current_page, 'mr_extension_wakeup_percentage',
|
| + '%', wakeup_percentage))
|
|
|