Fix desktop.memory measurement to emit memory-infra dumps.

tools/perf/benchmarks/memory.py

 # Copyright 2015 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 re
 
 from core import perf_benchmark
 
 from telemetry import benchmark
 from telemetry.timeline import chrome_trace_category_filter
@@ skipping 16 matching lines @@
   is part of chrome tracing, and extracts it using timeline-based measurements.
   """
 
   def CreateTimelineBasedMeasurementOptions(self):
     # Enable only memory-infra, to get memory dumps, and blink.console, to get
     # the timeline markers used for mapping threads to tabs.
     trace_memory = chrome_trace_category_filter.ChromeTraceCategoryFilter(
         filter_string='-*,blink.console,disabled-by-default-memory-infra')
     tbm_options = timeline_based_measurement.Options(
         overhead_level=trace_memory)
-    tbm_options.config.enable_android_graphics_memtrack = True

[Primiano Tucci (use gerrit), 2017/03/21 15:33:06]

isn't this going to lose graphics memtrack coverage on android? I am missing
something here
I

[nednguyen, 2017/03/21 15:35:18]

Yeah, this should be removed for desktop memory benchmark only

[perezju, 2017/03/21 15:48:34]

This should not be removed at all. It is needed for android, and ignored
elsewhere:
https://github.com/catapult-project/catapult/blob/master/telemetry/telemetry/...

Was this causing any sort of issue?

[erikchen, 2017/03/21 17:11:34]

whoops, I wanted to only remove this for desktop. Let me just add it back, since
it doesn't negatively affect desktop

     tbm_options.SetTimelineBasedMetrics(['memoryMetric'])
     # Setting an empty memory dump config disables periodic dumps.
     tbm_options.config.chrome_trace_config.SetMemoryDumpConfig(
         chrome_trace_config.MemoryDumpConfig())
     return tbm_options
 
   def SetExtraBrowserOptions(self, options):
     # Just before we measure memory we flush the system caches
     # unfortunately this doesn't immediately take effect, instead
     # the next page run is effected. Due to this the first page run
     # has anomalous results. This option causes us to flush caches
     # each time before Chrome starts so we effect even the first page
     # - avoiding the bug.
     options.clear_sytem_cache_for_browser_and_profile_on_start = True
 
 
 @benchmark.Enabled('mac')
 @benchmark.Enabled('win')
 @benchmark.Owner(emails=['erikchen@chromium.org'])
 class MemoryBenchmarkTrivialSitesDesktop(_MemoryInfra):
   """Measure memory usage on trivial sites."""
-  page_set = page_sets.TrivialSitesStorySet
   options = {'pageset_repeat': 5}
 
+  def CreateStorySet(self, options):
+    return page_sets.TrivialSitesStorySet(wait_in_seconds=0,
+                                          measure_memory=True)
+
   @classmethod
   def Name(cls):
     return 'memory.desktop'
 
   @classmethod
   def ShouldTearDownStateAfterEachStoryRun(cls):
     return True
 
   @classmethod
   def ValueCanBeAddedPredicate(cls, value, is_first_result):
@@ skipping 197 matching lines @@
   of long running idle Gmail page """
   page_set = page_sets.LongRunningIdleGmailBackgroundPageSet
 
   @classmethod
   def Name(cls):
     return 'memory.long_running_idle_gmail_background_tbmv2'
 
   @classmethod
   def ShouldDisable(cls, possible_browser):  # http://crbug.com/616530
     return cls.IsSvelte(possible_browser)