lttng/ust.h \
lttng/ust-endian.h \
lttng/ringbuffer-context.h \
- lttng/ust-align.h \
- lttng/ust-bug.h \
+ lttng/ust-utils.h \
lttng/ust-error.h \
lttng/tracef.h \
lttng/tp/lttng-ust-tracef.h \
#include <string.h>
#include <lttng/ust-tracer.h>
-#include <lttng/ust-align.h>
+#include <lttng/ust-utils.h>
#include <lttng/ust-compiler.h>
struct lttng_ust_lib_ring_buffer;
#include <stdint.h>
#include <lttng/ust-compiler.h>
-#ifndef __ust_stringify
-#define __ust_stringify1(x) #x
-#define __ust_stringify(x) __ust_stringify1(x)
-#endif /* __ust_stringify */
-
#define LTTNG_UST_ABI_SYM_NAME_LEN 256
#define LTTNG_UST_ABI_PROCNAME_LEN 16
+++ /dev/null
-/*
- * SPDX-License-Identifier: MIT
- *
- * Copyright (C) 2010-2011 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
- */
-
-#ifndef _LTTNG_UST_ALIGN_H
-#define _LTTNG_UST_ALIGN_H
-
-#include <lttng/ust-bug.h>
-
-/**
- * lttng_ust_offset_align - Calculate the offset needed to align an object on
- * its natural alignment towards higher addresses.
- * @align_drift: object offset from an "alignment"-aligned address.
- * @alignment: natural object alignment. Must be non-zero, power of 2.
- *
- * Returns the offset that must be added to align towards higher
- * addresses.
- */
-#define lttng_ust_offset_align(align_drift, alignment) \
- ({ \
- LTTNG_BUILD_RUNTIME_BUG_ON((alignment) == 0 \
- || ((alignment) & ((alignment) - 1))); \
- (((alignment) - (align_drift)) & ((alignment) - 1)); \
- })
-
-/**
- * lttng_ust_offset_align_floor - Calculate the offset needed to align an
- * object on its natural alignment towards lower addresses.
- * @align_drift: object offset from an "alignment"-aligned address.
- * @alignment: natural object alignment. Must be non-zero, power of 2.
- *
- * Returns the offset that must be substracted to align towards lower addresses.
- */
-#define lttng_ust_offset_align_floor(align_drift, alignment) \
- ({ \
- LTTNG_BUILD_RUNTIME_BUG_ON((alignment) == 0 \
- || ((alignment) & ((alignment) - 1))); \
- (((align_drift) - (alignment)) & ((alignment) - 1)); \
- })
-
-#endif /* _LTTNG_UST_ALIGN_H */
+++ /dev/null
-/*
- * SPDX-License-Identifier: MIT
- *
- * Copyright (C) 2010-2011 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
- */
-
-#ifndef _LTTNG_UST_BUG_H
-#define _LTTNG_UST_BUG_H
-
-#include <urcu/compiler.h>
-#include <stdio.h>
-#include <stdlib.h>
-
-#define LTTNG_BUG_ON(condition) \
- do { \
- if (caa_unlikely(condition)) { \
- fprintf(stderr, \
- "LTTng BUG in file %s, line %d.\n", \
- __FILE__, __LINE__); \
- exit(EXIT_FAILURE); \
- } \
- } while (0)
-
-#define LTTNG_BUILD_BUG_ON(condition) \
- ((void) sizeof(char[-!!(condition)]))
-
-/**
- * LTTNG_BUILD_RUNTIME_BUG_ON - check condition at build (if constant) or runtime
- * @condition: the condition which should be false.
- *
- * If the condition is a constant and true, the compiler will generate a build
- * error. If the condition is not constant, a BUG will be triggered at runtime
- * if the condition is ever true. If the condition is constant and false, no
- * code is emitted.
- */
-#define LTTNG_BUILD_RUNTIME_BUG_ON(condition) \
- do { \
- if (__builtin_constant_p(condition)) \
- LTTNG_BUILD_BUG_ON(condition); \
- else \
- LTTNG_BUG_ON(condition); \
- } while (0)
-
-#endif
#include <sys/types.h>
#include <lttng/ust-abi.h>
+#include <lttng/ust-utils.h>
#ifndef LTTNG_UST_UUID_LEN
#define LTTNG_UST_UUID_LEN 16
/* Default unix socket path */
#define LTTNG_UST_SOCK_FILENAME \
"lttng-ust-sock-" \
- __ust_stringify(LTTNG_UST_ABI_MAJOR_VERSION)
+ lttng_ust_stringify(LTTNG_UST_ABI_MAJOR_VERSION)
/*
* Shared memory files path are automatically related to shm root, e.g.
*/
#define LTTNG_UST_WAIT_FILENAME \
"lttng-ust-wait-" \
- __ust_stringify(LTTNG_UST_ABI_MAJOR_VERSION)
+ lttng_ust_stringify(LTTNG_UST_ABI_MAJOR_VERSION)
struct lttng_ust_lib_ring_buffer;
.struct_size = sizeof(struct lttng_ust_type_integer), \
.size = sizeof(_type) * CHAR_BIT, \
.alignment = lttng_alignof(_type) * CHAR_BIT, \
- .signedness = lttng_is_signed_type(_type), \
+ .signedness = lttng_ust_is_signed_type(_type), \
.reverse_byte_order = _byte_order != BYTE_ORDER, \
.base = _base, \
}))
__LTTNG_COMPOUND_LITERAL(struct lttng_ust_enum_entry, { \
.struct_size = sizeof(struct lttng_ust_enum_entry), \
.start = { \
- .value = lttng_is_signed_type(__typeof__(_value)) ? \
+ .value = lttng_ust_is_signed_type(__typeof__(_value)) ? \
(long long) (_value) : (_value), \
- .signedness = lttng_is_signed_type(__typeof__(_value)), \
+ .signedness = lttng_ust_is_signed_type(__typeof__(_value)), \
}, \
.end = { \
- .value = lttng_is_signed_type(__typeof__(_value)) ? \
+ .value = lttng_ust_is_signed_type(__typeof__(_value)) ? \
(long long) (_value) : (_value), \
- .signedness = lttng_is_signed_type(__typeof__(_value)), \
+ .signedness = lttng_ust_is_signed_type(__typeof__(_value)), \
}, \
.string = (_string), \
}),
__LTTNG_COMPOUND_LITERAL(struct lttng_ust_enum_entry, { \
.struct_size = sizeof(struct lttng_ust_enum_entry), \
.start = { \
- .value = lttng_is_signed_type(__typeof__(_range_start)) ? \
+ .value = lttng_ust_is_signed_type(__typeof__(_range_start)) ? \
(long long) (_range_start) : (_range_start), \
- .signedness = lttng_is_signed_type(__typeof__(_range_start)), \
+ .signedness = lttng_ust_is_signed_type(__typeof__(_range_start)), \
}, \
.end = { \
- .value = lttng_is_signed_type(__typeof__(_range_end)) ? \
+ .value = lttng_ust_is_signed_type(__typeof__(_range_end)) ? \
(long long) (_range_end) : (_range_end), \
- .signedness = lttng_is_signed_type(__typeof__(_range_end)), \
+ .signedness = lttng_ust_is_signed_type(__typeof__(_range_end)), \
}, \
.string = (_string), \
}),
#define _ctf_array_encoded(_type, _item, _src, _byte_order, \
_length, _encoding, _nowrite, \
_elem_type_base) \
- _lttng_array_element_type_is_supported(_type, _item)
+ lttng_ust_ctf_array_element_type_is_supported(_type, _item)
#undef _ctf_sequence_encoded
#define _ctf_sequence_encoded(_type, _item, _src, _byte_order, \
_length_type, _src_length, _encoding, _nowrite, \
_elem_type_base) \
- _lttng_array_element_type_is_supported(_type, _item)
+ lttng_ust_ctf_array_element_type_is_supported(_type, _item)
#undef TP_FIELDS
#define TP_FIELDS(...) __VA_ARGS__ /* Only one used in this phase */
#undef _ctf_integer_ext
#define _ctf_integer_ext(_type, _item, _src, _byte_order, _base, _nowrite) \
- if (lttng_is_signed_type(_type)) { \
+ if (lttng_ust_is_signed_type(_type)) { \
int64_t __ctf_tmp_int64; \
switch (sizeof(_type)) { \
case 1: \
#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_ARCH_HAS_EFFICIENT_UNALIGNED_ACCESS
#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 */
--- /dev/null
+/*
+ * SPDX-License-Identifier: MIT
+ *
+ * Copyright (C) 2010-2011 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
+ */
+
+#ifndef _LTTNG_UST_UTILS_H
+#define _LTTNG_UST_UTILS_H
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <urcu/compiler.h>
+
+/* For lttng_ust_is_integer_type */
+#if defined (__cplusplus)
+#include <type_traits>
+#endif
+
+
+/**
+ * lttng_ust_stringify - convert a literal value to a C string
+ */
+#define __lttng_ust_stringify1(x) #x
+#define lttng_ust_stringify(x) __lttng_ust_stringify1(x)
+
+/**
+ * lttng_ust_is_signed_type - check if type is signed
+ *
+ * Returns true if the type of @type is signed.
+ */
+#define lttng_ust_is_signed_type(type) ((type) -1 < (type) 1)
+
+
+/**
+ * lttng_ust_is_integer_type - check if type is an integer
+ *
+ * Returns true if the type of @type is an integer.
+ */
+#if defined(__cplusplus)
+#define lttng_ust_is_integer_type(type) (std::is_integral<type>::value)
+#else
+#define lttng_ust_is_integer_type(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
+
+/**
+ * lttng_ust_ctf_array_element_type_is_supported -
+ *
+ * Adds a compilation assertion that CTF arrays and sequences declared by the
+ * user are of an integral type.
+ */
+#define lttng_ust_ctf_array_element_type_is_supported(type, item) \
+ lttng_static_assert(lttng_ust_is_integer_type(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);
+
+
+/**
+ * lttng_ust_runtime_bug_on - check condition at runtime
+ * @condition: the condition which should be false.
+ *
+ * If the condition is true, a BUG will be triggered at runtime.
+ */
+#define lttng_ust_runtime_bug_on(condition) \
+ do { \
+ if (caa_unlikely(condition)) { \
+ fprintf(stderr, \
+ "LTTng BUG in file %s, line %d.\n", \
+ __FILE__, __LINE__); \
+ exit(EXIT_FAILURE); \
+ } \
+ } while (0)
+
+
+/**
+ * lttng_ust_build_bug_on - check condition at build
+ * @condition: the condition which should be false.
+ *
+ * If the condition is true, the compiler will generate a build error.
+ */
+#define lttng_ust_build_bug_on(condition) \
+ ((void) sizeof(char[-!!(condition)]))
+
+
+/**
+ * lttng_ust_build_runtime_bug_on - check condition at build (if constant) or runtime
+ * @condition: the condition which should be false.
+ *
+ * If the condition is a constant and true, the compiler will generate a build
+ * error. If the condition is not constant, a BUG will be triggered at runtime
+ * if the condition is ever true. If the condition is constant and false, no
+ * code is emitted.
+ */
+#define lttng_ust_build_runtime_bug_on(condition) \
+ do { \
+ if (__builtin_constant_p(condition)) \
+ lttng_ust_build_bug_on(condition); \
+ else \
+ lttng_ust_runtime_bug_on(condition); \
+ } while (0)
+
+
+/**
+ * lttng_ust_offset_align - Calculate the offset needed to align an object on
+ * its natural alignment towards higher addresses.
+ * @align_drift: object offset from an "alignment"-aligned address.
+ * @alignment: natural object alignment. Must be non-zero, power of 2.
+ *
+ * Returns the offset that must be added to align towards higher
+ * addresses.
+ */
+#define lttng_ust_offset_align(align_drift, alignment) \
+ ({ \
+ lttng_ust_build_runtime_bug_on((alignment) == 0 \
+ || ((alignment) & ((alignment) - 1))); \
+ (((alignment) - (align_drift)) & ((alignment) - 1)); \
+ })
+
+
+/**
+ * lttng_ust_offset_align_floor - Calculate the offset needed to align an
+ * object on its natural alignment towards lower addresses.
+ * @align_drift: object offset from an "alignment"-aligned address.
+ * @alignment: natural object alignment. Must be non-zero, power of 2.
+ *
+ * Returns the offset that must be substracted to align towards lower addresses.
+ */
+#define lttng_ust_offset_align_floor(align_drift, alignment) \
+ ({ \
+ lttng_ust_build_runtime_bug_on((alignment) == 0 \
+ || ((alignment) & ((alignment) - 1))); \
+ (((align_drift) - (alignment)) & ((alignment) - 1)); \
+ })
+
+#endif /* _LTTNG_UST_UTILS_H */
#include <numaif.h>
#endif
-#include <lttng/ust-align.h>
+#include <lttng/ust-utils.h>
#include <ust-helper.h>
#include <ust-fd.h>
#include <stddef.h>
#include <stdint.h>
-#include <lttng/ust-align.h>
+#include <lttng/ust-utils.h>
#include "context-internal.h"
#include "lttng-bytecode.h"
type = lttng_ust_create_type_integer(sizeof(ino_t) * CHAR_BIT,
lttng_alignof(ino_t) * CHAR_BIT,
- lttng_is_signed_type(ino_t),
+ lttng_ust_is_signed_type(ino_t),
BYTE_ORDER, 10);
if (!type)
return -ENOMEM;
type = lttng_ust_create_type_integer(sizeof(int) * CHAR_BIT,
lttng_alignof(int) * CHAR_BIT,
- lttng_is_signed_type(int),
+ lttng_ust_is_signed_type(int),
BYTE_ORDER, 10);
if (!type)
return -ENOMEM;
type = lttng_ust_create_type_integer(sizeof(void *) * CHAR_BIT,
lttng_alignof(void *) * CHAR_BIT,
- lttng_is_signed_type(void *),
+ lttng_ust_is_signed_type(void *),
BYTE_ORDER, 16);
if (!type)
return -ENOMEM;
type = lttng_ust_create_type_integer(sizeof(ino_t) * CHAR_BIT,
lttng_alignof(ino_t) * CHAR_BIT,
- lttng_is_signed_type(ino_t),
+ lttng_ust_is_signed_type(ino_t),
BYTE_ORDER, 10);
if (!type)
return -ENOMEM;
type = lttng_ust_create_type_integer(sizeof(ino_t) * CHAR_BIT,
lttng_alignof(ino_t) * CHAR_BIT,
- lttng_is_signed_type(ino_t),
+ lttng_ust_is_signed_type(ino_t),
BYTE_ORDER, 10);
if (!type)
return -ENOMEM;
type = lttng_ust_create_type_integer(sizeof(ino_t) * CHAR_BIT,
lttng_alignof(ino_t) * CHAR_BIT,
- lttng_is_signed_type(ino_t),
+ lttng_ust_is_signed_type(ino_t),
BYTE_ORDER, 10);
if (!type)
return -ENOMEM;
}
ust_type = lttng_ust_create_type_integer(sizeof(uint64_t) * CHAR_BIT,
lttng_alignof(uint64_t) * CHAR_BIT,
- lttng_is_signed_type(uint64_t),
+ lttng_ust_is_signed_type(uint64_t),
BYTE_ORDER, 10);
if (!ust_type) {
ret = -ENOMEM;
type = lttng_ust_create_type_integer(sizeof(ino_t) * CHAR_BIT,
lttng_alignof(ino_t) * CHAR_BIT,
- lttng_is_signed_type(ino_t),
+ lttng_ust_is_signed_type(ino_t),
BYTE_ORDER, 10);
if (!type)
return -ENOMEM;
type = lttng_ust_create_type_integer(sizeof(unsigned long) * CHAR_BIT,
lttng_alignof(unsigned long) * CHAR_BIT,
- lttng_is_signed_type(unsigned long),
+ lttng_ust_is_signed_type(unsigned long),
BYTE_ORDER, 10);
if (!type)
return -ENOMEM;
type = lttng_ust_create_type_integer(sizeof(ino_t) * CHAR_BIT,
lttng_alignof(ino_t) * CHAR_BIT,
- lttng_is_signed_type(ino_t),
+ lttng_ust_is_signed_type(ino_t),
BYTE_ORDER, 10);
if (!type)
return -ENOMEM;
type = lttng_ust_create_type_integer(sizeof(ino_t) * CHAR_BIT,
lttng_alignof(ino_t) * CHAR_BIT,
- lttng_is_signed_type(ino_t),
+ lttng_ust_is_signed_type(ino_t),
BYTE_ORDER, 10);
if (!type)
return -ENOMEM;
type = lttng_ust_create_type_integer(sizeof(ino_t) * CHAR_BIT,
lttng_alignof(ino_t) * CHAR_BIT,
- lttng_is_signed_type(ino_t),
+ lttng_ust_is_signed_type(ino_t),
BYTE_ORDER, 10);
if (!type)
return -ENOMEM;
type = lttng_ust_create_type_integer(sizeof(gid_t) * CHAR_BIT,
lttng_alignof(gid_t) * CHAR_BIT,
- lttng_is_signed_type(gid_t),
+ lttng_ust_is_signed_type(gid_t),
BYTE_ORDER, 10);
if (!type)
return -ENOMEM;
type = lttng_ust_create_type_integer(sizeof(uid_t) * CHAR_BIT,
lttng_alignof(uid_t) * CHAR_BIT,
- lttng_is_signed_type(uid_t),
+ lttng_ust_is_signed_type(uid_t),
BYTE_ORDER, 10);
if (!type)
return -ENOMEM;
type = lttng_ust_create_type_integer(sizeof(gid_t) * CHAR_BIT,
lttng_alignof(gid_t) * CHAR_BIT,
- lttng_is_signed_type(gid_t),
+ lttng_ust_is_signed_type(gid_t),
BYTE_ORDER, 10);
if (!type)
return -ENOMEM;
type = lttng_ust_create_type_integer(sizeof(pid_t) * CHAR_BIT,
lttng_alignof(pid_t) * CHAR_BIT,
- lttng_is_signed_type(pid_t),
+ lttng_ust_is_signed_type(pid_t),
BYTE_ORDER, 10);
if (!type)
return -ENOMEM;
type = lttng_ust_create_type_integer(sizeof(gid_t) * CHAR_BIT,
lttng_alignof(gid_t) * CHAR_BIT,
- lttng_is_signed_type(gid_t),
+ lttng_ust_is_signed_type(gid_t),
BYTE_ORDER, 10);
if (!type)
return -ENOMEM;
type = lttng_ust_create_type_integer(sizeof(uid_t) * CHAR_BIT,
lttng_alignof(uid_t) * CHAR_BIT,
- lttng_is_signed_type(uid_t),
+ lttng_ust_is_signed_type(uid_t),
BYTE_ORDER, 10);
if (!type)
return -ENOMEM;
type = lttng_ust_create_type_integer(sizeof(pid_t) * CHAR_BIT,
lttng_alignof(pid_t) * CHAR_BIT,
- lttng_is_signed_type(pid_t),
+ lttng_ust_is_signed_type(pid_t),
BYTE_ORDER, 10);
if (!type)
return -ENOMEM;
type = lttng_ust_create_type_integer(sizeof(uid_t) * CHAR_BIT,
lttng_alignof(uid_t) * CHAR_BIT,
- lttng_is_signed_type(uid_t),
+ lttng_ust_is_signed_type(uid_t),
BYTE_ORDER, 10);
if (!type)
return -ENOMEM;
#include <urcu/compiler.h>
#include <lttng/urcu/urcu-ust.h>
+#include <lttng/ust-utils.h>
#include <lttng/ust-events.h>
#include <lttng/ust-abi.h>
#include <lttng/ust.h>
#include "ust-compat.h"
/* Concatenate lttng ust shared library name with its major version number. */
-#define LTTNG_UST_LIB_SO_NAME "liblttng-ust.so." __ust_stringify(CONFIG_LTTNG_UST_LIBRARY_VERSION_MAJOR)
+#define LTTNG_UST_LIB_SO_NAME "liblttng-ust.so." lttng_ust_stringify(CONFIG_LTTNG_UST_LIBRARY_VERSION_MAJOR)
/*
* Has lttng ust comm constructor been called ?
__LTTNG_COMPOUND_LITERAL(struct lttng_ust_enum_entry, { \
.struct_size = sizeof(struct lttng_ust_enum_entry), \
.start = { \
- .signedness = lttng_is_signed_type(__typeof__(_value)), \
- .value = lttng_is_signed_type(__typeof__(_value)) ? \
+ .signedness = lttng_ust_is_signed_type(__typeof__(_value)), \
+ .value = lttng_ust_is_signed_type(__typeof__(_value)) ? \
(long long) (_value) : (_value), \
}, \
.end = { \
- .signedness = lttng_is_signed_type(__typeof__(_value)), \
- .value = lttng_is_signed_type(__typeof__(_value)) ? \
+ .signedness = lttng_ust_is_signed_type(__typeof__(_value)), \
+ .value = lttng_ust_is_signed_type(__typeof__(_value)) ? \
(long long) (_value) : (_value), \
}, \
.string = (_string), \
#include <sys/types.h>
#include <unistd.h>
-#include <lttng/ust-align.h>
+#include <lttng/ust-utils.h>
#include <ust-elf.h>
#include <ust-fd.h>
array_type->alignment = 0;
array_type->encoding = lttng_ust_string_encoding_UTF8;
array_type->elem_type = lttng_ust_create_type_integer(sizeof(char) * CHAR_BIT,
- lttng_alignof(char) * CHAR_BIT, lttng_is_signed_type(char),
+ lttng_alignof(char) * CHAR_BIT, lttng_ust_is_signed_type(char),
BYTE_ORDER, 10);
if (!array_type->elem_type)
goto error_elem;
#include <urcu/arch.h>
#include <limits.h>
-#include <lttng/ust-align.h>
+#include <lttng/ust-utils.h>
#include <lttng/ringbuffer-context.h>
#include "ringbuffer-config.h"
#include <poll.h>
#include <ust-helper.h>
-#include <lttng/ust-align.h>
+#include <lttng/ust-utils.h>
#include <lttng/ringbuffer-context.h>
#include "smp.h"
#include <urcu/arch.h>
#include <string.h>
-#include <lttng/ust-align.h>
+#include <lttng/ust-utils.h>
#include <lttng/ust-compiler.h>
#include <lttng/ust-tracer.h>
#include <numaif.h>
#endif
-#include <lttng/ust-align.h>
+#include <lttng/ust-utils.h>
#include <ust-helper.h>
#include <ust-fd.h>