From b15c4010a54a79e955d82b46826d14c882276669 Mon Sep 17 00:00:00 2001 From: Michael Jeanson Date: Wed, 17 Mar 2021 16:00:33 -0400 Subject: [PATCH] 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 Signed-off-by: Mathieu Desnoyers --- include/Makefile.am | 4 ++-- include/lttng/{ => tp}/lttng-ust-tracef.h | 0 include/lttng/{ => tp}/lttng-ust-tracelog.h | 0 include/lttng/tracef.h | 2 +- include/lttng/tracelog.h | 2 +- liblttng-ust/lttng-ust-tracef-provider.h | 4 ++-- liblttng-ust/lttng-ust-tracelog-provider.h | 4 ++-- 7 files changed, 8 insertions(+), 8 deletions(-) rename include/lttng/{ => tp}/lttng-ust-tracef.h (100%) rename include/lttng/{ => tp}/lttng-ust-tracelog.h (100%) diff --git a/include/Makefile.am b/include/Makefile.am index 80b32785..0020ca10 100644 --- 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/tp/lttng-ust-tracef.h similarity index 100% rename from include/lttng/lttng-ust-tracef.h rename to include/lttng/tp/lttng-ust-tracef.h diff --git a/include/lttng/lttng-ust-tracelog.h b/include/lttng/tp/lttng-ust-tracelog.h similarity index 100% rename from include/lttng/lttng-ust-tracelog.h rename to include/lttng/tp/lttng-ust-tracelog.h diff --git a/include/lttng/tracef.h b/include/lttng/tracef.h index fff912d0..df4b4645 100644 --- 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 +#include #ifdef __cplusplus extern "C" { diff --git a/include/lttng/tracelog.h b/include/lttng/tracelog.h index 743b6824..4dfb9d36 100644 --- 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 +#include #ifdef __cplusplus extern "C" { diff --git a/liblttng-ust/lttng-ust-tracef-provider.h b/liblttng-ust/lttng-ust-tracef-provider.h index 8a00e4dc..6f27fed4 100644 --- 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 +#include #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 diff --git a/liblttng-ust/lttng-ust-tracelog-provider.h b/liblttng-ust/lttng-ust-tracelog-provider.h index 7623bf28..25989dfc 100644 --- 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 +#include #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 -- 2.34.1