X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=src%2Flib%2Flttng-ust%2Fust-core.c;h=d070124edf622c68c7215d73418fc31e770dd6cf;hb=249cffb5cdf9cff45298a44580b24d4dd9d63ba0;hp=d4829904304c2314bfefe78c6f4f7e5b5d6b466e;hpb=6339062a5bbe886493d0691d13e28e37a7206362;p=lttng-ust.git

diff --git a/src/lib/lttng-ust/ust-core.c b/src/lib/lttng-ust/ust-core.c
index d4829904..d070124e 100644
--- a/src/lib/lttng-ust/ust-core.c
+++ b/src/lib/lttng-ust/ust-core.c
@@ -10,12 +10,12 @@
 #include <stdlib.h>
 
 #include "context-internal.h"
-#include "ust-events-internal.h"
+#include "lib/lttng-ust/events.h"
 #include "common/logging.h"
 #include "lttng-tracer-core.h"
 #include "lttng-rb-clients.h"
 #include "lttng-counter-client.h"
-#include "jhash.h"
+#include "common/jhash.h"
 
 static CDS_LIST_HEAD(lttng_transport_list);
 static CDS_LIST_HEAD(lttng_counter_transport_list);
@@ -109,18 +109,20 @@ struct lttng_enum *lttng_ust_enum_get_from_desc(struct lttng_ust_session *sessio
 }
 
 size_t lttng_ust_dummy_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(char));
+	size += lttng_ust_ring_buffer_align(offset, lttng_ust_rb_alignof(char));
 	size += sizeof(char);		/* tag */
 	return size;
 }
 
 void lttng_ust_dummy_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)
 {
 	char sel_char = (char) LTTNG_UST_DYNAMIC_TYPE_NONE;
 
@@ -128,6 +130,7 @@ void lttng_ust_dummy_record(void *priv __attribute__((unused)),
 }
 
 void lttng_ust_dummy_get_value(void *priv __attribute__((unused)),
+		struct lttng_ust_probe_ctx *probe_ctx __attribute__((unused)),
 		struct lttng_ust_ctx_value *value)
 {
 	value->sel = LTTNG_UST_DYNAMIC_TYPE_NONE;