X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=libcounter%2Fshm.h;h=7be88605d6d0a7c8e1b4a6261f86747fec74cd1b;hb=31624f6cf986d7e7761847f66562c97bc773a02c;hp=265e6973a456c98bb92effed13913948f2fad840;hpb=3b098ac1f1db6ee1466c1f8ffbe2576e5604fb35;p=lttng-ust.git

diff --git a/libcounter/shm.h b/libcounter/shm.h
index 265e6973..7be88605 100644
--- a/libcounter/shm.h
+++ b/libcounter/shm.h
@@ -1,33 +1,18 @@
-#ifndef _LIBCOUNTER_SHM_H
-#define _LIBCOUNTER_SHM_H
-
 /*
- * libcounter/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 _LIBCOUNTER_SHM_H
+#define _LIBCOUNTER_SHM_H
+
 #include <stddef.h>
 #include <stdint.h>
 #include <unistd.h>
 #include <usterr-signal-safe.h>
 #include <urcu/compiler.h>
 #include "shm_types.h"
-#include "helper.h"
 
 /* lttng_counter_handle_create - for UST. */
 extern
@@ -38,7 +23,8 @@ extern
 int lttng_counter_handle_add_cpu(struct lttng_counter_shm_handle *handle,
 		int shm_fd, uint32_t cpu_nr,
 		uint64_t memory_map_size);
-LTTNG_HIDDEN
+
+__attribute__((visibility("hidden")))
 unsigned int lttng_counter_handle_get_nr_cpus(struct lttng_counter_shm_handle *handle);
 
 /*
@@ -87,22 +73,26 @@ void _lttng_counter_set_shmp(struct lttng_counter_shm_ref *ref, struct lttng_cou
 
 #define lttng_counter_set_shmp(ref, src)	_lttng_counter_set_shmp(&(ref)._ref, src)
 
-LTTNG_HIDDEN
+__attribute__((visibility("hidden")))
 struct lttng_counter_shm_object_table *lttng_counter_shm_object_table_create(size_t max_nb_obj);
-LTTNG_HIDDEN
+
+__attribute__((visibility("hidden")))
 struct lttng_counter_shm_object *lttng_counter_shm_object_table_alloc(struct lttng_counter_shm_object_table *table,
 			size_t memory_map_size,
 			enum lttng_counter_shm_object_type type,
 			const int cpu_fd,
 			int cpu);
-LTTNG_HIDDEN
+
+__attribute__((visibility("hidden")))
 struct lttng_counter_shm_object *lttng_counter_shm_object_table_append_shm(struct lttng_counter_shm_object_table *table,
 			int shm_fd, size_t memory_map_size);
+
 /* mem ownership is passed to lttng_counter_shm_object_table_append_mem(). */
-LTTNG_HIDDEN
+__attribute__((visibility("hidden")))
 struct lttng_counter_shm_object *lttng_counter_shm_object_table_append_mem(struct lttng_counter_shm_object_table *table,
 			void *mem, size_t memory_map_size);
-LTTNG_HIDDEN
+
+__attribute__((visibility("hidden")))
 void lttng_counter_shm_object_table_destroy(struct lttng_counter_shm_object_table *table, int consumer);
 
 /*
@@ -112,9 +102,10 @@ void lttng_counter_shm_object_table_destroy(struct lttng_counter_shm_object_tabl
  * *NOT* multithread-safe (should be protected by mutex).
  * Returns a -1, -1 tuple on error.
  */
-LTTNG_HIDDEN
+__attribute__((visibility("hidden")))
 struct lttng_counter_shm_ref lttng_counter_zalloc_shm(struct lttng_counter_shm_object *obj, size_t len);
-LTTNG_HIDDEN
+
+__attribute__((visibility("hidden")))
 void lttng_counter_align_shm(struct lttng_counter_shm_object *obj, size_t align);
 
 static inline