Move compat macros in 'lttng/align.h' to a private header

[lttng-ust.git] / libcounter / shm.h

diff --git a/libcounter/shm.h b/libcounter/shm.h
index 2c6e0c7b15177d46685a87a5278323a97e69406b..b162e98f292f4eee98f3625b6451e145dca425fe 100644 (file)
--- a/libcounter/shm.h
+++ b/libcounter/shm.h
@@ -1,32 +1,19 @@
-#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 "ust-helper.h"
 
 /* lttng_counter_handle_create - for UST. */
 extern
@@ -37,6 +24,7 @@ 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
 unsigned int lttng_counter_handle_get_nr_cpus(struct lttng_counter_shm_handle *handle);
 
 /*
@@ -85,17 +73,22 @@ 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
 struct lttng_counter_shm_object_table *lttng_counter_shm_object_table_create(size_t max_nb_obj);
+LTTNG_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
 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
 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
 void lttng_counter_shm_object_table_destroy(struct lttng_counter_shm_object_table *table, int consumer);
 
 /*
@@ -105,7 +98,9 @@ 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
 struct lttng_counter_shm_ref lttng_counter_zalloc_shm(struct lttng_counter_shm_object *obj, size_t len);
+LTTNG_HIDDEN
 void lttng_counter_align_shm(struct lttng_counter_shm_object *obj, size_t align);
 
 static inline