X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=liblttng-ust%2Flttng-context-mnt-ns.c;h=8a2b7e867aee652007160f3275424037720426c6;hb=8acb8bdfec7f1827ca762900e0fcbaa8f187742f;hp=930bd61849a257d0002962ac887ecd15730f0eef;hpb=daacdbfc04fe07ecff0a0d1878b4f48d38912c78;p=lttng-ust.git

diff --git a/liblttng-ust/lttng-context-mnt-ns.c b/liblttng-ust/lttng-context-mnt-ns.c
index 930bd618..8a2b7e86 100644
--- a/liblttng-ust/lttng-context-mnt-ns.c
+++ b/liblttng-ust/lttng-context-mnt-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 "context-internal.h"
 #include "ns.h"
@@ -76,7 +77,7 @@ size_t mnt_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;
 }
@@ -84,13 +85,12 @@ size_t mnt_ns_get_size(struct lttng_ust_ctx_field *field, size_t offset)
 static
 void mnt_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 mnt_ns;
 
 	mnt_ns = get_mnt_ns();
-	lib_ring_buffer_align_ctx(ctx, lttng_alignof(mnt_ns));
-	chan->ops->event_write(ctx, &mnt_ns, sizeof(mnt_ns));
+	chan->ops->event_write(ctx, &mnt_ns, sizeof(mnt_ns), lttng_ust_rb_alignof(mnt_ns));
 }
 
 static
@@ -103,25 +103,40 @@ void mnt_ns_get_value(struct lttng_ust_ctx_field *field,
 int lttng_add_mnt_ns_to_ctx(struct lttng_ust_ctx **ctx)
 {
 	struct lttng_ust_ctx_field *field;
-
-	field = lttng_append_context(ctx);
-	if (!field)
+	struct lttng_ust_type_common *type;
+	int ret;
+
+	type = lttng_ust_create_type_integer(sizeof(ino_t) * CHAR_BIT,
+			lttng_ust_rb_alignof(ino_t) * CHAR_BIT,
+			lttng_ust_is_signed_type(ino_t),
+			BYTE_ORDER, 10);
+	if (!type)
 		return -ENOMEM;
+	field = lttng_append_context(ctx);
+	if (!field) {
+		ret = -ENOMEM;
+		goto error_context;
+	}
 	if (lttng_find_context(*ctx, "mnt_ns")) {
-		lttng_remove_context_field(ctx, field);
-		return -EEXIST;
+		ret = -EEXIST;
+		goto error_find_context;
+	}
+	field->event_field->name = strdup("mnt_ns");
+	if (!field->event_field->name) {
+		ret = -ENOMEM;
+		goto error_name;
 	}
-	field->event_field->name = "mnt_ns";
-	field->event_field->type.atype = atype_integer;
-	field->event_field->type.u.integer.size = sizeof(ino_t) * CHAR_BIT;
-	field->event_field->type.u.integer.alignment = lttng_alignof(ino_t) * CHAR_BIT;
-	field->event_field->type.u.integer.signedness = lttng_is_signed_type(ino_t);
-	field->event_field->type.u.integer.reverse_byte_order = 0;
-	field->event_field->type.u.integer.base = 10;
-	field->event_field->type.u.integer.encoding = lttng_encode_none;
+	field->event_field->type = type;
 	field->get_size = mnt_ns_get_size;
 	field->record = mnt_ns_record;
 	field->get_value = mnt_ns_get_value;
 	lttng_context_update(*ctx);
 	return 0;
+
+error_name:
+error_find_context:
+	lttng_remove_context_field(ctx, field);
+error_context:
+	lttng_ust_destroy_type(type);
+	return ret;
 }