Compile fix following moved headers

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

diff --git a/libringbuffer/backend_types.h b/libringbuffer/backend_types.h
index 2eb03b55dee2628e6bcca25a74cfd50702289d93..7300309f27ef97071354a8f4298ad7bed50d9f67 100644 (file)
--- a/libringbuffer/backend_types.h
+++ b/libringbuffer/backend_types.h
@@ -11,9 +11,11 @@
  * Dual LGPL v2.1/GPL v2 license.
  */
 
+#include <limits.h>
 #include "shm_internal.h"
+#include "vatomic.h"
 
-struct lib_ring_buffer_backend_pages {
+struct lttng_ust_lib_ring_buffer_backend_pages {
        unsigned long mmap_offset;      /* offset of the subbuffer in mmap */
        union v_atomic records_commit;  /* current records committed count */
        union v_atomic records_unread;  /* records to read */
@@ -21,7 +23,7 @@ struct lib_ring_buffer_backend_pages {
        DECLARE_SHMP(char, p);          /* Backing memory map */
 };
 
-struct lib_ring_buffer_backend_subbuffer {
+struct lttng_ust_lib_ring_buffer_backend_subbuffer {
        /* Identifier for subbuf backend pages. Exchanged atomically. */
        unsigned long id;               /* backend subbuffer identifier */
 };
@@ -30,22 +32,22 @@ struct lib_ring_buffer_backend_subbuffer {
  * Forward declaration of frontend-specific channel and ring_buffer.
  */
 struct channel;
-struct lib_ring_buffer;
+struct lttng_ust_lib_ring_buffer;
 
-struct lib_ring_buffer_backend_pages_shmp {
-       DECLARE_SHMP(struct lib_ring_buffer_backend_pages, shmp);
+struct lttng_ust_lib_ring_buffer_backend_pages_shmp {
+       DECLARE_SHMP(struct lttng_ust_lib_ring_buffer_backend_pages, shmp);
 };
 
-struct lib_ring_buffer_backend {
+struct lttng_ust_lib_ring_buffer_backend {
        /* Array of ring_buffer_backend_subbuffer for writer */
-       DECLARE_SHMP(struct lib_ring_buffer_backend_subbuffer, buf_wsb);
+       DECLARE_SHMP(struct lttng_ust_lib_ring_buffer_backend_subbuffer, buf_wsb);
        /* ring_buffer_backend_subbuffer for reader */
-       struct lib_ring_buffer_backend_subbuffer buf_rsb;
+       struct lttng_ust_lib_ring_buffer_backend_subbuffer buf_rsb;
        /*
         * Pointer array of backend pages, for whole buffer.
         * Indexed by ring_buffer_backend_subbuffer identifier (id) index.
         */
-       DECLARE_SHMP(struct lib_ring_buffer_backend_pages_shmp, array);
+       DECLARE_SHMP(struct lttng_ust_lib_ring_buffer_backend_pages_shmp, array);
        DECLARE_SHMP(char, memory_map); /* memory mapping */
 
        DECLARE_SHMP(struct channel, chan);     /* Associated channel */
@@ -54,8 +56,8 @@ struct lib_ring_buffer_backend {
        unsigned int allocated:1;       /* Bool: is buffer allocated ? */
 };
 
-struct lib_ring_buffer_shmp {
-       DECLARE_SHMP(struct lib_ring_buffer, shmp); /* Channel per-cpu buffers */
+struct lttng_ust_lib_ring_buffer_shmp {
+       DECLARE_SHMP(struct lttng_ust_lib_ring_buffer, shmp); /* Channel per-cpu buffers */
 };
 
 struct channel_backend {
@@ -69,11 +71,11 @@ struct channel_backend {
        unsigned int buf_size_order;    /* Order of buffer size */
        int extra_reader_sb:1;          /* Bool: has extra reader subbuffer */
        unsigned long num_subbuf;       /* Number of sub-buffers for writer */
-       u64 start_tsc;                  /* Channel creation TSC value */
-       void *priv;                     /* Client-specific information */
-       struct lib_ring_buffer_config config; /* Ring buffer configuration */
+       uint64_t start_tsc;             /* Channel creation TSC value */
+       DECLARE_SHMP(void *, priv_data);/* Client-specific information */
+       struct lttng_ust_lib_ring_buffer_config config; /* Ring buffer configuration */
        char name[NAME_MAX];            /* Channel name */
-       struct lib_ring_buffer_shmp buf[];
+       struct lttng_ust_lib_ring_buffer_shmp buf[];
 };
 
 #endif /* _LINUX_RING_BUFFER_BACKEND_TYPES_H */