From 5671a6610b06175832338ed78db486b59bc5246c Mon Sep 17 00:00:00 2001 From: Mathieu Desnoyers Date: Tue, 15 Mar 2016 11:41:09 -0400 Subject: [PATCH] libs: use system include paths Signed-off-by: Mathieu Desnoyers --- lib/align.h | 2 +- lib/bitfield.h | 2 +- lib/prio_heap/lttng_prio_heap.c | 2 +- lib/ringbuffer/api.h | 10 +++++----- lib/ringbuffer/backend.h | 4 ++-- lib/ringbuffer/backend_internal.h | 6 +++--- lib/ringbuffer/config.h | 4 ++-- lib/ringbuffer/frontend.h | 2 +- lib/ringbuffer/frontend_api.h | 4 ++-- lib/ringbuffer/frontend_internal.h | 8 ++++---- lib/ringbuffer/frontend_types.h | 8 ++++---- lib/ringbuffer/iterator.h | 6 +++--- 12 files changed, 29 insertions(+), 29 deletions(-) diff --git a/lib/align.h b/lib/align.h index a21169ea..5b91ae87 100644 --- a/lib/align.h +++ b/lib/align.h @@ -24,7 +24,7 @@ #ifdef __KERNEL__ #include -#include "bug.h" +#include #define ALIGN_FLOOR(x, a) __ALIGN_FLOOR_MASK(x, (typeof(x)) (a) - 1) #define __ALIGN_FLOOR_MASK(x, mask) ((x) & ~(mask)) diff --git a/lib/bitfield.h b/lib/bitfield.h index 0af1c39d..a3927a56 100644 --- a/lib/bitfield.h +++ b/lib/bitfield.h @@ -27,7 +27,7 @@ * SOFTWARE. */ -#include "../lttng-endian.h" +#include #ifndef CHAR_BIT #define CHAR_BIT 8 diff --git a/lib/prio_heap/lttng_prio_heap.c b/lib/prio_heap/lttng_prio_heap.c index d296da0c..6db7f524 100644 --- a/lib/prio_heap/lttng_prio_heap.c +++ b/lib/prio_heap/lttng_prio_heap.c @@ -25,7 +25,7 @@ */ #include -#include "lttng_prio_heap.h" +#include #ifdef DEBUG_HEAP void lttng_check_heap(const struct lttng_ptr_heap *heap) diff --git a/lib/ringbuffer/api.h b/lib/ringbuffer/api.h index fbac7110..4383b14e 100644 --- a/lib/ringbuffer/api.h +++ b/lib/ringbuffer/api.h @@ -23,15 +23,15 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "../../wrapper/ringbuffer/backend.h" -#include "../../wrapper/ringbuffer/frontend.h" -#include "../../wrapper/ringbuffer/vfs.h" +#include +#include +#include /* * ring_buffer_frontend_api.h contains static inline functions that depend on - * client static inlines. Hence the inclusion of this "api" header only + * client static inlines. Hence the inclusion of this >api> header only * within the client. */ -#include "../../wrapper/ringbuffer/frontend_api.h" +#include #endif /* _LIB_RING_BUFFER_API_H */ diff --git a/lib/ringbuffer/backend.h b/lib/ringbuffer/backend.h index 6f3296bc..c0142071 100644 --- a/lib/ringbuffer/backend.h +++ b/lib/ringbuffer/backend.h @@ -37,8 +37,8 @@ #include /* Internal helpers */ -#include "../../wrapper/ringbuffer/backend_internal.h" -#include "../../wrapper/ringbuffer/frontend_internal.h" +#include +#include /* Ring buffer backend API */ diff --git a/lib/ringbuffer/backend_internal.h b/lib/ringbuffer/backend_internal.h index 04a7ae17..d18967d6 100644 --- a/lib/ringbuffer/backend_internal.h +++ b/lib/ringbuffer/backend_internal.h @@ -23,9 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "../../wrapper/ringbuffer/config.h" -#include "../../wrapper/ringbuffer/backend_types.h" -#include "../../wrapper/ringbuffer/frontend_types.h" +#include +#include +#include #include #include diff --git a/lib/ringbuffer/config.h b/lib/ringbuffer/config.h index 8fa2c55b..b8169afe 100644 --- a/lib/ringbuffer/config.h +++ b/lib/ringbuffer/config.h @@ -26,8 +26,8 @@ #include #include -#include "../align.h" -#include "../../lttng-tracer-core.h" +#include +#include struct lib_ring_buffer; struct channel; diff --git a/lib/ringbuffer/frontend.h b/lib/ringbuffer/frontend.h index 4473e86f..4955b3dd 100644 --- a/lib/ringbuffer/frontend.h +++ b/lib/ringbuffer/frontend.h @@ -49,7 +49,7 @@ #include /* Internal helpers */ -#include "../../wrapper/ringbuffer/frontend_internal.h" +#include /* Buffer creation/removal and setup operations */ diff --git a/lib/ringbuffer/frontend_api.h b/lib/ringbuffer/frontend_api.h index b622bd7e..b92ff290 100644 --- a/lib/ringbuffer/frontend_api.h +++ b/lib/ringbuffer/frontend_api.h @@ -29,8 +29,8 @@ * See linux/ringbuffer/frontend.h for channel allocation and read-side API. */ -#include "../../wrapper/ringbuffer/frontend.h" -#include "../../wrapper/percpu-defs.h" +#include +#include #include #include diff --git a/lib/ringbuffer/frontend_internal.h b/lib/ringbuffer/frontend_internal.h index d170e9ab..b13edd10 100644 --- a/lib/ringbuffer/frontend_internal.h +++ b/lib/ringbuffer/frontend_internal.h @@ -28,10 +28,10 @@ * See ring_buffer_frontend.c for more information on wait-free algorithms. */ -#include "../../wrapper/ringbuffer/config.h" -#include "../../wrapper/ringbuffer/backend_types.h" -#include "../../wrapper/ringbuffer/frontend_types.h" -#include "../../lib/prio_heap/lttng_prio_heap.h" /* For per-CPU read-side iterator */ +#include +#include +#include +#include /* For per-CPU read-side iterator */ /* Buffer offset macros */ diff --git a/lib/ringbuffer/frontend_types.h b/lib/ringbuffer/frontend_types.h index 9fc3a30a..46bf8d27 100644 --- a/lib/ringbuffer/frontend_types.h +++ b/lib/ringbuffer/frontend_types.h @@ -29,10 +29,10 @@ */ #include -#include "../../wrapper/ringbuffer/config.h" -#include "../../wrapper/ringbuffer/backend_types.h" -#include "../../wrapper/spinlock.h" -#include "../../lib/prio_heap/lttng_prio_heap.h" /* For per-CPU read-side iterator */ +#include +#include +#include +#include /* For per-CPU read-side iterator */ /* * A switch is done during tracing or as a final flush after tracing (so it diff --git a/lib/ringbuffer/iterator.h b/lib/ringbuffer/iterator.h index b0e17644..6ed5b3b6 100644 --- a/lib/ringbuffer/iterator.h +++ b/lib/ringbuffer/iterator.h @@ -26,9 +26,9 @@ * Mathieu Desnoyers */ -#include "../../wrapper/ringbuffer/backend.h" -#include "../../wrapper/ringbuffer/frontend.h" -#include "../../wrapper/ringbuffer/vfs.h" +#include +#include +#include /* * lib_ring_buffer_get_next_record advances the buffer read position to the next -- 2.34.1