Use Systrace tracing controller in profile_chrome

systrace/profile_chrome/chrome_tracing_agent.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 json
 import optparse
 import os
 import py_utils
 import re
 
@@ skipping 73 matching lines @@
     #
     # The first one is printed when tracing starts and the second one indicates
     # that the trace file is ready to be pulled.
     try:
       self._logcat_monitor.WaitFor(self._trace_start_re, timeout=5)
       self._is_tracing = True
     except device_errors.CommandTimeoutError:
       raise RuntimeError(
           'Trace start marker not found. Possible causes: 1) Is the correct '
           'version of the browser running? 2) Is the browser already launched?')
+    return True
 
   @py_utils.Timeout(tracing_agents.START_STOP_TIMEOUT)
   def StopAgentTracing(self, timeout=None):
     if self._is_tracing:
       self._device.BroadcastIntent(intent.Intent(
           action='%s.GPU_PROFILER_STOP' % self._package_info.package))
       self._trace_file = self._logcat_monitor.WaitFor(
           self._trace_finish_re, timeout=120).group(1)
       self._is_tracing = False
     if self._trace_memory:
       self._device.SetProp(_HEAP_PROFILE_MMAP_PROPERTY, 0)
+    return True
 
   @py_utils.Timeout(tracing_agents.GET_RESULTS_TIMEOUT)
   def GetResults(self, timeout=None):
     with open(self._PullTrace(), 'r') as f:
       trace_data = f.read()
     return trace_result.TraceResult('traceEvents', trace_data)
 
   def _PullTrace(self):
     trace_file = self._trace_file.replace('/storage/emulated/0/', '/sdcard/')
     host_file = os.path.join(os.path.curdir, os.path.basename(trace_file))
     try:
       self._device.PullFile(trace_file, host_file)
     except device_errors.AdbCommandFailedError:
       raise RuntimeError(
           'Cannot pull the trace file. Have you granted Storage permission to '
           'the browser? (Android Settings -> Apps -> [the browser app] -> '
           'Permissions -> Storage)')
     return host_file
 
   def SupportsExplicitClockSync(self):
     return False
 
   def RecordClockSyncMarker(self, sync_id, did_record_sync_marker_callback):
+    # pylint: disable=unused-argument
     assert self.SupportsExplicitClockSync(), ('Clock sync marker cannot be '
         'recorded since explicit clock sync is not supported.')
 
 
 class ChromeConfig(tracing_agents.TracingConfig):
   def __init__(self, chrome_categories, trace_cc, trace_frame_viewer,
                trace_ubercompositor, trace_gpu, trace_flow, trace_memory,
-               trace_scheduler):
+               trace_scheduler, ring_buffer, device, package_info):
     tracing_agents.TracingConfig.__init__(self)
     self.chrome_categories = chrome_categories
     self.trace_cc = trace_cc
     self.trace_frame_viewer = trace_frame_viewer
     self.trace_ubercompositor = trace_ubercompositor
     self.trace_gpu = trace_gpu
     self.trace_flow = trace_flow
     self.trace_memory = trace_memory
     self.trace_scheduler = trace_scheduler
+    self.ring_buffer = ring_buffer
+    self.device = device
+    self.package_info = package_info
 
 
+def try_create_agent(config):
+  if config.chrome_categories:
+    return ChromeTracingAgent(config.device, config.package_info,
+                              config.ring_buffer, config.trace_memory)
+  return None
+
 def add_options(parser):
   chrome_opts = optparse.OptionGroup(parser, 'Chrome tracing options')
   chrome_opts.add_option('-c', '--categories', help='Select Chrome tracing '
                          'categories with comma-delimited wildcards, '
                          'e.g., "*", "cat1*,-cat1a". Omit this option to trace '
                          'Chrome\'s default categories. Chrome tracing can be '
                          'disabled with "--categories=\'\'". Use "list" to '
                          'see the available categories.',
                          metavar='CHROME_CATEGORIES', dest='chrome_categories',
                          default=_DEFAULT_CHROME_CATEGORIES)
@@ skipping 15 matching lines @@
                          action='store_true')
   chrome_opts.add_option('--trace-scheduler', help='Enable extra trace '
                          'categories for scheduler state',
                          action='store_true')
   return chrome_opts
 
 def get_config(options):
   return ChromeConfig(options.chrome_categories, options.trace_cc,
                       options.trace_frame_viewer, options.trace_ubercompositor,
                       options.trace_gpu, options.trace_flow,
-                      options.trace_memory, options.trace_scheduler)
+                      options.trace_memory, options.trace_scheduler,
+                      options.ring_buffer, options.device,
+                      options.package_info)
 
 def _ComputeChromeCategories(config):
   categories = []
   if config.trace_frame_viewer:
     categories.append('disabled-by-default-cc.debug')
   if config.trace_ubercompositor:
     categories.append('disabled-by-default-cc.debug*')
   if config.trace_gpu:
     categories.append('disabled-by-default-gpu.debug*')
   if config.trace_flow:
     categories.append('disabled-by-default-toplevel.flow')
   if config.trace_memory:
     categories.append('disabled-by-default-memory')
   if config.trace_scheduler:
     categories.append('disabled-by-default-blink.scheduler')
     categories.append('disabled-by-default-cc.debug.scheduler')
     categories.append('disabled-by-default-renderer.scheduler')
   if config.chrome_categories:
     categories += config.chrome_categories.split(',')
   return categories