Rename struct lttng_probe_ctx to struct lttng_kernel_probe_ctx

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Change-Id: I629b7e447b9842ab863894abd08e4901b439ee17

diff --git a/include/lttng/event-notifier-notification.h b/include/lttng/event-notifier-notification.h
index 539900b31417052df6b41be539395efb6218e166..b9731961dfb082c82a4811f7f183352330406602 100644 (file)
--- 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 2d5c4b12e47961a73e29a5139d9c3a920edeae65..b7fb2833916611e87e44314127a27eb1d6369ad0 100644 (file)
--- 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 5b312d144c3ef7e492ffcdf5b47ae0d24cd26c51..eafdf5cf1992b829a0135c696a3a9e8fb0ca701e 100644 (file)
--- 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 1ffb115e82e21fa7c301b693ff9baae8dda9f19f..87a0c13d95c4631f2ffcf1752553970cf9bec12e 100644 (file)
--- 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 23c053fcc944283a664746e9481b86b7bde8e1e2..7d187555814e12d721bed69c2c41773cea75e1d9 100644 (file)
--- 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 bc638f941f20365d76fef12b004c0619fe10934a..9fc3f54ebf8de906a86a4c2ba9eb159d0b0aeb53 100644 (file)
--- 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 be0a32489e8c0bc725b75455eb5e6ab6a96a8a25..b46a23b74c1e4cccc4151a772d3ae340b5604d86 100644 (file)
--- 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 34a977a0c550e0a48eaca3009ce1b1ef49eb3fdc..7d818e3833077a1527b592c126c11e0fbbca9dfb 100644 (file)
--- 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 2e43735904a00523e3049b9502cbe0b69c40164d..9c8f6d38f5d3052f764e6c87d24ef7e75b6d6af7 100644 (file)
--- 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 0bc345c5f9c9d3c2d1ef58b7dd898260434450c8..5e8c615527e885ae1d45bd30b1e366f023108ab3 100644 (file)
--- 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 9e1d71a29725116c3f5cf4c8eeeef31587d17e6e..1fa32ac256f21dd55bcaf0caff3d2f2ea3100cd0 100644 (file)
--- a/src/lttng-context-cpu-id.c
+++ b/src/lttng-context-cpu-id.c
@@ -17,7 +17,7 @@
 #include <lttng/tracer.h>
 
 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 958ada67144c45254aef8d07a33647d229776dd4..e1674fb820e05651cb9dba39ecf22a58315fcb61 100644 (file)
--- a/src/lttng-context-egid.c
+++ b/src/lttng-context-egid.c
@@ -19,7 +19,7 @@
 #include <wrapper/user_namespace.h>
 
 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 4bd106ae356aaa69fdc9e9a4868382a95e92b1ad..855e2552ddca3a60126e30df42ce4c7ef1ab2c42 100644 (file)
--- a/src/lttng-context-euid.c
+++ b/src/lttng-context-euid.c
@@ -19,7 +19,7 @@
 #include <wrapper/user_namespace.h>
 
 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 721e1a38fcce56247f444687a03a1c4069b9e6e6..6d6110885416c5aa5abbf525cc5423f56d6ce36b 100644 (file)
--- a/src/lttng-context-gid.c
+++ b/src/lttng-context-gid.c
@@ -19,7 +19,7 @@
 #include <wrapper/user_namespace.h>
 
 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 df46293b0bf860914cc92717aed22f8e2d793723..b12ff0bcdd46b310e0834c4f361a264030e6f41a 100644 (file)
--- 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 4d0596a3288bf74b029ada077f9a41e924ae4dcd..971b8b0347b7c28b5c85123b2f6f0a2fa3deb31f 100644 (file)
--- 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 d66415397272f24455ae25e080b0d203c85f2985..3bc3ffcb0c31d57933ce38a28d4554eef14eadec 100644 (file)
--- 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 449f7dba7af42ac8225594c0a2b46fff45e0e07a..82401138c8e2999942983b956990a9a79a5c65d0 100644 (file)
--- a/src/lttng-context-migratable.c
+++ b/src/lttng-context-migratable.c
@@ -18,7 +18,7 @@
 #include <lttng/tracer.h>
 
 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 79b702caebced3d59a76ff17b4c0650b4268eb52..0f97069999a81a2d067f4d81612fbc9b1099bafe 100644 (file)
--- 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 6984d1a44d7dfdac404c550e5cad042272da501f..090e6e55aab2a950fb963928e576b462624fe9c0 100644 (file)
--- a/src/lttng-context-need-reschedule.c
+++ b/src/lttng-context-need-reschedule.c
@@ -18,7 +18,7 @@
 #include <lttng/tracer.h>
 
 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 22fcca79a60ade158574a354eec8dbb7cea32bc4..e0b4b4db3720a062e712bb21c26479b4bd61cdd5 100644 (file)
--- 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 ef61570c502da79474c5d7217962be35b68fc957..031d39d95143b696b9880aed07c41a742dfc9c61 100644 (file)
--- a/src/lttng-context-nice.c
+++ b/src/lttng-context-nice.c
@@ -17,7 +17,7 @@
 #include <lttng/tracer.h>
 
 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 d69ada5ef77c7f142f496cfda9a101d5a843b420..f3d7bdf1ce6a34857e28397ae08250ca7f2816b4 100644 (file)
--- a/src/lttng-context-perf-counters.c
+++ b/src/lttng-context-perf-counters.c
@@ -21,7 +21,7 @@
 #include <lttng/tracer.h>
 
 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 41c15cb531632f158eeeb581e901259e003336ba..d4ff5153c31f72595272cd9d4ba4bac2ae4ed238 100644 (file)
--- 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 e3e962d666092124748a9660eda47f2938967333..b43503e682d2f29760a86d94425bf862621dafb9 100644 (file)
--- a/src/lttng-context-pid.c
+++ b/src/lttng-context-pid.c
@@ -17,7 +17,7 @@
 #include <lttng/tracer.h>
 
 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 1494f5c70a6c7ab17667e7e2988decc85531341e..c9a0d5c38db6e2421627a9bf18077e11a404f6aa 100644 (file)
--- a/src/lttng-context-ppid.c
+++ b/src/lttng-context-ppid.c
@@ -18,7 +18,7 @@
 #include <lttng/tracer.h>
 
 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 59d33fff5ad8d62105739203c004e1ec4eb72115..41b8ae5cd71471dbe6f2ea85ae6b234e6cd0ba0b 100644 (file)
--- 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 3eb3ff9056b3a3022d4cb759efd22089121b5cbf..f8f18a83ee17a0a9515a0f137fc53b8364132293 100644 (file)
--- 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 94ba94e78879319f643bb6cbbba392b11ca4441b..22714946b437411bc2a83e5716b0242b2cf4cbb2 100644 (file)
--- a/src/lttng-context-procname.c
+++ b/src/lttng-context-procname.c
@@ -18,7 +18,7 @@
 #include <lttng/endian.h>
 
 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 23d5e5bc4e8229dbb2d643da479511debc646123..9af1a4843792b6d85720cdcba86d3ac31f51de3e 100644 (file)
--- a/src/lttng-context-sgid.c
+++ b/src/lttng-context-sgid.c
@@ -19,7 +19,7 @@
 #include <wrapper/user_namespace.h>
 
 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 5a9e7bebd54f9025c68e6dcd06ec1e6a3df0b852..916219eb555f6496f1efee45a8a1dcd110fdbd23 100644 (file)
--- a/src/lttng-context-suid.c
+++ b/src/lttng-context-suid.c
@@ -19,7 +19,7 @@
 #include <wrapper/user_namespace.h>
 
 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 5a9dee54fd8f8c8c74b89541192c0567b621bf9f..0b763fce1cc5f5807137a35d0eeb6d1c3c5d7431 100644 (file)
--- a/src/lttng-context-tid.c
+++ b/src/lttng-context-tid.c
@@ -17,7 +17,7 @@
 #include <lttng/tracer.h>
 
 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 355feb163cc048f6963dfc4fb771c243d45afc9c..0fceef476d6ea33a285fdfc2642376186faea1d6 100644 (file)
--- 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 86d999afdfac324f3843394ccf4b263f86d132cd..9e17d5bc5d0af6f279ff252a70353a350ee1fd5d 100644 (file)
--- a/src/lttng-context-uid.c
+++ b/src/lttng-context-uid.c
@@ -19,7 +19,7 @@
 #include <wrapper/user_namespace.h>
 
 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 f774d9716487f23c22c56621a7c1065c60ecf77b..4ca4df2fa47080add28efb838446101bf2d6e3e5 100644 (file)
--- 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 204cafb658962065805e77e6c60d8896284e4d6b..1f6602150152809400ef8c43de7332b08bb7672b 100644 (file)
--- 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 87c53baff039edbb3e4a05066257ce4c9a010dcb..3e43f6b0488eb4a8b70f9a89f1bc91a381fc0396 100644 (file)
--- a/src/lttng-context-vegid.c
+++ b/src/lttng-context-vegid.c
@@ -19,7 +19,7 @@
 #include <wrapper/user_namespace.h>
 
 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 5b4930dbcc11a7d27cdb55af7e91463446b86a2e..965c3eecb3a4438f19e8a8d2b73a37b1b2f5446b 100644 (file)
--- a/src/lttng-context-veuid.c
+++ b/src/lttng-context-veuid.c
@@ -19,7 +19,7 @@
 #include <wrapper/user_namespace.h>
 
 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 768ed519bc6e9ccf7566eef607b987cf95e0bb34..1a03dd1aeb8e49f89bcb20fa9871c9defdb9c21c 100644 (file)
--- a/src/lttng-context-vgid.c
+++ b/src/lttng-context-vgid.c
@@ -19,7 +19,7 @@
 #include <wrapper/user_namespace.h>
 
 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 dfc56751539eaf30fdd71d49a3e56442290edf3d..83091db1782097391aa91b87e652648e49595076 100644 (file)
--- a/src/lttng-context-vpid.c
+++ b/src/lttng-context-vpid.c
@@ -17,7 +17,7 @@
 #include <lttng/tracer.h>
 
 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 5f72a0648d71f579fac1a7cfaa3108cfa5f9d879..5b438840d496e910c3df5abc6a1febe9ac49e857 100644 (file)
--- a/src/lttng-context-vppid.c
+++ b/src/lttng-context-vppid.c
@@ -18,7 +18,7 @@
 #include <lttng/tracer.h>
 
 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 d95b2a1daa8d72defc36a84b5ebe40ae5261fe88..f47f0d142216c59c77cd824f0d6c03d2b34b26d6 100644 (file)
--- a/src/lttng-context-vsgid.c
+++ b/src/lttng-context-vsgid.c
@@ -19,7 +19,7 @@
 #include <wrapper/user_namespace.h>
 
 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 38b0a71e5171695f56903c56078e67f12ad0dcd2..29ff30dcb84af52f84c1cc2d01d9a4809f0813af 100644 (file)
--- a/src/lttng-context-vsuid.c
+++ b/src/lttng-context-vsuid.c
@@ -19,7 +19,7 @@
 #include <wrapper/user_namespace.h>
 
 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 ba597efc8834638304300adcd1984c66006435eb..4e22757725fb139181cdd78d97419f5db8a49e80 100644 (file)
--- a/src/lttng-context-vtid.c
+++ b/src/lttng-context-vtid.c
@@ -17,7 +17,7 @@
 #include <lttng/tracer.h>
 
 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 e3c946c910f1058f21c2858e7405167cbc20e2c7..2ecc411e373d1f42d4ccee12899e097b69b958b3 100644 (file)
--- a/src/lttng-context-vuid.c
+++ b/src/lttng-context-vuid.c
@@ -19,7 +19,7 @@
 #include <wrapper/user_namespace.h>
 
 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 0ba566ba9c6810fc79f3d8126121b310dd03a580..0d4415dbd62195cb94cb740bc9a1fb13ada70835 100644 (file)
--- 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 e3fa493f8a93f7170afd65f2637dd95d25a38578..1db8be497557e9da6e9f850f919ba734dd2ef075 100644 (file)
--- 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 2b5e91a2fadc1d110784c2955926ff1dfe3653ec..30604b502415c7718d605d5ca3dae37579eb29ca 100644 (file)
--- 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 f679dd764cf73178ffff628b9689519fafaae16d..4f2504e91ff3bbcf36978311a356ac4d59ec48d8 100644 (file)
--- 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),
        };