X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=include%2Flttng%2Fust-tracer.h;h=0094477ea635d9ba11879a88e08b43a1e0830890;hb=1c1968450409b3c159a3000f9e1a968ff1e5f7e8;hp=205af942c50ca456a2f211e6b481a1995dfb2a99;hpb=562c813acc6247c3c749841f4e4f812e7cedb66a;p=lttng-ust.git

diff --git a/include/lttng/ust-tracer.h b/include/lttng/ust-tracer.h
index 205af942..0094477e 100644
--- a/include/lttng/ust-tracer.h
+++ b/include/lttng/ust-tracer.h
@@ -1,39 +1,45 @@
-#ifndef _LTTNG_TRACER_H
-#define _LTTNG_TRACER_H
+// SPDX-FileCopyrightText: 2005-2012 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
+//
+// SPDX-License-Identifier: MIT
 
 /*
- * Copyright (C) 2005-2011 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
- *
  * This contains the core definitions for the Linux Trace Toolkit.
- *
- * THIS MATERIAL IS PROVIDED AS IS, WITH ABSOLUTELY NO WARRANTY EXPRESSED
- * OR IMPLIED.  ANY USE IS AT YOUR OWN RISK.
- *
- * Permission is hereby granted to use or copy this program
- * for any purpose,  provided the above notices are retained on all copies.
- * Permission to modify the code and to distribute modified code is granted,
- * provided the above notices are retained, and a notice that the code was
- * modified is included with the above copyright notice.
  */
 
-#include <lttng/ust-config.h>
-#include <lttng/ust-version.h>
+#ifndef _LTTNG_UST_TRACER_H
+#define _LTTNG_UST_TRACER_H
 
-#ifndef LTTNG_UST_HAVE_EFFICIENT_UNALIGNED_ACCESS
-/* Align data on its natural alignment */
-#define RING_BUFFER_ALIGN
-#endif
+#include <lttng/ust-arch.h>
+#include <lttng/ust-compiler.h>
+#include <lttng/ust-utils.h>
+#include <lttng/ust-version.h>
 
-#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)) < 0)
+/*
+ * 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)
+
 
-#endif /* _LTTNG_TRACER_CORE_H */
+#endif /* _LTTNG_UST_TRACER_H */