Pass in custom options to Systrace agents

systrace/profile_chrome/profiler.py

Index: systrace/profile_chrome/profiler.py
diff --git a/systrace/profile_chrome/profiler.py b/systrace/profile_chrome/profiler.py
index 6f0c3e259d5334f725aab0350e89a51aaaf82c02..f434801acecac613e5ab210e741933ff3b1e045f 100644
--- a/systrace/profile_chrome/profiler.py
+++ b/systrace/profile_chrome/profiler.py
@@ -5,15 +5,33 @@
 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):
@@ -76,11 +94,12 @@ def GetSupportedBrowsers():
   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.
@@ -94,7 +113,7 @@ def CaptureProfile(agents, interval, output=None, compress=False,
   """
   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='')
@@ -109,3 +128,7 @@ def CaptureProfile(agents, interval, output=None, compress=False,
     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