Use CategoryFilter::kDefaultCategoryFilterString instead of "*" as the default category

build/android/adb_profile_chrome.py

 #!/usr/bin/env python
 #
 # Copyright 2013 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 gzip
 import logging
 import optparse
 import os
 import re
 import sys
 import threading
 import time
 import zipfile
 import zlib
 
 from pylib import android_commands
 from pylib import cmd_helper
 from pylib import constants
 from pylib import pexpect
 
 
+_DEFAULT_CHROME_CATEGORIES = '_DEFAULT_CHROME_CATEGORIES'

[Sami, 2013/10/16 09:43:34]

Instead of sending this string to Chrome, could we check for it below in
ChromeTracingController and not set any categories in the intent if it matches?

[Xianzhu, 2013/10/16 16:47:48]

I had thought so but later found when --trace-cc or --trace-gpu is used, we need
the string to tell chrome not just the cc/gpu disabled-by-default categories are
enabled.

+
+
 def _GetTraceTimestamp():
  return time.strftime('%Y-%m-%d-%H%M%S', time.localtime())
 
 
 class ChromeTracingController(object):
   def __init__(self, adb, package_info, categories, ring_buffer):
     self._adb = adb
     self._package_info = package_info
     self._categories = categories
     self._ring_buffer = ring_buffer
@@ skipping 246 matching lines @@
   cont_options = optparse.OptionGroup(parser, 'Continuous tracing')
   cont_options.add_option('--continuous', help='Profile continuously until '
                           'stopped.', action='store_true')
   cont_options.add_option('--ring-buffer', help='Use the trace buffer as a '
                           'ring buffer and save its contents when stopping '
                           'instead of appending events into one long trace.',
                           action='store_true')
   parser.add_option_group(cont_options)
 
   categories = optparse.OptionGroup(parser, 'Trace categories')
-  categories.add_option('-c', '--categories', help='Select categories to trace '
-                        'with comma-delimited wildcards, e.g., '
-                        '"*", "cat1*,-cat1a". Default is "*".', default='*',
-                        dest='chrome_categories')
+  categories.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=\'\'".',
+                        metavar='CHROME_CATEGORIES', dest='chrome_categories',
+                        default=_DEFAULT_CHROME_CATEGORIES)
   categories.add_option('-s', '--systrace', help='Capture a systrace with the '
                         'chosen comma-delimited systrace categories. You can '
                         'also capture a combined Chrome + systrace by enabling '
                         'both types of categories. Use "list" to see the '
-                        'available categories.', metavar='SYS_CATEGORIES',
+                        'available categories. Systrace is disabled by '
+                        'default.', metavar='SYS_CATEGORIES',
                         dest='systrace_categories', default='')
   categories.add_option('--trace-cc', help='Enable extra trace categories for '
                         'compositor frame viewer data.', action='store_true')
   categories.add_option('--trace-gpu', help='Enable extra trace categories for '
                         'GPU data.', action='store_true')
   parser.add_option_group(categories)
 
   parser.add_option('-o', '--output', help='Save profile output to file.')
   browsers = sorted(_GetSupportedBrowsers().keys())
   parser.add_option('-b', '--browser', help='Select among installed browsers. '
@@ skipping 42 matching lines @@
     return 1
 
   _CaptureAndPullTrace(controllers,
                        options.time if not options.continuous else 0,
                        options.output,
                        options.compress)
 
 
 if __name__ == '__main__':
   sys.exit(main())