#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 "ust-events-internal.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"
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;
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;