Add a --startup option to generate combined traces for startup.

tools/profile_chrome/main.py

 #!/usr/bin/env python
 #
 # Copyright 2014 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 logging
 import optparse
 import os
 import sys
 import webbrowser
 
 from profile_chrome import chrome_controller
+from profile_chrome import flags
 from profile_chrome import perf_controller
 from profile_chrome import profiler
 from profile_chrome import systrace_controller
 from profile_chrome import ui
 
 from pylib import android_commands
 from pylib.device import device_utils
 
 
 _DEFAULT_CHROME_CATEGORIES = '_DEFAULT_CHROME_CATEGORIES'
@@ skipping 88 matching lines @@
   chrome_opts.add_option('--trace-flow', help='Enable extra trace categories '
                          'for IPC message flows.', action='store_true')
   chrome_opts.add_option('--trace-memory', help='Enable extra trace categories '
                          'for memory profile. (tcmalloc required)',
                          action='store_true')
   chrome_opts.add_option('--trace-scheduler', help='Enable extra trace '
                          'categories for scheduler state',
                          action='store_true')
   parser.add_option_group(chrome_opts)
 
-  systrace_opts = optparse.OptionGroup(parser, 'Systrace tracing options')
-  systrace_opts.add_option('-s', '--systrace', help='Capture a systrace with '
-                        'the chosen comma-delimited systrace categories. You '
-                        'can also capture a combined Chrome + systrace by '
-                        'enable both types of categories. Use "list" to see '
-                        'the available categories. Systrace is disabled by '
-                        'default.', metavar='SYS_CATEGORIES',
-                        dest='systrace_categories', default='')
-  parser.add_option_group(systrace_opts)
+  parser.add_option_group(flags.SystraceOptions(parser))
 
   if perf_controller.PerfProfilerController.IsSupported():
     perf_opts = optparse.OptionGroup(parser, 'Perf profiling options')
     perf_opts.add_option('-p', '--perf', help='Capture a perf profile with '
                          'the chosen comma-delimited event categories. '
                          'Samples CPU cycles by default. Use "list" to see '
                          'the available sample types.', action='callback',
                          default='', callback=_OptionalValueCallback('cycles'),
                          metavar='PERF_CATEGORIES', dest='perf_categories')
     parser.add_option_group(perf_opts)
 
-  output_options = optparse.OptionGroup(parser, 'Output options')
-  output_options.add_option('-o', '--output', help='Save trace output to file.')
-  output_options.add_option('--json', help='Save trace as raw JSON instead of '
-                            'HTML.', action='store_true')
-  output_options.add_option('--view', help='Open resulting trace file in a '
-                            'browser.', action='store_true')
-  parser.add_option_group(output_options)
+  parser.add_option_group(flags.OutputOptions(parser))
 
   browsers = sorted(profiler.GetSupportedBrowsers().keys())
   parser.add_option('-b', '--browser', help='Select among installed browsers. '
                     'One of ' + ', '.join(browsers) + ', "stable" is used by '
                     'default.', type='choice', choices=browsers,
                     default='stable')
   parser.add_option('-v', '--verbose', help='Verbose logging.',
                     action='store_true')
   parser.add_option('-z', '--compress', help='Compress the resulting trace '
                     'with gzip. ', action='store_true')
@@ skipping 64 matching lines @@
                     'Chrome tracing results in duplicate trace events.')
 
   enabled_controllers = []
   if chrome_categories:
     enabled_controllers.append(
         chrome_controller.ChromeTracingController(device,
                                                   package_info,
                                                   chrome_categories,
                                                   options.ring_buffer,
                                                   options.trace_memory))
   if systrace_categories:

[pasko, 2015/01/27 17:00:24]

wouldn't it still be useful to put systrace earlier for non-startup cases?

[Benoit L, 2015/01/27 18:41:41]

Maybe, but this would be another CL.

[pasko, 2015/01/28 12:26:03]

I assumed it is only about swapping a few lines here, is it more involved? Can
please you put a TODO? This would reduce the likelihood of it being forgotten.

     enabled_controllers.append(
         systrace_controller.SystraceController(device,
                                                systrace_categories,
                                                options.ring_buffer))
 
   if perf_categories:
     enabled_controllers.append(
         perf_controller.PerfProfilerController(device,
                                                perf_categories))
 
   if not enabled_controllers:
     ui.PrintMessage('No trace categories enabled.')
     return 1
 
   if options.output:
     options.output = os.path.expanduser(options.output)
   result = profiler.CaptureProfile(
       enabled_controllers,
       options.time if not options.continuous else 0,
       output=options.output,
       compress=options.compress,
       write_json=options.json)
   if options.view:
     if sys.platform == 'darwin':
       os.system('/usr/bin/open %s' % os.path.abspath(result))
     else:
       webbrowser.open(result)