Remove event id parameter from event_reserve callback

[lttng-modules.git] / src / lttng-context-callstack-legacy-impl.h

diff --git a/src/lttng-context-callstack-legacy-impl.h b/src/lttng-context-callstack-legacy-impl.h
index 8d78fb95700891b0a2f2dc622b6c36b2b5f3fce6..edd13cf5d30445278cec1b49f522e54734e6ba92 100644 (file)
--- a/src/lttng-context-callstack-legacy-impl.h
+++ b/src/lttng-context-callstack-legacy-impl.h
@@ -56,18 +56,6 @@ static struct lttng_cs_type cs_types[] = {
        },
 };
 
-static
-const char *lttng_cs_ctx_mode_name(enum lttng_cs_ctx_modes mode)
-{
-       return cs_types[mode].name;
-}
-
-static
-const char *lttng_cs_ctx_mode_length_name(enum lttng_cs_ctx_modes mode)
-{
-       return cs_types[mode].length_name;
-}
-
 static
 int init_type(enum lttng_cs_ctx_modes mode)
 {
@@ -108,7 +96,7 @@ void lttng_cs_set_init(struct lttng_cs __percpu *cs_set)
 DEFINE_PER_CPU(int, callstack_user_nesting);
 
 static
-struct stack_trace *stack_trace_context(struct lttng_ctx_field *field,
+struct stack_trace *stack_trace_context(struct lttng_kernel_ctx_field *field,
                                        struct lib_ring_buffer_ctx *ctx)
 {
        int buffer_nesting, cs_user_nesting;
@@ -119,7 +107,7 @@ struct stack_trace *stack_trace_context(struct lttng_ctx_field *field,
         * Do not gather the userspace callstack context when the event was
         * triggered by the userspace callstack context saving mechanism.
         */
-       cs_user_nesting = per_cpu(callstack_user_nesting, ctx->cpu);
+       cs_user_nesting = per_cpu(callstack_user_nesting, ctx->priv.reserve_cpu);
 
        if (fdata->mode == CALLSTACK_USER && cs_user_nesting >= 1)
                return NULL;
@@ -131,8 +119,8 @@ struct stack_trace *stack_trace_context(struct lttng_ctx_field *field,
         * max nesting is checked in lib_ring_buffer_get_cpu().
         * Check it again as a safety net.
         */
-       cs = per_cpu_ptr(fdata->cs_percpu, ctx->cpu);
-       buffer_nesting = per_cpu(lib_ring_buffer_nesting, ctx->cpu) - 1;
+       cs = per_cpu_ptr(fdata->cs_percpu, ctx->priv.reserve_cpu);
+       buffer_nesting = per_cpu(lib_ring_buffer_nesting, ctx->priv.reserve_cpu) - 1;
        if (buffer_nesting >= RING_BUFFER_MAX_NESTING)
                return NULL;
 
@@ -140,7 +128,7 @@ struct stack_trace *stack_trace_context(struct lttng_ctx_field *field,
 }
 
 static
-size_t lttng_callstack_length_get_size(size_t offset, struct lttng_ctx_field *field,
+size_t lttng_callstack_length_get_size(size_t offset, struct lttng_kernel_ctx_field *field,
                                struct lib_ring_buffer_ctx *ctx,
                                struct lttng_channel *chan)
 {
@@ -156,7 +144,7 @@ size_t lttng_callstack_length_get_size(size_t offset, struct lttng_ctx_field *fi
  * resulting callstack is saved to be accessed in the record step.
  */
 static
-size_t lttng_callstack_sequence_get_size(size_t offset, struct lttng_ctx_field *field,
+size_t lttng_callstack_sequence_get_size(size_t offset, struct lttng_kernel_ctx_field *field,
                                        struct lib_ring_buffer_ctx *ctx,
                                        struct lttng_channel *chan)
 {
@@ -175,13 +163,13 @@ size_t lttng_callstack_sequence_get_size(size_t offset, struct lttng_ctx_field *
        trace->nr_entries = 0;
 
        if (fdata->mode == CALLSTACK_USER)
-               ++per_cpu(callstack_user_nesting, ctx->cpu);
+               ++per_cpu(callstack_user_nesting, ctx->priv.reserve_cpu);
 
        /* do the real work and reserve space */
        cs_types[fdata->mode].save_func(trace);
 
        if (fdata->mode == CALLSTACK_USER)
-               per_cpu(callstack_user_nesting, ctx->cpu)--;
+               per_cpu(callstack_user_nesting, ctx->priv.reserve_cpu)--;
 
        /*
         * Remove final ULONG_MAX delimiter. If we cannot find it, add
@@ -201,7 +189,7 @@ size_t lttng_callstack_sequence_get_size(size_t offset, struct lttng_ctx_field *
 }
 
 static
-void lttng_callstack_length_record(struct lttng_ctx_field *field,
+void lttng_callstack_length_record(struct lttng_kernel_ctx_field *field,
                        struct lib_ring_buffer_ctx *ctx,
                        struct lttng_channel *chan)
 {
@@ -219,7 +207,7 @@ void lttng_callstack_length_record(struct lttng_ctx_field *field,
        chan->ops->event_write(ctx, &nr_seq_entries, sizeof(unsigned int));
 }
 static
-void lttng_callstack_sequence_record(struct lttng_ctx_field *field,
+void lttng_callstack_sequence_record(struct lttng_kernel_ctx_field *field,
                        struct lib_ring_buffer_ctx *ctx,
                        struct lttng_channel *chan)
 {