X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=libringbuffer%2Fshm.h;h=64507463dadb8cc0fe1d2f9e7bc5d36a09546179;hb=5198080d2234eb06e95d245d0a9747810f496475;hp=ee8438587c06e7fcfcaab59f74111397b45531e6;hpb=071dec4386ff4c89d8b0f92ab1a8dbf079abd50c;p=lttng-ust.git

diff --git a/libringbuffer/shm.h b/libringbuffer/shm.h
index ee843858..64507463 100644
--- a/libringbuffer/shm.h
+++ b/libringbuffer/shm.h
@@ -13,24 +13,27 @@
 #include <usterr-signal-safe.h>
 #include <urcu/compiler.h>
 #include "shm_types.h"
-#include "ust-helper.h"
 
 /* channel_handle_create - for UST. */
-LTTNG_HIDDEN
+__attribute__((visibility("hidden")))
 extern
 struct lttng_ust_shm_handle *channel_handle_create(void *data,
 				uint64_t memory_map_size, int wakeup_fd);
+
 /* channel_handle_add_stream - for UST. */
-LTTNG_HIDDEN
+__attribute__((visibility("hidden")))
 extern
 int channel_handle_add_stream(struct lttng_ust_shm_handle *handle,
 		int shm_fd, int wakeup_fd, uint32_t stream_nr,
 		uint64_t memory_map_size);
-LTTNG_HIDDEN
+
+__attribute__((visibility("hidden")))
 unsigned int channel_handle_get_nr_streams(struct lttng_ust_shm_handle *handle);
-LTTNG_HIDDEN
+
+__attribute__((visibility("hidden")))
 extern
-void channel_destroy(struct channel *chan, struct lttng_ust_shm_handle *handle,
+void channel_destroy(struct lttng_ust_lib_ring_buffer_channel *chan,
+		struct lttng_ust_shm_handle *handle,
 		int consumer);
 
 /*
@@ -78,23 +81,27 @@ void _set_shmp(struct shm_ref *ref, struct shm_ref src)
 
 #define set_shmp(ref, src)	_set_shmp(&(ref)._ref, src)
 
-LTTNG_HIDDEN
+__attribute__((visibility("hidden")))
 struct shm_object_table *shm_object_table_create(size_t max_nb_obj);
-LTTNG_HIDDEN
+
+__attribute__((visibility("hidden")))
 struct shm_object *shm_object_table_alloc(struct shm_object_table *table,
 			size_t memory_map_size,
 			enum shm_object_type type,
 			const int stream_fd,
 			int cpu);
-LTTNG_HIDDEN
+
+__attribute__((visibility("hidden")))
 struct shm_object *shm_object_table_append_shm(struct shm_object_table *table,
 			int shm_fd, int wakeup_fd, uint32_t stream_nr,
 			size_t memory_map_size);
+
 /* mem ownership is passed to shm_object_table_append_mem(). */
-LTTNG_HIDDEN
+__attribute__((visibility("hidden")))
 struct shm_object *shm_object_table_append_mem(struct shm_object_table *table,
 			void *mem, size_t memory_map_size, int wakeup_fd);
-LTTNG_HIDDEN
+
+__attribute__((visibility("hidden")))
 void shm_object_table_destroy(struct shm_object_table *table, int consumer);
 
 /*
@@ -104,9 +111,10 @@ void shm_object_table_destroy(struct shm_object_table *table, int consumer);
  * *NOT* multithread-safe (should be protected by mutex).
  * Returns a -1, -1 tuple on error.
  */
-LTTNG_HIDDEN
+__attribute__((visibility("hidden")))
 struct shm_ref zalloc_shm(struct shm_object *obj, size_t len);
-LTTNG_HIDDEN
+
+__attribute__((visibility("hidden")))
 void align_shm(struct shm_object *obj, size_t align);
 
 static inline