X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=libringbuffer%2Fring_buffer_frontend.c;h=5629876983ee56ca7d5d1c4509d45d4dca5f5f38;hb=4f41890f998c2c3778213ed2a8938534fb3060e1;hp=53d269d29644d9ef5578848f702099951b8fbd6a;hpb=45e9e6996ae8da8d5dfffbe9aebd8e0438a84124;p=lttng-ust.git

diff --git a/libringbuffer/ring_buffer_frontend.c b/libringbuffer/ring_buffer_frontend.c
index 53d269d2..56298769 100644
--- a/libringbuffer/ring_buffer_frontend.c
+++ b/libringbuffer/ring_buffer_frontend.c
@@ -38,18 +38,22 @@
  * Dual LGPL v2.1/GPL v2 license.
  */
 
+#define _GNU_SOURCE
 #include <sys/types.h>
 #include <sys/mman.h>
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <urcu/compiler.h>
 #include <urcu/ref.h>
+#include <helper.h>
 
 #include "smp.h"
 #include <lttng/ringbuffer-config.h>
+#include "vatomic.h"
 #include "backend.h"
 #include "frontend.h"
 #include "shm.h"
+#include "../liblttng-ust/compat.h"	/* For ENODATA */
 
 #ifndef max
 #define max(a, b)	((a) > (b) ? (a) : (b))
@@ -90,7 +94,8 @@ __thread unsigned int lib_ring_buffer_nesting;
 static
 void lib_ring_buffer_print_errors(struct channel *chan,
 				  struct lttng_ust_lib_ring_buffer *buf, int cpu,
-				  struct lttng_ust_shm_handle *handle);
+				  struct lttng_ust_shm_handle *handle)
+	__attribute__((unused));
 
 /**
  * lib_ring_buffer_reset - Reset ring buffer to initial values.
@@ -165,7 +170,7 @@ int lib_ring_buffer_create(struct lttng_ust_lib_ring_buffer *buf,
 	struct channel *chan = caa_container_of(chanb, struct channel, backend);
 	void *priv = channel_get_private(chan);
 	size_t subbuf_header_size;
-	u64 tsc;
+	uint64_t tsc;
 	int ret;
 
 	/* Test for cpu hotplug */
@@ -418,7 +423,7 @@ struct lttng_ust_shm_handle *channel_create(const struct lttng_ust_lib_ring_buff
 		   void *buf_addr, 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)
 {
 	int ret, cpu;
 	size_t shmsize, chansize;
@@ -608,8 +613,8 @@ struct lttng_ust_lib_ring_buffer *channel_get_ring_buffer(
 					const struct lttng_ust_lib_ring_buffer_config *config,
 					struct channel *chan, int cpu,
 					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 shm_ref *ref;
 
@@ -944,12 +949,6 @@ void lib_ring_buffer_print_buffer_errors(struct lttng_ust_lib_ring_buffer *buf,
 	const struct lttng_ust_lib_ring_buffer_config *config = &chan->backend.config;
 	unsigned long write_offset, cons_offset;
 
-	/*
-	 * Can be called in the error path of allocation when
-	 * trans_channel_data is not yet set.
-	 */
-	if (!chan)
-		return;
 	/*
 	 * No need to order commit_count, write_offset and cons_offset reads
 	 * because we execute at teardown when no more writer nor reader
@@ -1009,7 +1008,7 @@ static
 void lib_ring_buffer_switch_old_start(struct lttng_ust_lib_ring_buffer *buf,
 				      struct channel *chan,
 				      struct switch_offsets *offsets,
-				      u64 tsc,
+				      uint64_t tsc,
 				      struct lttng_ust_shm_handle *handle)
 {
 	const struct lttng_ust_lib_ring_buffer_config *config = &chan->backend.config;
@@ -1047,7 +1046,7 @@ static
 void lib_ring_buffer_switch_old_end(struct lttng_ust_lib_ring_buffer *buf,
 				    struct channel *chan,
 				    struct switch_offsets *offsets,
-				    u64 tsc,
+				    uint64_t tsc,
 				    struct lttng_ust_shm_handle *handle)
 {
 	const struct lttng_ust_lib_ring_buffer_config *config = &chan->backend.config;
@@ -1084,7 +1083,7 @@ static
 void lib_ring_buffer_switch_new_start(struct lttng_ust_lib_ring_buffer *buf,
 				      struct channel *chan,
 				      struct switch_offsets *offsets,
-				      u64 tsc,
+				      uint64_t tsc,
 				      struct lttng_ust_shm_handle *handle)
 {
 	const struct lttng_ust_lib_ring_buffer_config *config = &chan->backend.config;
@@ -1120,7 +1119,7 @@ static
 void lib_ring_buffer_switch_new_end(struct lttng_ust_lib_ring_buffer *buf,
 				    struct channel *chan,
 				    struct switch_offsets *offsets,
-				    u64 tsc,
+				    uint64_t tsc,
 				    struct lttng_ust_shm_handle *handle)
 {
 	const struct lttng_ust_lib_ring_buffer_config *config = &chan->backend.config;
@@ -1156,7 +1155,7 @@ int lib_ring_buffer_try_switch_slow(enum switch_mode mode,
 				    struct lttng_ust_lib_ring_buffer *buf,
 				    struct channel *chan,
 				    struct switch_offsets *offsets,
-				    u64 *tsc)
+				    uint64_t *tsc)
 {
 	const struct lttng_ust_lib_ring_buffer_config *config = &chan->backend.config;
 	unsigned long off;
@@ -1221,7 +1220,7 @@ void lib_ring_buffer_switch_slow(struct lttng_ust_lib_ring_buffer *buf, enum swi
 	const struct lttng_ust_lib_ring_buffer_config *config = &chan->backend.config;
 	struct switch_offsets offsets;
 	unsigned long oldidx;
-	u64 tsc;
+	uint64_t tsc;
 
 	offsets.size = 0;