X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=liblttng-ust%2Flttng-context-cpu-id.c;h=b3c64974ed37b43961f0a149b5d782332e44a9ae;hb=106ff4dab82c51bd7bf022220bf43f15fb04f8bc;hp=9c553828a389529d41541d8351c4ac403d3af3ec;hpb=0466ac28c41336fd6d373cc8b0b26ef132225b9f;p=lttng-ust.git

diff --git a/liblttng-ust/lttng-context-cpu-id.c b/liblttng-ust/lttng-context-cpu-id.c
index 9c553828..b3c64974 100644
--- a/liblttng-ust/lttng-context-cpu-id.c
+++ b/liblttng-ust/lttng-context-cpu-id.c
@@ -16,6 +16,7 @@
 #include <stddef.h>
 #include <sys/types.h>
 #include <unistd.h>
+#include <limits.h>
 #include <lttng/ust-events.h>
 #include <lttng/ust-tracer.h>
 #include "../libringbuffer/getcpu.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,13 +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));
-	chan->ops->event_write(ctx, &cpu, sizeof(cpu));
+	chan->ops->event_write(ctx, &cpu, sizeof(cpu), lttng_ust_rb_alignof(cpu));
 }
 
 static
@@ -59,8 +59,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;