X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;ds=sidebyside;f=liblttng-ust%2Flttng-context-vgid.c;h=78316139c7d2dc9c2c36eed0141ad9e755989caf;hb=c53279a3e7796da67c5ad8d5e5657bf03def2dcb;hp=5bfcd22e4c8091b2150b07ee63f680a67214860e;hpb=a084756d092167324ee09d3f819cc45407b58233;p=lttng-ust.git

diff --git a/liblttng-ust/lttng-context-vgid.c b/liblttng-ust/lttng-context-vgid.c
index 5bfcd22e..78316139 100644
--- a/liblttng-ust/lttng-context-vgid.c
+++ b/liblttng-ust/lttng-context-vgid.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"
@@ -65,7 +66,7 @@ size_t vgid_get_size(struct lttng_ust_ctx_field *field, size_t offset)
 {
 	size_t size = 0;
 
-	size += lib_ring_buffer_align(offset, lttng_alignof(gid_t));
+	size += lttng_ust_lib_ring_buffer_align(offset, lttng_ust_rb_alignof(gid_t));
 	size += sizeof(gid_t);
 	return size;
 }
@@ -73,13 +74,12 @@ size_t vgid_get_size(struct lttng_ust_ctx_field *field, size_t offset)
 static
 void vgid_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)
 {
 	gid_t vgid;
 
 	vgid = get_vgid();
-	lib_ring_buffer_align_ctx(ctx, lttng_alignof(vgid));
-	chan->ops->event_write(ctx, &vgid, sizeof(vgid));
+	chan->ops->event_write(ctx, &vgid, sizeof(vgid), lttng_ust_rb_alignof(vgid));
 }
 
 static
@@ -96,8 +96,8 @@ int lttng_add_vgid_to_ctx(struct lttng_ust_ctx **ctx)
 	int ret;
 
 	type = lttng_ust_create_type_integer(sizeof(gid_t) * CHAR_BIT,
-			lttng_alignof(gid_t) * CHAR_BIT,
-			lttng_is_signed_type(gid_t),
+			lttng_ust_rb_alignof(gid_t) * CHAR_BIT,
+			lttng_ust_is_signed_type(gid_t),
 			BYTE_ORDER, 10);
 	if (!type)
 		return -ENOMEM;