X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;ds=sidebyside;f=libringbuffer%2Ffrontend.h;h=12e210050b1882ae1849a5571a3407c00b37420e;hb=6ba6fd60507f8e045bdc4f1be14e9d99c6a15f7f;hp=2ab369e50aefdfef8ab969aeb0a1e2335e2bcbae;hpb=ddabe860f4cf41a4206a8157d83e6b9354f85cb5;p=lttng-ust.git

diff --git a/libringbuffer/frontend.h b/libringbuffer/frontend.h
index 2ab369e5..12e21005 100644
--- a/libringbuffer/frontend.h
+++ b/libringbuffer/frontend.h
@@ -34,35 +34,34 @@
  * address mapping. It is used only by RING_BUFFER_STATIC configuration. It can
  * be set to NULL for other backends.
  *
- * priv_data (output) is set to a pointer into a "priv_data_len"-sized
- * memory area for client-specific data. This memory is managed by lib
- * ring buffer. priv_data_align is the alignment required for the
- * private data area.
+ * private data is a memory area for configuration data. This memory is
+ * managed by lib ring buffer. priv_data_align is the alignment required
+ * for the private data area.
  */
 
-__attribute__((visibility("hidden")))
 extern
 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,
 				const int *stream_fds, int nr_stream_fds,
-				int64_t blocking_timeout);
+				int64_t blocking_timeout)
+	__attribute__((visibility("hidden")));
 
 /*
  * channel_destroy finalizes all channel's buffers, waits for readers to
  * release all references, and destroys the channel.
  */
-__attribute__((visibility("hidden")))
-extern
-void channel_destroy(struct channel *chan, struct lttng_ust_shm_handle *handle,
-		int consumer);
+void channel_destroy(struct lttng_ust_lib_ring_buffer_channel *chan,
+		struct lttng_ust_shm_handle *handle,
+		int consumer)
+	__attribute__((visibility("hidden")));
 
 
 /* Buffer read operations */
@@ -76,84 +75,85 @@ void channel_destroy(struct channel *chan, struct lttng_ust_shm_handle *handle,
 #define for_each_channel_cpu(cpu, chan)					\
 	for_each_possible_cpu(cpu)
 
-__attribute__((visibility("hidden")))
 extern 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_lib_ring_buffer_channel *chan, int cpu,
 				struct lttng_ust_shm_handle *handle,
 				int *shm_fd, int *wait_fd,
 				int *wakeup_fd,
-				uint64_t *memory_map_size);
+				uint64_t *memory_map_size)
+	__attribute__((visibility("hidden")));
 
-__attribute__((visibility("hidden")))
 extern
 int ring_buffer_channel_close_wait_fd(const struct lttng_ust_lib_ring_buffer_config *config,
-			struct channel *chan,
-			struct lttng_ust_shm_handle *handle);
+			struct lttng_ust_lib_ring_buffer_channel *chan,
+			struct lttng_ust_shm_handle *handle)
+	__attribute__((visibility("hidden")));
 
-__attribute__((visibility("hidden")))
 extern
 int ring_buffer_channel_close_wakeup_fd(const struct lttng_ust_lib_ring_buffer_config *config,
-			struct channel *chan,
-			struct lttng_ust_shm_handle *handle);
+			struct lttng_ust_lib_ring_buffer_channel *chan,
+			struct lttng_ust_shm_handle *handle)
+	__attribute__((visibility("hidden")));
 
-__attribute__((visibility("hidden")))
 extern
 int ring_buffer_stream_close_wait_fd(const struct lttng_ust_lib_ring_buffer_config *config,
-		struct channel *chan,
+		struct lttng_ust_lib_ring_buffer_channel *chan,
 		struct lttng_ust_shm_handle *handle,
-		int cpu);
+		int cpu)
+	__attribute__((visibility("hidden")));
 
-__attribute__((visibility("hidden")))
 extern
 int ring_buffer_stream_close_wakeup_fd(const struct lttng_ust_lib_ring_buffer_config *config,
-		struct channel *chan,
+		struct lttng_ust_lib_ring_buffer_channel *chan,
 		struct lttng_ust_shm_handle *handle,
-		int cpu);
+		int cpu)
+	__attribute__((visibility("hidden")));
 
-__attribute__((visibility("hidden")))
 extern int lib_ring_buffer_open_read(struct lttng_ust_lib_ring_buffer *buf,
-				     struct lttng_ust_shm_handle *handle);
+				     struct lttng_ust_shm_handle *handle)
+	__attribute__((visibility("hidden")));
 
-__attribute__((visibility("hidden")))
 extern void lib_ring_buffer_release_read(struct lttng_ust_lib_ring_buffer *buf,
-					 struct lttng_ust_shm_handle *handle);
+					 struct lttng_ust_shm_handle *handle)
+	__attribute__((visibility("hidden")));
 
 /*
  * Initialize signals for ring buffer. Should be called early e.g. by
  * main() in the program to affect all threads.
  */
-__attribute__((visibility("hidden")))
-void lib_ringbuffer_signal_init(void);
+void lib_ringbuffer_signal_init(void)
+	__attribute__((visibility("hidden")));
 
 /*
  * Read sequence: snapshot, many get_subbuf/put_subbuf, move_consumer.
  */
-__attribute__((visibility("hidden")))
 extern int lib_ring_buffer_snapshot(struct lttng_ust_lib_ring_buffer *buf,
 				    unsigned long *consumed,
 				    unsigned long *produced,
-				    struct lttng_ust_shm_handle *handle);
+				    struct lttng_ust_shm_handle *handle)
+	__attribute__((visibility("hidden")));
 
-__attribute__((visibility("hidden")))
 extern int lib_ring_buffer_snapshot_sample_positions(
 				    struct lttng_ust_lib_ring_buffer *buf,
 				    unsigned long *consumed,
 				    unsigned long *produced,
-				    struct lttng_ust_shm_handle *handle);
+				    struct lttng_ust_shm_handle *handle)
+	__attribute__((visibility("hidden")));
 
-__attribute__((visibility("hidden")))
 extern void lib_ring_buffer_move_consumer(struct lttng_ust_lib_ring_buffer *buf,
 					  unsigned long consumed_new,
-					  struct lttng_ust_shm_handle *handle);
+					  struct lttng_ust_shm_handle *handle)
+	__attribute__((visibility("hidden")));
 
-__attribute__((visibility("hidden")))
 extern int lib_ring_buffer_get_subbuf(struct lttng_ust_lib_ring_buffer *buf,
 				      unsigned long consumed,
-				      struct lttng_ust_shm_handle *handle);
-__attribute__((visibility("hidden")))
+				      struct lttng_ust_shm_handle *handle)
+	__attribute__((visibility("hidden")));
+
 extern void lib_ring_buffer_put_subbuf(struct lttng_ust_lib_ring_buffer *buf,
-				       struct lttng_ust_shm_handle *handle);
+				       struct lttng_ust_shm_handle *handle)
+	__attribute__((visibility("hidden")));
 
 /*
  * lib_ring_buffer_get_next_subbuf/lib_ring_buffer_put_next_subbuf are helpers
@@ -176,7 +176,7 @@ static inline
 void lib_ring_buffer_put_next_subbuf(struct lttng_ust_lib_ring_buffer *buf,
 				     struct lttng_ust_shm_handle *handle)
 {
-	struct channel *chan;
+	struct lttng_ust_lib_ring_buffer_channel *chan;
 
 	chan = shmp(handle, buf->backend.chan);
 	if (!chan)
@@ -186,12 +186,12 @@ void lib_ring_buffer_put_next_subbuf(struct lttng_ust_lib_ring_buffer *buf,
 			handle);
 }
 
-__attribute__((visibility("hidden")))
-extern void channel_reset(struct channel *chan);
+extern void channel_reset(struct lttng_ust_lib_ring_buffer_channel *chan)
+	__attribute__((visibility("hidden")));
 
-__attribute__((visibility("hidden")))
 extern void lib_ring_buffer_reset(struct lttng_ust_lib_ring_buffer *buf,
-				  struct lttng_ust_shm_handle *handle);
+				  struct lttng_ust_shm_handle *handle)
+	__attribute__((visibility("hidden")));
 
 static inline
 unsigned long lib_ring_buffer_get_offset(const struct lttng_ust_lib_ring_buffer_config *config,
@@ -201,8 +201,9 @@ unsigned long lib_ring_buffer_get_offset(const struct lttng_ust_lib_ring_buffer_
 }
 
 static inline
-unsigned long lib_ring_buffer_get_consumed(const struct lttng_ust_lib_ring_buffer_config *config,
-					   struct lttng_ust_lib_ring_buffer *buf)
+unsigned long lib_ring_buffer_get_consumed(
+		const struct lttng_ust_lib_ring_buffer_config *config __attribute__((unused)),
+		struct lttng_ust_lib_ring_buffer *buf)
 {
 	return uatomic_read(&buf->consumed);
 }
@@ -212,8 +213,9 @@ unsigned long lib_ring_buffer_get_consumed(const struct lttng_ust_lib_ring_buffe
  * ordering enforced with respect to trace teardown).
  */
 static inline
-int lib_ring_buffer_is_finalized(const struct lttng_ust_lib_ring_buffer_config *config,
-				 struct lttng_ust_lib_ring_buffer *buf)
+int lib_ring_buffer_is_finalized(
+		const struct lttng_ust_lib_ring_buffer_config *config __attribute__((unused)),
+		 struct lttng_ust_lib_ring_buffer *buf)
 {
 	int finalized = CMM_ACCESS_ONCE(buf->finalized);
 	/*
@@ -224,13 +226,13 @@ int lib_ring_buffer_is_finalized(const struct lttng_ust_lib_ring_buffer_config *
 }
 
 static inline
-int lib_ring_buffer_channel_is_finalized(const struct channel *chan)
+int lib_ring_buffer_channel_is_finalized(const struct lttng_ust_lib_ring_buffer_channel *chan)
 {
 	return chan->finalized;
 }
 
 static inline
-int lib_ring_buffer_channel_is_disabled(const struct channel *chan)
+int lib_ring_buffer_channel_is_disabled(const struct lttng_ust_lib_ring_buffer_channel *chan)
 {
 	return uatomic_read(&chan->record_disabled);
 }