X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=libringbuffer%2Fring_buffer_frontend.c;h=7b276ad935a3b89e4a10b1a41402f8976b80bd70;hb=f574bfb4d81b26d3cfc0243868d138e33470a950;hp=45ff7deeace46c64dc550dfdb08a1cdfb69f357d;hpb=0466ac28c41336fd6d373cc8b0b26ef132225b9f;p=lttng-ust.git

diff --git a/libringbuffer/ring_buffer_frontend.c b/libringbuffer/ring_buffer_frontend.c
index 45ff7dee..7b276ad9 100644
--- a/libringbuffer/ring_buffer_frontend.c
+++ b/libringbuffer/ring_buffer_frontend.c
@@ -52,9 +52,10 @@
 #include <poll.h>
 #include <ust-helper.h>
 
-#include <lttng/align.h>
-#include "smp.h"
+#include <lttng/ust-align.h>
 #include <lttng/ringbuffer-context.h>
+
+#include "smp.h"
 #include "ringbuffer-config.h"
 #include "vatomic.h"
 #include "backend.h"
@@ -335,7 +336,7 @@ int lib_ring_buffer_create(struct lttng_ust_lib_ring_buffer *buf,
 	struct lttng_ust_lib_ring_buffer_backend_subbuffer *wsb;
 	struct lttng_ust_lib_ring_buffer_channel *shmp_chan;
 	struct commit_counters_hot *cc_hot;
-	void *priv = channel_get_private(chan);
+	void *priv = channel_get_private_config(chan);
 	size_t subbuf_header_size;
 	uint64_t tsc;
 	int ret;
@@ -937,9 +938,10 @@ static void channel_free(struct lttng_ust_lib_ring_buffer_channel *chan,
  * channel_create - Create channel.
  * @config: ring buffer instance configuration
  * @name: name of the channel
- * @priv_data: ring buffer client private data area pointer (output)
- * @priv_data_size: length, in bytes, of the private data area.
- * @priv_data_init: initialization data for private data.
+ * @priv_data_align: alignment, in bytes, of the private data area. (config)
+ * @priv_data_size: length, in bytes, of the private data area. (config)
+ * @priv_data_init: initialization data for private data. (config)
+ * @priv: local private data (memory owner by caller)
  * @buf_addr: pointer the the beginning of the preallocated buffer contiguous
  *            address mapping. It is used only by RING_BUFFER_STATIC
  *            configuration. It can be set to NULL for other backends.
@@ -957,10 +959,10 @@ static void channel_free(struct lttng_ust_lib_ring_buffer_channel *chan,
  */
 struct lttng_ust_shm_handle *channel_create(const struct lttng_ust_lib_ring_buffer_config *config,
 		   const char *name,
-		   void **priv_data,
 		   size_t priv_data_align,
 		   size_t priv_data_size,
 		   void *priv_data_init,
+		   void *priv,
 		   void *buf_addr, size_t subbuf_size,
 		   size_t num_subbuf, unsigned int switch_timer_interval,
 		   unsigned int read_timer_interval,
@@ -1034,6 +1036,8 @@ struct lttng_ust_shm_handle *channel_create(const struct lttng_ust_lib_ring_buff
 
 	/* space for private data */
 	if (priv_data_size) {
+		void *priv_config;
+
 		DECLARE_SHMP(void, priv_data_alloc);
 
 		align_shm(shmobj, priv_data_align);
@@ -1041,16 +1045,16 @@ struct lttng_ust_shm_handle *channel_create(const struct lttng_ust_lib_ring_buff
 		set_shmp(priv_data_alloc, zalloc_shm(shmobj, priv_data_size));
 		if (!shmp(handle, priv_data_alloc))
 			goto error_append;
-		*priv_data = channel_get_private(chan);
-		memcpy(*priv_data, priv_data_init, priv_data_size);
+		priv_config = channel_get_private_config(chan);
+		memcpy(priv_config, priv_data_init, priv_data_size);
 	} else {
 		chan->priv_data_offset = -1;
-		if (priv_data)
-			*priv_data = NULL;
 	}
 
 	chan->u.s.blocking_timeout_ms = (int32_t) blocking_timeout_ms;
 
+	channel_set_private(chan, priv);
+
 	ret = channel_backend_init(&chan->backend, name, config,
 				   subbuf_size, num_subbuf, handle,
 				   stream_fds);
@@ -1680,8 +1684,7 @@ void lib_ring_buffer_print_subbuffer_errors(struct lttng_ust_lib_ring_buffer *bu
 static
 void lib_ring_buffer_print_buffer_errors(struct lttng_ust_lib_ring_buffer *buf,
 					 struct lttng_ust_lib_ring_buffer_channel *chan,
-					 void *priv, int cpu,
-					 struct lttng_ust_shm_handle *handle)
+					 int cpu, struct lttng_ust_shm_handle *handle)
 {
 	const struct lttng_ust_lib_ring_buffer_config *config = &chan->backend.config;
 	unsigned long write_offset, cons_offset;
@@ -1714,7 +1717,6 @@ void lib_ring_buffer_print_errors(struct lttng_ust_lib_ring_buffer_channel *chan
 				struct lttng_ust_shm_handle *handle)
 {
 	const struct lttng_ust_lib_ring_buffer_config *config = &chan->backend.config;
-	void *priv = channel_get_private(chan);
 
 	if (!strcmp(chan->backend.name, "relay-metadata-mmap")) {
 		DBG("ring buffer %s: %lu records written, "
@@ -1740,7 +1742,7 @@ void lib_ring_buffer_print_errors(struct lttng_ust_lib_ring_buffer_channel *chan
 				v_read(config, &buf->records_lost_wrap),
 				v_read(config, &buf->records_lost_big));
 	}
-	lib_ring_buffer_print_buffer_errors(buf, chan, priv, cpu, handle);
+	lib_ring_buffer_print_buffer_errors(buf, chan, cpu, handle);
 }
 
 /*