X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=liblttng-ust%2Flttng-tracer-core.h;h=668d2a8966676cc334f5e418f5cfa8f77ea0fcab;hb=d465835d05ead88505e49aa62319b22dfc1fc026;hp=2ab8bc7c9c255cef02e2da6669b2513603836313;hpb=0466ac28c41336fd6d373cc8b0b26ef132225b9f;p=lttng-ust.git

diff --git a/liblttng-ust/lttng-tracer-core.h b/liblttng-ust/lttng-tracer-core.h
index 2ab8bc7c..668d2a89 100644
--- a/liblttng-ust/lttng-tracer-core.h
+++ b/liblttng-ust/lttng-tracer-core.h
@@ -13,7 +13,6 @@
 #include <urcu/arch.h>
 #include <urcu/list.h>
 #include <lttng/ust-tracer.h>
-#include <lttng/bug.h>
 #include <lttng/ringbuffer-context.h>
 #include <usterr-signal-safe.h>
 
@@ -26,12 +25,13 @@
 #define LTTNG_PROC_NS_PATH_MAX 40
 
 struct lttng_ust_session;
-struct lttng_channel;
-struct lttng_event;
+struct lttng_ust_channel_buffer;
 struct lttng_ust_ctx_field;
 struct lttng_ust_lib_ring_buffer_ctx;
 struct lttng_ust_ctx_value;
+struct lttng_ust_event_recorder;
 struct lttng_ust_event_notifier;
+struct lttng_ust_notification_ctx;
 
 __attribute__((visibility("hidden")))
 int ust_lock(void) __attribute__ ((warn_unused_result));
@@ -93,7 +93,7 @@ size_t lttng_ust_dummy_get_size(struct lttng_ust_ctx_field *field, size_t offset
 __attribute__((visibility("hidden")))
 void lttng_ust_dummy_record(struct lttng_ust_ctx_field *field,
 		 struct lttng_ust_lib_ring_buffer_ctx *ctx,
-		 struct lttng_channel *chan);
+		 struct lttng_ust_channel_buffer *chan);
 __attribute__((visibility("hidden")))
 void lttng_ust_dummy_get_value(struct lttng_ust_ctx_field *field,
 		struct lttng_ust_ctx_value *value);
@@ -101,7 +101,8 @@ void lttng_ust_dummy_get_value(struct lttng_ust_ctx_field *field,
 __attribute__((visibility("hidden")))
 void lttng_event_notifier_notification_send(
 		struct lttng_ust_event_notifier *event_notifier,
-		const char *stack_data);
+		const char *stack_data,
+		struct lttng_ust_notification_ctx *notif_ctx);
 
 __attribute__((visibility("hidden")))
 struct lttng_counter_transport *lttng_counter_transport_find(const char *name);
@@ -112,7 +113,7 @@ void lttng_counter_transport_register(struct lttng_counter_transport *transport)
 __attribute__((visibility("hidden")))
 void lttng_counter_transport_unregister(struct lttng_counter_transport *transport);
 
-#ifdef HAVE_PERF_EVENT
+#ifdef HAVE_LINUX_PERF_EVENT_H
 __attribute__((visibility("hidden")))
 void lttng_ust_fixup_perf_counter_tls(void);
 
@@ -121,7 +122,7 @@ void lttng_perf_lock(void);
 
 __attribute__((visibility("hidden")))
 void lttng_perf_unlock(void);
-#else /* #ifdef HAVE_PERF_EVENT */
+#else /* #ifdef HAVE_LINUX_PERF_EVENT_H */
 static inline
 void lttng_ust_fixup_perf_counter_tls(void)
 {
@@ -134,6 +135,6 @@ static inline
 void lttng_perf_unlock(void)
 {
 }
-#endif /* #else #ifdef HAVE_PERF_EVENT */
+#endif /* #else #ifdef HAVE_LINUX_PERF_EVENT_H */
 
 #endif /* _LTTNG_TRACER_CORE_H */