From a92e844e9e4cc9d5c4a7ec3d1c0738d375430446 Mon Sep 17 00:00:00 2001 From: Mathieu Desnoyers Date: Mon, 3 May 2021 10:27:18 -0400 Subject: [PATCH] Rename struct lttng_probe_ctx to struct lttng_kernel_probe_ctx Signed-off-by: Mathieu Desnoyers Change-Id: I629b7e447b9842ab863894abd08e4901b439ee17 --- include/lttng/event-notifier-notification.h | 2 +- include/lttng/events-internal.h | 8 ++++---- include/lttng/events.h | 8 ++++---- include/lttng/lttng-bytecode.h | 4 ++-- include/lttng/tracepoint-event-impl.h | 2 +- include/ringbuffer/config.h | 4 ++-- src/lttng-bytecode-interpreter.c | 10 +++++----- src/lttng-context-callstack-legacy-impl.h | 8 ++++---- src/lttng-context-callstack-stackwalk-impl.h | 8 ++++---- src/lttng-context-cgroup-ns.c | 6 +++--- src/lttng-context-cpu-id.c | 6 +++--- src/lttng-context-egid.c | 6 +++--- src/lttng-context-euid.c | 6 +++--- src/lttng-context-gid.c | 6 +++--- src/lttng-context-hostname.c | 6 +++--- src/lttng-context-interruptible.c | 8 ++++---- src/lttng-context-ipc-ns.c | 6 +++--- src/lttng-context-migratable.c | 6 +++--- src/lttng-context-mnt-ns.c | 6 +++--- src/lttng-context-need-reschedule.c | 6 +++--- src/lttng-context-net-ns.c | 6 +++--- src/lttng-context-nice.c | 6 +++--- src/lttng-context-perf-counters.c | 4 ++-- src/lttng-context-pid-ns.c | 6 +++--- src/lttng-context-pid.c | 6 +++--- src/lttng-context-ppid.c | 6 +++--- src/lttng-context-preemptible.c | 6 +++--- src/lttng-context-prio.c | 6 +++--- src/lttng-context-procname.c | 6 +++--- src/lttng-context-sgid.c | 6 +++--- src/lttng-context-suid.c | 6 +++--- src/lttng-context-tid.c | 6 +++--- src/lttng-context-time-ns.c | 6 +++--- src/lttng-context-uid.c | 6 +++--- src/lttng-context-user-ns.c | 6 +++--- src/lttng-context-uts-ns.c | 6 +++--- src/lttng-context-vegid.c | 6 +++--- src/lttng-context-veuid.c | 6 +++--- src/lttng-context-vgid.c | 6 +++--- src/lttng-context-vpid.c | 6 +++--- src/lttng-context-vppid.c | 6 +++--- src/lttng-context-vsgid.c | 6 +++--- src/lttng-context-vsuid.c | 6 +++--- src/lttng-context-vtid.c | 6 +++--- src/lttng-context-vuid.c | 6 +++--- src/lttng-event-notifier-notification.c | 2 +- src/probes/lttng-kprobes.c | 2 +- src/probes/lttng-kretprobes.c | 2 +- src/probes/lttng-uprobes.c | 2 +- 49 files changed, 139 insertions(+), 139 deletions(-) diff --git a/include/lttng/event-notifier-notification.h b/include/lttng/event-notifier-notification.h index 539900b3..b9731961 100644 --- a/include/lttng/event-notifier-notification.h +++ b/include/lttng/event-notifier-notification.h @@ -12,7 +12,7 @@ void lttng_event_notifier_notification_send(struct lttng_kernel_event_notifier *event_notifier, const char *stack_data, - struct lttng_probe_ctx *probe_ctx, + struct lttng_kernel_probe_ctx *probe_ctx, struct lttng_kernel_notification_ctx *notif_ctx); #endif /* _LTTNG_EVENT_NOTIFIER_NOTIFICATION_H */ diff --git a/include/lttng/events-internal.h b/include/lttng/events-internal.h index 2d5c4b12..b7fb2833 100644 --- a/include/lttng/events-internal.h +++ b/include/lttng/events-internal.h @@ -139,12 +139,12 @@ struct lttng_perf_counter_field { struct lttng_kernel_ctx_field { const struct lttng_kernel_event_field *event_field; - size_t (*get_size)(void *priv, struct lttng_probe_ctx *probe_ctx, + size_t (*get_size)(void *priv, struct lttng_kernel_probe_ctx *probe_ctx, size_t offset); - void (*record)(void *priv, struct lttng_probe_ctx *probe_ctx, + void (*record)(void *priv, struct lttng_kernel_probe_ctx *probe_ctx, struct lib_ring_buffer_ctx *ctx, struct lttng_channel *chan); - void (*get_value)(void *priv, struct lttng_probe_ctx *probe_ctx, + void (*get_value)(void *priv, struct lttng_kernel_probe_ctx *probe_ctx, struct lttng_ctx_value *value); void (*destroy)(void *priv); void *priv; @@ -235,7 +235,7 @@ static inline bool lttng_kernel_type_is_bytewise_integer(const struct lttng_kern int lttng_kernel_interpret_event_filter(const struct lttng_kernel_event_common *event, const char *interpreter_stack_data, - struct lttng_probe_ctx *probe_ctx, + struct lttng_kernel_probe_ctx *probe_ctx, void *event_filter_ctx); static inline diff --git a/include/lttng/events.h b/include/lttng/events.h index 5b312d14..eafdf5cf 100644 --- a/include/lttng/events.h +++ b/include/lttng/events.h @@ -292,7 +292,7 @@ struct lttng_kernel_event_field { } \ }), -struct lttng_probe_ctx { +struct lttng_kernel_probe_ctx { struct lttng_kernel_event_common *event; uint8_t interruptible; }; @@ -343,7 +343,7 @@ struct lttng_kernel_bytecode_runtime { struct lttng_kernel_bytecode_node *bc; int (*interpreter_func)(struct lttng_kernel_bytecode_runtime *kernel_bytecode, const char *interpreter_stack_data, - struct lttng_probe_ctx *lttng_probe_ctx, + struct lttng_kernel_probe_ctx *lttng_probe_ctx, void *caller_ctx); int link_failed; struct list_head node; /* list of bytecode runtime in event */ @@ -410,7 +410,7 @@ struct lttng_kernel_event_common { int eval_filter; /* Need to evaluate filters */ int (*run_filter)(const struct lttng_kernel_event_common *event, const char *stack_data, - struct lttng_probe_ctx *probe_ctx, + struct lttng_kernel_probe_ctx *probe_ctx, void *filter_ctx); }; @@ -436,7 +436,7 @@ struct lttng_kernel_event_notifier { int eval_capture; /* Need to evaluate capture */ void (*notification_send)(struct lttng_kernel_event_notifier *event_notifier, const char *stack_data, - struct lttng_probe_ctx *probe_ctx, + struct lttng_kernel_probe_ctx *probe_ctx, struct lttng_kernel_notification_ctx *notif_ctx); }; diff --git a/include/lttng/lttng-bytecode.h b/include/lttng/lttng-bytecode.h index 1ffb115e..87a0c13d 100644 --- a/include/lttng/lttng-bytecode.h +++ b/include/lttng/lttng-bytecode.h @@ -291,12 +291,12 @@ int lttng_bytecode_specialize(const struct lttng_kernel_event_desc *event_desc, int lttng_bytecode_interpret_error(struct lttng_kernel_bytecode_runtime *bytecode_runtime, const char *stack_data, - struct lttng_probe_ctx *probe_ctx, + struct lttng_kernel_probe_ctx *probe_ctx, void *ctx); int lttng_bytecode_interpret(struct lttng_kernel_bytecode_runtime *kernel_bytecode, const char *interpreter_stack_data, - struct lttng_probe_ctx *lttng_probe_ctx, + struct lttng_kernel_probe_ctx *lttng_probe_ctx, void *caller_ctx); #endif /* _LTTNG_FILTER_H */ diff --git a/include/lttng/tracepoint-event-impl.h b/include/lttng/tracepoint-event-impl.h index 23c053fc..7d187555 100644 --- a/include/lttng/tracepoint-event-impl.h +++ b/include/lttng/tracepoint-event-impl.h @@ -1004,7 +1004,7 @@ static void __event_probe__##_name(_data_proto) \ { \ struct probe_local_vars { _locvar }; \ struct lttng_kernel_event_common *__event = __data; \ - struct lttng_probe_ctx __lttng_probe_ctx = { \ + struct lttng_kernel_probe_ctx __lttng_probe_ctx = { \ .event = __event, \ .interruptible = !irqs_disabled(), \ }; \ diff --git a/include/ringbuffer/config.h b/include/ringbuffer/config.h index bc638f94..9fc3f54e 100644 --- a/include/ringbuffer/config.h +++ b/include/ringbuffer/config.h @@ -210,7 +210,7 @@ struct lib_ring_buffer_ctx { * alignment of the largest element * in the payload */ - struct lttng_probe_ctx *probe_ctx; /* Probe context */ + struct lttng_kernel_probe_ctx *probe_ctx; /* Probe context */ }; /** @@ -224,7 +224,7 @@ static inline void lib_ring_buffer_ctx_init(struct lib_ring_buffer_ctx *ctx, void *client_priv, size_t data_size, int largest_align, - struct lttng_probe_ctx *probe_ctx) + struct lttng_kernel_probe_ctx *probe_ctx) { ctx->client_priv = client_priv; ctx->data_size = data_size; diff --git a/src/lttng-bytecode-interpreter.c b/src/lttng-bytecode-interpreter.c index be0a3248..b46a23b7 100644 --- a/src/lttng-bytecode-interpreter.c +++ b/src/lttng-bytecode-interpreter.c @@ -211,7 +211,7 @@ int stack_strcmp(struct estack *stack, int top, const char *cmp_type) int lttng_bytecode_interpret_error( struct lttng_kernel_bytecode_runtime *bytecode_runtime __attribute__((unused)), const char *stack_data __attribute__((unused)), - struct lttng_probe_ctx *probe_ctx __attribute__((unused)), + struct lttng_kernel_probe_ctx *probe_ctx __attribute__((unused)), void *ctx __attribute__((unused))) { return LTTNG_KERNEL_BYTECODE_INTERPRETER_ERROR; @@ -266,7 +266,7 @@ LABEL_##name #define IS_INTEGER_REGISTER(reg_type) \ (reg_type == REG_S64 || reg_type == REG_U64) -static int context_get_index(struct lttng_probe_ctx *lttng_probe_ctx, +static int context_get_index(struct lttng_kernel_probe_ctx *lttng_probe_ctx, struct load_ptr *ptr, uint32_t idx) { @@ -363,7 +363,7 @@ static int context_get_index(struct lttng_probe_ctx *lttng_probe_ctx, return 0; } -static int dynamic_get_index(struct lttng_probe_ctx *lttng_probe_ctx, +static int dynamic_get_index(struct lttng_kernel_probe_ctx *lttng_probe_ctx, struct bytecode_runtime *runtime, uint64_t index, struct estack_entry *stack_top) { @@ -758,7 +758,7 @@ void dbg_load_ref_user_str_printk(const struct estack_entry *user_str_reg) */ int lttng_bytecode_interpret(struct lttng_kernel_bytecode_runtime *kernel_bytecode, const char *interpreter_stack_data, - struct lttng_probe_ctx *lttng_probe_ctx, + struct lttng_kernel_probe_ctx *lttng_probe_ctx, void *caller_ctx) { struct bytecode_runtime *bytecode = container_of(kernel_bytecode, struct bytecode_runtime, p); @@ -1849,7 +1849,7 @@ LTTNG_STACK_FRAME_NON_STANDARD(lttng_bytecode_interpret); */ int lttng_kernel_interpret_event_filter(const struct lttng_kernel_event_common *event, const char *interpreter_stack_data, - struct lttng_probe_ctx *probe_ctx, + struct lttng_kernel_probe_ctx *probe_ctx, void *event_filter_ctx __attribute__((unused))) { struct lttng_kernel_bytecode_runtime *filter_bc_runtime; diff --git a/src/lttng-context-callstack-legacy-impl.h b/src/lttng-context-callstack-legacy-impl.h index 34a977a0..7d818e38 100644 --- a/src/lttng-context-callstack-legacy-impl.h +++ b/src/lttng-context-callstack-legacy-impl.h @@ -130,7 +130,7 @@ struct stack_trace *stack_trace_context(struct field_data *fdata, int cpu) } static -size_t lttng_callstack_length_get_size(void *priv, struct lttng_probe_ctx *probe_ctx, size_t offset) +size_t lttng_callstack_length_get_size(void *priv, struct lttng_kernel_probe_ctx *probe_ctx, size_t offset) { size_t orig_offset = offset; @@ -144,7 +144,7 @@ size_t lttng_callstack_length_get_size(void *priv, struct lttng_probe_ctx *probe * resulting callstack is saved to be accessed in the record step. */ static -size_t lttng_callstack_sequence_get_size(void *priv, struct lttng_probe_ctx *probe_ctx, size_t offset) +size_t lttng_callstack_sequence_get_size(void *priv, struct lttng_kernel_probe_ctx *probe_ctx, size_t offset) { struct stack_trace *trace; struct field_data *fdata = (struct field_data *) priv; @@ -188,7 +188,7 @@ size_t lttng_callstack_sequence_get_size(void *priv, struct lttng_probe_ctx *pro } static -void lttng_callstack_length_record(void *priv, struct lttng_probe_ctx *probe_ctx, +void lttng_callstack_length_record(void *priv, struct lttng_kernel_probe_ctx *probe_ctx, struct lib_ring_buffer_ctx *ctx, struct lttng_channel *chan) { @@ -208,7 +208,7 @@ void lttng_callstack_length_record(void *priv, struct lttng_probe_ctx *probe_ctx chan->ops->event_write(ctx, &nr_seq_entries, sizeof(unsigned int)); } static -void lttng_callstack_sequence_record(void *priv, struct lttng_probe_ctx *probe_ctx, +void lttng_callstack_sequence_record(void *priv, struct lttng_kernel_probe_ctx *probe_ctx, struct lib_ring_buffer_ctx *ctx, struct lttng_channel *chan) { diff --git a/src/lttng-context-callstack-stackwalk-impl.h b/src/lttng-context-callstack-stackwalk-impl.h index 2e437359..9c8f6d38 100644 --- a/src/lttng-context-callstack-stackwalk-impl.h +++ b/src/lttng-context-callstack-stackwalk-impl.h @@ -132,7 +132,7 @@ struct lttng_stack_trace *stack_trace_context(struct field_data *fdata, int cpu) } static -size_t lttng_callstack_length_get_size(void *priv, struct lttng_probe_ctx *probe_ctx, size_t offset) +size_t lttng_callstack_length_get_size(void *priv, struct lttng_kernel_probe_ctx *probe_ctx, size_t offset) { size_t orig_offset = offset; @@ -146,7 +146,7 @@ size_t lttng_callstack_length_get_size(void *priv, struct lttng_probe_ctx *probe * resulting callstack is saved to be accessed in the record step. */ static -size_t lttng_callstack_sequence_get_size(void *priv, struct lttng_probe_ctx *probe_ctx, size_t offset) +size_t lttng_callstack_sequence_get_size(void *priv, struct lttng_kernel_probe_ctx *probe_ctx, size_t offset) { struct lttng_stack_trace *trace; struct field_data *fdata = (struct field_data *) priv; @@ -193,7 +193,7 @@ size_t lttng_callstack_sequence_get_size(void *priv, struct lttng_probe_ctx *pro } static -void lttng_callstack_length_record(void *priv, struct lttng_probe_ctx *probe_ctx, +void lttng_callstack_length_record(void *priv, struct lttng_kernel_probe_ctx *probe_ctx, struct lib_ring_buffer_ctx *ctx, struct lttng_channel *chan) { @@ -214,7 +214,7 @@ void lttng_callstack_length_record(void *priv, struct lttng_probe_ctx *probe_ctx } static -void lttng_callstack_sequence_record(void *priv, struct lttng_probe_ctx *probe_ctx, +void lttng_callstack_sequence_record(void *priv, struct lttng_kernel_probe_ctx *probe_ctx, struct lib_ring_buffer_ctx *ctx, struct lttng_channel *chan) { diff --git a/src/lttng-context-cgroup-ns.c b/src/lttng-context-cgroup-ns.c index 0bc345c5..5e8c6155 100644 --- a/src/lttng-context-cgroup-ns.c +++ b/src/lttng-context-cgroup-ns.c @@ -25,7 +25,7 @@ LTTNG_UBUNTU_KERNEL_RANGE(4,4,0,0, 4,5,0,0)) static -size_t cgroup_ns_get_size(void *priv, struct lttng_probe_ctx *probe_ctx, size_t offset) +size_t cgroup_ns_get_size(void *priv, struct lttng_kernel_probe_ctx *probe_ctx, size_t offset) { size_t size = 0; @@ -35,7 +35,7 @@ size_t cgroup_ns_get_size(void *priv, struct lttng_probe_ctx *probe_ctx, size_t } static -void cgroup_ns_record(void *priv, struct lttng_probe_ctx *probe_ctx, +void cgroup_ns_record(void *priv, struct lttng_kernel_probe_ctx *probe_ctx, struct lib_ring_buffer_ctx *ctx, struct lttng_channel *chan) { @@ -57,7 +57,7 @@ void cgroup_ns_record(void *priv, struct lttng_probe_ctx *probe_ctx, static void cgroup_ns_get_value(void *priv, - struct lttng_probe_ctx *lttng_probe_ctx, + struct lttng_kernel_probe_ctx *lttng_probe_ctx, struct lttng_ctx_value *value) { unsigned int cgroup_ns_inum = 0; diff --git a/src/lttng-context-cpu-id.c b/src/lttng-context-cpu-id.c index 9e1d71a2..1fa32ac2 100644 --- a/src/lttng-context-cpu-id.c +++ b/src/lttng-context-cpu-id.c @@ -17,7 +17,7 @@ #include static -size_t cpu_id_get_size(void *priv, struct lttng_probe_ctx *probe_ctx, size_t offset) +size_t cpu_id_get_size(void *priv, struct lttng_kernel_probe_ctx *probe_ctx, size_t offset) { size_t size = 0; @@ -27,7 +27,7 @@ size_t cpu_id_get_size(void *priv, struct lttng_probe_ctx *probe_ctx, size_t off } static -void cpu_id_record(void *priv, struct lttng_probe_ctx *probe_ctx, +void cpu_id_record(void *priv, struct lttng_kernel_probe_ctx *probe_ctx, struct lib_ring_buffer_ctx *ctx, struct lttng_channel *chan) { @@ -40,7 +40,7 @@ void cpu_id_record(void *priv, struct lttng_probe_ctx *probe_ctx, static void cpu_id_get_value(void *priv, - struct lttng_probe_ctx *lttng_probe_ctx, + struct lttng_kernel_probe_ctx *lttng_probe_ctx, struct lttng_ctx_value *value) { value->u.s64 = smp_processor_id(); diff --git a/src/lttng-context-egid.c b/src/lttng-context-egid.c index 958ada67..e1674fb8 100644 --- a/src/lttng-context-egid.c +++ b/src/lttng-context-egid.c @@ -19,7 +19,7 @@ #include static -size_t egid_get_size(void *priv, struct lttng_probe_ctx *probe_ctx, size_t offset) +size_t egid_get_size(void *priv, struct lttng_kernel_probe_ctx *probe_ctx, size_t offset) { size_t size = 0; @@ -29,7 +29,7 @@ size_t egid_get_size(void *priv, struct lttng_probe_ctx *probe_ctx, size_t offse } static -void egid_record(void *priv, struct lttng_probe_ctx *probe_ctx, +void egid_record(void *priv, struct lttng_kernel_probe_ctx *probe_ctx, struct lib_ring_buffer_ctx *ctx, struct lttng_channel *chan) { @@ -42,7 +42,7 @@ void egid_record(void *priv, struct lttng_probe_ctx *probe_ctx, static void egid_get_value(void *priv, - struct lttng_probe_ctx *lttng_probe_ctx, + struct lttng_kernel_probe_ctx *lttng_probe_ctx, struct lttng_ctx_value *value) { value->u.s64 = lttng_current_egid(); diff --git a/src/lttng-context-euid.c b/src/lttng-context-euid.c index 4bd106ae..855e2552 100644 --- a/src/lttng-context-euid.c +++ b/src/lttng-context-euid.c @@ -19,7 +19,7 @@ #include static -size_t euid_get_size(void *priv, struct lttng_probe_ctx *probe_ctx, size_t offset) +size_t euid_get_size(void *priv, struct lttng_kernel_probe_ctx *probe_ctx, size_t offset) { size_t size = 0; @@ -29,7 +29,7 @@ size_t euid_get_size(void *priv, struct lttng_probe_ctx *probe_ctx, size_t offse } static -void euid_record(void *priv, struct lttng_probe_ctx *probe_ctx, +void euid_record(void *priv, struct lttng_kernel_probe_ctx *probe_ctx, struct lib_ring_buffer_ctx *ctx, struct lttng_channel *chan) { @@ -42,7 +42,7 @@ void euid_record(void *priv, struct lttng_probe_ctx *probe_ctx, static void euid_get_value(void *priv, - struct lttng_probe_ctx *lttng_probe_ctx, + struct lttng_kernel_probe_ctx *lttng_probe_ctx, struct lttng_ctx_value *value) { value->u.s64 = lttng_current_euid(); diff --git a/src/lttng-context-gid.c b/src/lttng-context-gid.c index 721e1a38..6d611088 100644 --- a/src/lttng-context-gid.c +++ b/src/lttng-context-gid.c @@ -19,7 +19,7 @@ #include static -size_t gid_get_size(void *priv, struct lttng_probe_ctx *probe_ctx, size_t offset) +size_t gid_get_size(void *priv, struct lttng_kernel_probe_ctx *probe_ctx, size_t offset) { size_t size = 0; @@ -29,7 +29,7 @@ size_t gid_get_size(void *priv, struct lttng_probe_ctx *probe_ctx, size_t offset } static -void gid_record(void *priv, struct lttng_probe_ctx *probe_ctx, +void gid_record(void *priv, struct lttng_kernel_probe_ctx *probe_ctx, struct lib_ring_buffer_ctx *ctx, struct lttng_channel *chan) { @@ -42,7 +42,7 @@ void gid_record(void *priv, struct lttng_probe_ctx *probe_ctx, static void gid_get_value(void *priv, - struct lttng_probe_ctx *lttng_probe_ctx, + struct lttng_kernel_probe_ctx *lttng_probe_ctx, struct lttng_ctx_value *value) { value->u.s64 = lttng_current_gid(); diff --git a/src/lttng-context-hostname.c b/src/lttng-context-hostname.c index df46293b..b12ff0bc 100644 --- a/src/lttng-context-hostname.c +++ b/src/lttng-context-hostname.c @@ -20,7 +20,7 @@ #define LTTNG_HOSTNAME_CTX_LEN (__NEW_UTS_LEN + 1) static -size_t hostname_get_size(void *priv, struct lttng_probe_ctx *probe_ctx, size_t offset) +size_t hostname_get_size(void *priv, struct lttng_kernel_probe_ctx *probe_ctx, size_t offset) { size_t size = 0; @@ -29,7 +29,7 @@ size_t hostname_get_size(void *priv, struct lttng_probe_ctx *probe_ctx, size_t o } static -void hostname_record(void *priv, struct lttng_probe_ctx *probe_ctx, +void hostname_record(void *priv, struct lttng_kernel_probe_ctx *probe_ctx, struct lib_ring_buffer_ctx *ctx, struct lttng_channel *chan) { @@ -55,7 +55,7 @@ void hostname_record(void *priv, struct lttng_probe_ctx *probe_ctx, static void hostname_get_value(void *priv, - struct lttng_probe_ctx *lttng_probe_ctx, + struct lttng_kernel_probe_ctx *lttng_probe_ctx, struct lttng_ctx_value *value) { struct nsproxy *nsproxy; diff --git a/src/lttng-context-interruptible.c b/src/lttng-context-interruptible.c index 4d0596a3..971b8b03 100644 --- a/src/lttng-context-interruptible.c +++ b/src/lttng-context-interruptible.c @@ -22,7 +22,7 @@ */ static -size_t interruptible_get_size(void *priv, struct lttng_probe_ctx *probe_ctx, size_t offset) +size_t interruptible_get_size(void *priv, struct lttng_kernel_probe_ctx *probe_ctx, size_t offset) { size_t size = 0; @@ -32,11 +32,11 @@ size_t interruptible_get_size(void *priv, struct lttng_probe_ctx *probe_ctx, siz } static -void interruptible_record(void *priv, struct lttng_probe_ctx *probe_ctx, +void interruptible_record(void *priv, struct lttng_kernel_probe_ctx *probe_ctx, struct lib_ring_buffer_ctx *ctx, struct lttng_channel *chan) { - struct lttng_probe_ctx *lttng_probe_ctx = ctx->probe_ctx; + struct lttng_kernel_probe_ctx *lttng_probe_ctx = ctx->probe_ctx; int8_t interruptible = lttng_probe_ctx->interruptible; lib_ring_buffer_align_ctx(ctx, lttng_alignof(interruptible)); @@ -45,7 +45,7 @@ void interruptible_record(void *priv, struct lttng_probe_ctx *probe_ctx, static void interruptible_get_value(void *priv, - struct lttng_probe_ctx *lttng_probe_ctx, + struct lttng_kernel_probe_ctx *lttng_probe_ctx, struct lttng_ctx_value *value) { int8_t interruptible = lttng_probe_ctx->interruptible; diff --git a/src/lttng-context-ipc-ns.c b/src/lttng-context-ipc-ns.c index d6641539..3bc3ffcb 100644 --- a/src/lttng-context-ipc-ns.c +++ b/src/lttng-context-ipc-ns.c @@ -24,7 +24,7 @@ (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(3,8,0)) static -size_t ipc_ns_get_size(void *priv, struct lttng_probe_ctx *probe_ctx, size_t offset) +size_t ipc_ns_get_size(void *priv, struct lttng_kernel_probe_ctx *probe_ctx, size_t offset) { size_t size = 0; @@ -34,7 +34,7 @@ size_t ipc_ns_get_size(void *priv, struct lttng_probe_ctx *probe_ctx, size_t off } static -void ipc_ns_record(void *priv, struct lttng_probe_ctx *probe_ctx, +void ipc_ns_record(void *priv, struct lttng_kernel_probe_ctx *probe_ctx, struct lib_ring_buffer_ctx *ctx, struct lttng_channel *chan) { @@ -56,7 +56,7 @@ void ipc_ns_record(void *priv, struct lttng_probe_ctx *probe_ctx, static void ipc_ns_get_value(void *priv, - struct lttng_probe_ctx *lttng_probe_ctx, + struct lttng_kernel_probe_ctx *lttng_probe_ctx, struct lttng_ctx_value *value) { unsigned int ipc_ns_inum = 0; diff --git a/src/lttng-context-migratable.c b/src/lttng-context-migratable.c index 449f7dba..82401138 100644 --- a/src/lttng-context-migratable.c +++ b/src/lttng-context-migratable.c @@ -18,7 +18,7 @@ #include static -size_t migratable_get_size(void *priv, struct lttng_probe_ctx *probe_ctx, size_t offset) +size_t migratable_get_size(void *priv, struct lttng_kernel_probe_ctx *probe_ctx, size_t offset) { size_t size = 0; @@ -28,7 +28,7 @@ size_t migratable_get_size(void *priv, struct lttng_probe_ctx *probe_ctx, size_t } static -void migratable_record(void *priv, struct lttng_probe_ctx *probe_ctx, +void migratable_record(void *priv, struct lttng_kernel_probe_ctx *probe_ctx, struct lib_ring_buffer_ctx *ctx, struct lttng_channel *chan) { @@ -40,7 +40,7 @@ void migratable_record(void *priv, struct lttng_probe_ctx *probe_ctx, static void migratable_get_value(void *priv, - struct lttng_probe_ctx *lttng_probe_ctx, + struct lttng_kernel_probe_ctx *lttng_probe_ctx, struct lttng_ctx_value *value) { value->u.s64 = !current->migrate_disable; diff --git a/src/lttng-context-mnt-ns.c b/src/lttng-context-mnt-ns.c index 79b702ca..0f970699 100644 --- a/src/lttng-context-mnt-ns.c +++ b/src/lttng-context-mnt-ns.c @@ -26,7 +26,7 @@ #include <../fs/mount.h> static -size_t mnt_ns_get_size(void *priv, struct lttng_probe_ctx *probe_ctx, size_t offset) +size_t mnt_ns_get_size(void *priv, struct lttng_kernel_probe_ctx *probe_ctx, size_t offset) { size_t size = 0; @@ -36,7 +36,7 @@ size_t mnt_ns_get_size(void *priv, struct lttng_probe_ctx *probe_ctx, size_t off } static -void mnt_ns_record(void *priv, struct lttng_probe_ctx *probe_ctx, +void mnt_ns_record(void *priv, struct lttng_kernel_probe_ctx *probe_ctx, struct lib_ring_buffer_ctx *ctx, struct lttng_channel *chan) { @@ -58,7 +58,7 @@ void mnt_ns_record(void *priv, struct lttng_probe_ctx *probe_ctx, static void mnt_ns_get_value(void *priv, - struct lttng_probe_ctx *lttng_probe_ctx, + struct lttng_kernel_probe_ctx *lttng_probe_ctx, struct lttng_ctx_value *value) { unsigned int mnt_ns_inum = 0; diff --git a/src/lttng-context-need-reschedule.c b/src/lttng-context-need-reschedule.c index 6984d1a4..090e6e55 100644 --- a/src/lttng-context-need-reschedule.c +++ b/src/lttng-context-need-reschedule.c @@ -18,7 +18,7 @@ #include static -size_t need_reschedule_get_size(void *priv, struct lttng_probe_ctx *probe_ctx, size_t offset) +size_t need_reschedule_get_size(void *priv, struct lttng_kernel_probe_ctx *probe_ctx, size_t offset) { size_t size = 0; @@ -28,7 +28,7 @@ size_t need_reschedule_get_size(void *priv, struct lttng_probe_ctx *probe_ctx, s } static -void need_reschedule_record(void *priv, struct lttng_probe_ctx *probe_ctx, +void need_reschedule_record(void *priv, struct lttng_kernel_probe_ctx *probe_ctx, struct lib_ring_buffer_ctx *ctx, struct lttng_channel *chan) { @@ -40,7 +40,7 @@ void need_reschedule_record(void *priv, struct lttng_probe_ctx *probe_ctx, static void need_reschedule_get_value(void *priv, - struct lttng_probe_ctx *lttng_probe_ctx, + struct lttng_kernel_probe_ctx *lttng_probe_ctx, struct lttng_ctx_value *value) { value->u.s64 = test_tsk_need_resched(current);; diff --git a/src/lttng-context-net-ns.c b/src/lttng-context-net-ns.c index 22fcca79..e0b4b4db 100644 --- a/src/lttng-context-net-ns.c +++ b/src/lttng-context-net-ns.c @@ -25,7 +25,7 @@ (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(3,8,0)) static -size_t net_ns_get_size(void *priv, struct lttng_probe_ctx *probe_ctx, size_t offset) +size_t net_ns_get_size(void *priv, struct lttng_kernel_probe_ctx *probe_ctx, size_t offset) { size_t size = 0; @@ -35,7 +35,7 @@ size_t net_ns_get_size(void *priv, struct lttng_probe_ctx *probe_ctx, size_t off } static -void net_ns_record(void *priv, struct lttng_probe_ctx *probe_ctx, +void net_ns_record(void *priv, struct lttng_kernel_probe_ctx *probe_ctx, struct lib_ring_buffer_ctx *ctx, struct lttng_channel *chan) { @@ -57,7 +57,7 @@ void net_ns_record(void *priv, struct lttng_probe_ctx *probe_ctx, static void net_ns_get_value(void *priv, - struct lttng_probe_ctx *lttng_probe_ctx, + struct lttng_kernel_probe_ctx *lttng_probe_ctx, struct lttng_ctx_value *value) { unsigned int net_ns_inum = 0; diff --git a/src/lttng-context-nice.c b/src/lttng-context-nice.c index ef61570c..031d39d9 100644 --- a/src/lttng-context-nice.c +++ b/src/lttng-context-nice.c @@ -17,7 +17,7 @@ #include static -size_t nice_get_size(void *priv, struct lttng_probe_ctx *probe_ctx, size_t offset) +size_t nice_get_size(void *priv, struct lttng_kernel_probe_ctx *probe_ctx, size_t offset) { size_t size = 0; @@ -27,7 +27,7 @@ size_t nice_get_size(void *priv, struct lttng_probe_ctx *probe_ctx, size_t offse } static -void nice_record(void *priv, struct lttng_probe_ctx *probe_ctx, +void nice_record(void *priv, struct lttng_kernel_probe_ctx *probe_ctx, struct lib_ring_buffer_ctx *ctx, struct lttng_channel *chan) { @@ -40,7 +40,7 @@ void nice_record(void *priv, struct lttng_probe_ctx *probe_ctx, static void nice_get_value(void *priv, - struct lttng_probe_ctx *lttng_probe_ctx, + struct lttng_kernel_probe_ctx *lttng_probe_ctx, struct lttng_ctx_value *value) { value->u.s64 = task_nice(current); diff --git a/src/lttng-context-perf-counters.c b/src/lttng-context-perf-counters.c index d69ada5e..f3d7bdf1 100644 --- a/src/lttng-context-perf-counters.c +++ b/src/lttng-context-perf-counters.c @@ -21,7 +21,7 @@ #include static -size_t perf_counter_get_size(void *priv, struct lttng_probe_ctx *probe_ctx, size_t offset) +size_t perf_counter_get_size(void *priv, struct lttng_kernel_probe_ctx *probe_ctx, size_t offset) { size_t size = 0; @@ -31,7 +31,7 @@ size_t perf_counter_get_size(void *priv, struct lttng_probe_ctx *probe_ctx, size } static -void perf_counter_record(void *priv, struct lttng_probe_ctx *probe_ctx, +void perf_counter_record(void *priv, struct lttng_kernel_probe_ctx *probe_ctx, struct lib_ring_buffer_ctx *ctx, struct lttng_channel *chan) { diff --git a/src/lttng-context-pid-ns.c b/src/lttng-context-pid-ns.c index 41c15cb5..d4ff5153 100644 --- a/src/lttng-context-pid-ns.c +++ b/src/lttng-context-pid-ns.c @@ -24,7 +24,7 @@ (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(3,8,0)) static -size_t pid_ns_get_size(void *priv, struct lttng_probe_ctx *probe_ctx, size_t offset) +size_t pid_ns_get_size(void *priv, struct lttng_kernel_probe_ctx *probe_ctx, size_t offset) { size_t size = 0; @@ -34,7 +34,7 @@ size_t pid_ns_get_size(void *priv, struct lttng_probe_ctx *probe_ctx, size_t off } static -void pid_ns_record(void *priv, struct lttng_probe_ctx *probe_ctx, +void pid_ns_record(void *priv, struct lttng_kernel_probe_ctx *probe_ctx, struct lib_ring_buffer_ctx *ctx, struct lttng_channel *chan) { @@ -57,7 +57,7 @@ void pid_ns_record(void *priv, struct lttng_probe_ctx *probe_ctx, static void pid_ns_get_value(void *priv, - struct lttng_probe_ctx *lttng_probe_ctx, + struct lttng_kernel_probe_ctx *lttng_probe_ctx, struct lttng_ctx_value *value) { struct pid_namespace *ns; diff --git a/src/lttng-context-pid.c b/src/lttng-context-pid.c index e3e962d6..b43503e6 100644 --- a/src/lttng-context-pid.c +++ b/src/lttng-context-pid.c @@ -17,7 +17,7 @@ #include static -size_t pid_get_size(void *priv, struct lttng_probe_ctx *probe_ctx, size_t offset) +size_t pid_get_size(void *priv, struct lttng_kernel_probe_ctx *probe_ctx, size_t offset) { size_t size = 0; @@ -27,7 +27,7 @@ size_t pid_get_size(void *priv, struct lttng_probe_ctx *probe_ctx, size_t offset } static -void pid_record(void *priv, struct lttng_probe_ctx *probe_ctx, +void pid_record(void *priv, struct lttng_kernel_probe_ctx *probe_ctx, struct lib_ring_buffer_ctx *ctx, struct lttng_channel *chan) { @@ -40,7 +40,7 @@ void pid_record(void *priv, struct lttng_probe_ctx *probe_ctx, static void pid_get_value(void *priv, - struct lttng_probe_ctx *lttng_probe_ctx, + struct lttng_kernel_probe_ctx *lttng_probe_ctx, struct lttng_ctx_value *value) { value->u.s64 = task_tgid_nr(current); diff --git a/src/lttng-context-ppid.c b/src/lttng-context-ppid.c index 1494f5c7..c9a0d5c3 100644 --- a/src/lttng-context-ppid.c +++ b/src/lttng-context-ppid.c @@ -18,7 +18,7 @@ #include static -size_t ppid_get_size(void *priv, struct lttng_probe_ctx *probe_ctx, size_t offset) +size_t ppid_get_size(void *priv, struct lttng_kernel_probe_ctx *probe_ctx, size_t offset) { size_t size = 0; @@ -28,7 +28,7 @@ size_t ppid_get_size(void *priv, struct lttng_probe_ctx *probe_ctx, size_t offse } static -void ppid_record(void *priv, struct lttng_probe_ctx *probe_ctx, +void ppid_record(void *priv, struct lttng_kernel_probe_ctx *probe_ctx, struct lib_ring_buffer_ctx *ctx, struct lttng_channel *chan) { @@ -50,7 +50,7 @@ void ppid_record(void *priv, struct lttng_probe_ctx *probe_ctx, static void ppid_get_value(void *priv, - struct lttng_probe_ctx *lttng_probe_ctx, + struct lttng_kernel_probe_ctx *lttng_probe_ctx, struct lttng_ctx_value *value) { pid_t ppid; diff --git a/src/lttng-context-preemptible.c b/src/lttng-context-preemptible.c index 59d33fff..41b8ae5c 100644 --- a/src/lttng-context-preemptible.c +++ b/src/lttng-context-preemptible.c @@ -26,7 +26,7 @@ #define LTTNG_PREEMPT_DISABLE_NESTING 2 static -size_t preemptible_get_size(void *priv, struct lttng_probe_ctx *probe_ctx, size_t offset) +size_t preemptible_get_size(void *priv, struct lttng_kernel_probe_ctx *probe_ctx, size_t offset) { size_t size = 0; @@ -36,7 +36,7 @@ size_t preemptible_get_size(void *priv, struct lttng_probe_ctx *probe_ctx, size_ } static -void preemptible_record(void *priv, struct lttng_probe_ctx *probe_ctx, +void preemptible_record(void *priv, struct lttng_kernel_probe_ctx *probe_ctx, struct lib_ring_buffer_ctx *ctx, struct lttng_channel *chan) { @@ -52,7 +52,7 @@ void preemptible_record(void *priv, struct lttng_probe_ctx *probe_ctx, static void preemptible_get_value(void *priv, - struct lttng_probe_ctx *lttng_probe_ctx, + struct lttng_kernel_probe_ctx *lttng_probe_ctx, struct lttng_ctx_value *value) { int pc = preempt_count(); diff --git a/src/lttng-context-prio.c b/src/lttng-context-prio.c index 3eb3ff90..f8f18a83 100644 --- a/src/lttng-context-prio.c +++ b/src/lttng-context-prio.c @@ -44,7 +44,7 @@ int __canary__task_prio(const struct task_struct *p) } static -size_t prio_get_size(void *priv, struct lttng_probe_ctx *probe_ctx, size_t offset) +size_t prio_get_size(void *priv, struct lttng_kernel_probe_ctx *probe_ctx, size_t offset) { size_t size = 0; @@ -54,7 +54,7 @@ size_t prio_get_size(void *priv, struct lttng_probe_ctx *probe_ctx, size_t offse } static -void prio_record(void *priv, struct lttng_probe_ctx *probe_ctx, +void prio_record(void *priv, struct lttng_kernel_probe_ctx *probe_ctx, struct lib_ring_buffer_ctx *ctx, struct lttng_channel *chan) { @@ -67,7 +67,7 @@ void prio_record(void *priv, struct lttng_probe_ctx *probe_ctx, static void prio_get_value(void *priv, - struct lttng_probe_ctx *lttng_probe_ctx, + struct lttng_kernel_probe_ctx *lttng_probe_ctx, struct lttng_ctx_value *value) { value->u.s64 = wrapper_task_prio_sym(current); diff --git a/src/lttng-context-procname.c b/src/lttng-context-procname.c index 94ba94e7..22714946 100644 --- a/src/lttng-context-procname.c +++ b/src/lttng-context-procname.c @@ -18,7 +18,7 @@ #include static -size_t procname_get_size(void *priv, struct lttng_probe_ctx *probe_ctx, size_t offset) +size_t procname_get_size(void *priv, struct lttng_kernel_probe_ctx *probe_ctx, size_t offset) { size_t size = 0; @@ -33,7 +33,7 @@ size_t procname_get_size(void *priv, struct lttng_probe_ctx *probe_ctx, size_t o * could lead to crash in IRQ context and deadlock of the lockdep tracer. */ static -void procname_record(void *priv, struct lttng_probe_ctx *probe_ctx, +void procname_record(void *priv, struct lttng_kernel_probe_ctx *probe_ctx, struct lib_ring_buffer_ctx *ctx, struct lttng_channel *chan) { @@ -42,7 +42,7 @@ void procname_record(void *priv, struct lttng_probe_ctx *probe_ctx, static void procname_get_value(void *priv, - struct lttng_probe_ctx *lttng_probe_ctx, + struct lttng_kernel_probe_ctx *lttng_probe_ctx, struct lttng_ctx_value *value) { value->u.str = current->comm; diff --git a/src/lttng-context-sgid.c b/src/lttng-context-sgid.c index 23d5e5bc..9af1a484 100644 --- a/src/lttng-context-sgid.c +++ b/src/lttng-context-sgid.c @@ -19,7 +19,7 @@ #include static -size_t sgid_get_size(void *priv, struct lttng_probe_ctx *probe_ctx, size_t offset) +size_t sgid_get_size(void *priv, struct lttng_kernel_probe_ctx *probe_ctx, size_t offset) { size_t size = 0; @@ -29,7 +29,7 @@ size_t sgid_get_size(void *priv, struct lttng_probe_ctx *probe_ctx, size_t offse } static -void sgid_record(void *priv, struct lttng_probe_ctx *probe_ctx, +void sgid_record(void *priv, struct lttng_kernel_probe_ctx *probe_ctx, struct lib_ring_buffer_ctx *ctx, struct lttng_channel *chan) { @@ -42,7 +42,7 @@ void sgid_record(void *priv, struct lttng_probe_ctx *probe_ctx, static void sgid_get_value(void *priv, - struct lttng_probe_ctx *lttng_probe_ctx, + struct lttng_kernel_probe_ctx *lttng_probe_ctx, struct lttng_ctx_value *value) { value->u.s64 = lttng_current_sgid(); diff --git a/src/lttng-context-suid.c b/src/lttng-context-suid.c index 5a9e7beb..916219eb 100644 --- a/src/lttng-context-suid.c +++ b/src/lttng-context-suid.c @@ -19,7 +19,7 @@ #include static -size_t suid_get_size(void *priv, struct lttng_probe_ctx *probe_ctx, size_t offset) +size_t suid_get_size(void *priv, struct lttng_kernel_probe_ctx *probe_ctx, size_t offset) { size_t size = 0; @@ -29,7 +29,7 @@ size_t suid_get_size(void *priv, struct lttng_probe_ctx *probe_ctx, size_t offse } static -void suid_record(void *priv, struct lttng_probe_ctx *probe_ctx, +void suid_record(void *priv, struct lttng_kernel_probe_ctx *probe_ctx, struct lib_ring_buffer_ctx *ctx, struct lttng_channel *chan) { @@ -42,7 +42,7 @@ void suid_record(void *priv, struct lttng_probe_ctx *probe_ctx, static void suid_get_value(void *priv, - struct lttng_probe_ctx *lttng_probe_ctx, + struct lttng_kernel_probe_ctx *lttng_probe_ctx, struct lttng_ctx_value *value) { value->u.s64 = lttng_current_suid(); diff --git a/src/lttng-context-tid.c b/src/lttng-context-tid.c index 5a9dee54..0b763fce 100644 --- a/src/lttng-context-tid.c +++ b/src/lttng-context-tid.c @@ -17,7 +17,7 @@ #include static -size_t tid_get_size(void *priv, struct lttng_probe_ctx *probe_ctx, size_t offset) +size_t tid_get_size(void *priv, struct lttng_kernel_probe_ctx *probe_ctx, size_t offset) { size_t size = 0; @@ -27,7 +27,7 @@ size_t tid_get_size(void *priv, struct lttng_probe_ctx *probe_ctx, size_t offset } static -void tid_record(void *priv, struct lttng_probe_ctx *probe_ctx, +void tid_record(void *priv, struct lttng_kernel_probe_ctx *probe_ctx, struct lib_ring_buffer_ctx *ctx, struct lttng_channel *chan) { @@ -40,7 +40,7 @@ void tid_record(void *priv, struct lttng_probe_ctx *probe_ctx, static void tid_get_value(void *priv, - struct lttng_probe_ctx *lttng_probe_ctx, + struct lttng_kernel_probe_ctx *lttng_probe_ctx, struct lttng_ctx_value *value) { pid_t tid; diff --git a/src/lttng-context-time-ns.c b/src/lttng-context-time-ns.c index 355feb16..0fceef47 100644 --- a/src/lttng-context-time-ns.c +++ b/src/lttng-context-time-ns.c @@ -24,7 +24,7 @@ #if defined(CONFIG_TIME_NS) static -size_t time_ns_get_size(void *priv, struct lttng_probe_ctx *probe_ctx, size_t offset) +size_t time_ns_get_size(void *priv, struct lttng_kernel_probe_ctx *probe_ctx, size_t offset) { size_t size = 0; @@ -34,7 +34,7 @@ size_t time_ns_get_size(void *priv, struct lttng_probe_ctx *probe_ctx, size_t of } static -void time_ns_record(void *priv, struct lttng_probe_ctx *probe_ctx, +void time_ns_record(void *priv, struct lttng_kernel_probe_ctx *probe_ctx, struct lib_ring_buffer_ctx *ctx, struct lttng_channel *chan) { @@ -56,7 +56,7 @@ void time_ns_record(void *priv, struct lttng_probe_ctx *probe_ctx, static void time_ns_get_value(void *priv, - struct lttng_probe_ctx *lttng_probe_ctx, + struct lttng_kernel_probe_ctx *lttng_probe_ctx, struct lttng_ctx_value *value) { unsigned int time_ns_inum = 0; diff --git a/src/lttng-context-uid.c b/src/lttng-context-uid.c index 86d999af..9e17d5bc 100644 --- a/src/lttng-context-uid.c +++ b/src/lttng-context-uid.c @@ -19,7 +19,7 @@ #include static -size_t uid_get_size(void *priv, struct lttng_probe_ctx *probe_ctx, size_t offset) +size_t uid_get_size(void *priv, struct lttng_kernel_probe_ctx *probe_ctx, size_t offset) { size_t size = 0; @@ -29,7 +29,7 @@ size_t uid_get_size(void *priv, struct lttng_probe_ctx *probe_ctx, size_t offset } static -void uid_record(void *priv, struct lttng_probe_ctx *probe_ctx, +void uid_record(void *priv, struct lttng_kernel_probe_ctx *probe_ctx, struct lib_ring_buffer_ctx *ctx, struct lttng_channel *chan) { @@ -42,7 +42,7 @@ void uid_record(void *priv, struct lttng_probe_ctx *probe_ctx, static void uid_get_value(void *priv, - struct lttng_probe_ctx *lttng_probe_ctx, + struct lttng_kernel_probe_ctx *lttng_probe_ctx, struct lttng_ctx_value *value) { value->u.s64 = lttng_current_uid(); diff --git a/src/lttng-context-user-ns.c b/src/lttng-context-user-ns.c index f774d971..4ca4df2f 100644 --- a/src/lttng-context-user-ns.c +++ b/src/lttng-context-user-ns.c @@ -24,7 +24,7 @@ (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(3,8,0)) static -size_t user_ns_get_size(void *priv, struct lttng_probe_ctx *probe_ctx, size_t offset) +size_t user_ns_get_size(void *priv, struct lttng_kernel_probe_ctx *probe_ctx, size_t offset) { size_t size = 0; @@ -34,7 +34,7 @@ size_t user_ns_get_size(void *priv, struct lttng_probe_ctx *probe_ctx, size_t of } static -void user_ns_record(void *priv, struct lttng_probe_ctx *probe_ctx, +void user_ns_record(void *priv, struct lttng_kernel_probe_ctx *probe_ctx, struct lib_ring_buffer_ctx *ctx, struct lttng_channel *chan) { @@ -49,7 +49,7 @@ void user_ns_record(void *priv, struct lttng_probe_ctx *probe_ctx, static void user_ns_get_value(void *priv, - struct lttng_probe_ctx *lttng_probe_ctx, + struct lttng_kernel_probe_ctx *lttng_probe_ctx, struct lttng_ctx_value *value) { unsigned int user_ns_inum = 0; diff --git a/src/lttng-context-uts-ns.c b/src/lttng-context-uts-ns.c index 204cafb6..1f660215 100644 --- a/src/lttng-context-uts-ns.c +++ b/src/lttng-context-uts-ns.c @@ -24,7 +24,7 @@ (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(3,8,0)) static -size_t uts_ns_get_size(void *priv, struct lttng_probe_ctx *probe_ctx, size_t offset) +size_t uts_ns_get_size(void *priv, struct lttng_kernel_probe_ctx *probe_ctx, size_t offset) { size_t size = 0; @@ -34,7 +34,7 @@ size_t uts_ns_get_size(void *priv, struct lttng_probe_ctx *probe_ctx, size_t off } static -void uts_ns_record(void *priv, struct lttng_probe_ctx *probe_ctx, +void uts_ns_record(void *priv, struct lttng_kernel_probe_ctx *probe_ctx, struct lib_ring_buffer_ctx *ctx, struct lttng_channel *chan) { @@ -56,7 +56,7 @@ void uts_ns_record(void *priv, struct lttng_probe_ctx *probe_ctx, static void uts_ns_get_value(void *priv, - struct lttng_probe_ctx *lttng_probe_ctx, + struct lttng_kernel_probe_ctx *lttng_probe_ctx, struct lttng_ctx_value *value) { unsigned int uts_ns_inum = 0; diff --git a/src/lttng-context-vegid.c b/src/lttng-context-vegid.c index 87c53baf..3e43f6b0 100644 --- a/src/lttng-context-vegid.c +++ b/src/lttng-context-vegid.c @@ -19,7 +19,7 @@ #include static -size_t vegid_get_size(void *priv, struct lttng_probe_ctx *probe_ctx, size_t offset) +size_t vegid_get_size(void *priv, struct lttng_kernel_probe_ctx *probe_ctx, size_t offset) { size_t size = 0; @@ -29,7 +29,7 @@ size_t vegid_get_size(void *priv, struct lttng_probe_ctx *probe_ctx, size_t offs } static -void vegid_record(void *priv, struct lttng_probe_ctx *probe_ctx, +void vegid_record(void *priv, struct lttng_kernel_probe_ctx *probe_ctx, struct lib_ring_buffer_ctx *ctx, struct lttng_channel *chan) { @@ -42,7 +42,7 @@ void vegid_record(void *priv, struct lttng_probe_ctx *probe_ctx, static void vegid_get_value(void *priv, - struct lttng_probe_ctx *lttng_probe_ctx, + struct lttng_kernel_probe_ctx *lttng_probe_ctx, struct lttng_ctx_value *value) { value->u.s64 = lttng_current_vegid(); diff --git a/src/lttng-context-veuid.c b/src/lttng-context-veuid.c index 5b4930db..965c3eec 100644 --- a/src/lttng-context-veuid.c +++ b/src/lttng-context-veuid.c @@ -19,7 +19,7 @@ #include static -size_t veuid_get_size(void *priv, struct lttng_probe_ctx *probe_ctx, size_t offset) +size_t veuid_get_size(void *priv, struct lttng_kernel_probe_ctx *probe_ctx, size_t offset) { size_t size = 0; @@ -29,7 +29,7 @@ size_t veuid_get_size(void *priv, struct lttng_probe_ctx *probe_ctx, size_t offs } static -void veuid_record(void *priv, struct lttng_probe_ctx *probe_ctx, +void veuid_record(void *priv, struct lttng_kernel_probe_ctx *probe_ctx, struct lib_ring_buffer_ctx *ctx, struct lttng_channel *chan) { @@ -42,7 +42,7 @@ void veuid_record(void *priv, struct lttng_probe_ctx *probe_ctx, static void veuid_get_value(void *priv, - struct lttng_probe_ctx *lttng_probe_ctx, + struct lttng_kernel_probe_ctx *lttng_probe_ctx, struct lttng_ctx_value *value) { value->u.s64 = lttng_current_veuid(); diff --git a/src/lttng-context-vgid.c b/src/lttng-context-vgid.c index 768ed519..1a03dd1a 100644 --- a/src/lttng-context-vgid.c +++ b/src/lttng-context-vgid.c @@ -19,7 +19,7 @@ #include static -size_t vgid_get_size(void *priv, struct lttng_probe_ctx *probe_ctx, size_t offset) +size_t vgid_get_size(void *priv, struct lttng_kernel_probe_ctx *probe_ctx, size_t offset) { size_t size = 0; @@ -29,7 +29,7 @@ size_t vgid_get_size(void *priv, struct lttng_probe_ctx *probe_ctx, size_t offse } static -void vgid_record(void *priv, struct lttng_probe_ctx *probe_ctx, +void vgid_record(void *priv, struct lttng_kernel_probe_ctx *probe_ctx, struct lib_ring_buffer_ctx *ctx, struct lttng_channel *chan) { @@ -42,7 +42,7 @@ void vgid_record(void *priv, struct lttng_probe_ctx *probe_ctx, static void vgid_get_value(void *priv, - struct lttng_probe_ctx *lttng_probe_ctx, + struct lttng_kernel_probe_ctx *lttng_probe_ctx, struct lttng_ctx_value *value) { value->u.s64 = lttng_current_vgid(); diff --git a/src/lttng-context-vpid.c b/src/lttng-context-vpid.c index dfc56751..83091db1 100644 --- a/src/lttng-context-vpid.c +++ b/src/lttng-context-vpid.c @@ -17,7 +17,7 @@ #include static -size_t vpid_get_size(void *priv, struct lttng_probe_ctx *probe_ctx, size_t offset) +size_t vpid_get_size(void *priv, struct lttng_kernel_probe_ctx *probe_ctx, size_t offset) { size_t size = 0; @@ -27,7 +27,7 @@ size_t vpid_get_size(void *priv, struct lttng_probe_ctx *probe_ctx, size_t offse } static -void vpid_record(void *priv, struct lttng_probe_ctx *probe_ctx, +void vpid_record(void *priv, struct lttng_kernel_probe_ctx *probe_ctx, struct lib_ring_buffer_ctx *ctx, struct lttng_channel *chan) { @@ -46,7 +46,7 @@ void vpid_record(void *priv, struct lttng_probe_ctx *probe_ctx, static void vpid_get_value(void *priv, - struct lttng_probe_ctx *lttng_probe_ctx, + struct lttng_kernel_probe_ctx *lttng_probe_ctx, struct lttng_ctx_value *value) { pid_t vpid; diff --git a/src/lttng-context-vppid.c b/src/lttng-context-vppid.c index 5f72a064..5b438840 100644 --- a/src/lttng-context-vppid.c +++ b/src/lttng-context-vppid.c @@ -18,7 +18,7 @@ #include static -size_t vppid_get_size(void *priv, struct lttng_probe_ctx *probe_ctx, size_t offset) +size_t vppid_get_size(void *priv, struct lttng_kernel_probe_ctx *probe_ctx, size_t offset) { size_t size = 0; @@ -28,7 +28,7 @@ size_t vppid_get_size(void *priv, struct lttng_probe_ctx *probe_ctx, size_t offs } static -void vppid_record(void *priv, struct lttng_probe_ctx *probe_ctx, +void vppid_record(void *priv, struct lttng_kernel_probe_ctx *probe_ctx, struct lib_ring_buffer_ctx *ctx, struct lttng_channel *chan) { @@ -61,7 +61,7 @@ void vppid_record(void *priv, struct lttng_probe_ctx *probe_ctx, static void vppid_get_value(void *priv, - struct lttng_probe_ctx *lttng_probe_ctx, + struct lttng_kernel_probe_ctx *lttng_probe_ctx, struct lttng_ctx_value *value) { struct task_struct *parent; diff --git a/src/lttng-context-vsgid.c b/src/lttng-context-vsgid.c index d95b2a1d..f47f0d14 100644 --- a/src/lttng-context-vsgid.c +++ b/src/lttng-context-vsgid.c @@ -19,7 +19,7 @@ #include static -size_t vsgid_get_size(void *priv, struct lttng_probe_ctx *probe_ctx, size_t offset) +size_t vsgid_get_size(void *priv, struct lttng_kernel_probe_ctx *probe_ctx, size_t offset) { size_t size = 0; @@ -29,7 +29,7 @@ size_t vsgid_get_size(void *priv, struct lttng_probe_ctx *probe_ctx, size_t offs } static -void vsgid_record(void *priv, struct lttng_probe_ctx *probe_ctx, +void vsgid_record(void *priv, struct lttng_kernel_probe_ctx *probe_ctx, struct lib_ring_buffer_ctx *ctx, struct lttng_channel *chan) { @@ -42,7 +42,7 @@ void vsgid_record(void *priv, struct lttng_probe_ctx *probe_ctx, static void vsgid_get_value(void *priv, - struct lttng_probe_ctx *lttng_probe_ctx, + struct lttng_kernel_probe_ctx *lttng_probe_ctx, struct lttng_ctx_value *value) { value->u.s64 = lttng_current_vsgid(); diff --git a/src/lttng-context-vsuid.c b/src/lttng-context-vsuid.c index 38b0a71e..29ff30dc 100644 --- a/src/lttng-context-vsuid.c +++ b/src/lttng-context-vsuid.c @@ -19,7 +19,7 @@ #include static -size_t vsuid_get_size(void *priv, struct lttng_probe_ctx *probe_ctx, size_t offset) +size_t vsuid_get_size(void *priv, struct lttng_kernel_probe_ctx *probe_ctx, size_t offset) { size_t size = 0; @@ -29,7 +29,7 @@ size_t vsuid_get_size(void *priv, struct lttng_probe_ctx *probe_ctx, size_t offs } static -void vsuid_record(void *priv, struct lttng_probe_ctx *probe_ctx, +void vsuid_record(void *priv, struct lttng_kernel_probe_ctx *probe_ctx, struct lib_ring_buffer_ctx *ctx, struct lttng_channel *chan) { @@ -42,7 +42,7 @@ void vsuid_record(void *priv, struct lttng_probe_ctx *probe_ctx, static void vsuid_get_value(void *priv, - struct lttng_probe_ctx *lttng_probe_ctx, + struct lttng_kernel_probe_ctx *lttng_probe_ctx, struct lttng_ctx_value *value) { value->u.s64 = lttng_current_vsuid(); diff --git a/src/lttng-context-vtid.c b/src/lttng-context-vtid.c index ba597efc..4e227577 100644 --- a/src/lttng-context-vtid.c +++ b/src/lttng-context-vtid.c @@ -17,7 +17,7 @@ #include static -size_t vtid_get_size(void *priv, struct lttng_probe_ctx *probe_ctx, size_t offset) +size_t vtid_get_size(void *priv, struct lttng_kernel_probe_ctx *probe_ctx, size_t offset) { size_t size = 0; @@ -27,7 +27,7 @@ size_t vtid_get_size(void *priv, struct lttng_probe_ctx *probe_ctx, size_t offse } static -void vtid_record(void *priv, struct lttng_probe_ctx *probe_ctx, +void vtid_record(void *priv, struct lttng_kernel_probe_ctx *probe_ctx, struct lib_ring_buffer_ctx *ctx, struct lttng_channel *chan) { @@ -46,7 +46,7 @@ void vtid_record(void *priv, struct lttng_probe_ctx *probe_ctx, static void vtid_get_value(void *priv, - struct lttng_probe_ctx *lttng_probe_ctx, + struct lttng_kernel_probe_ctx *lttng_probe_ctx, struct lttng_ctx_value *value) { pid_t vtid; diff --git a/src/lttng-context-vuid.c b/src/lttng-context-vuid.c index e3c946c9..2ecc411e 100644 --- a/src/lttng-context-vuid.c +++ b/src/lttng-context-vuid.c @@ -19,7 +19,7 @@ #include static -size_t vuid_get_size(void *priv, struct lttng_probe_ctx *probe_ctx, size_t offset) +size_t vuid_get_size(void *priv, struct lttng_kernel_probe_ctx *probe_ctx, size_t offset) { size_t size = 0; @@ -29,7 +29,7 @@ size_t vuid_get_size(void *priv, struct lttng_probe_ctx *probe_ctx, size_t offse } static -void vuid_record(void *priv, struct lttng_probe_ctx *probe_ctx, +void vuid_record(void *priv, struct lttng_kernel_probe_ctx *probe_ctx, struct lib_ring_buffer_ctx *ctx, struct lttng_channel *chan) { @@ -42,7 +42,7 @@ void vuid_record(void *priv, struct lttng_probe_ctx *probe_ctx, static void vuid_get_value(void *priv, - struct lttng_probe_ctx *lttng_probe_ctx, + struct lttng_kernel_probe_ctx *lttng_probe_ctx, struct lttng_ctx_value *value) { value->u.s64 = lttng_current_vuid(); diff --git a/src/lttng-event-notifier-notification.c b/src/lttng-event-notifier-notification.c index 0ba566ba..0d4415db 100644 --- a/src/lttng-event-notifier-notification.c +++ b/src/lttng-event-notifier-notification.c @@ -427,7 +427,7 @@ void notification_send(struct lttng_event_notifier_notification *notif, void lttng_event_notifier_notification_send(struct lttng_kernel_event_notifier *event_notifier, const char *stack_data, - struct lttng_probe_ctx *probe_ctx, + struct lttng_kernel_probe_ctx *probe_ctx, struct lttng_kernel_notification_ctx *notif_ctx) { struct lttng_event_notifier_notification notif = { 0 }; diff --git a/src/probes/lttng-kprobes.c b/src/probes/lttng-kprobes.c index e3fa493f..1db8be49 100644 --- a/src/probes/lttng-kprobes.c +++ b/src/probes/lttng-kprobes.c @@ -24,7 +24,7 @@ int lttng_kprobes_event_handler_pre(struct kprobe *p, struct pt_regs *regs) struct lttng_kernel_event_common_private *event_priv = container_of(p, struct lttng_kernel_event_common_private, u.kprobe.kp); struct lttng_kernel_event_common *event = event_priv->pub; - struct lttng_probe_ctx lttng_probe_ctx = { + struct lttng_kernel_probe_ctx lttng_probe_ctx = { .event = event, .interruptible = !lttng_regs_irqs_disabled(regs), }; diff --git a/src/probes/lttng-kretprobes.c b/src/probes/lttng-kretprobes.c index 2b5e91a2..30604b50 100644 --- a/src/probes/lttng-kretprobes.c +++ b/src/probes/lttng-kretprobes.c @@ -39,7 +39,7 @@ int _lttng_kretprobes_handler(struct kretprobe_instance *krpi, struct lttng_krp *lttng_krp = container_of(lttng_get_kretprobe(krpi), struct lttng_krp, krp); struct lttng_kernel_event_common *event = lttng_krp->event[type]; - struct lttng_probe_ctx lttng_probe_ctx = { + struct lttng_kernel_probe_ctx lttng_probe_ctx = { .event = event, .interruptible = !lttng_regs_irqs_disabled(regs), }; diff --git a/src/probes/lttng-uprobes.c b/src/probes/lttng-uprobes.c index f679dd76..4f2504e9 100644 --- a/src/probes/lttng-uprobes.c +++ b/src/probes/lttng-uprobes.c @@ -29,7 +29,7 @@ int lttng_uprobes_event_handler_pre(struct uprobe_consumer *uc, struct pt_regs * struct lttng_uprobe_handler *uprobe_handler = container_of(uc, struct lttng_uprobe_handler, up_consumer); struct lttng_kernel_event_common *event = uprobe_handler->event; - struct lttng_probe_ctx lttng_probe_ctx = { + struct lttng_kernel_probe_ctx lttng_probe_ctx = { .event = event, .interruptible = !lttng_regs_irqs_disabled(regs), }; -- 2.34.1