mirror of https://github.com/OpenIPC/firmware.git
110 lines
3.7 KiB
Diff
110 lines
3.7 KiB
Diff
diff -drupN a/drivers/android/binder_trace.h b/drivers/android/binder_trace.h
|
|
--- a/drivers/android/binder_trace.h 2018-08-06 17:23:04.000000000 +0300
|
|
+++ b/drivers/android/binder_trace.h 2022-06-12 05:28:14.000000000 +0300
|
|
@@ -23,7 +23,8 @@
|
|
struct binder_buffer;
|
|
struct binder_node;
|
|
struct binder_proc;
|
|
-struct binder_ref;
|
|
+struct binder_alloc;
|
|
+struct binder_ref_data;
|
|
struct binder_thread;
|
|
struct binder_transaction;
|
|
|
|
@@ -146,8 +147,8 @@ TRACE_EVENT(binder_transaction_received,
|
|
|
|
TRACE_EVENT(binder_transaction_node_to_ref,
|
|
TP_PROTO(struct binder_transaction *t, struct binder_node *node,
|
|
- struct binder_ref *ref),
|
|
- TP_ARGS(t, node, ref),
|
|
+ struct binder_ref_data *rdata),
|
|
+ TP_ARGS(t, node, rdata),
|
|
|
|
TP_STRUCT__entry(
|
|
__field(int, debug_id)
|
|
@@ -160,8 +161,8 @@ TRACE_EVENT(binder_transaction_node_to_r
|
|
__entry->debug_id = t->debug_id;
|
|
__entry->node_debug_id = node->debug_id;
|
|
__entry->node_ptr = node->ptr;
|
|
- __entry->ref_debug_id = ref->debug_id;
|
|
- __entry->ref_desc = ref->desc;
|
|
+ __entry->ref_debug_id = rdata->debug_id;
|
|
+ __entry->ref_desc = rdata->desc;
|
|
),
|
|
TP_printk("transaction=%d node=%d src_ptr=0x%016llx ==> dest_ref=%d dest_desc=%d",
|
|
__entry->debug_id, __entry->node_debug_id,
|
|
@@ -170,8 +171,9 @@ TRACE_EVENT(binder_transaction_node_to_r
|
|
);
|
|
|
|
TRACE_EVENT(binder_transaction_ref_to_node,
|
|
- TP_PROTO(struct binder_transaction *t, struct binder_ref *ref),
|
|
- TP_ARGS(t, ref),
|
|
+ TP_PROTO(struct binder_transaction *t, struct binder_node *node,
|
|
+ struct binder_ref_data *rdata),
|
|
+ TP_ARGS(t, node, rdata),
|
|
|
|
TP_STRUCT__entry(
|
|
__field(int, debug_id)
|
|
@@ -182,10 +184,10 @@ TRACE_EVENT(binder_transaction_ref_to_no
|
|
),
|
|
TP_fast_assign(
|
|
__entry->debug_id = t->debug_id;
|
|
- __entry->ref_debug_id = ref->debug_id;
|
|
- __entry->ref_desc = ref->desc;
|
|
- __entry->node_debug_id = ref->node->debug_id;
|
|
- __entry->node_ptr = ref->node->ptr;
|
|
+ __entry->ref_debug_id = rdata->debug_id;
|
|
+ __entry->ref_desc = rdata->desc;
|
|
+ __entry->node_debug_id = node->debug_id;
|
|
+ __entry->node_ptr = node->ptr;
|
|
),
|
|
TP_printk("transaction=%d node=%d src_ref=%d src_desc=%d ==> dest_ptr=0x%016llx",
|
|
__entry->debug_id, __entry->node_debug_id,
|
|
@@ -194,9 +196,10 @@ TRACE_EVENT(binder_transaction_ref_to_no
|
|
);
|
|
|
|
TRACE_EVENT(binder_transaction_ref_to_ref,
|
|
- TP_PROTO(struct binder_transaction *t, struct binder_ref *src_ref,
|
|
- struct binder_ref *dest_ref),
|
|
- TP_ARGS(t, src_ref, dest_ref),
|
|
+ TP_PROTO(struct binder_transaction *t, struct binder_node *node,
|
|
+ struct binder_ref_data *src_ref,
|
|
+ struct binder_ref_data *dest_ref),
|
|
+ TP_ARGS(t, node, src_ref, dest_ref),
|
|
|
|
TP_STRUCT__entry(
|
|
__field(int, debug_id)
|
|
@@ -208,7 +211,7 @@ TRACE_EVENT(binder_transaction_ref_to_re
|
|
),
|
|
TP_fast_assign(
|
|
__entry->debug_id = t->debug_id;
|
|
- __entry->node_debug_id = src_ref->node->debug_id;
|
|
+ __entry->node_debug_id = node->debug_id;
|
|
__entry->src_ref_debug_id = src_ref->debug_id;
|
|
__entry->src_ref_desc = src_ref->desc;
|
|
__entry->dest_ref_debug_id = dest_ref->debug_id;
|
|
@@ -268,9 +271,9 @@ DEFINE_EVENT(binder_buffer_class, binder
|
|
TP_ARGS(buffer));
|
|
|
|
TRACE_EVENT(binder_update_page_range,
|
|
- TP_PROTO(struct binder_proc *proc, bool allocate,
|
|
+ TP_PROTO(struct binder_alloc *alloc, bool allocate,
|
|
void *start, void *end),
|
|
- TP_ARGS(proc, allocate, start, end),
|
|
+ TP_ARGS(alloc, allocate, start, end),
|
|
TP_STRUCT__entry(
|
|
__field(int, proc)
|
|
__field(bool, allocate)
|
|
@@ -278,9 +281,9 @@ TRACE_EVENT(binder_update_page_range,
|
|
__field(size_t, size)
|
|
),
|
|
TP_fast_assign(
|
|
- __entry->proc = proc->pid;
|
|
+ __entry->proc = alloc->pid;
|
|
__entry->allocate = allocate;
|
|
- __entry->offset = start - proc->buffer;
|
|
+ __entry->offset = start - alloc->buffer;
|
|
__entry->size = end - start;
|
|
),
|
|
TP_printk("proc=%d allocate=%d offset=%zu size=%zu",
|