X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=src%2Flib%2Flttng-ust%2Flttng-context-pthread-id.c;h=452639e1d6f81f36b3f8c53de10c92a2db773a06;hb=b2e37d27accf5e32128b82392dbe1a9522c7dc20;hp=da02d1a862b1d58a52d09f999cfde1c9fa6f479b;hpb=6339062a5bbe886493d0691d13e28e37a7206362;p=lttng-ust.git

diff --git a/src/lib/lttng-ust/lttng-context-pthread-id.c b/src/lib/lttng-ust/lttng-context-pthread-id.c
index da02d1a8..452639e1 100644
--- a/src/lib/lttng-ust/lttng-context-pthread-id.c
+++ b/src/lib/lttng-ust/lttng-context-pthread-id.c
@@ -12,25 +12,27 @@
 #include <pthread.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 pthread_id_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(unsigned long));
+	size += lttng_ust_ring_buffer_align(offset, lttng_ust_rb_alignof(unsigned long));
 	size += sizeof(unsigned long);
 	return size;
 }
 
 static
 void pthread_id_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 __attribute__((unused)),
+		struct lttng_ust_ring_buffer_ctx *ctx,
+		struct lttng_ust_channel_buffer *chan)
 {
 	unsigned long pthread_id;
 
@@ -40,9 +42,10 @@ void pthread_id_record(void *priv __attribute__((unused)),
 
 static
 void pthread_id_get_value(void *priv __attribute__((unused)),
+		struct lttng_ust_probe_ctx *probe_ctx __attribute__((unused)),
 		struct lttng_ust_ctx_value *value)
 {
-	value->u.s64 = (unsigned long) pthread_self();
+	value->u.u64 = (unsigned long) pthread_self();
 }
 
 static const struct lttng_ust_ctx_field *ctx_field = lttng_ust_static_ctx_field(
@@ -50,7 +53,7 @@ static const struct lttng_ust_ctx_field *ctx_field = lttng_ust_static_ctx_field(
 		lttng_ust_static_type_integer(sizeof(unsigned long) * CHAR_BIT,
 				lttng_ust_rb_alignof(unsigned long) * CHAR_BIT,
 				lttng_ust_is_signed_type(unsigned long),
-				BYTE_ORDER, 10),
+				LTTNG_UST_BYTE_ORDER, 10),
 		false, false),
 	pthread_id_get_size,
 	pthread_id_record,