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

tools/perf/metrics/memory.py

 # Copyright 2013 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import sys
 
 from metrics import histogram_util
 from metrics import Metric
+from telemetry.value import scalar
+from telemetry.value import histogram

[tonyg, 2014/06/11 03:29:58]

nit: alphabetize

 
 _HISTOGRAMS = [
     {'name': 'V8.MemoryExternalFragmentationTotal', 'units': 'percent',
      'display_name': 'V8_MemoryExternalFragmentationTotal',
      'type': histogram_util.RENDERER_HISTOGRAM},
     {'name': 'V8.MemoryHeapSampleTotalCommitted', 'units': 'kb',
      'display_name': 'V8_MemoryHeapSampleTotalCommitted',
      'type': histogram_util.RENDERER_HISTOGRAM},
     {'name': 'V8.MemoryHeapSampleTotalUsed', 'units': 'kb',
      'display_name': 'V8_MemoryHeapSampleTotalUsed',
@@ skipping 67 matching lines @@
 
   # Optional argument trace_name is not in base class Metric.
   # pylint: disable=W0221
   def AddResults(self, tab, results, trace_name=None):
     """Add results for this page to the results object."""
     assert self._histogram_delta, 'Must call Stop() first'
     for h in _HISTOGRAMS:
       # Histogram data may not be available
       if h['name'] not in self._histogram_start:
         continue
-      results.Add(h['display_name'], h['units'],
-                  self._histogram_delta[h['name']],
-                  data_type='unimportant-histogram')
+      results.AddValue(histogram.HistogramValue(
+          results.current_page, h['display_name'], h['units'],
+          raw_value_json=self._histogram_delta[h['name']], important=False))
     self._memory_stats = self._browser.memory_stats
     if not self._memory_stats['Browser']:
       return
     AddResultsForProcesses(results, self._memory_stats,
                            metric_trace_name=trace_name)
 
     end_commit_charge = self._memory_stats['SystemCommitCharge']
     commit_charge_difference = end_commit_charge - self._start_commit_charge
-    results.Add(trace_name or 'commit_charge', 'kb',
-                commit_charge_difference,
-                chart_name='commit_charge',
-                data_type='unimportant')
-    results.Add(trace_name or 'processes', 'count',
-                self._memory_stats['ProcessCount'],
-                chart_name='processes',
-                data_type='unimportant')
+    results.AddValue(scalar.ScalarValue(
+        results.current_page,
+        'commit_charge.' + (trace_name or 'commit_charge'),
+        'kb',
+        commit_charge_difference))

[tonyg, 2014/06/11 03:29:58]

important=False

+    results.AddValue(scalar.ScalarValue(
+        results.current_page,
+        'processes.' + (trace_name or 'processes'),
+        'count',
+        self._memory_stats['ProcessCount'],
+        important=False))
 
 
 def AddResultsForProcesses(results, memory_stats, chart_trace_name='final',
                            metric_trace_name=None,
                            exclude_metrics=None):
   """Adds memory stats for browser, renderer and gpu processes.
 
   Args:
     results: A PageMeasurement results object.
     memory_stats: System memory stats collected.
@@ skipping 31 matching lines @@
         stats = memory_stats[process_type_memory]
         if value_name_memory in stats:
           values.append(stats[value_name_memory])
       if values:
         if metric_trace_name:
           current_trace = '%s_%s' % (metric_trace_name, process_type_trace)
           chart_name = value_name_trace
         else:
           current_trace = '%s_%s' % (value_name_trace, process_type_trace)
           chart_name = current_trace
-        results.Add(current_trace, 'kb', sum(values) / 1024,
-                    chart_name=chart_name, data_type='unimportant')
+        results.AddValue(scalar.ScalarValue(
+            results.current_page, '%s.%s' % (chart_name, current_trace), 'kb',
+            sum(values) / 1024, important=False))
 
     AddResult('VM', 'vm_%s_size' % chart_trace_name)
     AddResult('WorkingSetSize', 'vm_%s_%s_size' % (metric, chart_trace_name))
     AddResult('PrivateDirty', 'vm_private_dirty_%s' % chart_trace_name)
     AddResult('ProportionalSetSize',
               'vm_proportional_set_size_%s' % chart_trace_name)
     AddResult('SharedDirty', 'vm_shared_dirty_%s' % chart_trace_name)
     AddResult('VMPeak', 'vm_peak_size')
     AddResult('WorkingSetSizePeak', '%s_peak_size' % metric)
 
   AddResultsForProcessTypes(['Browser'], 'browser')
   AddResultsForProcessTypes(['Renderer'], 'renderer')
   AddResultsForProcessTypes(['Gpu'], 'gpu')
   AddResultsForProcessTypes(['Browser', 'Renderer', 'Gpu'], 'total')