#ifndef _LTTNG_UST_TRACER_H
#define _LTTNG_UST_TRACER_H
-#include <limits.h>
-
-#if defined (__cplusplus)
-#include <type_traits>
-#endif
-
+#include <lttng/ust-arch.h>
#include <lttng/ust-compiler.h>
-#include <lttng/ust-config.h>
+#include <lttng/ust-utils.h>
#include <lttng/ust-version.h>
-#ifndef LTTNG_UST_HAVE_EFFICIENT_UNALIGNED_ACCESS
-/* Align data on its natural alignment */
-#define RING_BUFFER_ALIGN
-#endif
-
-#ifndef CHAR_BIT
-#define CHAR_BIT 8
+/*
+ * On architectures without efficient unaligned accesses, the layout of
+ * the ringbuffer's content respects the natural alignment of the
+ * system. Only pack its content on architectures we know have efficient
+ * unaligned memory access.
+ *
+ * Whether to pack the ring buffer contents or not is part of the ABI
+ * between the probe providers and the tracer, and is selected by the
+ * lttng/ust-arch.h header.
+ */
+#ifndef LTTNG_UST_ARCH_HAS_EFFICIENT_UNALIGNED_ACCESS
+#define LTTNG_UST_RING_BUFFER_NATURAL_ALIGN
#endif
-#ifdef RING_BUFFER_ALIGN
-#define lttng_alignof(type) __alignof__(type)
+#ifdef LTTNG_UST_RING_BUFFER_NATURAL_ALIGN
+#define lttng_ust_rb_alignof(type) __alignof__(type)
#else
-#define lttng_alignof(type) 1
+#define lttng_ust_rb_alignof(type) 1
#endif
-#define lttng_is_signed_type(type) ((type) -1 < (type) 0)
-
/*
- * This macro adds a compilation assertion that CTF arrays and sequences
- * declared by the users are of an integral type.
+ * Concatenate lttng ust shared libraries name with their major version number.
*/
+#define LTTNG_UST_LIB_SONAME "liblttng-ust.so." lttng_ust_stringify(LTTNG_UST_LIB_SONAME_MAJOR)
+#define LTTNG_UST_TRACEPOINT_LIB_SONAME "liblttng-ust-tracepoint.so." lttng_ust_stringify(LTTNG_UST_LIB_SONAME_MAJOR)
+#define LTTNG_UST_CTL_LIB_SONAME "liblttng-ust-ctl.so." lttng_ust_stringify(LTTNG_UST_CTL_LIB_SONAME_MAJOR)
-#if defined(__cplusplus)
-#define _lttng_is_integer(type) (std::is_integral<type>::value)
-#else
-#define _lttng_is_integer(type) (__builtin_types_compatible_p(type, _Bool) || \
- __builtin_types_compatible_p(type, char) || \
- __builtin_types_compatible_p(type, unsigned char) || \
- __builtin_types_compatible_p(type, short) || \
- __builtin_types_compatible_p(type, unsigned short) || \
- __builtin_types_compatible_p(type, int) || \
- __builtin_types_compatible_p(type, unsigned int) || \
- __builtin_types_compatible_p(type, long) || \
- __builtin_types_compatible_p(type, unsigned long) || \
- __builtin_types_compatible_p(type, long long) || \
- __builtin_types_compatible_p(type, unsigned long long))
-#endif
-
-#define _lttng_array_element_type_is_supported(_type, _item) \
- lttng_static_assert(_lttng_is_integer(_type), \
- "Non-integer type `" #_item "` not supported as element of CTF_ARRAY or CTF_SEQUENCE", \
- Non_integer_type__##_item##__not_supported_as_element_of_CTF_ARRAY_or_CTF_SEQUENCE);
#endif /* _LTTNG_UST_TRACER_H */