X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=libringbuffer%2Fshm.h;h=dab0b68d561b9ce1a05df0bc421f5ebb9a20e144;hb=4041a8a71441f133654c4ca2a187748e08f03b22;hp=a6b9ed8aeeca2c23cdb8538281f78ffe89c5447f;hpb=5ea386c3b8e3566ec0b6710c82aae433de4d944a;p=lttng-ust.git

diff --git a/libringbuffer/shm.h b/libringbuffer/shm.h
index a6b9ed8a..dab0b68d 100644
--- a/libringbuffer/shm.h
+++ b/libringbuffer/shm.h
@@ -1,43 +1,39 @@
-#ifndef _LIBRINGBUFFER_SHM_H
-#define _LIBRINGBUFFER_SHM_H
-
 /*
- * libringbuffer/shm.h
+ * SPDX-License-Identifier: LGPL-2.1-only
  *
  * Copyright (C) 2011-2012 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; only
- * version 2.1 of the License.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#ifndef _LIBRINGBUFFER_SHM_H
+#define _LIBRINGBUFFER_SHM_H
+
+#include <stddef.h>
 #include <stdint.h>
+#include <unistd.h>
 #include <usterr-signal-safe.h>
 #include <urcu/compiler.h>
 #include "shm_types.h"
 
 /* channel_handle_create - for UST. */
+__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. */
+__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);
+
+__attribute__((visibility("hidden")))
 unsigned int channel_handle_get_nr_streams(struct lttng_ust_shm_handle *handle);
+
+__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);
 
 /*
@@ -68,12 +64,8 @@ char *_shmp_offset(struct shm_object_table *table, struct shm_ref *ref,
 	return &obj->memory_map[ref_offset];
 }
 
-#define shmp_index(handle, ref, index)					\
-	({								\
-		__typeof__((ref)._type) ____ptr_ret;			\
-		____ptr_ret = (__typeof__(____ptr_ret)) _shmp_offset((handle)->table, &(ref)._ref, index, sizeof(*____ptr_ret));	\
-		____ptr_ret;						\
-	})
+#define shmp_index(handle, ref, index)	\
+	((__typeof__((ref)._type)) _shmp_offset((handle)->table, &(ref)._ref, index, sizeof(*((ref)._type))))
 
 #define shmp(handle, ref)	shmp_index(handle, ref, 0)
 
@@ -85,18 +77,28 @@ void _set_shmp(struct shm_ref *ref, struct shm_ref src)
 
 #define set_shmp(ref, src)	_set_shmp(&(ref)._ref, src)
 
+__attribute__((visibility("hidden")))
 struct shm_object_table *shm_object_table_create(size_t max_nb_obj);
+
+__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);
+			const int stream_fd,
+			int cpu);
+
+__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(). */
+__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);
-void shm_object_table_destroy(struct shm_object_table *table);
+
+__attribute__((visibility("hidden")))
+void shm_object_table_destroy(struct shm_object_table *table, int consumer);
 
 /*
  * zalloc_shm - allocate memory within a shm object.
@@ -105,7 +107,10 @@ void shm_object_table_destroy(struct shm_object_table *table);
  * *NOT* multithread-safe (should be protected by mutex).
  * Returns a -1, -1 tuple on error.
  */
+__attribute__((visibility("hidden")))
 struct shm_ref zalloc_shm(struct shm_object *obj, size_t len);
+
+__attribute__((visibility("hidden")))
 void align_shm(struct shm_object *obj, size_t align);
 
 static inline