X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=liblttng-ust%2Flttng-context-pid-ns.c;h=10b0c1b292429b270190072ef512a21bc2287920;hb=2208d8b5689264e35ed0a660d8c3c82021cc0367;hp=df7a764db56ea0438c5be4f0926bc4f6fc8c6a60;hpb=fc80554e0cd4c7739c64fe8bc8b87a77d3c19d07;p=lttng-ust.git

diff --git a/liblttng-ust/lttng-context-pid-ns.c b/liblttng-ust/lttng-context-pid-ns.c
index df7a764d..10b0c1b2 100644
--- a/liblttng-ust/lttng-context-pid-ns.c
+++ b/liblttng-ust/lttng-context-pid-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"
@@ -75,56 +76,71 @@ void lttng_context_pid_ns_reset(void)
 }
 
 static
-size_t pid_ns_get_size(struct lttng_ctx_field *field, size_t offset)
+size_t pid_ns_get_size(struct lttng_ust_ctx_field *field __attribute__((unused)),
+		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;
 }
 
 static
-void pid_ns_record(struct lttng_ctx_field *field,
+void pid_ns_record(struct lttng_ust_ctx_field *field __attribute__((unused)),
 		 struct lttng_ust_lib_ring_buffer_ctx *ctx,
-		 struct lttng_channel *chan)
+		 struct lttng_ust_channel_buffer *chan)
 {
 	ino_t pid_ns;
 
 	pid_ns = get_pid_ns();
-	lib_ring_buffer_align_ctx(ctx, lttng_alignof(pid_ns));
-	chan->ops->event_write(ctx, &pid_ns, sizeof(pid_ns));
+	chan->ops->event_write(ctx, &pid_ns, sizeof(pid_ns), lttng_ust_rb_alignof(pid_ns));
 }
 
 static
-void pid_ns_get_value(struct lttng_ctx_field *field,
-		struct lttng_ctx_value *value)
+void pid_ns_get_value(struct lttng_ust_ctx_field *field __attribute__((unused)),
+		struct lttng_ust_ctx_value *value)
 {
 	value->u.s64 = get_pid_ns();
 }
 
-int lttng_add_pid_ns_to_ctx(struct lttng_ctx **ctx)
+int lttng_add_pid_ns_to_ctx(struct lttng_ust_ctx **ctx)
 {
-	struct lttng_ctx_field *field;
-
-	field = lttng_append_context(ctx);
-	if (!field)
+	struct lttng_ust_ctx_field *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, "pid_ns")) {
-		lttng_remove_context_field(ctx, field);
-		return -EEXIST;
+		ret = -EEXIST;
+		goto error_find_context;
+	}
+	field->event_field->name = strdup("pid_ns");
+	if (!field->event_field->name) {
+		ret = -ENOMEM;
+		goto error_name;
 	}
-	field->event_field.name = "pid_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 = pid_ns_get_size;
 	field->record = pid_ns_record;
 	field->get_value = pid_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;
 }