X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=liblttng-ust%2Flttng-context-cpu-id.c;h=e518314d46d2842243c0be5467a48b258e489c7f;hb=d6d2eb792414485fa36c6c473f74235840c678d7;hp=cdcfe1a1574fe473ab1a4dd0c64dcd622188cc74;hpb=a084756d092167324ee09d3f819cc45407b58233;p=lttng-ust.git

diff --git a/liblttng-ust/lttng-context-cpu-id.c b/liblttng-ust/lttng-context-cpu-id.c
index cdcfe1a1..e518314d 100644
--- a/liblttng-ust/lttng-context-cpu-id.c
+++ b/liblttng-ust/lttng-context-cpu-id.c
@@ -16,10 +16,11 @@
 #include <stddef.h>
 #include <sys/types.h>
 #include <unistd.h>
+#include <limits.h>
 #include <lttng/ust-events.h>
 #include <lttng/ust-tracer.h>
-#include <lttng/ringbuffer-config.h>
 #include "../libringbuffer/getcpu.h"
+#include <lttng/ringbuffer-context.h>
 
 #include "context-internal.h"
 
@@ -28,7 +29,7 @@ size_t cpu_id_get_size(struct lttng_ust_ctx_field *field, size_t offset)
 {
 	size_t size = 0;
 
-	size += lib_ring_buffer_align(offset, lttng_alignof(int));
+	size += lttng_ust_lib_ring_buffer_align(offset, lttng_ust_rb_alignof(int));
 	size += sizeof(int);
 	return size;
 }
@@ -36,12 +37,12 @@ size_t cpu_id_get_size(struct lttng_ust_ctx_field *field, size_t offset)
 static
 void cpu_id_record(struct lttng_ust_ctx_field *field,
 		 struct lttng_ust_lib_ring_buffer_ctx *ctx,
-		 struct lttng_channel *chan)
+		 struct lttng_ust_channel_buffer *chan)
 {
 	int cpu;
 
 	cpu = lttng_ust_get_cpu();
-	lib_ring_buffer_align_ctx(ctx, lttng_alignof(cpu));
+	lttng_ust_lib_ring_buffer_align_ctx(ctx, lttng_ust_rb_alignof(cpu));
 	chan->ops->event_write(ctx, &cpu, sizeof(cpu));
 }
 
@@ -59,8 +60,8 @@ int lttng_add_cpu_id_to_ctx(struct lttng_ust_ctx **ctx)
 	int ret;
 
 	type = lttng_ust_create_type_integer(sizeof(int) * CHAR_BIT,
-			lttng_alignof(int) * CHAR_BIT,
-			lttng_is_signed_type(int),
+			lttng_ust_rb_alignof(int) * CHAR_BIT,
+			lttng_ust_is_signed_type(int),
 			BYTE_ORDER, 10);
 	if (!type)
 		return -ENOMEM;