X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=libringbuffer%2Ffrontend.h;h=12e210050b1882ae1849a5571a3407c00b37420e;hb=6ba6fd60507f8e045bdc4f1be14e9d99c6a15f7f;hp=c337eecab27316eef3e8bb95fefeb71b81d8395a;hpb=b89c5899ef86060111a6814c13df2684dc352737;p=lttng-ust.git

diff --git a/libringbuffer/frontend.h b/libringbuffer/frontend.h
index c337eeca..12e21005 100644
--- a/libringbuffer/frontend.h
+++ b/libringbuffer/frontend.h
@@ -39,7 +39,6 @@
  * 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,
@@ -52,16 +51,17 @@ struct lttng_ust_shm_handle *channel_create(const struct lttng_ust_lib_ring_buff
 				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")))
 void channel_destroy(struct lttng_ust_lib_ring_buffer_channel *chan,
 		struct lttng_ust_shm_handle *handle,
-		int consumer);
+		int consumer)
+	__attribute__((visibility("hidden")));
 
 
 /* Buffer read operations */
@@ -75,84 +75,85 @@ void channel_destroy(struct lttng_ust_lib_ring_buffer_channel *chan,
 #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 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 lttng_ust_lib_ring_buffer_channel *chan,
-			struct lttng_ust_shm_handle *handle);
+			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 lttng_ust_lib_ring_buffer_channel *chan,
-			struct lttng_ust_shm_handle *handle);
+			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 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 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
@@ -185,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 lttng_ust_lib_ring_buffer_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,
@@ -200,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);
 }
@@ -211,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);
 	/*