Commit cd1715e4 authored by nednguyen@google.com's avatar nednguyen@google.com

Change results.Add to results.AddResult in memory metrics.

BUG=383153

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@276572 0039d316-1c4b-4281-b951-d872f2087c98
parent 8d715ad6
...@@ -6,6 +6,9 @@ import sys ...@@ -6,6 +6,9 @@ import sys
from metrics import histogram_util from metrics import histogram_util
from metrics import Metric from metrics import Metric
from telemetry.value import histogram
from telemetry.value import scalar
_HISTOGRAMS = [ _HISTOGRAMS = [
{'name': 'V8.MemoryExternalFragmentationTotal', 'units': 'percent', {'name': 'V8.MemoryExternalFragmentationTotal', 'units': 'percent',
...@@ -93,9 +96,9 @@ class MemoryMetric(Metric): ...@@ -93,9 +96,9 @@ class MemoryMetric(Metric):
# Histogram data may not be available # Histogram data may not be available
if h['name'] not in self._histogram_start: if h['name'] not in self._histogram_start:
continue continue
results.Add(h['display_name'], h['units'], results.AddValue(histogram.HistogramValue(
self._histogram_delta[h['name']], results.current_page, h['display_name'], h['units'],
data_type='unimportant-histogram') raw_value_json=self._histogram_delta[h['name']], important=False))
self._memory_stats = self._browser.memory_stats self._memory_stats = self._browser.memory_stats
if not self._memory_stats['Browser']: if not self._memory_stats['Browser']:
return return
...@@ -104,14 +107,17 @@ class MemoryMetric(Metric): ...@@ -104,14 +107,17 @@ class MemoryMetric(Metric):
end_commit_charge = self._memory_stats['SystemCommitCharge'] end_commit_charge = self._memory_stats['SystemCommitCharge']
commit_charge_difference = end_commit_charge - self._start_commit_charge commit_charge_difference = end_commit_charge - self._start_commit_charge
results.Add(trace_name or 'commit_charge', 'kb', results.AddValue(scalar.ScalarValue(
commit_charge_difference, results.current_page,
chart_name='commit_charge', 'commit_charge.' + (trace_name or 'commit_charge'),
data_type='unimportant') 'kb',
results.Add(trace_name or 'processes', 'count', commit_charge_difference, important=False))
self._memory_stats['ProcessCount'], results.AddValue(scalar.ScalarValue(
chart_name='processes', results.current_page,
data_type='unimportant') 'processes.' + (trace_name or 'processes'),
'count',
self._memory_stats['ProcessCount'],
important=False))
def AddResultsForProcesses(results, memory_stats, chart_trace_name='final', def AddResultsForProcesses(results, memory_stats, chart_trace_name='final',
...@@ -163,8 +169,9 @@ def AddResultsForProcesses(results, memory_stats, chart_trace_name='final', ...@@ -163,8 +169,9 @@ def AddResultsForProcesses(results, memory_stats, chart_trace_name='final',
else: else:
current_trace = '%s_%s' % (value_name_trace, process_type_trace) current_trace = '%s_%s' % (value_name_trace, process_type_trace)
chart_name = current_trace chart_name = current_trace
results.Add(current_trace, 'kb', sum(values) / 1024, results.AddValue(scalar.ScalarValue(
chart_name=chart_name, data_type='unimportant') results.current_page, '%s.%s' % (chart_name, current_trace), 'kb',
sum(values) / 1024, important=False))
AddResult('VM', 'vm_%s_size' % chart_trace_name) AddResult('VM', 'vm_%s_size' % chart_trace_name)
AddResult('WorkingSetSize', 'vm_%s_%s_size' % (metric, chart_trace_name)) AddResult('WorkingSetSize', 'vm_%s_%s_size' % (metric, chart_trace_name))
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment