cleanup: function attribute 'constructor'

[lttng-ust.git] / liblttng-ust / lttng-context-vuid.c

diff --git a/liblttng-ust/lttng-context-vuid.c b/liblttng-ust/lttng-context-vuid.c
index 438b4222da0226c3c28ce7c39d6d12322cbf7913..0e05fc4f1d8422404eddee187185a1e33f7c21a5 100644 (file)
--- a/liblttng-ust/lttng-context-vuid.c
+++ b/liblttng-ust/lttng-context-vuid.c
@@ -8,6 +8,7 @@
  */
 
 #define _LGPL_SOURCE
+#include <limits.h>
 #include <stddef.h>
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -65,7 +66,7 @@ size_t vuid_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;
 }
@@ -73,13 +74,12 @@ size_t vuid_get_size(struct lttng_ust_ctx_field *field, size_t offset)
 static
 void vuid_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 vuid;
 
        vuid = get_vuid();
-       lib_ring_buffer_align_ctx(ctx, lttng_alignof(vuid));
-       chan->ops->event_write(ctx, &vuid, sizeof(vuid));
+       chan->ops->event_write(ctx, &vuid, sizeof(vuid), lttng_ust_rb_alignof(vuid));
 }
 
 static
@@ -96,8 +96,8 @@ int lttng_add_vuid_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;