Rename shm_handle to lttng_ust_shm_handle

[lttng-ust.git] / include / ust / ringbuffer-config.h

diff --git a/include/ust/ringbuffer-config.h b/include/ust/ringbuffer-config.h
index 15fee52d26bb13f8da9bf6de3069e3ba73281b79..12bdc8695993a7b01f4e93e1b7f79718f8cf344c 100644 (file)
--- a/include/ust/ringbuffer-config.h
+++ b/include/ust/ringbuffer-config.h
@@ -13,6 +13,8 @@
  */
 
 #include <errno.h>
+#include "ust/lttng-tracer.h"
+#include "ust/usterr-signal-safe.h"
 #include "ust/kcompat/kcompat.h"
 #include "ust/align.h"
 
@@ -20,7 +22,7 @@ struct lib_ring_buffer;
 struct channel;
 struct lib_ring_buffer_config;
 struct lib_ring_buffer_ctx;
-struct shm_handle *handle;
+struct lttng_ust_shm_handle *handle;
 
 /*
  * Ring buffer client callbacks. Only used by slow path, never on fast path.
@@ -42,24 +44,24 @@ struct lib_ring_buffer_client_cb {
        size_t (*subbuffer_header_size) (void);
        void (*buffer_begin) (struct lib_ring_buffer *buf, u64 tsc,
                              unsigned int subbuf_idx,
-                             struct shm_handle *handle);
+                             struct lttng_ust_shm_handle *handle);
        void (*buffer_end) (struct lib_ring_buffer *buf, u64 tsc,
                            unsigned int subbuf_idx, unsigned long data_size,
-                           struct shm_handle *handle);
+                           struct lttng_ust_shm_handle *handle);
 
        /* Optional callbacks (can be set to NULL) */
 
        /* Called at buffer creation/finalize */
        int (*buffer_create) (struct lib_ring_buffer *buf, void *priv,
                              int cpu, const char *name,
-                             struct shm_handle *handle);
+                             struct lttng_ust_shm_handle *handle);
        /*
         * Clients should guarantee that no new reader handle can be opened
         * after finalize.
         */
        void (*buffer_finalize) (struct lib_ring_buffer *buf,
                                 void *priv, int cpu,
-                                struct shm_handle *handle);
+                                struct lttng_ust_shm_handle *handle);
 
        /*
         * Extract header length, payload length and timestamp from event
@@ -70,7 +72,7 @@ struct lib_ring_buffer_client_cb {
                            struct channel *chan, struct lib_ring_buffer *buf,
                            size_t offset, size_t *header_len,
                            size_t *payload_len, u64 *timestamp,
-                           struct shm_handle *handle);
+                           struct lttng_ust_shm_handle *handle);
 };
 
 /*
@@ -172,7 +174,7 @@ struct lib_ring_buffer_ctx {
        /* input received by lib_ring_buffer_reserve(), saved here. */
        struct channel *chan;           /* channel */
        void *priv;                     /* client private data */
-       struct shm_handle *handle;      /* shared-memory handle */
+       struct lttng_ust_shm_handle *handle;    /* shared-memory handle */
        size_t data_size;               /* size of payload */
        int largest_align;              /*
                                         * alignment of the largest element
@@ -210,7 +212,7 @@ static inline
 void lib_ring_buffer_ctx_init(struct lib_ring_buffer_ctx *ctx,
                              struct channel *chan, void *priv,
                              size_t data_size, int largest_align,
-                             int cpu, struct shm_handle *handle)
+                             int cpu, struct lttng_ust_shm_handle *handle)
 {
        ctx->chan = chan;
        ctx->priv = priv;