Move the ringbuffer and counter clients to 'src/common/'

[lttng-ust.git] / src / lib / lttng-ust / lttng-ust-abi.c

diff --git a/src/lib/lttng-ust/lttng-ust-abi.c b/src/lib/lttng-ust/lttng-ust-abi.c
index f8e0f5bbdd907faf083a6c9271688ea056060869..2a8b8c09c8c17bc7a03b9adbd1c79ea6a948be03 100644 (file)
--- a/src/lib/lttng-ust/lttng-ust-abi.c
+++ b/src/lib/lttng-ust/lttng-ust-abi.c
@@ -43,10 +43,11 @@
 #include "common/ringbuffer/frontend.h"
 #include "common/ringbuffer/shm.h"
 #include "common/counter/counter.h"
-#include "tracepoint-internal.h"
-#include "lttng-tracer.h"
-#include "string-utils.h"
+#include "common/tracepoint.h"
+#include "common/tracer.h"
+#include "common/strutils.h"
 #include "lib/lttng-ust/events.h"
+#include "lib/lttng-ust/lttng-tracer-core.h"
 #include "context-internal.h"
 #include "common/macros.h"
 
@@ -291,7 +292,7 @@ int lttng_abi_create_root_handle(void)
 static
 int lttng_is_channel_ready(struct lttng_ust_channel_buffer *lttng_chan)
 {
-       struct lttng_ust_lib_ring_buffer_channel *chan;
+       struct lttng_ust_ring_buffer_channel *chan;
        unsigned int nr_streams, exp_streams;
 
        chan = lttng_chan->priv->rb_chan;
@@ -452,8 +453,8 @@ int lttng_abi_map_channel(int session_objd,
        struct lttng_ust_shm_handle *channel_handle;
        struct lttng_ust_abi_channel_config *lttng_chan_config;
        struct lttng_ust_channel_buffer *lttng_chan_buf;
-       struct lttng_ust_lib_ring_buffer_channel *chan;
-       struct lttng_ust_lib_ring_buffer_config *config;
+       struct lttng_ust_ring_buffer_channel *chan;
+       struct lttng_ust_ring_buffer_config *config;
        void *chan_data;
        int wakeup_fd;
        uint64_t len;