commit 6ae9526278fc956ece9e4967d07bd8a4227ff6bb
author Florian Mayer <fmayer@google.com> Thu Dec 06 16:10:29 2018 +0000
committer Florian Mayer <fmayer@google.com> Thu Dec 06 16:10:29 2018 +0000
tree 200e2f95cae8ddd560c68dc7df116851ee661c8c
parent 7ec5bccd72f6ec4e97ebd1bad602f41cae20d2f8

profiling: Do not disable SELinux by default in script.

Change-Id: I56fb068f66000e916aebcbfc983db5a1685d5ff5
Bug: 117762471

tools/heap_profile

diff --git a/tools/heap_profile b/tools/heap_profile
index d37f325..5aea0b6 100755
--- a/tools/heap_profile
+++ b/tools/heap_profile
@@ -98,12 +98,6 @@
   IS_INTERRUPTED = True
 
 
-def on_exit(enforcing):
-  subprocess.check_output(['adb', 'shell', 'su root stop heapprofd'])
-  subprocess.check_output(
-      ['adb', 'shell', 'su root setenforce %s' % enforcing])
-
-
 def main(argv):
   parser = argparse.ArgumentParser()
   parser.add_argument("-i", "--interval", help="Sampling interval. "
@@ -118,6 +112,9 @@
                       nargs='+')
   parser.add_argument("-t", "--trace-to-text-binary",
                       help="Path to local trace to text. For debugging.")
+  parser.add_argument("--disable-selinux", action="store_true",
+                      help="Disable SELinux enforcement for duration of "
+                      "profile")
 
   args = parser.parse_args()
 
@@ -158,10 +155,14 @@
   cfg = CFG.format(all=str(args.all == True).lower(), interval=args.interval,
                    duration=args.duration, target_cfg=target_cfg)
 
-  enforcing = subprocess.check_output(['adb', 'shell', 'getenforce'])
-  atexit.register(on_exit, enforcing)
+  if args.disable_selinux:
+    enforcing = subprocess.check_output(['adb', 'shell', 'getenforce'])
+    atexit.register(subprocess.check_call,
+        ['adb', 'shell', 'su root setenforce %s' % enforcing])
+    subprocess.check_call(['adb', 'shell', 'su root setenforce 0'])
 
-  subprocess.check_call(['adb', 'shell', 'su root setenforce 0'])
+  atexit.register(subprocess.check_call,
+                  ['adb', 'shell', 'su root stop heapprofd'])
   subprocess.check_call(['adb', 'shell', 'su root start heapprofd'])
 
   perfetto_pid = subprocess.check_output(
@@ -177,7 +178,8 @@
   signal.signal(signal.SIGINT, old_handler)
   if IS_INTERRUPTED:
     # Not check_call because it could have existed in the meantime.
-    subprocess.call(['adb', 'shell', 'kill', '-INT', perfetto_pid])
+    subprocess.call(['adb', 'shell', 'su', 'root', 'kill', '-INT',
+                     perfetto_pid])
 
   # Wait for perfetto cmd to return.
   while exists: