X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=liblttng-ust%2Flttng-context-vegid.c;h=6b7d06981012097663b410c5a96ba5aded0e12f5;hb=5152f6df156d6ccb234965d1b3d26b167bd6b94e;hp=488bfdd814a731fac011985d02c09fbe677d6975;hpb=0466ac28c41336fd6d373cc8b0b26ef132225b9f;p=lttng-ust.git

diff --git a/liblttng-ust/lttng-context-vegid.c b/liblttng-ust/lttng-context-vegid.c
index 488bfdd8..6b7d0698 100644
--- a/liblttng-ust/lttng-context-vegid.c
+++ b/liblttng-ust/lttng-context-vegid.c
@@ -8,6 +8,7 @@
  */
 
 #define _LGPL_SOURCE
+#include <limits.h>
 #include <stddef.h>
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -61,29 +62,29 @@ void lttng_context_vegid_reset(void)
 }
 
 static
-size_t vegid_get_size(struct lttng_ust_ctx_field *field, size_t offset)
+size_t vegid_get_size(struct lttng_ust_ctx_field *field __attribute__((unused)),
+		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;
 }
 
 static
-void vegid_record(struct lttng_ust_ctx_field *field,
+void vegid_record(struct lttng_ust_ctx_field *field __attribute__((unused)),
 		 struct lttng_ust_lib_ring_buffer_ctx *ctx,
-		 struct lttng_channel *chan)
+		 struct lttng_ust_channel_buffer *chan)
 {
 	gid_t vegid;
 
 	vegid = get_vegid();
-	lib_ring_buffer_align_ctx(ctx, lttng_alignof(vegid));
-	chan->ops->event_write(ctx, &vegid, sizeof(vegid));
+	chan->ops->event_write(ctx, &vegid, sizeof(vegid), lttng_ust_rb_alignof(vegid));
 }
 
 static
-void vegid_get_value(struct lttng_ust_ctx_field *field,
+void vegid_get_value(struct lttng_ust_ctx_field *field __attribute__((unused)),
 		struct lttng_ust_ctx_value *value)
 {
 	value->u.s64 = get_vegid();
@@ -96,8 +97,8 @@ int lttng_add_vegid_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;