X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=liblttng-ust%2Flttng-context-vpid.c;h=c77468c1dd3df79af65a6c0906690651af9e99ef;hb=60864af02c63fdaaf9264b4f14bfbc9f9fba64bd;hp=78e1f0ceaaf6c223c2ec8d0bb9ffdd01e2d9c594;hpb=a084756d092167324ee09d3f819cc45407b58233;p=lttng-ust.git

diff --git a/liblttng-ust/lttng-context-vpid.c b/liblttng-ust/lttng-context-vpid.c
index 78e1f0ce..c77468c1 100644
--- a/liblttng-ust/lttng-context-vpid.c
+++ b/liblttng-ust/lttng-context-vpid.c
@@ -7,12 +7,13 @@
  */
 
 #define _LGPL_SOURCE
+#include <limits.h>
 #include <stddef.h>
 #include <sys/types.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"
 
@@ -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,11 +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));
+	lttng_ust_lib_ring_buffer_align_ctx(ctx, lttng_ust_rb_alignof(vpid));
 	chan->ops->event_write(ctx, &vpid, sizeof(vpid));
 }
 
@@ -79,8 +80,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;