Fix: perf counters context: error handling on type allocation

[lttng-ust.git] / libringbuffer / backend_internal.h

diff --git a/libringbuffer/backend_internal.h b/libringbuffer/backend_internal.h
index f0a66d46de69acac2265408751b5d73bf9053f55..766fde2d30d851d79bcd05770be5b8786c991807 100644 (file)
--- a/libringbuffer/backend_internal.h
+++ b/libringbuffer/backend_internal.h
@@ -14,7 +14,8 @@
 #include <unistd.h>
 #include <urcu/compiler.h>
 
-#include <lttng/ringbuffer-config.h>
+#include <lttng/ringbuffer-context.h>
+#include "ringbuffer-config.h"
 #include "backend_types.h"
 #include "frontend_types.h"
 #include "shm.h"
@@ -25,7 +26,8 @@
 
 __attribute__((visibility("hidden")))
 int lib_ring_buffer_backend_create(struct lttng_ust_lib_ring_buffer_backend *bufb,
-                                  struct channel_backend *chan, int cpu,
+                                  struct channel_backend *chan,
+                                  int cpu,
                                   struct lttng_ust_shm_handle *handle,
                                   struct shm_object *shmobj);
 
@@ -284,7 +286,7 @@ void subbuffer_consume_record(const struct lttng_ust_lib_ring_buffer_config *con
                              struct lttng_ust_shm_handle *handle)
 {
        unsigned long sb_bindex;
-       struct channel *chan;
+       struct lttng_ust_lib_ring_buffer_channel *chan;
        struct lttng_ust_lib_ring_buffer_backend_pages_shmp *pages_shmp;
        struct lttng_ust_lib_ring_buffer_backend_pages *backend_pages;
 
@@ -504,7 +506,7 @@ void lib_ring_buffer_set_noref_offset(const struct lttng_ust_lib_ring_buffer_con
                                      struct lttng_ust_shm_handle *handle)
 {
        struct lttng_ust_lib_ring_buffer_backend_subbuffer *wsb;
-       struct channel *chan;
+       struct lttng_ust_lib_ring_buffer_channel *chan;
 
        if (config->mode != RING_BUFFER_OVERWRITE)
                return;
@@ -554,7 +556,7 @@ int update_read_sb_index(const struct lttng_ust_lib_ring_buffer_config *config,
                return -EPERM;
 
        if (config->mode == RING_BUFFER_OVERWRITE) {
-               struct channel *chan;
+               struct lttng_ust_lib_ring_buffer_channel *chan;
 
                /*
                 * Exchange the target writer subbuffer with our own unused