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

diff --git a/include/lttng/ust-tracer.h b/include/lttng/ust-tracer.h
index 7b371953..0094477e 100644
--- a/include/lttng/ust-tracer.h
+++ b/include/lttng/ust-tracer.h
@@ -1,42 +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.
- *
- * Copyright 2011-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.
  */
 
-#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 */