#include <urcu/list.h>
#include <urcu/uatomic.h>
-#include "ust/core.h"
+#include "lttng/core.h"
-#include <ust/usterr-signal-safe.h>
-#include <ust/ringbuffer-config.h>
+#include <lttng/usterr-signal-safe.h>
+#include <lttng/ringbuffer-config.h>
#include "backend_types.h"
#include "shm_internal.h"
} ____cacheline_aligned;
/* ring buffer state */
-struct lib_ring_buffer {
+struct lttng_ust_lib_ring_buffer {
/* First 32 bytes cache-hot cacheline */
union v_atomic offset; /* Current offset in the buffer */
DECLARE_SHMP(struct commit_counters_hot, commit_hot);
* Last timestamp written in the buffer.
*/
- struct lib_ring_buffer_backend backend; /* Associated backend */
+ struct lttng_ust_lib_ring_buffer_backend backend; /* Associated backend */
DECLARE_SHMP(struct commit_counters_cold, commit_cold);
/* Commit count per sub-buffer */
int switch_timer_enabled:1; /* Protected by ring_buffer_nohz_lock */
int read_timer_enabled:1; /* Protected by ring_buffer_nohz_lock */
/* shmp pointer to self */
- DECLARE_SHMP(struct lib_ring_buffer, self);
+ DECLARE_SHMP(struct lttng_ust_lib_ring_buffer, self);
} ____cacheline_aligned;
static inline
/*
* Issue warnings and disable channels upon internal error.
- * Can receive struct lib_ring_buffer or struct lib_ring_buffer_backend
+ * Can receive struct lttng_ust_lib_ring_buffer or struct lttng_ust_lib_ring_buffer_backend
* parameters.
*/
#define CHAN_WARN_ON(c, cond) \
({ \
struct channel *__chan; \
- int _____ret = unlikely(cond); \
+ int _____ret = caa_unlikely(cond); \
if (_____ret) { \
if (__same_type(*(c), struct channel_backend)) \
__chan = caa_container_of((void *) (c), \