X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=src%2Flib%2Flttng-ust%2Flttng-context-perf-counters.c;h=1d44a54ae1e6afd1ecf8f81d896055b8393bec9d;hb=b2e37d27accf5e32128b82392dbe1a9522c7dc20;hp=5f5b5cbfeac086aaaa5117fd08adc21519c51e6e;hpb=6339062a5bbe886493d0691d13e28e37a7206362;p=lttng-ust.git

diff --git a/src/lib/lttng-ust/lttng-context-perf-counters.c b/src/lib/lttng-ust/lttng-context-perf-counters.c
index 5f5b5cbf..1d44a54a 100644
--- a/src/lib/lttng-ust/lttng-context-perf-counters.c
+++ b/src/lib/lttng-ust/lttng-context-perf-counters.c
@@ -21,7 +21,7 @@
 #include <lttng/ust-arch.h>
 #include <lttng/ust-events.h>
 #include <lttng/ust-tracer.h>
-#include <lttng/ringbuffer-context.h>
+#include <lttng/ust-ringbuffer-context.h>
 #include <urcu/system.h>
 #include <urcu/arch.h>
 #include <urcu/rculist.h>
@@ -34,7 +34,7 @@
 
 #include "context-internal.h"
 #include "lttng-tracer-core.h"
-#include "ust-events-internal.h"
+#include "lib/lttng-ust/events.h"
 
 /*
  * We use a global perf counter key and iterate on per-thread RCU lists
@@ -161,11 +161,12 @@ void lttng_perf_unlock(void)
 
 static
 size_t perf_counter_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(uint64_t));
+	size += lttng_ust_ring_buffer_align(offset, lttng_ust_rb_alignof(uint64_t));
 	size += sizeof(uint64_t);
 	return size;
 }
@@ -262,7 +263,7 @@ uint64_t arch_read_perf_counter(
 }
 
 static
-int arch_perf_keep_fd(struct lttng_perf_counter_thread_field *thread_field)
+int arch_perf_keep_fd(struct lttng_perf_counter_thread_field *thread_field __attribute__((unused)))
 {
 	return 1;
 }
@@ -442,8 +443,9 @@ uint64_t wrapper_perf_counter_read(void *priv)
 
 static
 void perf_counter_record(void *priv,
-		 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)
 {
 	uint64_t value;
 
@@ -453,9 +455,10 @@ void perf_counter_record(void *priv,
 
 static
 void perf_counter_get_value(void *priv,
+		struct lttng_ust_probe_ctx *probe_ctx __attribute__((unused)),
 		struct lttng_ust_ctx_value *value)
 {
-	value->u.s64 = wrapper_perf_counter_read(priv);
+	value->u.u64 = wrapper_perf_counter_read(priv);
 }
 
 /* Called with perf lock held */
@@ -531,7 +534,7 @@ static const struct lttng_ust_type_common *ust_type =
 	lttng_ust_static_type_integer(sizeof(uint64_t) * CHAR_BIT,
 			lttng_ust_rb_alignof(uint64_t) * CHAR_BIT,
 			lttng_ust_is_signed_type(uint64_t),
-			BYTE_ORDER, 10);
+			LTTNG_UST_BYTE_ORDER, 10);
 
 /* Called with UST lock held */
 int lttng_add_perf_counter_to_ctx(uint32_t type,