Add --trace-memory option for tracing heap memory

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 json
 import logging
 import optparse
@@ skipping 13 matching lines @@
 from pylib import constants
 from pylib import pexpect
 from pylib.device import device_utils
 
 _TRACE_VIEWER_ROOT = os.path.join(constants.DIR_SOURCE_ROOT,
                                   'third_party', 'trace-viewer')
 sys.path.append(_TRACE_VIEWER_ROOT)
 from trace_viewer.build import trace2html # pylint: disable=F0401
 
 _DEFAULT_CHROME_CATEGORIES = '_DEFAULT_CHROME_CATEGORIES'
-
+_HEAP_PROFILE_MMAP_PROPERTY = 'heapprof.mmap'
 
 def _GetTraceTimestamp():
   return time.strftime('%Y-%m-%d-%H%M%S', time.localtime())
 
 
 class ChromeTracingController(object):
   def __init__(self, device, package_info, categories, ring_buffer):
     self._device = device
     self._package_info = package_info
     self._categories = categories
@@ skipping 257 matching lines @@
 def _ComputeChromeCategories(options):
   categories = []
   if options.trace_frame_viewer:
     categories.append('disabled-by-default-cc.debug')
   if options.trace_ubercompositor:
     categories.append('disabled-by-default-cc.debug*')
   if options.trace_gpu:
     categories.append('disabled-by-default-gpu.debug*')
   if options.trace_flow:
     categories.append('disabled-by-default-toplevel.flow')
+  if options.trace_memory:
+    categories.append('disabled-by-default-memory')
   if options.chrome_categories:
     categories += options.chrome_categories.split(',')
   return categories
 
 
 def _ComputeSystraceCategories(options):
   if not options.systrace_categories:
     return []
   return options.systrace_categories.split(',')
 
@@ skipping 42 matching lines @@
   categories.add_option('--trace-frame-viewer',
                         help='Enable enough trace categories for '
                         'compositor frame viewing.', action='store_true')
   categories.add_option('--trace-ubercompositor',
                         help='Enable enough trace categories for '
                         'ubercompositor frame data.', action='store_true')
   categories.add_option('--trace-gpu', help='Enable extra trace categories for '
                         'GPU data.', action='store_true')
   categories.add_option('--trace-flow', help='Enable extra trace categories '
                         'for IPC message flows.', action='store_true')
+  categories.add_option('--trace-memory', help='Enable extra trace categories '
+                        'for memory profile. (tcmalloc required)',
+                        action='store_true')
   parser.add_option_group(categories)
 
   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)
 
@@ skipping 44 matching lines @@
     return 0
 
   if options.systrace_categories in ['list', 'help']:
     _PrintMessage('\n'.join(SystraceController.GetCategories(device)))
     return 0
 
   if not options.time and not options.continuous:
     _PrintMessage('Time interval or continuous tracing should be specified.')
     return 1
 
+  system_properties = device.old_interface.system_properties

[Sami, 2014/05/22 15:52:38]

Could you please move this bit of code to ChromeTracingController.StartTracing()
(and add a new constructor parameter for it, e.g., trace_memory)...

+  if options.trace_memory:
+    device.old_interface.EnableAdbRoot()
+    system_properties[_HEAP_PROFILE_MMAP_PROPERTY] = 1
+
   chrome_categories = _ComputeChromeCategories(options)
   systrace_categories = _ComputeSystraceCategories(options)
 
   if chrome_categories and 'webview' in systrace_categories:
     logging.warning('Using the "webview" category in systrace together with '
                     'Chrome tracing results in duplicate trace events.')
 
   controllers = []
   if chrome_categories:
     controllers.append(ChromeTracingController(device,
                                                package_info,
                                                chrome_categories,
                                                options.ring_buffer))
   if systrace_categories:
     controllers.append(SystraceController(device,
                                           systrace_categories,
                                           options.ring_buffer))
 
   if not controllers:
     _PrintMessage('No trace categories enabled.')
     return 1
 
   if options.output:
     options.output = os.path.expanduser(options.output)
   result = _CaptureAndPullTrace(controllers,
                                 options.time if not options.continuous else 0,
                                 options.output,
                                 options.compress,
                                 options.json)
+
+  if options.trace_memory:

[Sami, 2014/05/22 15:52:38]

...and this code to ChromeTracingController.StopTracing()? This way the
try...finally construct makes sure the flag is not left on even if something
else fails.

+    system_properties[_HEAP_PROFILE_MMAP_PROPERTY] = 0
+
   if options.view:
     if sys.platform == 'darwin':
       os.system('/usr/bin/open %s' % os.path.abspath(result))
     else:
       webbrowser.open(result)
 
 
 if __name__ == '__main__':
   sys.exit(main())