X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=src%2Flib%2Flttng-ust%2Flttng-context-vtid.c;h=880e34b90a1dae8aa9b95eec305ceaa08d0b5176;hb=a9fd951a21f28704ffdfd4217766f725a217208b;hp=ce8dcd2c951e8df66de95af938c4237a5f08d814;hpb=6339062a5bbe886493d0691d13e28e37a7206362;p=lttng-ust.git

diff --git a/src/lib/lttng-ust/lttng-context-vtid.c b/src/lib/lttng-ust/lttng-context-vtid.c
index ce8dcd2c..880e34b9 100644
--- a/src/lib/lttng-ust/lttng-context-vtid.c
+++ b/src/lib/lttng-ust/lttng-context-vtid.c
@@ -13,7 +13,7 @@
 #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 "common/compat/tid.h"
 #include <urcu/tls-compat.h>
 
@@ -38,11 +38,12 @@ void lttng_context_vtid_reset(void)
 
 static
 size_t vtid_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(pid_t));
+	size += lttng_ust_ring_buffer_align(offset, lttng_ust_rb_alignof(pid_t));
 	size += sizeof(pid_t);
 	return size;
 }
@@ -62,8 +63,9 @@ pid_t wrapper_getvtid(void)
 
 static
 void vtid_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)
 {
 	pid_t vtid = wrapper_getvtid();
 
@@ -72,6 +74,7 @@ void vtid_record(void *priv __attribute__((unused)),
 
 static
 void vtid_get_value(void *priv __attribute__((unused)),
+		struct lttng_ust_probe_ctx *probe_ctx __attribute__((unused)),
 		struct lttng_ust_ctx_value *value)
 {
 	value->u.s64 = wrapper_getvtid();
@@ -82,7 +85,7 @@ static const struct lttng_ust_ctx_field *ctx_field = lttng_ust_static_ctx_field(
 		lttng_ust_static_type_integer(sizeof(pid_t) * CHAR_BIT,
 				lttng_ust_rb_alignof(pid_t) * CHAR_BIT,
 				lttng_ust_is_signed_type(pid_t),
-				BYTE_ORDER, 10),
+				LTTNG_UST_BYTE_ORDER, 10),
 		false, false),
 	vtid_get_size,
 	vtid_record,
@@ -107,9 +110,9 @@ error_find_context:
 }
 
 /*
- * Force a read (imply TLS fixup for dlopen) of TLS variables.
+ * Force a read (imply TLS allocation for dlopen) of TLS variables.
  */
-void lttng_fixup_vtid_tls(void)
+void lttng_vtid_alloc_tls(void)
 {
 	asm volatile ("" : : "m" (URCU_TLS(cached_vtid)));
 }