Move public tracepoint definition headers to 'lttng/tp'

Separate the tracepoint definition headers for tracef and tracelog from
the rest of the public API headers.

Change-Id: I8e38e2c8c0a3c2d6f7ab172c3fdbc2d6e5ad8d9d
Signed-off-by: Michael Jeanson <mjeanson@efficios.com>
Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>

diff --git a/include/Makefile.am b/include/Makefile.am
index 80b32785d4baa85e4a41fa48ee050a26e3c86cba..0020ca10ec74c03a0c3c72ff395e06cbbc3b031e 100644 (file)
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -26,9 +26,9 @@ nobase_include_HEADERS = \
        lttng/ust-bug.h \
        lttng/ust-error.h \
        lttng/tracef.h \
-       lttng/lttng-ust-tracef.h \
+       lttng/tp/lttng-ust-tracef.h \
        lttng/tracelog.h \
-       lttng/lttng-ust-tracelog.h \
+       lttng/tp/lttng-ust-tracelog.h \
        lttng/ust-clock.h \
        lttng/ust-getcpu.h \
        lttng/ust-libc-wrapper.h \

diff --git a/include/lttng/lttng-ust-tracef.h b/include/lttng/lttng-ust-tracef.h
deleted file mode 100644 (file)
index 785f213..0000000
--- a/include/lttng/lttng-ust-tracef.h
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
- * SPDX-License-Identifier: MIT
- *
- * Copyright (C) 2011-2014 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
- */
-
-#include <lttng/tracepoint.h>
-#include <stdarg.h>
-
-TRACEPOINT_EVENT(lttng_ust_tracef, event,
-       TP_ARGS(const char *, msg, unsigned int, len, void *, ip),
-       TP_FIELDS(
-               ctf_sequence_text(char, msg, msg, unsigned int, len)
-       )
-)
-TRACEPOINT_LOGLEVEL(lttng_ust_tracef, event, TRACE_DEBUG)

diff --git a/include/lttng/lttng-ust-tracelog.h b/include/lttng/lttng-ust-tracelog.h
deleted file mode 100644 (file)
index abc66a0..0000000
--- a/include/lttng/lttng-ust-tracelog.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * SPDX-License-Identifier: MIT
- *
- * Copyright (C) 2011-2015 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
- */
-
-#include <lttng/tracepoint.h>
-#include <stdarg.h>
-
-TRACEPOINT_EVENT_CLASS(lttng_ust_tracelog, tlclass,
-       TP_ARGS(const char *, file, int, line, const char *, func,
-               const char *, msg, unsigned int, len, void *, ip),
-       TP_FIELDS(
-               ctf_integer(int, line, line)
-               ctf_string(file, file)
-               ctf_string(func, func)
-               ctf_sequence_text(char, msg, msg, unsigned int, len)
-       )
-)
-
-#define TP_TRACELOG_TEMPLATE(_level_enum) \
-       TRACEPOINT_EVENT_INSTANCE(lttng_ust_tracelog, tlclass, _level_enum, \
-               TP_ARGS(const char *, file, int, line, const char *, func, \
-                       const char *, msg, unsigned int, len, void *, ip) \
-       ) \
-       TRACEPOINT_LOGLEVEL(lttng_ust_tracelog, _level_enum, _level_enum)
-
-TP_TRACELOG_TEMPLATE(TRACE_EMERG)
-TP_TRACELOG_TEMPLATE(TRACE_ALERT)
-TP_TRACELOG_TEMPLATE(TRACE_CRIT)
-TP_TRACELOG_TEMPLATE(TRACE_ERR)
-TP_TRACELOG_TEMPLATE(TRACE_WARNING)
-TP_TRACELOG_TEMPLATE(TRACE_NOTICE)
-TP_TRACELOG_TEMPLATE(TRACE_INFO)
-TP_TRACELOG_TEMPLATE(TRACE_DEBUG_SYSTEM)
-TP_TRACELOG_TEMPLATE(TRACE_DEBUG_PROGRAM)
-TP_TRACELOG_TEMPLATE(TRACE_DEBUG_PROCESS)
-TP_TRACELOG_TEMPLATE(TRACE_DEBUG_MODULE)
-TP_TRACELOG_TEMPLATE(TRACE_DEBUG_UNIT)
-TP_TRACELOG_TEMPLATE(TRACE_DEBUG_FUNCTION)
-TP_TRACELOG_TEMPLATE(TRACE_DEBUG_LINE)
-TP_TRACELOG_TEMPLATE(TRACE_DEBUG)

diff --git a/include/lttng/tp/lttng-ust-tracef.h b/include/lttng/tp/lttng-ust-tracef.h
new file mode 100644 (file)
index 0000000..785f213
--- /dev/null
+++ b/include/lttng/tp/lttng-ust-tracef.h
@@ -0,0 +1,16 @@
+/*
+ * SPDX-License-Identifier: MIT
+ *
+ * Copyright (C) 2011-2014 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
+ */
+
+#include <lttng/tracepoint.h>
+#include <stdarg.h>
+
+TRACEPOINT_EVENT(lttng_ust_tracef, event,
+       TP_ARGS(const char *, msg, unsigned int, len, void *, ip),
+       TP_FIELDS(
+               ctf_sequence_text(char, msg, msg, unsigned int, len)
+       )
+)
+TRACEPOINT_LOGLEVEL(lttng_ust_tracef, event, TRACE_DEBUG)

diff --git a/include/lttng/tp/lttng-ust-tracelog.h b/include/lttng/tp/lttng-ust-tracelog.h
new file mode 100644 (file)
index 0000000..abc66a0
--- /dev/null
+++ b/include/lttng/tp/lttng-ust-tracelog.h
@@ -0,0 +1,42 @@
+/*
+ * SPDX-License-Identifier: MIT
+ *
+ * Copyright (C) 2011-2015 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
+ */
+
+#include <lttng/tracepoint.h>
+#include <stdarg.h>
+
+TRACEPOINT_EVENT_CLASS(lttng_ust_tracelog, tlclass,
+       TP_ARGS(const char *, file, int, line, const char *, func,
+               const char *, msg, unsigned int, len, void *, ip),
+       TP_FIELDS(
+               ctf_integer(int, line, line)
+               ctf_string(file, file)
+               ctf_string(func, func)
+               ctf_sequence_text(char, msg, msg, unsigned int, len)
+       )
+)
+
+#define TP_TRACELOG_TEMPLATE(_level_enum) \
+       TRACEPOINT_EVENT_INSTANCE(lttng_ust_tracelog, tlclass, _level_enum, \
+               TP_ARGS(const char *, file, int, line, const char *, func, \
+                       const char *, msg, unsigned int, len, void *, ip) \
+       ) \
+       TRACEPOINT_LOGLEVEL(lttng_ust_tracelog, _level_enum, _level_enum)
+
+TP_TRACELOG_TEMPLATE(TRACE_EMERG)
+TP_TRACELOG_TEMPLATE(TRACE_ALERT)
+TP_TRACELOG_TEMPLATE(TRACE_CRIT)
+TP_TRACELOG_TEMPLATE(TRACE_ERR)
+TP_TRACELOG_TEMPLATE(TRACE_WARNING)
+TP_TRACELOG_TEMPLATE(TRACE_NOTICE)
+TP_TRACELOG_TEMPLATE(TRACE_INFO)
+TP_TRACELOG_TEMPLATE(TRACE_DEBUG_SYSTEM)
+TP_TRACELOG_TEMPLATE(TRACE_DEBUG_PROGRAM)
+TP_TRACELOG_TEMPLATE(TRACE_DEBUG_PROCESS)
+TP_TRACELOG_TEMPLATE(TRACE_DEBUG_MODULE)
+TP_TRACELOG_TEMPLATE(TRACE_DEBUG_UNIT)
+TP_TRACELOG_TEMPLATE(TRACE_DEBUG_FUNCTION)
+TP_TRACELOG_TEMPLATE(TRACE_DEBUG_LINE)
+TP_TRACELOG_TEMPLATE(TRACE_DEBUG)

diff --git a/include/lttng/tracef.h b/include/lttng/tracef.h
index fff912d01eaa568b264db5f62893373847dcabc1..df4b464570a9963331f7446ed31852be32391794 100644 (file)
--- a/include/lttng/tracef.h
+++ b/include/lttng/tracef.h
@@ -7,7 +7,7 @@
 #ifndef _LTTNG_UST_TRACEF_H
 #define _LTTNG_UST_TRACEF_H
 
-#include <lttng/lttng-ust-tracef.h>
+#include <lttng/tp/lttng-ust-tracef.h>
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/include/lttng/tracelog.h b/include/lttng/tracelog.h
index 743b6824a0fb2355a7e32a29bd032aff83d91360..4dfb9d3615c81fd9dc70bea086311b5e5e41d261 100644 (file)
--- a/include/lttng/tracelog.h
+++ b/include/lttng/tracelog.h
@@ -7,7 +7,7 @@
 #ifndef _LTTNG_UST_TRACELOG_H
 #define _LTTNG_UST_TRACELOG_H
 
-#include <lttng/lttng-ust-tracelog.h>
+#include <lttng/tp/lttng-ust-tracelog.h>
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/liblttng-ust/lttng-ust-tracef-provider.h b/liblttng-ust/lttng-ust-tracef-provider.h
index 8a00e4dcfa807eae9176da5351ee28d47808230d..6f27fed4a5367ca351ec0318ba17c492ae059ab7 100644 (file)
--- a/liblttng-ust/lttng-ust-tracef-provider.h
+++ b/liblttng-ust/lttng-ust-tracef-provider.h
@@ -10,13 +10,13 @@
 #if !defined(_TRACEPOINT_LTTNG_UST_TRACEF_PROVIDER_H) || defined(TRACEPOINT_HEADER_MULTI_READ)
 #define _TRACEPOINT_LTTNG_UST_TRACEF_PROVIDER_H
 
-#include <lttng/lttng-ust-tracef.h>
+#include <lttng/tp/lttng-ust-tracef.h>
 
 #endif /* _TRACEPOINT_LTTNG_UST_TRACEF_PROVIDER_H */
 
 #define TP_IP_PARAM ip /* IP context received as parameter */
 #undef TRACEPOINT_INCLUDE
-#define TRACEPOINT_INCLUDE "./lttng-ust-tracef.h"
+#define TRACEPOINT_INCLUDE "./tp/lttng-ust-tracef.h"
 
 /* This part must be outside ifdef protection */
 #include <lttng/tracepoint-event.h>

diff --git a/liblttng-ust/lttng-ust-tracelog-provider.h b/liblttng-ust/lttng-ust-tracelog-provider.h
index 7623bf287f32f2f62d4afc8f49bfbf2f54c7febd..25989dfc883e6b3b188cdd05a1ee29cce7bb343d 100644 (file)
--- a/liblttng-ust/lttng-ust-tracelog-provider.h
+++ b/liblttng-ust/lttng-ust-tracelog-provider.h
@@ -10,13 +10,13 @@
 #if !defined(_TRACEPOINT_LTTNG_UST_TRACELOG_PROVIDER_H) || defined(TRACEPOINT_HEADER_MULTI_READ)
 #define _TRACEPOINT_LTTNG_UST_TRACELOG_PROVIDER_H
 
-#include <lttng/lttng-ust-tracelog.h>
+#include <lttng/tp/lttng-ust-tracelog.h>
 
 #endif /* _TRACEPOINT_LTTNG_UST_TRACEF_PROVIDER_H */
 
 #define TP_IP_PARAM ip /* IP context received as parameter */
 #undef TRACEPOINT_INCLUDE
-#define TRACEPOINT_INCLUDE "./lttng-ust-tracelog.h"
+#define TRACEPOINT_INCLUDE "./tp/lttng-ust-tracelog.h"
 
 /* This part must be outside ifdef protection */
 #include <lttng/tracepoint-event.h>