X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=src%2Flib%2Flttng-ust%2Flttng-context-ip.c;h=bc22ce296155b1d23d65e229226566ffbfdb1de2;hb=bddade91e51d3f26fef22c7fe5dca5b22d59012a;hp=e9cc969fdc48a8488f9bddced3a2c048fe7aa6a3;hpb=6339062a5bbe886493d0691d13e28e37a7206362;p=lttng-ust.git

diff --git a/src/lib/lttng-ust/lttng-context-ip.c b/src/lib/lttng-ust/lttng-context-ip.c
index e9cc969f..bc22ce29 100644
--- a/src/lib/lttng-ust/lttng-context-ip.c
+++ b/src/lib/lttng-ust/lttng-context-ip.c
@@ -13,42 +13,53 @@
 #include <unistd.h>
 #include <lttng/ust-events.h>
 #include <lttng/ust-tracer.h>
-#include <lttng/ringbuffer-context.h>
+#include <lttng/ust-ringbuffer-context.h>
 
 #include "context-internal.h"
 
 static
 size_t ip_get_size(void *priv __attribute__((unused)),
+		struct lttng_ust_probe_ctx *probe_ctx __attribute__((unused)),
 		size_t offset)
 {
 	size_t size = 0;
 
-	size += lttng_ust_lib_ring_buffer_align(offset, lttng_ust_rb_alignof(void *));
+	size += lttng_ust_ring_buffer_align(offset, lttng_ust_rb_alignof(void *));
 	size += sizeof(void *);
 	return size;
 }
 
 static
 void ip_record(void *priv __attribute__((unused)),
-		 struct lttng_ust_lib_ring_buffer_ctx *ctx,
-		 struct lttng_ust_channel_buffer *chan)
+		struct lttng_ust_probe_ctx *probe_ctx,
+		struct lttng_ust_ring_buffer_ctx *ctx,
+		struct lttng_ust_channel_buffer *chan)
 {
 	void *ip;
 
-	ip = ctx->ip;
+	ip = probe_ctx->ip;
 	chan->ops->event_write(ctx, &ip, sizeof(ip), lttng_ust_rb_alignof(ip));
 }
 
+static
+void ip_get_value(void *priv __attribute__((unused)),
+		struct lttng_ust_probe_ctx *probe_ctx,
+		struct lttng_ust_ctx_value *value)
+{
+	value->u.u64 = (unsigned long) probe_ctx->ip;
+}
+
 static const struct lttng_ust_ctx_field *ctx_field = lttng_ust_static_ctx_field(
 	lttng_ust_static_event_field("ip",
 		lttng_ust_static_type_integer(sizeof(void *) * CHAR_BIT,
 				lttng_ust_rb_alignof(void *) * CHAR_BIT,
 				lttng_ust_is_signed_type(void *),
-				BYTE_ORDER, 10),
+				LTTNG_UST_BYTE_ORDER, 10),
 		false, false),
 	ip_get_size,
 	ip_record,
-	NULL, NULL, NULL);
+	ip_get_value,
+	NULL, NULL);
 
 int lttng_add_ip_to_ctx(struct lttng_ust_ctx **ctx)
 {