commit d205fc93a51b9b3998bae9cfb94b3096589fae70
author Mika Raento <mikie@google.com> Tue Jun 26 01:52:10 2018 -0700
committer android-build-merger <android-build-merger@google.com> Tue Jun 26 01:52:10 2018 -0700
tree 0f38f1d93ddc496556070a02a5e2cbcb78c57f4c
parent 2710a3cfa3a21829cf9b096d49ba1f66896285d0
parent b58c06f48e74d25c41ac53f901d664c021ca8dd8

Merge "Add binder transaction size tracing" am: e818ec3705 am: 9abc9c5dbe
am: b58c06f48e

Change-Id: I3b394d254ea90a4a63decb47082d828520843305

cmds/atrace/atrace.cpp

diff --git a/cmds/atrace/atrace.cpp b/cmds/atrace/atrace.cpp
index 2561e0a..94eaf05 100644
--- a/cmds/atrace/atrace.cpp
+++ b/cmds/atrace/atrace.cpp
@@ -209,6 +209,7 @@
     { "binder_driver", "Binder Kernel driver", 0, {
         { REQ,      "events/binder/binder_transaction/enable" },
         { REQ,      "events/binder/binder_transaction_received/enable" },
+        { REQ,      "events/binder/binder_transaction_alloc_buf/enable" },
         { OPT,      "events/binder/binder_set_priority/enable" },
     } },
     { "binder_lock", "Binder global lock trace", 0, {

cmds/atrace/atrace.rc

diff --git a/cmds/atrace/atrace.rc b/cmds/atrace/atrace.rc
index 579cfaf..9be1077 100644
--- a/cmds/atrace/atrace.rc
+++ b/cmds/atrace/atrace.rc
@@ -57,6 +57,8 @@
     chmod 0666 /sys/kernel/tracing/events/binder/binder_transaction/enable
     chmod 0666 /sys/kernel/debug/tracing/events/binder/binder_transaction_received/enable
     chmod 0666 /sys/kernel/tracing/events/binder/binder_transaction_received/enable
+    chmod 0666 /sys/kernel/debug/tracing/events/binder/binder_transaction_alloc_buf/enable
+    chmod 0666 /sys/kernel/tracing/events/binder/binder_transaction_alloc_buf/enable
     chmod 0666 /sys/kernel/debug/tracing/events/binder/binder_lock/enable
     chmod 0666 /sys/kernel/tracing/events/binder/binder_lock/enable
     chmod 0666 /sys/kernel/debug/tracing/events/binder/binder_locked/enable