X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=include%2Flttng%2Fust-tracer.h;h=3a771e9b135c48aec798a18082d1203779580ec9;hb=5f796aec4e514c556b20454a58c6ca9b4f3128a9;hp=410be46b0ca9831b760c15254909e02bd4eed68d;hpb=b6cd40337647f5a01c24b155c7808a856cd8c377;p=lttng-ust.git

diff --git a/include/lttng/ust-tracer.h b/include/lttng/ust-tracer.h
index 410be46b..3a771e9b 100644
--- a/include/lttng/ust-tracer.h
+++ b/include/lttng/ust-tracer.h
@@ -9,58 +9,24 @@
 #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>
 
+/*
+ * Default to having the content of the ringbuffer respect the natural
+ * alignment of the system. Only pack its content on architectures we know
+ * have efficient unaligned memory access.
+ */
 #ifndef LTTNG_UST_ARCH_HAS_EFFICIENT_UNALIGNED_ACCESS
-/* Align data on its natural alignment */
-#define RING_BUFFER_ALIGN
-#endif
-
-#ifndef CHAR_BIT
-#define CHAR_BIT 8
+#define LTTNG_UST_RING_BUFFER_NATURAL_ALIGN
 #endif
 
-#ifdef RING_BUFFER_ALIGN
+#ifdef LTTNG_UST_RING_BUFFER_NATURAL_ALIGN
 #define lttng_alignof(type)	__alignof__(type)
 #else
 #define lttng_alignof(type)	1
 #endif
 
-#define lttng_is_signed_type(type)           ((type) -1 < (type) 1)
-
-/*
- * This macro adds a compilation assertion that CTF arrays and sequences
- * declared by the users are of an integral type.
- */
-
-#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 */