X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=liblttng-ust%2Flttng-context-vsuid.c;h=ff58a7412fde49fee1935ca1ff0bd0c4eae4717f;hb=b89c5899ef86060111a6814c13df2684dc352737;hp=c7d0815179e720149a716fcd53aef75f702fa021;hpb=a084756d092167324ee09d3f819cc45407b58233;p=lttng-ust.git

diff --git a/liblttng-ust/lttng-context-vsuid.c b/liblttng-ust/lttng-context-vsuid.c
index c7d08151..ff58a741 100644
--- a/liblttng-ust/lttng-context-vsuid.c
+++ b/liblttng-ust/lttng-context-vsuid.c
@@ -8,13 +8,14 @@
  */
 
 #define _LGPL_SOURCE
+#include <limits.h>
 #include <stddef.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <unistd.h>
 #include <lttng/ust-events.h>
 #include <lttng/ust-tracer.h>
-#include <lttng/ringbuffer-config.h>
+#include <lttng/ringbuffer-context.h>
 
 #include "context-internal.h"
 #include "creds.h"
@@ -69,7 +70,7 @@ size_t vsuid_get_size(struct lttng_ust_ctx_field *field, size_t offset)
 {
 	size_t size = 0;
 
-	size += lib_ring_buffer_align(offset, lttng_alignof(uid_t));
+	size += lttng_ust_lib_ring_buffer_align(offset, lttng_ust_rb_alignof(uid_t));
 	size += sizeof(uid_t);
 	return size;
 }
@@ -77,13 +78,12 @@ size_t vsuid_get_size(struct lttng_ust_ctx_field *field, size_t offset)
 static
 void vsuid_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)
 {
 	uid_t vsuid;
 
 	vsuid = get_vsuid();
-	lib_ring_buffer_align_ctx(ctx, lttng_alignof(vsuid));
-	chan->ops->event_write(ctx, &vsuid, sizeof(vsuid));
+	chan->ops->event_write(ctx, &vsuid, sizeof(vsuid), lttng_ust_rb_alignof(vsuid));
 }
 
 static
@@ -100,8 +100,8 @@ int lttng_add_vsuid_to_ctx(struct lttng_ust_ctx **ctx)
 	int ret;
 
 	type = lttng_ust_create_type_integer(sizeof(uid_t) * CHAR_BIT,
-			lttng_alignof(uid_t) * CHAR_BIT,
-			lttng_is_signed_type(uid_t),
+			lttng_ust_rb_alignof(uid_t) * CHAR_BIT,
+			lttng_ust_is_signed_type(uid_t),
 			BYTE_ORDER, 10);
 	if (!type)
 		return -ENOMEM;