Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(119)

Unified Diff: trunk/src/tools/perf/metrics/memory.py

Issue 111773002: Revert 239784 "Make page_cycler.py fully measure memory for each..." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 7 years 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 side-by-side diff with in-line comments
Download patch
Index: trunk/src/tools/perf/metrics/memory.py
===================================================================
--- trunk/src/tools/perf/metrics/memory.py (revision 239788)
+++ trunk/src/tools/perf/metrics/memory.py (working copy)
@@ -77,9 +77,7 @@
self._histogram_delta[h['name']] = histogram_util.SubtractHistogram(
histogram_data, self._histogram_start[h['name']])
- # Optional argument trace_name is not in base class Metric.
- # pylint: disable=W0221
- def AddResults(self, tab, results, trace_name=None):
+ def AddResults(self, tab, results):
"""Add results for this page to the results object."""
assert self._histogram_delta, 'Must call Stop() first'
for h in _HISTOGRAMS:
@@ -88,6 +86,9 @@
continue
results.Add(h['name'], h['units'], self._histogram_delta[h['name']],
data_type='unimportant-histogram')
+
+ def AddSummaryResults(self, results, trace_name=None):
+ """Add summary (overall) results to the results object."""
self._memory_stats = self._browser.memory_stats
if not self._memory_stats['Browser']:
return
@@ -96,15 +97,15 @@
if sys.platform == 'win32':
metric = 'working_set'
- def AddResultsForProcessTypes(process_types_memory, process_type_trace):
- """Add all results for a given set of process types.
+ def AddSummariesForProcessTypes(process_types_memory, process_type_trace):
+ """Add all summaries to the results for a given set of process types.
Args:
process_types_memory: A list of process types, e.g. Browser, 'Renderer'
process_type_trace: The name of this set of process types in the output
"""
- def AddResult(value_name_memory, value_name_trace):
- """Add a result for a given statistic.
+ def AddSummary(value_name_memory, value_name_trace):
+ """Add a summary to the results for a given statistic.
Args:
value_name_memory: Name of some statistic, e.g. VM, WorkingSetSize
@@ -124,29 +125,30 @@
else:
current_trace = '%s_%s' % (value_name_trace, process_type_trace)
chart_name = current_trace
- results.Add(current_trace, 'bytes', sum(values),
- chart_name=chart_name, data_type='unimportant')
+ results.AddSummary(current_trace, 'bytes', sum(values),
+ chart_name=chart_name, data_type='unimportant')
- AddResult('VM', 'vm_final_size')
- AddResult('WorkingSetSize', 'vm_%s_final_size' % metric)
- AddResult('PrivateDirty', 'vm_private_dirty_final')
- AddResult('ProportionalSetSize', 'vm_proportional_set_size_final')
- AddResult('SharedDirty', 'vm_shared_dirty_final')
- AddResult('VMPeak', 'vm_peak_size')
- AddResult('WorkingSetSizePeak', '%s_peak_size' % metric)
+ AddSummary('VM', 'vm_final_size')
+ AddSummary('WorkingSetSize', 'vm_%s_final_size' % metric)
+ AddSummary('PrivateDirty', 'vm_private_dirty_final')
+ AddSummary('ProportionalSetSize', 'vm_proportional_set_size_final')
+ AddSummary('SharedDirty', 'vm_shared_dirty_final')
+ AddSummary('VMPeak', 'vm_peak_size')
+ AddSummary('WorkingSetSizePeak', '%s_peak_size' % metric)
- AddResultsForProcessTypes(['Browser'], 'browser')
- AddResultsForProcessTypes(['Renderer'], 'renderer')
- AddResultsForProcessTypes(['Gpu'], 'gpu')
- AddResultsForProcessTypes(['Browser', 'Renderer', 'Gpu'], 'total')
+ AddSummariesForProcessTypes(['Browser'], 'browser')
+ AddSummariesForProcessTypes(['Renderer'], 'renderer')
+ AddSummariesForProcessTypes(['Gpu'], 'gpu')
+ AddSummariesForProcessTypes(['Browser', 'Renderer', 'Gpu'], 'total')
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.AddSummary(trace_name or 'commit_charge', 'kb',
+ commit_charge_difference,
+ chart_name='commit_charge',
+ data_type='unimportant')
+ results.AddSummary(trace_name or 'processes', 'count',
+ self._memory_stats['ProcessCount'],
+ chart_name='processes',
+ data_type='unimportant')
+
« no previous file with comments | « trunk/src/tools/perf/measurements/page_cycler.py ('k') | trunk/src/tools/telemetry/telemetry/core/browser.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698