Use 'ust-' prefix for all global private headers

Reduce the chances of a header filename clash by namespacing all the
global public header files with 'ust-'. Also, consistency makes me
happy.

Change-Id: I41a0b32885a5568ebf4c554893bde8a1ea5c3402
Signed-off-by: Michael Jeanson <mjeanson@efficios.com>
Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>

diff --git a/include/Makefile.am b/include/Makefile.am
index 4a9e6d39aafec8162caba3c7888ee065b67cd31f..c338205c9ec2518daa94d1a3c4dd7bd6ab7201ff 100644 (file)
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -53,7 +53,7 @@ nobase_nodist_include_HEADERS = \
 
 noinst_HEADERS = \
        usterr-signal-safe.h \
-       ust_snprintf.h \
+       ust-snprintf.h \
        ust-comm.h \
        ust-fd.h \
        ust-tid.h \
@@ -61,6 +61,6 @@ noinst_HEADERS = \
        ust-dlfcn.h \
        ust-dynamic-type.h \
        ust-context-provider.h \
-       helper.h \
-       share.h
+       ust-helper.h \
+       ust-share.h
 

diff --git a/include/helper.h b/include/helper.h
deleted file mode 100644 (file)
index e529ba0..0000000
--- a/include/helper.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * SPDX-License-Identifier: LGPL-2.1-only
- *
- * Copyright (C) 2011 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
- */
-
-#ifndef _LTTNG_UST_HELPER_H
-#define _LTTNG_UST_HELPER_H
-
-#include <stdlib.h>
-
-static inline __attribute__((always_inline))
-void *zmalloc(size_t len)
-{
-       return calloc(len, 1);
-}
-
-#define max_t(type, x, y)                              \
-       ({                                              \
-               type __max1 = (x);                      \
-               type __max2 = (y);                      \
-               __max1 > __max2 ? __max1: __max2;       \
-       })
-
-#define min_t(type, x, y)                              \
-       ({                                              \
-               type __min1 = (x);                      \
-               type __min2 = (y);                      \
-               __min1 <= __min2 ? __min1: __min2;      \
-       })
-
-#define LTTNG_ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]))
-
-/*
- * Use of __builtin_return_address(0) sometimes seems to cause stack
- * corruption on 32-bit PowerPC. Disable this feature on that
- * architecture for now by always using the NULL value for the ip
- * context.
- */
-#if defined(__PPC__) && !defined(__PPC64__)
-#define LTTNG_UST_CALLER_IP()          NULL
-#else /* #if defined(__PPC__) && !defined(__PPC64__) */
-#define LTTNG_UST_CALLER_IP()          __builtin_return_address(0)
-#endif /* #else #if defined(__PPC__) && !defined(__PPC64__) */
-
-/*
- * LTTNG_HIDDEN: set the hidden attribute for internal functions
- * On Windows, symbols are local unless explicitly exported,
- * see https://gcc.gnu.org/wiki/Visibility
- */
-#if defined(_WIN32) || defined(__CYGWIN__)
-#define LTTNG_HIDDEN
-#else
-#define LTTNG_HIDDEN __attribute__((visibility("hidden")))
-#endif
-
-#endif /* _LTTNG_UST_HELPER_H */

diff --git a/include/share.h b/include/share.h
deleted file mode 100644 (file)
index 28a4a05..0000000
--- a/include/share.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * SPDX-License-Identifier: MIT
- *
- * Copyright (C) 2011 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
- */
-
-#ifndef _LTTNG_SHARE_H
-#define _LTTNG_SHARE_H
-
-#include <stdlib.h>
-#include <sys/uio.h>
-
-#include "helper.h"
-
-/* Should be hidden but would break the ABI */
-ssize_t patient_write(int fd, const void *buf, size_t count);
-LTTNG_HIDDEN
-ssize_t patient_writev(int fd, struct iovec *iov, int iovcnt);
-/* Should be hidden but would break the ABI */
-ssize_t patient_send(int fd, const void *buf, size_t count, int flags);
-
-#endif /* _LTTNG_SHARE_H */

diff --git a/include/ust-comm.h b/include/ust-comm.h
index 410d3d68ed41f3e7af73a31afd9b73c571118afa..7d1871dc7fc11c7e6f000e964518578f2d933f6b 100644 (file)
--- a/include/ust-comm.h
+++ b/include/ust-comm.h
@@ -21,7 +21,7 @@
 #include <lttng/ust-error.h>
 #include <lttng/ust-compiler.h>
 #include <lttng/ust-ctl.h>
-#include "helper.h"
+#include "ust-helper.h"
 
 #ifndef LTTNG_PACKED
 #error "LTTNG_PACKED should be defined"

diff --git a/include/ust-helper.h b/include/ust-helper.h
new file mode 100644 (file)
index 0000000..e529ba0
--- /dev/null
+++ b/include/ust-helper.h
@@ -0,0 +1,57 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-only
+ *
+ * Copyright (C) 2011 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
+ */
+
+#ifndef _LTTNG_UST_HELPER_H
+#define _LTTNG_UST_HELPER_H
+
+#include <stdlib.h>
+
+static inline __attribute__((always_inline))
+void *zmalloc(size_t len)
+{
+       return calloc(len, 1);
+}
+
+#define max_t(type, x, y)                              \
+       ({                                              \
+               type __max1 = (x);                      \
+               type __max2 = (y);                      \
+               __max1 > __max2 ? __max1: __max2;       \
+       })
+
+#define min_t(type, x, y)                              \
+       ({                                              \
+               type __min1 = (x);                      \
+               type __min2 = (y);                      \
+               __min1 <= __min2 ? __min1: __min2;      \
+       })
+
+#define LTTNG_ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]))
+
+/*
+ * Use of __builtin_return_address(0) sometimes seems to cause stack
+ * corruption on 32-bit PowerPC. Disable this feature on that
+ * architecture for now by always using the NULL value for the ip
+ * context.
+ */
+#if defined(__PPC__) && !defined(__PPC64__)
+#define LTTNG_UST_CALLER_IP()          NULL
+#else /* #if defined(__PPC__) && !defined(__PPC64__) */
+#define LTTNG_UST_CALLER_IP()          __builtin_return_address(0)
+#endif /* #else #if defined(__PPC__) && !defined(__PPC64__) */
+
+/*
+ * LTTNG_HIDDEN: set the hidden attribute for internal functions
+ * On Windows, symbols are local unless explicitly exported,
+ * see https://gcc.gnu.org/wiki/Visibility
+ */
+#if defined(_WIN32) || defined(__CYGWIN__)
+#define LTTNG_HIDDEN
+#else
+#define LTTNG_HIDDEN __attribute__((visibility("hidden")))
+#endif
+
+#endif /* _LTTNG_UST_HELPER_H */

diff --git a/include/ust-share.h b/include/ust-share.h
new file mode 100644 (file)
index 0000000..cabb264
--- /dev/null
+++ b/include/ust-share.h
@@ -0,0 +1,22 @@
+/*
+ * SPDX-License-Identifier: MIT
+ *
+ * Copyright (C) 2011 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
+ */
+
+#ifndef _LTTNG_SHARE_H
+#define _LTTNG_SHARE_H
+
+#include <stdlib.h>
+#include <sys/uio.h>
+
+#include "ust-helper.h"
+
+/* Should be hidden but would break the ABI */
+ssize_t patient_write(int fd, const void *buf, size_t count);
+LTTNG_HIDDEN
+ssize_t patient_writev(int fd, struct iovec *iov, int iovcnt);
+/* Should be hidden but would break the ABI */
+ssize_t patient_send(int fd, const void *buf, size_t count, int flags);
+
+#endif /* _LTTNG_SHARE_H */

diff --git a/include/ust-snprintf.h b/include/ust-snprintf.h
new file mode 100644 (file)
index 0000000..37c2218
--- /dev/null
+++ b/include/ust-snprintf.h
@@ -0,0 +1,16 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ *
+ * Copyright (C) 2009 Pierre-Marc Fournier
+ */
+
+#ifndef UST_SNPRINTF
+#define UST_SNPRINTF
+
+#include <stdarg.h>
+#include <stddef.h>
+
+extern int ust_safe_vsnprintf(char *str, size_t n, const char *fmt, va_list ap);
+extern int ust_safe_snprintf(char *str, size_t n, const char *fmt, ...);
+
+#endif /* UST_SNPRINTF */

diff --git a/include/ust_snprintf.h b/include/ust_snprintf.h
deleted file mode 100644 (file)
index 37c2218..0000000
--- a/include/ust_snprintf.h
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
- * SPDX-License-Identifier: LGPL-2.1-or-later
- *
- * Copyright (C) 2009 Pierre-Marc Fournier
- */
-
-#ifndef UST_SNPRINTF
-#define UST_SNPRINTF
-
-#include <stdarg.h>
-#include <stddef.h>
-
-extern int ust_safe_vsnprintf(char *str, size_t n, const char *fmt, va_list ap);
-extern int ust_safe_snprintf(char *str, size_t n, const char *fmt, ...);
-
-#endif /* UST_SNPRINTF */

diff --git a/include/usterr-signal-safe.h b/include/usterr-signal-safe.h
index 478ad1f89bda55f1034bdc2133255c91d97bb3cf..c3050a422f66e0408a616237f1af9609e84c4710 100644 (file)
--- a/include/usterr-signal-safe.h
+++ b/include/usterr-signal-safe.h
@@ -13,7 +13,7 @@
 #include <errno.h>
 #include <stdarg.h>
 #include <stdio.h>
-#include <share.h>
+#include <ust-share.h>
 #include "ust-tid.h"
 
 enum ust_loglevel {

diff --git a/libcounter/counter.c b/libcounter/counter.c
index 91506faf084fcbdf253855f35ff34e50b0017924..ca25bda6c80c69f3e3cbc42b2bdaa8d2255c20a9 100644 (file)
--- a/libcounter/counter.c
+++ b/libcounter/counter.c
@@ -13,7 +13,7 @@
 #include <urcu/system.h>
 #include <urcu/compiler.h>
 #include <stdbool.h>
-#include <helper.h>
+#include <ust-helper.h>
 #include <lttng/align.h>
 #include "smp.h"
 #include "shm.h"

diff --git a/libcounter/counter.h b/libcounter/counter.h
index 88e113f9a42a02f5eb905e08d50bcf6f524d1951..6b5382f5fd1318d6dfa41d4ebc2ff37fa7353741 100644 (file)
--- a/libcounter/counter.h
+++ b/libcounter/counter.h
@@ -12,7 +12,7 @@
 #include <stdint.h>
 #include <lttng/ust-config.h>
 #include "counter-types.h"
-#include "helper.h"
+#include "ust-helper.h"
 
 /* max_nr_elem is for each dimension. */
 LTTNG_HIDDEN

diff --git a/libcounter/shm.c b/libcounter/shm.c
index efebbd0ebdc2ccd1e6e84520b078db66d1982b38..13a9f642d15e10600b67c2317cfff5a6dd48b547 100644 (file)
--- a/libcounter/shm.c
+++ b/libcounter/shm.c
@@ -25,7 +25,7 @@
 #include <numa.h>
 #include <numaif.h>
 #endif
-#include <helper.h>
+#include <ust-helper.h>
 #include <ust-fd.h>
 #include "../libringbuffer/mmap.h"
 

diff --git a/libcounter/shm.h b/libcounter/shm.h
index a57b746da83abdb17d7f138a465f59353d794f55..b162e98f292f4eee98f3625b6451e145dca425fe 100644 (file)
--- a/libcounter/shm.h
+++ b/libcounter/shm.h
@@ -13,7 +13,7 @@
 #include <usterr-signal-safe.h>
 #include <urcu/compiler.h>
 #include "shm_types.h"
-#include "helper.h"
+#include "ust-helper.h"
 
 /* lttng_counter_handle_create - for UST. */
 extern

diff --git a/libcounter/smp.h b/libcounter/smp.h
index 8bf8974d10aa5eb92610e52fdfff706a74390c84..6b3de2875a447d722cdcd5d9e4747dde85084766 100644 (file)
--- a/libcounter/smp.h
+++ b/libcounter/smp.h
@@ -7,7 +7,7 @@
 #ifndef _LIBCOUNTER_SMP_H
 #define _LIBCOUNTER_SMP_H
 
-#include "helper.h"
+#include "ust-helper.h"
 
 /*
  * 4kB of per-cpu data available.

diff --git a/liblttng-ust-comm/lttng-ust-comm.c b/liblttng-ust-comm/lttng-ust-comm.c
index 8a35d9f7a4a3d3512cde25a6588e67b404f39001..dd592082f26da2148015e0f72f3ea3d0a8c61d9d 100644 (file)
--- a/liblttng-ust-comm/lttng-ust-comm.c
+++ b/liblttng-ust-comm/lttng-ust-comm.c
@@ -22,7 +22,7 @@
 #include <lttng/ust-ctl.h>
 #include <ust-comm.h>
 #include <ust-fd.h>
-#include <helper.h>
+#include <ust-helper.h>
 #include <lttng/ust-error.h>
 #include <lttng/ust-events.h>
 #include <ust-dynamic-type.h>

diff --git a/liblttng-ust-comm/lttng-ust-fd-tracker.c b/liblttng-ust-comm/lttng-ust-fd-tracker.c
index 98990cd9755997f611f6c989ccabcb1828057865..c9b5fdc0250c72d3538fe6fc9d35b77c45ce3d31 100644 (file)
--- a/liblttng-ust-comm/lttng-ust-fd-tracker.c
+++ b/liblttng-ust-comm/lttng-ust-fd-tracker.c
@@ -26,7 +26,7 @@
 #include <urcu/system.h>
 
 #include <ust-fd.h>
-#include <helper.h>
+#include <ust-helper.h>
 #include <lttng/ust-error.h>
 #include <usterr-signal-safe.h>
 

diff --git a/liblttng-ust-ctl/ustctl.c b/liblttng-ust-ctl/ustctl.c
index cfe2cc960a8e52c580982c09815b8ac681204ac1..38076928fbc68164f760c8161a717ae5695538e2 100644 (file)
--- a/liblttng-ust-ctl/ustctl.c
+++ b/liblttng-ust-ctl/ustctl.c
@@ -19,7 +19,7 @@
 #include <lttng/ust-endian.h>
 #include <usterr-signal-safe.h>
 #include <ust-comm.h>
-#include <helper.h>
+#include <ust-helper.h>
 
 #include "../libringbuffer/backend.h"
 #include "../libringbuffer/frontend.h"

diff --git a/liblttng-ust-dl/lttng-ust-dl.c b/liblttng-ust-dl/lttng-ust-dl.c
index 2e4c3c01f9b6dcb0e88d573993a4add6c787baa3..6b7362aca2b74402c2baf3bab4071b2ed677ad5e 100644 (file)
--- a/liblttng-ust-dl/lttng-ust-dl.c
+++ b/liblttng-ust-dl/lttng-ust-dl.c
@@ -16,7 +16,7 @@
 #include <ust-dlfcn.h>
 #include <lttng/ust-elf.h>
 #include <lttng/ust-events.h>
-#include <helper.h>
+#include <ust-helper.h>
 #include "usterr-signal-safe.h"
 
 /* Include link.h last else it conflicts with ust-dlfcn. */

diff --git a/liblttng-ust-fd/lttng-ust-fd.c b/liblttng-ust-fd/lttng-ust-fd.c
index 02a6f33c48da383969b9cfa97bc63438498d3d6d..c60f3f0370bcf51b7d54edca395cf8493e052f47 100644 (file)
--- a/liblttng-ust-fd/lttng-ust-fd.c
+++ b/liblttng-ust-fd/lttng-ust-fd.c
@@ -12,7 +12,7 @@
 #include <ust-fd.h>
 #include <dlfcn.h>
 
-#include <helper.h>
+#include <ust-helper.h>
 #include "usterr-signal-safe.h"
 
 static int (*__lttng_ust_fd_plibc_close)(int fd);

diff --git a/liblttng-ust-java-agent/jni/common/lttng_ust_context.c b/liblttng-ust-java-agent/jni/common/lttng_ust_context.c
index 2a06a1b35bb31cfbf3eff02f0f95f44fa12503fe..bda3b6ee1fafdbc8f552f4cac70a8bf6cbb5ad0f 100644 (file)
--- a/liblttng-ust-java-agent/jni/common/lttng_ust_context.c
+++ b/liblttng-ust-java-agent/jni/common/lttng_ust_context.c
@@ -14,7 +14,7 @@
 #include <lttng/ringbuffer-config.h>
 #include <ust-context-provider.h>
 
-#include "helper.h"
+#include "ust-helper.h"
 #include "lttng_ust_context.h"
 
 enum lttng_ust_jni_type {

diff --git a/liblttng-ust-libc-wrapper/lttng-ust-malloc.c b/liblttng-ust-libc-wrapper/lttng-ust-malloc.c
index 0ad45445f2041e71985562726fcef5fbd809bb78..694eed172fdedc87fb713198cd0b56019f1ba3e5 100644 (file)
--- a/liblttng-ust-libc-wrapper/lttng-ust-malloc.c
+++ b/liblttng-ust-libc-wrapper/lttng-ust-malloc.c
@@ -20,7 +20,7 @@
 #include <urcu/tls-compat.h>
 #include <urcu/arch.h>
 #include <lttng/align.h>
-#include <helper.h>
+#include <ust-helper.h>
 
 #define TRACEPOINT_DEFINE
 #define TRACEPOINT_CREATE_PROBES

diff --git a/liblttng-ust-libc-wrapper/lttng-ust-pthread.c b/liblttng-ust-libc-wrapper/lttng-ust-pthread.c
index 56d0ea3b35ac6eb0babcc50a83c90dbca4079438..06bf791b20c2c66f6b3a6b95f3f11dbc99c53be0 100644 (file)
--- a/liblttng-ust-libc-wrapper/lttng-ust-pthread.c
+++ b/liblttng-ust-libc-wrapper/lttng-ust-pthread.c
@@ -10,7 +10,7 @@
  * libc.
  */
 #include <ust-dlfcn.h>
-#include <helper.h>
+#include <ust-helper.h>
 #include <pthread.h>
 
 #define TRACEPOINT_DEFINE

diff --git a/liblttng-ust/context-internal.h b/liblttng-ust/context-internal.h
index 1ec1b57ee7e73c9a8efcdedb7b223192823b6f29..3f1f42e8c8a11de65b49e8d216bcaa8ba4b6c5a3 100644 (file)
--- a/liblttng-ust/context-internal.h
+++ b/liblttng-ust/context-internal.h
@@ -8,7 +8,7 @@
 #define _LTTNG_UST_CONTEXT_INTERNAL_H
 
 #include <lttng/ust-events.h>
-#include "helper.h"
+#include "ust-helper.h"
 
 LTTNG_HIDDEN
 int lttng_context_init_all(struct lttng_ctx **ctx);

diff --git a/liblttng-ust/context-provider-internal.h b/liblttng-ust/context-provider-internal.h
index f688db5e122811066305d4ad0475df4b1f997a19..6834343f1ad411afee58a0f84c0fee750dd9efb6 100644 (file)
--- a/liblttng-ust/context-provider-internal.h
+++ b/liblttng-ust/context-provider-internal.h
@@ -9,7 +9,7 @@
 
 #include <stddef.h>
 #include <lttng/ust-events.h>
-#include "helper.h"
+#include "ust-helper.h"
 
 LTTNG_HIDDEN
 void lttng_ust_context_set_event_notifier_group_provider(const char *name,

diff --git a/liblttng-ust/event-notifier-notification.c b/liblttng-ust/event-notifier-notification.c
index 472479fd39817060136cda0b99590050f52bdf84..942f6136a96acbcc2ab32996dd60ba773ef67972 100644 (file)
--- a/liblttng-ust/event-notifier-notification.c
+++ b/liblttng-ust/event-notifier-notification.c
@@ -14,7 +14,7 @@
 
 #include "../libmsgpack/msgpack.h"
 #include "lttng-bytecode.h"
-#include "share.h"
+#include "ust-share.h"
 
 /*
  * We want this write to be atomic AND non-blocking, meaning that we

diff --git a/liblttng-ust/futex.h b/liblttng-ust/futex.h
index 8305c929b3ed9da7dae0fa7d8801e2ce09cb59ff..9560eaf1bb1aa5a030f626f07533d7892daae59e 100644 (file)
--- a/liblttng-ust/futex.h
+++ b/liblttng-ust/futex.h
@@ -14,7 +14,7 @@
 #include <time.h>
 #include <sys/syscall.h>
 
-#include "helper.h"
+#include "ust-helper.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/liblttng-ust/getenv.c b/liblttng-ust/getenv.c
index 169c3bdf337eaab07d5dbfcefe22b24441e4f844..f2222ddbf5ab13dcf4a780fe09473a825dc96f59 100644 (file)
--- a/liblttng-ust/getenv.c
+++ b/liblttng-ust/getenv.c
@@ -10,7 +10,7 @@
 #include <stddef.h>
 #include <sys/types.h>
 #include <usterr-signal-safe.h>
-#include <helper.h>
+#include <ust-helper.h>
 #include "getenv.h"
 
 enum lttng_env_secure {

diff --git a/liblttng-ust/lttng-bytecode.h b/liblttng-ust/lttng-bytecode.h
index bf1f2cac1d996003044e225dd0016352c9f8ba9b..c0e90c45bc5744ad99a3f7b5f4d4a76b81e956f4 100644 (file)
--- a/liblttng-ust/lttng-bytecode.h
+++ b/liblttng-ust/lttng-bytecode.h
@@ -12,7 +12,7 @@
 #include <errno.h>
 #include <stdio.h>
 #include <stdbool.h>
-#include <helper.h>
+#include <ust-helper.h>
 #include <lttng/ust-events.h>
 #include <ust-context-provider.h>
 #include <stdint.h>

diff --git a/liblttng-ust/lttng-context-perf-counters.c b/liblttng-ust/lttng-context-perf-counters.c
index 9d57a23345787b7199cca543ed26448e2a633ed7..c7dc2ecbe03cd10442af063ef3e4b77ebaeb8e52 100644 (file)
--- a/liblttng-ust/lttng-context-perf-counters.c
+++ b/liblttng-ust/lttng-context-perf-counters.c
@@ -23,7 +23,7 @@
 #include <urcu/system.h>
 #include <urcu/arch.h>
 #include <urcu/rculist.h>
-#include <helper.h>
+#include <ust-helper.h>
 #include <urcu/ref.h>
 #include <usterr-signal-safe.h>
 #include <signal.h>

diff --git a/liblttng-ust/lttng-context-provider.c b/liblttng-ust/lttng-context-provider.c
index 9af001b57284d0b7e45ff1fd00f6a94efd74fa08..b3fc21defd48bedecf3d60859c0c0a24675cf07f 100644 (file)
--- a/liblttng-ust/lttng-context-provider.c
+++ b/liblttng-ust/lttng-context-provider.c
@@ -17,7 +17,7 @@
 #include "lttng-tracer-core.h"
 #include "jhash.h"
 #include "context-provider-internal.h"
-#include <helper.h>
+#include <ust-helper.h>
 
 #define CONTEXT_PROVIDER_HT_BITS       12
 #define CONTEXT_PROVIDER_HT_SIZE       (1U << CONTEXT_PROVIDER_HT_BITS)

diff --git a/liblttng-ust/lttng-context.c b/liblttng-ust/lttng-context.c
index 19f392f1c8edba97c6bf58671187c2c144c758c3..59bc082b6e353e43b7152bc2e2f245fb3d77d269 100644 (file)
--- a/liblttng-ust/lttng-context.c
+++ b/liblttng-ust/lttng-context.c
@@ -12,7 +12,7 @@
 #include <ust-context-provider.h>
 #include <lttng/urcu/pointer.h>
 #include <usterr-signal-safe.h>
-#include <helper.h>
+#include <ust-helper.h>
 #include <stddef.h>
 #include <string.h>
 #include <assert.h>

diff --git a/liblttng-ust/lttng-events.c b/liblttng-ust/lttng-events.c
index 47460102ef8813de503d1feeb0cf4b793547b8d8..72d25bb47ea3e3a05807f7e5cbc94b2ad0e5b482 100644 (file)
--- a/liblttng-ust/lttng-events.c
+++ b/liblttng-ust/lttng-events.c
@@ -33,7 +33,7 @@
 #include <lttng/ust-events.h>
 
 #include <usterr-signal-safe.h>
-#include <helper.h>
+#include <ust-helper.h>
 #include <lttng/ust-ctl.h>
 #include <ust-comm.h>
 #include <ust-fd.h>

diff --git a/liblttng-ust/lttng-probes.c b/liblttng-ust/lttng-probes.c
index e7dab9fce49c2603392a9362311aff3a88ee39d3..2306e1e63f48b30c30065c865fa1fc7e2a24db19 100644 (file)
--- a/liblttng-ust/lttng-probes.c
+++ b/liblttng-ust/lttng-probes.c
@@ -15,7 +15,7 @@
 #include <lttng/tracepoint.h>
 #include "tracepoint-internal.h"
 #include <assert.h>
-#include <helper.h>
+#include <ust-helper.h>
 #include <ctype.h>
 
 #include "lttng-tracer-core.h"

diff --git a/liblttng-ust/lttng-tracer-core.h b/liblttng-ust/lttng-tracer-core.h
index efb4f5b6764b4f5ec49b92136da838fe306ada6a..9042a3036ac890c6b733ca6ecf7ca0d6048dca7a 100644 (file)
--- a/liblttng-ust/lttng-tracer-core.h
+++ b/liblttng-ust/lttng-tracer-core.h
@@ -16,7 +16,7 @@
 #include <lttng/bug.h>
 #include <lttng/ringbuffer-config.h>
 #include <usterr-signal-safe.h>
-#include <helper.h>
+#include <ust-helper.h>
 
 /*
  * The longuest possible namespace proc path is with the cgroup ns

diff --git a/liblttng-ust/lttng-ust-abi.c b/liblttng-ust/lttng-ust-abi.c
index 8fd2e95806e792c6a4e501de3931940cf57e8494..a367168ac6f96e92a41a88ef45199516d2503783 100644 (file)
--- a/liblttng-ust/lttng-ust-abi.c
+++ b/liblttng-ust/lttng-ust-abi.c
@@ -30,7 +30,7 @@
 #include <urcu/compiler.h>
 #include <urcu/list.h>
 
-#include <helper.h>
+#include <ust-helper.h>
 #include <lttng/tracepoint.h>
 #include <lttng/ust-abi.h>
 #include <lttng/ust-error.h>

diff --git a/liblttng-ust/lttng-ust-comm.c b/liblttng-ust/lttng-ust-comm.c
index af8636a812eb438c34c48deb1e4349ca9dd17fc1..891eb16eef2ec71eb81cbf7d0c108a8d04d0f0be 100644 (file)
--- a/liblttng-ust/lttng-ust-comm.c
+++ b/liblttng-ust/lttng-ust-comm.c
@@ -39,7 +39,7 @@
 #include <ust-comm.h>
 #include <ust-fd.h>
 #include <usterr-signal-safe.h>
-#include <helper.h>
+#include <ust-helper.h>
 #include "tracepoint-internal.h"
 #include "lttng-tracer-core.h"
 #include "compat.h"

diff --git a/liblttng-ust/lttng-ust-dynamic-type.c b/liblttng-ust/lttng-ust-dynamic-type.c
index 3c1314c433715c005dbdfb2e2fa7ad4e80f517c1..6913ca4b1d1877a82844abaa70eeb46acb60a7ba 100644 (file)
--- a/liblttng-ust/lttng-ust-dynamic-type.c
+++ b/liblttng-ust/lttng-ust-dynamic-type.c
@@ -12,7 +12,7 @@
 #include <stddef.h>
 #include <inttypes.h>
 
-#include <helper.h>
+#include <ust-helper.h>
 #include <ust-dynamic-type.h>
 
 #define ctf_enum_value(_string, _value)                                        \

diff --git a/liblttng-ust/lttng-ust-elf.c b/liblttng-ust/lttng-ust-elf.c
index 52078d9629f34df177e88857ccd82690a6fb6c4e..b22b4b63087aee739a00ccad7ad59c570403a307 100644 (file)
--- a/liblttng-ust/lttng-ust-elf.c
+++ b/liblttng-ust/lttng-ust-elf.c
@@ -6,7 +6,7 @@
 
 #define _LGPL_SOURCE
 #include <fcntl.h>
-#include <helper.h>
+#include <ust-helper.h>
 #include <lttng/align.h>
 #include <lttng/ust-elf.h>
 #include <stdbool.h>

diff --git a/liblttng-ust/lttng-ust-statedump.c b/liblttng-ust/lttng-ust-statedump.c
index 4387cab4931ad8221b59d6d99df63eaff2904f7b..9d48e59ba24fadaede0774aa3fb130d1286aaa98 100644 (file)
--- a/liblttng-ust/lttng-ust-statedump.c
+++ b/liblttng-ust/lttng-ust-statedump.c
@@ -17,7 +17,7 @@
 #include <unistd.h>
 
 #include <lttng/ust-elf.h>
-#include <helper.h>
+#include <ust-helper.h>
 #include "lttng-tracer-core.h"
 #include "lttng-ust-statedump.h"
 #include "jhash.h"

diff --git a/liblttng-ust/rculfhash-internal.h b/liblttng-ust/rculfhash-internal.h
index 667dd611d7247b630aa47a290c11ee92a753a375..39b20ed55f419c9e22648cb7671f6c8970ebe7a4 100644 (file)
--- a/liblttng-ust/rculfhash-internal.h
+++ b/liblttng-ust/rculfhash-internal.h
@@ -14,7 +14,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <assert.h>
-#include "helper.h"
+#include "ust-helper.h"
 
 #ifdef DEBUG
 #define dbg_printf(fmt, args...)     printf("[debug lttng-ust rculfhash] " fmt, ## args)

diff --git a/liblttng-ust/rculfhash.h b/liblttng-ust/rculfhash.h
index be1544982c96153a80189c48235557ef4094a970..39f8e5a3442545b98cafac4d910f5d42d5415e65 100644 (file)
--- a/liblttng-ust/rculfhash.h
+++ b/liblttng-ust/rculfhash.h
@@ -13,7 +13,7 @@
 #include <stdint.h>
 #include <pthread.h>
 #include <urcu/compiler.h>
-#include "helper.h"
+#include "ust-helper.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/liblttng-ust/tracef.c b/liblttng-ust/tracef.c
index 9d922dee7262ec2d04b9b6ecbaeb8e4beb99bcc3..54fb735ab66b92196835f87efb8f46b2539f6e2a 100644 (file)
--- a/liblttng-ust/tracef.c
+++ b/liblttng-ust/tracef.c
@@ -6,7 +6,7 @@
 
 #define _LGPL_SOURCE
 #include <stdio.h>
-#include <helper.h>
+#include <ust-helper.h>
 
 #define TRACEPOINT_CREATE_PROBES
 #define TRACEPOINT_DEFINE

diff --git a/liblttng-ust/tracelog.c b/liblttng-ust/tracelog.c
index 3d48b1eddd1306f918b3f0bb4f78c1ba6306caca..5dc2ffc5e16b21e4acb48ede4a2c75ab5fee61a9 100644 (file)
--- a/liblttng-ust/tracelog.c
+++ b/liblttng-ust/tracelog.c
@@ -6,7 +6,7 @@
 
 #define _LGPL_SOURCE
 #include <stdio.h>
-#include <helper.h>
+#include <ust-helper.h>
 
 #define TRACEPOINT_CREATE_PROBES
 #define TRACEPOINT_DEFINE

diff --git a/liblttng-ust/tracepoint.c b/liblttng-ust/tracepoint.c
index f65097f6aaa92cc640eab93751847d32abf9556d..089232e1030d2cc4b05f3247a19bbf2576937610 100644 (file)
--- a/liblttng-ust/tracepoint.c
+++ b/liblttng-ust/tracepoint.c
@@ -24,7 +24,7 @@
 #include <lttng/ust-abi.h>     /* for LTTNG_UST_SYM_NAME_LEN */
 
 #include <usterr-signal-safe.h>
-#include <helper.h>
+#include <ust-helper.h>
 
 #include "tracepoint-internal.h"
 #include "lttng-tracer-core.h"

diff --git a/liblttng-ust/ust-events-internal.h b/liblttng-ust/ust-events-internal.h
index 807f14f88842933dfb64ac3d3198d092a779b590..bd30e00a258b48b4901d80463ab8fb44a9164d36 100644 (file)
--- a/liblttng-ust/ust-events-internal.h
+++ b/liblttng-ust/ust-events-internal.h
@@ -12,7 +12,7 @@
 #include <urcu/list.h>
 #include <urcu/hlist.h>
 
-#include <helper.h>
+#include <ust-helper.h>
 #include <lttng/ust-events.h>
 
 struct lttng_event_enabler {

diff --git a/libmsgpack/msgpack.h b/libmsgpack/msgpack.h
index ea8a82ee7d3dbbc1fa4610e5f91519b773d82e23..04606306619bdbf878a7511d2587fb4299eee060 100644 (file)
--- a/libmsgpack/msgpack.h
+++ b/libmsgpack/msgpack.h
@@ -12,7 +12,7 @@
 #include <linux/types.h>
 #else /* __KERNEL__ */
 #include <stdint.h>
-#include "helper.h"
+#include "ust-helper.h"
 #endif /* __KERNEL__ */
 
 struct lttng_msgpack_writer {

diff --git a/libringbuffer/ring_buffer_frontend.c b/libringbuffer/ring_buffer_frontend.c
index 90459f006491e2e63512f6d1af3e407f6fca4ba5..736c598ae0cd1a3794d263665b7aa36d5a5954b7 100644 (file)
--- a/libringbuffer/ring_buffer_frontend.c
+++ b/libringbuffer/ring_buffer_frontend.c
@@ -50,7 +50,7 @@
 #include <urcu/ref.h>
 #include <urcu/tls-compat.h>
 #include <poll.h>
-#include <helper.h>
+#include <ust-helper.h>
 
 #include "smp.h"
 #include <lttng/ringbuffer-config.h>

diff --git a/libringbuffer/shm.c b/libringbuffer/shm.c
index 3dbb9f4928a6d81b43c01fc1dbd4dbd3620ebf0c..580504681acc649ef013610cbe26b16967bfc068 100644 (file)
--- a/libringbuffer/shm.c
+++ b/libringbuffer/shm.c
@@ -24,7 +24,7 @@
 #include <numa.h>
 #include <numaif.h>
 #endif
-#include <helper.h>
+#include <ust-helper.h>
 #include <ust-fd.h>
 #include "mmap.h"
 

diff --git a/snprintf/patient_write.c b/snprintf/patient_write.c
index 4f344ec97d1af588e877142f02822abbb40f9588..2ec00cd9ecffbf9eaff4880cedd8e8652d2f743e 100644 (file)
--- a/snprintf/patient_write.c
+++ b/snprintf/patient_write.c
@@ -19,7 +19,7 @@
 
 #include <errno.h>
 
-#include <share.h>
+#include <ust-share.h>
 
 /*
  * This write is patient because it restarts if it was incomplete.

diff --git a/snprintf/snprintf.c b/snprintf/snprintf.c
index 200120882a59bdbb9586c83f6c204637606fe3f3..7e37a5e5886d449776b095d913a014f63f6a0b9d 100644 (file)
--- a/snprintf/snprintf.c
+++ b/snprintf/snprintf.c
@@ -15,7 +15,7 @@
 #include <string.h>
 #include <stdarg.h>
 #include "local.h"
-#include "ust_snprintf.h"
+#include "ust-snprintf.h"
 
 #define DUMMY_LEN      1
 

diff --git a/tests/unit/snprintf/snprintf.c b/tests/unit/snprintf/snprintf.c
index ad73934245aa039246c1830f7115fc40e4fd8f40..a2fbdc96ddfbec202ad414e9748665ab712d535a 100644 (file)
--- a/tests/unit/snprintf/snprintf.c
+++ b/tests/unit/snprintf/snprintf.c
@@ -6,7 +6,7 @@
 
 #include <stdio.h>
 #include <string.h>
-#include "ust_snprintf.h"
+#include "ust-snprintf.h"
 
 #include "tap.h"