X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=include%2Flttng%2Fust-tracer.h;h=acc475bfe1dde65bb16a239652b359568da6448c;hb=eae3c72949135b48639440468dc78ea1d5e937e9;hp=546fc2c5422cbfde9a0c38d16b43ebff0f1dd93b;hpb=029ba7b267745ada271dcc18f8b1880e27510932;p=lttng-ust.git

diff --git a/include/lttng/ust-tracer.h b/include/lttng/ust-tracer.h
index 546fc2c5..acc475bf 100644
--- a/include/lttng/ust-tracer.h
+++ b/include/lttng/ust-tracer.h
@@ -1,41 +1,23 @@
-#ifndef _LTTNG_UST_TRACER_H
-#define _LTTNG_UST_TRACER_H
-
 /*
- * Copyright (C) 2005-2011 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
- *
- * This contains the core definitions for the Linux Trace Toolkit.
+ * SPDX-License-Identifier: MIT
  *
- * Copyright 2011-2012 - Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
+ * Copyright (C) 2005-2012 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
+ * This contains the core definitions for the Linux Trace Toolkit.
  */
 
-#if defined (__cplusplus)
-#include <type_traits>
-#endif
+#ifndef _LTTNG_UST_TRACER_H
+#define _LTTNG_UST_TRACER_H
+
+#include <limits.h>
 
+#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
+#ifndef LTTNG_UST_ARCH_HAS_EFFICIENT_UNALIGNED_ACCESS
 /* Align data on its natural alignment */
 #define RING_BUFFER_ALIGN
 #endif
@@ -50,32 +32,4 @@
 #define lttng_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.
- */
-
-#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 */