Merge changes I1305c019,Ifcbd4f49 into main

* changes: binder_tracker: Support binder_command and binder_return Add binder_command and binder_return ftrace events
google · Sep 25, 2023 · c478eb8 · c478eb8
2 parents f7662c8 + f4263b0
commit c478eb8
Show file tree

Hide file tree

Showing 13 changed files with 760 additions and 2 deletions.
diff --git a/protos/perfetto/trace/ftrace/binder.proto b/protos/perfetto/trace/ftrace/binder.proto
@@ -39,3 +39,9 @@ message BinderTransactionAllocBufFtraceEvent {
   optional uint64 offsets_size = 3;
   optional uint64 extra_buffers_size = 4;
 }
+message BinderCommandFtraceEvent {
+  optional uint32 cmd = 1;
+}
+message BinderReturnFtraceEvent {
+  optional uint32 cmd = 1;
+}
diff --git a/protos/perfetto/trace/ftrace/ftrace_event.proto b/protos/perfetto/trace/ftrace/ftrace_event.proto
@@ -599,5 +599,7 @@ message FtraceEvent {
     MaliMaliCSFINTERRUPTSTARTFtraceEvent mali_mali_CSF_INTERRUPT_START = 482;
     MaliMaliCSFINTERRUPTENDFtraceEvent mali_mali_CSF_INTERRUPT_END = 483;
     SamsungTracingMarkWriteFtraceEvent samsung_tracing_mark_write = 484;
+    BinderCommandFtraceEvent binder_command = 485;
+    BinderReturnFtraceEvent binder_return = 486;
   }
 }
diff --git a/protos/perfetto/trace/perfetto_trace.proto b/protos/perfetto/trace/perfetto_trace.proto
@@ -5483,6 +5483,12 @@ message BinderTransactionAllocBufFtraceEvent {
   optional uint64 offsets_size = 3;
   optional uint64 extra_buffers_size = 4;
 }
+message BinderCommandFtraceEvent {
+  optional uint32 cmd = 1;
+}
+message BinderReturnFtraceEvent {
+  optional uint32 cmd = 1;
+}
 
 // End of protos/perfetto/trace/ftrace/binder.proto
 
@@ -9207,6 +9213,8 @@ message FtraceEvent {
     MaliMaliCSFINTERRUPTSTARTFtraceEvent mali_mali_CSF_INTERRUPT_START = 482;
     MaliMaliCSFINTERRUPTENDFtraceEvent mali_mali_CSF_INTERRUPT_END = 483;
     SamsungTracingMarkWriteFtraceEvent samsung_tracing_mark_write = 484;
+    BinderCommandFtraceEvent binder_command = 485;
+    BinderReturnFtraceEvent binder_return = 486;
   }
 }
 

diff --git a/src/tools/ftrace_proto_gen/event_list b/src/tools/ftrace_proto_gen/event_list
@@ -479,3 +479,5 @@ synthetic/suspend_resume_minimal
 mali/mali_CSF_INTERRUPT_START
 mali/mali_CSF_INTERRUPT_END
 samsung/tracing_mark_write
+binder/binder_command
+binder/binder_return