sandwich: Make speed-index and memory measurement optional from run-all

tools/android/loading/sandwich.py

 #! /usr/bin/env python
 # Copyright 2016 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.
 
 """Instructs Chrome to load series of web pages and reports results.
 
 When running Chrome is sandwiched between preprocessed disk caches and
 WepPageReplay serving all connections.
 
@@ skipping 26 matching lines @@
 import sandwich_misc
 from sandwich_runner import SandwichRunner
 import sandwich_task_builder
 import task_manager
 from trace_test.webserver_test import WebServer
 
 
 # Use options layer to access constants.
 OPTIONS = options.OPTIONS
 
+_SPEED_INDEX_MEASUREMENT = 'speed-index'
+_MEMORY_MEASUREMENT = 'memory'
+
 
 def _ArgumentParser():
   """Build a command line argument's parser."""
   # Command parser when dealing with jobs.
   common_job_parser = argparse.ArgumentParser(add_help=False)
   common_job_parser.add_argument('--job', required=True,
                                  help='JSON file with job description.')
   common_job_parser.add_argument('--android', default=None, type=str,
                                  dest='android_device_serial',
                                  help='Android device\'s serial to use.')
@@ skipping 115 matching lines @@
                                    help='Source page in source-dir to navigate '
                                         'to.')
   record_trace_parser.add_argument('-o', '--output', type=str, required=True,
                                    help='Output path of the generated trace.')
 
   # Run all subcommand.
   run_all = subparsers.add_parser('run-all',
                        parents=[common_job_parser, task_parser],
                        help='Run all steps using the task manager '
                             'infrastructure.')
+  run_all.add_argument('-m', '--measure', default=[], dest='optional_measures',
+                       choices=[_SPEED_INDEX_MEASUREMENT, _MEMORY_MEASUREMENT],
+                       nargs='+', help='Enable optional measure.')

[pasko, 2016/04/28 15:04:59]

Enable optional measurements.

[gabadie, 2016/04/28 15:56:22]

Done.

   run_all.add_argument('-g', '--gen-full', action='store_true',
                        help='Generate the full graph with all possible'
                             'benchmarks.')
   run_all.add_argument('--wpr-archive', default=None, type=str,
                        dest='wpr_archive_path',
                        help='WebPageReplay archive to use, instead of '
                             'generating one.')
   run_all.add_argument('--url-repeat', default=1, type=int,
                        help='How many times to repeat the urls.')
 
@@ skipping 82 matching lines @@
 
 
 def _RunAllMain(args):
   android_device = None
   if args.android_device_serial:
     android_device = \
         device_setup.GetDeviceFromSerial(args.android_device_serial)
   builder = sandwich_task_builder.SandwichTaskBuilder(
       output_directory=args.output,
       android_device=android_device,
-      job_path=args.job,
-      url_repeat=args.url_repeat)
+      job_path=args.job)
   if args.wpr_archive_path:
     builder.OverridePathToWprArchive(args.wpr_archive_path)
   else:
     builder.PopulateWprRecordingTask()
   builder.PopulateCommonPipelines()
 
+  def BenchmarkRunnerTransformer(runner):
+    runner.record_video = _SPEED_INDEX_MEASUREMENT in args.optional_measures
+    runner.record_memory_dumps = _MEMORY_MEASUREMENT in args.optional_measures
+    runner.job_repeat = args.url_repeat

[gabadie, 2016/04/28 14:29:32]

Passing down these benchmark specific parameters using boiler plate code to make
them becoming members of SandwichTaskBuilder was starting to annoy me very much.
So I have decided in this CL to use the full power of the runner transformers.
Instead of making SandwichTaskBuilder more fat.

+
   runner_transformer_name = 'no-network-emulation'
-  runner_transformer = lambda arg: None
+  runner_transformer = BenchmarkRunnerTransformer
   builder.PopulateLoadBenchmark(sandwich_misc.EMPTY_CACHE_DISCOVERER,
                                 runner_transformer_name, runner_transformer)
   builder.PopulateLoadBenchmark(sandwich_misc.FULL_CACHE_DISCOVERER,
                                 runner_transformer_name, runner_transformer)
 
   if args.gen_full:
     for subresource_discoverer in sandwich_misc.SUBRESOURCE_DISCOVERERS:
       if subresource_discoverer == sandwich_misc.FULL_CACHE_DISCOVERER:
         continue
       for network_condition in ['Regular4G', 'Regular3G', 'Regular2G']:
         runner_transformer_name = network_condition.lower()
         runner_transformer = sandwich_task_builder.NetworkSimulationTransformer(
-            network_condition)
+            network_condition, parent_transformer=BenchmarkRunnerTransformer)
         builder.PopulateLoadBenchmark(
             subresource_discoverer, runner_transformer_name, runner_transformer)
 
   return task_manager.ExecuteWithCommandLine(
       args, builder.tasks.values(), builder.default_final_tasks)
 
 
 def main(command_line_args):
   logging.basicConfig(level=logging.INFO)
   devil_chromium.Initialize()
@@ skipping 16 matching lines @@
     return _FilterCacheMain(args)
   if args.subcommand == 'record-test-trace':
     return _RecordWebServerTestTrace(args)
   if args.subcommand == 'run-all':
     return _RunAllMain(args)
   assert False
 
 
 if __name__ == '__main__':
   sys.exit(main(sys.argv[1:]))