Pass in custom options to Systrace agents

systrace/profile_chrome/profiler.py

 # 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 time
 
 from devil.android.constants import chrome
+from profile_chrome import atrace_tracing_agent
+from profile_chrome import chrome_startup_tracing_agent
 from profile_chrome import chrome_tracing_agent
+from profile_chrome import ddms_tracing_agent
+from profile_chrome import perf_tracing_agent
 from profile_chrome import ui
 from profile_chrome import util
 from systrace import output_generator
 
 
-def _StartTracing(agents):
+# TODO(washingtonp): This mapping is temporarily in place because
+# profile_chrome does not currently follow Systrace's controller API. This
+# mapping will be removed in the CL that makes profile_chrome follow the
+# Systrace API.
+AGENT_TYPE_TO_MODULE = {'chrome trace': chrome_tracing_agent,
+                        'Browser Startup Trace': chrome_startup_tracing_agent,
+                        'ddms profile': ddms_tracing_agent,
+                        'perf profile': perf_tracing_agent,
+                        'atrace': atrace_tracing_agent}
+
+
+def _StartTracing(agents, options):
   for agent in agents:
-    agent.StartAgentTracing(None, None)
+    if repr(agent) == 'faketrace':

[Sami, 2016/08/26 15:53:43]

Can we avoid hardcoding faketrace here? How about we just skip creating configs
for agents that don't appear in AGENT_TYPE_TO_MODULE? (Maybe we could remove
stub config for the startup agent too.)

[washingtonp, 2016/08/26 18:50:54]

Done. We cannot remove the stub for the startup agent, by the way,
because adb_profile_chrome_startup directly calls this function.

+      return None
+    agent.StartAgentTracing(AGENT_TYPE_TO_MODULE[repr(agent)].
+                            get_config(options))
 
 
 def _StopTracing(agents):
   for agent in agents:
     agent.StopAgentTracing()
 
 
 def _GetResults(agents, output, compress, write_json, interval):
   ui.PrintMessage('Downloading...', eol='')
 
@@ skipping 42 matching lines @@
   supported_browsers = {
     'stable': chrome.PACKAGE_INFO['chrome_stable'],
     'beta': chrome.PACKAGE_INFO['chrome_beta'],
     'dev': chrome.PACKAGE_INFO['chrome_dev'],
     'build': chrome.PACKAGE_INFO['chrome'],
   }
   supported_browsers.update(chrome.PACKAGE_INFO)
   return supported_browsers
 
 
-def CaptureProfile(agents, interval, output=None, compress=False,
+def CaptureProfile(options, agents, interval, output=None, compress=False,
                    write_json=False):
   """Records a profiling trace saves the result to a file.
 
   Args:
+    options: Command line options.
     agents: List of tracing agents.
     interval: Time interval to capture in seconds. An interval of None (or 0)
         continues tracing until stopped by the user.
     output: Output file name or None to use an automatically generated name.
     compress: If True, the result will be compressed either with gzip or zip
         depending on the number of captured subtraces.
     write_json: If True, prefer JSON output over HTML.
 
   Returns:
     Path to saved profile.
   """
   trace_type = ' + '.join(map(str, agents))
   try:
-    _StartTracing(agents)
+    _StartTracing(agents, options)
     if interval:
       ui.PrintMessage(('Capturing %d-second %s. Press Enter to stop early...' %
                       (interval, trace_type)), eol='')
       ui.WaitForEnter(interval)
     else:
       ui.PrintMessage('Capturing %s. Press Enter to stop...' % trace_type,
                       eol='')
       raw_input()
   finally:
     _StopTracing(agents)
   if interval:
     ui.PrintMessage('done')
 
   return _GetResults(agents, output, compress, write_json, interval)
+
+def get_config(options):

[Sami, 2016/08/26 15:53:43]

Is this used? If not, let's remove it.

[washingtonp, 2016/08/26 18:50:54]

Done.

+  # pylint: disable=unused-argument
+  return None