X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=liblttng-ust%2Flttng-context-vpid.c;h=436859600260dead1b9fc6b6505a7fd973892abb;hb=c589eca21586907ffd057fa614e7e2715086b5c7;hp=3594e52919c6a37f00f9f9c9e56fb44626709378;hpb=0466ac28c41336fd6d373cc8b0b26ef132225b9f;p=lttng-ust.git

diff --git a/liblttng-ust/lttng-context-vpid.c b/liblttng-ust/lttng-context-vpid.c
index 3594e529..43685960 100644
--- a/liblttng-ust/lttng-context-vpid.c
+++ b/liblttng-ust/lttng-context-vpid.c
@@ -7,6 +7,7 @@
  */
 
 #define _LGPL_SOURCE
+#include <limits.h>
 #include <stddef.h>
 #include <sys/types.h>
 #include <unistd.h>
@@ -49,7 +50,7 @@ size_t vpid_get_size(struct lttng_ust_ctx_field *field, size_t offset)
 {
 	size_t size = 0;
 
-	size += lib_ring_buffer_align(offset, lttng_alignof(pid_t));
+	size += lttng_ust_lib_ring_buffer_align(offset, lttng_ust_rb_alignof(pid_t));
 	size += sizeof(pid_t);
 	return size;
 }
@@ -57,12 +58,11 @@ size_t vpid_get_size(struct lttng_ust_ctx_field *field, size_t offset)
 static
 void vpid_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)
 {
 	pid_t vpid = wrapper_getvpid();
 
-	lib_ring_buffer_align_ctx(ctx, lttng_alignof(vpid));
-	chan->ops->event_write(ctx, &vpid, sizeof(vpid));
+	chan->ops->event_write(ctx, &vpid, sizeof(vpid), lttng_ust_rb_alignof(vpid));
 }
 
 static
@@ -79,8 +79,8 @@ int lttng_add_vpid_to_ctx(struct lttng_ust_ctx **ctx)
 	int ret;
 
 	type = lttng_ust_create_type_integer(sizeof(pid_t) * CHAR_BIT,
-			lttng_alignof(pid_t) * CHAR_BIT,
-			lttng_is_signed_type(pid_t),
+			lttng_ust_rb_alignof(pid_t) * CHAR_BIT,
+			lttng_ust_is_signed_type(pid_t),
 			BYTE_ORDER, 10);
 	if (!type)
 		return -ENOMEM;