commit 8cafb589b7e414c21a0ef2647fd30c1d1a3a0572
author Lalit Maganti <lalitm@google.com> Thu Jun 23 13:18:52 2022 +0100
committer Lalit Maganti <lalitm@google.com> Thu Jun 23 13:18:52 2022 +0100
tree 42a575d648e9c5e2e994fde8c9fee618fda1c656
parent eba209175d8cb8a5d1708a2858ff2d0c3a53dcd3

tp: remove all increase in memory use caused by switching to vectors

This reverses all the increases in resting memory caused by
aosp/2129479 by calling shrink to fit once tables have been parsed.
This doesn't affect tables while they're being parsed: maybe we need
to look at this but needs more analysis.

Bug: 235104800
Doc: go/perfetto-tp-memory-use
Change-Id: I7b36397059f4578fd23fad131b845e08e430eaba

tools/measure_tp_performance.py

diff --git a/tools/measure_tp_performance.py b/tools/measure_tp_performance.py
index 88a372e..8014c39 100755
--- a/tools/measure_tp_performance.py
+++ b/tools/measure_tp_performance.py
@@ -35,7 +35,7 @@
   tp = subprocess.Popen(
       tp_args,
       stdin=subprocess.PIPE,
-      stdout=subprocess.DEVNULL,
+      stdout=None if args.verbose else subprocess.DEVNULL,
       stderr=subprocess.PIPE,
       universal_newlines=True,
       env=env)
@@ -43,6 +43,8 @@
   lines = []
   while True:
     line = tp.stderr.readline()
+    if args.verbose:
+      sys.stderr.write(line)
     lines.append(line)
 
     match = REGEX.match(line)
@@ -81,8 +83,8 @@
   profile = subprocess.Popen(
       perfetto_args,
       stdin=subprocess.PIPE,
-      stdout=subprocess.DEVNULL,
-      stderr=subprocess.DEVNULL)
+      stdout=None if args.verbose else subprocess.DEVNULL,
+      stderr=None if args.verbose else subprocess.DEVNULL)
   profile.stdin.write(config)
   profile.stdin.close()
 
@@ -149,8 +151,11 @@
   parser.add_argument(
       '--kill-existing',
       action='store_true',
-      help='Kill traced, perfetto_cmd '
-      'and trace processor shell if running')
+      help='Kill traced, perfetto_cmd and trace processor shell if running')
+  parser.add_argument(
+      '--verbose',
+      action='store_true',
+      help='Logs all stderr and stdout from subprocesses')
   parser.add_argument('trace_file', type=str, help='Path to trace')
   args = parser.parse_args()
 
@@ -166,8 +171,8 @@
                    stderr=subprocess.DEVNULL)
 
   traced = subprocess.Popen([os.path.join(args.out, 'traced')],
-                            stdout=subprocess.DEVNULL,
-                            stderr=subprocess.DEVNULL)
+                            stdout=None if args.verbose else subprocess.DEVNULL,
+                            stderr=None if args.verbose else subprocess.DEVNULL)
   print('Heap profile dump at max')
   heap_profile_run(args, dump_at_max=True)
   print('Heap profile dump at resting')