X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=liblttng-ust%2Flttng-context-net-ns.c;h=c7022b54a8f241fd37bd1d45f259815ba2afb03f;hb=68f882666d2a83f061d702d154983a61987e25e2;hp=d6c807aa35ad6a5625808788b78c5736050f8f64;hpb=c0c0989ab70574e09b2f7e8b48c2da6af664a849;p=lttng-ust.git

diff --git a/liblttng-ust/lttng-context-net-ns.c b/liblttng-ust/lttng-context-net-ns.c
index d6c807aa..c7022b54 100644
--- a/liblttng-ust/lttng-context-net-ns.c
+++ b/liblttng-ust/lttng-context-net-ns.c
@@ -15,8 +15,10 @@
 #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 "context-internal.h"
 #include "lttng-tracer-core.h"
 #include "ns.h"
 
@@ -87,7 +89,7 @@ void lttng_context_net_ns_reset(void)
 }
 
 static
-size_t net_ns_get_size(struct lttng_ctx_field *field, size_t offset)
+size_t net_ns_get_size(struct lttng_ust_ctx_field *field, size_t offset)
 {
 	size_t size = 0;
 
@@ -97,7 +99,7 @@ size_t net_ns_get_size(struct lttng_ctx_field *field, size_t offset)
 }
 
 static
-void net_ns_record(struct lttng_ctx_field *field,
+void net_ns_record(struct lttng_ust_ctx_field *field,
 		 struct lttng_ust_lib_ring_buffer_ctx *ctx,
 		 struct lttng_channel *chan)
 {
@@ -109,15 +111,15 @@ void net_ns_record(struct lttng_ctx_field *field,
 }
 
 static
-void net_ns_get_value(struct lttng_ctx_field *field,
-		struct lttng_ctx_value *value)
+void net_ns_get_value(struct lttng_ust_ctx_field *field,
+		struct lttng_ust_ctx_value *value)
 {
 	value->u.s64 = get_net_ns();
 }
 
-int lttng_add_net_ns_to_ctx(struct lttng_ctx **ctx)
+int lttng_add_net_ns_to_ctx(struct lttng_ust_ctx **ctx)
 {
-	struct lttng_ctx_field *field;
+	struct lttng_ust_ctx_field *field;
 
 	field = lttng_append_context(ctx);
 	if (!field)
@@ -126,14 +128,14 @@ int lttng_add_net_ns_to_ctx(struct lttng_ctx **ctx)
 		lttng_remove_context_field(ctx, field);
 		return -EEXIST;
 	}
-	field->event_field.name = "net_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->name = "net_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 = net_ns_get_size;
 	field->record = net_ns_record;
 	field->get_value = net_ns_get_value;