X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Flttng-context-callstack.c;h=5034d8a71bd644b6811b97c8cd7ae6ae769a6301;hb=a3d0aa6872fb70b8162e6e1dc2b3aaad112213eb;hp=82816875975ceb2fdd46cb6684bc545a0137d41b;hpb=437d5aa59380583ce1cd14d394a53b398be1275d;p=lttng-modules.git

diff --git a/src/lttng-context-callstack.c b/src/lttng-context-callstack.c
index 82816875..5034d8a7 100644
--- a/src/lttng-context-callstack.c
+++ b/src/lttng-context-callstack.c
@@ -46,6 +46,7 @@
 #include <ringbuffer/backend.h>
 #include <ringbuffer/frontend.h>
 #include <lttng/events.h>
+#include <lttng/events-internal.h>
 #include <lttng/tracer.h>
 #include <lttng/endian.h>
 #include "wrapper/vmalloc.h"
@@ -90,9 +91,9 @@ error_alloc:
 }
 
 static
-void lttng_callstack_sequence_destroy(struct lttng_kernel_ctx_field *field)
+void lttng_callstack_sequence_destroy(void *priv)
 {
-	struct field_data *fdata = field->priv;
+	struct field_data *fdata = priv;
 
 	field_data_free(fdata);
 }
@@ -100,23 +101,23 @@ void lttng_callstack_sequence_destroy(struct lttng_kernel_ctx_field *field)
 static const struct lttng_kernel_event_field *event_fields_kernel[NR_FIELDS] = {
 	lttng_kernel_static_event_field("_callstack_kernel_length",
 		lttng_kernel_static_type_integer_from_type(unsigned int, __BYTE_ORDER, 10),
-		false, false, false),
+		false, false),
 	lttng_kernel_static_event_field("callstack_kernel",
-		lttng_kernel_static_type_sequence("_callstack_kernel_length",
+		lttng_kernel_static_type_sequence(NULL,
 			lttng_kernel_static_type_integer_from_type(unsigned long, __BYTE_ORDER, 16),
 			0, none),
-		false, false, false),
+		false, false),
 };
 
 static const struct lttng_kernel_event_field *event_fields_user[NR_FIELDS] = {
 	lttng_kernel_static_event_field("_callstack_user_length",
 		lttng_kernel_static_type_integer_from_type(unsigned int, __BYTE_ORDER, 10),
-		false, false, false),
+		false, false),
 	lttng_kernel_static_event_field("callstack_user",
-		lttng_kernel_static_type_sequence("_callstack_user_length",
+		lttng_kernel_static_type_sequence(NULL,
 			lttng_kernel_static_type_integer_from_type(unsigned long, __BYTE_ORDER, 16),
 			0, none),
-		false, false, false),
+		false, false),
 };
 
 const struct lttng_kernel_event_field **lttng_cs_event_fields(enum lttng_cs_ctx_modes mode)
@@ -158,7 +159,7 @@ int __lttng_add_callstack_generic(struct lttng_kernel_ctx **ctx,
 	}
 	memset(&ctx_field, 0, sizeof(ctx_field));
 	ctx_field.event_field = event_fields[0];
-	ctx_field.get_size_arg = lttng_callstack_length_get_size;
+	ctx_field.get_size = lttng_callstack_length_get_size;
 	ctx_field.record = lttng_callstack_length_record;
 	ctx_field.priv = fdata;
 	ret = lttng_kernel_context_append(ctx, &ctx_field);
@@ -169,7 +170,7 @@ int __lttng_add_callstack_generic(struct lttng_kernel_ctx **ctx,
 
 	memset(&ctx_field, 0, sizeof(ctx_field));
 	ctx_field.event_field = event_fields[1];
-	ctx_field.get_size_arg = lttng_callstack_sequence_get_size;
+	ctx_field.get_size = lttng_callstack_sequence_get_size;
 	ctx_field.record = lttng_callstack_sequence_record;
 	ctx_field.destroy = lttng_callstack_sequence_destroy;
 	ctx_field.priv = fdata;
@@ -205,10 +206,10 @@ error_create:
 int lttng_add_callstack_to_ctx(struct lttng_kernel_ctx **ctx, int type)
 {
 	switch (type) {
-	case LTTNG_KERNEL_CONTEXT_CALLSTACK_KERNEL:
+	case LTTNG_KERNEL_ABI_CONTEXT_CALLSTACK_KERNEL:
 		return __lttng_add_callstack_generic(ctx, CALLSTACK_KERNEL);
 #ifdef CONFIG_X86
-	case LTTNG_KERNEL_CONTEXT_CALLSTACK_USER:
+	case LTTNG_KERNEL_ABI_CONTEXT_CALLSTACK_USER:
 		return __lttng_add_callstack_generic(ctx, CALLSTACK_USER);
 #endif
 	default: