cleanup: function attribute 'constructor'

[lttng-ust.git] / liblttng-ust / lttng-context-net-ns.c

diff --git a/liblttng-ust/lttng-context-net-ns.c b/liblttng-ust/lttng-context-net-ns.c
index 415c8ac3358dbb4adbaf393ea5fef6eaa49d62c0..655759ac06ef25c854c5da1217107fd29b95dd40 100644 (file)
--- a/liblttng-ust/lttng-context-net-ns.c
+++ b/liblttng-ust/lttng-context-net-ns.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 <ust-tid.h>
 #include <urcu/tls-compat.h>
 
@@ -93,7 +94,7 @@ size_t net_ns_get_size(struct lttng_ust_ctx_field *field, size_t offset)
 {
        size_t size = 0;
 
-       size += lib_ring_buffer_align(offset, lttng_alignof(ino_t));
+       size += lttng_ust_lib_ring_buffer_align(offset, lttng_ust_rb_alignof(ino_t));
        size += sizeof(ino_t);
        return size;
 }
@@ -101,13 +102,12 @@ size_t net_ns_get_size(struct lttng_ust_ctx_field *field, size_t offset)
 static
 void net_ns_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)
 {
        ino_t net_ns;
 
        net_ns = get_net_ns();
-       lib_ring_buffer_align_ctx(ctx, lttng_alignof(net_ns));
-       chan->ops->event_write(ctx, &net_ns, sizeof(net_ns));
+       chan->ops->event_write(ctx, &net_ns, sizeof(net_ns), lttng_ust_rb_alignof(net_ns));
 }
 
 static
@@ -124,8 +124,8 @@ int lttng_add_net_ns_to_ctx(struct lttng_ust_ctx **ctx)
        int ret;
 
        type = lttng_ust_create_type_integer(sizeof(ino_t) * CHAR_BIT,
-                       lttng_alignof(ino_t) * CHAR_BIT,
-                       lttng_is_signed_type(ino_t),
+                       lttng_ust_rb_alignof(ino_t) * CHAR_BIT,
+                       lttng_ust_is_signed_type(ino_t),
                        BYTE_ORDER, 10);
        if (!type)
                return -ENOMEM;