X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=liblttng-ust%2Flttng-context-ipc-ns.c;h=2ec62416c1cd4fbc3dc42e39a94e789bf8bf2036;hb=6ba6fd60507f8e045bdc4f1be14e9d99c6a15f7f;hp=893daabc9bb1bf1254fc527f6c72d53baf5580bf;hpb=c0c0989ab70574e09b2f7e8b48c2da6af664a849;p=lttng-ust.git

diff --git a/liblttng-ust/lttng-context-ipc-ns.c b/liblttng-ust/lttng-context-ipc-ns.c
index 893daabc..2ec62416 100644
--- a/liblttng-ust/lttng-context-ipc-ns.c
+++ b/liblttng-ust/lttng-context-ipc-ns.c
@@ -8,15 +8,18 @@
  */
 
 #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/ust-tid.h>
+#include <ust-tid.h>
 #include <urcu/tls-compat.h>
+#include <lttng/ringbuffer-context.h>
+
+#include "context-internal.h"
 #include "lttng-tracer-core.h"
 #include "ns.h"
 
@@ -87,58 +90,61 @@ void lttng_context_ipc_ns_reset(void)
 }
 
 static
-size_t ipc_ns_get_size(struct lttng_ctx_field *field, size_t offset)
+size_t ipc_ns_get_size(void *priv __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 ipc_ns_record(struct lttng_ctx_field *field,
+void ipc_ns_record(void *priv __attribute__((unused)),
 		 struct lttng_ust_lib_ring_buffer_ctx *ctx,
-		 struct lttng_channel *chan)
+		 struct lttng_ust_channel_buffer *chan)
 {
 	ino_t ipc_ns;
 
 	ipc_ns = get_ipc_ns();
-	lib_ring_buffer_align_ctx(ctx, lttng_alignof(ipc_ns));
-	chan->ops->event_write(ctx, &ipc_ns, sizeof(ipc_ns));
+	chan->ops->event_write(ctx, &ipc_ns, sizeof(ipc_ns), lttng_ust_rb_alignof(ipc_ns));
 }
 
 static
-void ipc_ns_get_value(struct lttng_ctx_field *field,
-		struct lttng_ctx_value *value)
+void ipc_ns_get_value(void *priv __attribute__((unused)),
+		struct lttng_ust_ctx_value *value)
 {
 	value->u.s64 = get_ipc_ns();
 }
 
-int lttng_add_ipc_ns_to_ctx(struct lttng_ctx **ctx)
+const struct lttng_ust_ctx_field *ctx_field = lttng_ust_static_ctx_field(
+	lttng_ust_static_event_field("ipc_ns",
+		lttng_ust_static_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),
+		false, false),
+	ipc_ns_get_size,
+	ipc_ns_record,
+	ipc_ns_get_value,
+	NULL, NULL);
+
+int lttng_add_ipc_ns_to_ctx(struct lttng_ust_ctx **ctx)
 {
-	struct lttng_ctx_field *field;
-
-	field = lttng_append_context(ctx);
-	if (!field)
-		return -ENOMEM;
-	if (lttng_find_context(*ctx, "ipc_ns")) {
-		lttng_remove_context_field(ctx, field);
-		return -EEXIST;
+	int ret;
+
+	if (lttng_find_context(*ctx, ctx_field->event_field->name)) {
+		ret = -EEXIST;
+		goto error_find_context;
 	}
-	field->event_field.name = "ipc_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->get_size = ipc_ns_get_size;
-	field->record = ipc_ns_record;
-	field->get_value = ipc_ns_get_value;
-	lttng_context_update(*ctx);
+	ret = lttng_ust_context_append(ctx, ctx_field);
+	if (ret)
+		return ret;
 	return 0;
+
+error_find_context:
+	return ret;
 }
 
 /*