Fix type range comparison always false for 64-bit arch

[lttng-ust.git] / liblttng-ust / ltt-ring-buffer-metadata-client.h

diff --git a/liblttng-ust/ltt-ring-buffer-metadata-client.h b/liblttng-ust/ltt-ring-buffer-metadata-client.h
index 0fd4d22264614fcc6633e55b5b0caf26e2d5e7f6..dcbaacb61c1c1d583473ed367d4396e5de72bea9 100644 (file)
--- a/liblttng-ust/ltt-ring-buffer-metadata-client.h
+++ b/liblttng-ust/ltt-ring-buffer-metadata-client.h
@@ -16,7 +16,7 @@
 
 struct metadata_packet_header {
        uint32_t magic;                 /* 0x75D11D57 */
-       uint8_t  uuid[16];              /* Unique Universal Identifier */
+       uint8_t  uuid[LTTNG_UST_UUID_LEN]; /* Unique Universal Identifier */
        uint32_t checksum;              /* 0 if unused */
        uint32_t content_size;          /* in bits */
        uint32_t packet_size;           /* in bits */
@@ -34,8 +34,7 @@ struct metadata_record_header {
 
 static const struct lttng_ust_lib_ring_buffer_config client_config;
 
-static inline
-u64 lib_ring_buffer_clock_read(struct channel *chan)
+static inline uint64_t lib_ring_buffer_clock_read(struct channel *chan)
 {
        return 0;
 }
@@ -51,7 +50,7 @@ unsigned char record_header_size(const struct lttng_ust_lib_ring_buffer_config *
 
 #include "../libringbuffer/api.h"
 
-static u64 client_ring_buffer_clock_read(struct channel *chan)
+static uint64_t client_ring_buffer_clock_read(struct channel *chan)
 {
        return 0;
 }
@@ -77,7 +76,7 @@ static size_t client_packet_header_size(void)
        return offsetof(struct metadata_packet_header, header_end);
 }
 
-static void client_buffer_begin(struct lttng_ust_lib_ring_buffer *buf, u64 tsc,
+static void client_buffer_begin(struct lttng_ust_lib_ring_buffer *buf, uint64_t tsc,
                                unsigned int subbuf_idx,
                                struct lttng_ust_shm_handle *handle)
 {
@@ -106,7 +105,7 @@ static void client_buffer_begin(struct lttng_ust_lib_ring_buffer *buf, u64 tsc,
  * offset is assumed to never be 0 here : never deliver a completely empty
  * subbuffer. data_size is between 1 and subbuf_size.
  */
-static void client_buffer_end(struct lttng_ust_lib_ring_buffer *buf, u64 tsc,
+static void client_buffer_end(struct lttng_ust_lib_ring_buffer *buf, uint64_t tsc,
                              unsigned int subbuf_idx, unsigned long data_size,
                              struct lttng_ust_shm_handle *handle)
 {
@@ -168,8 +167,8 @@ struct ltt_channel *_channel_create(const char *name,
                                size_t subbuf_size, size_t num_subbuf,
                                unsigned int switch_timer_interval,
                                unsigned int read_timer_interval,
-                               int *shm_fd, int *wait_fd,
-                               uint64_t *memory_map_size,
+                               int **shm_fd, int **wait_fd,
+                               uint64_t **memory_map_size,
                                struct ltt_channel *chan_priv_init)
 {
        void *priv;
@@ -199,8 +198,8 @@ void ltt_channel_destroy(struct ltt_channel *ltt_chan)
 static
 struct lttng_ust_lib_ring_buffer *ltt_buffer_read_open(struct channel *chan,
                                             struct lttng_ust_shm_handle *handle,
-                                            int *shm_fd, int *wait_fd,
-                                            uint64_t *memory_map_size)
+                                            int **shm_fd, int **wait_fd,
+                                            uint64_t **memory_map_size)
 {
        struct lttng_ust_lib_ring_buffer *buf;
 
@@ -284,8 +283,8 @@ static
 int ltt_flush_buffer(struct channel *chan, struct lttng_ust_shm_handle *handle)
 {
        struct lttng_ust_lib_ring_buffer *buf;
-       int shm_fd, wait_fd;
-       uint64_t memory_map_size;
+       int *shm_fd, *wait_fd;
+       uint64_t *memory_map_size;
 
        buf = channel_get_ring_buffer(&client_config, chan,
                        0, handle, &shm_fd, &wait_fd,