From 2459130397d7e7eecc44a5f06a39d65c78257eef Mon Sep 17 00:00:00 2001 From: Mathieu Desnoyers Date: Wed, 6 May 2020 09:21:00 -0400 Subject: [PATCH] Cleanup: Move lib/ringbuffer/ headers to include/ringbuffer/ Remove the proxy include files, and add the include/ directory to the preprocessor include search patch. Adapt all includes accordingly. Signed-off-by: Mathieu Desnoyers --- Makefile | 2 +- {lib => include}/ringbuffer/api.h | 10 +++++----- {lib => include}/ringbuffer/backend.h | 6 +++--- {lib => include}/ringbuffer/backend_internal.h | 9 +++++---- {lib => include}/ringbuffer/backend_types.h | 2 +- {lib => include}/ringbuffer/config.h | 4 ++-- {lib => include}/ringbuffer/frontend.h | 4 ++-- {lib => include}/ringbuffer/frontend_api.h | 4 ++-- {lib => include}/ringbuffer/frontend_internal.h | 8 ++++---- {lib => include}/ringbuffer/frontend_types.h | 6 +++--- {lib => include}/ringbuffer/iterator.h | 8 ++++---- {lib => include}/ringbuffer/nohz.h | 2 +- {lib => include}/ringbuffer/vatomic.h | 2 +- {lib => include}/ringbuffer/vfs.h | 2 +- lib/Kbuild | 2 +- lib/ringbuffer/ring_buffer_backend.c | 6 +++--- lib/ringbuffer/ring_buffer_frontend.c | 10 +++++----- lib/ringbuffer/ring_buffer_iterator.c | 2 +- lib/ringbuffer/ring_buffer_mmap.c | 6 +++--- lib/ringbuffer/ring_buffer_splice.c | 6 +++--- lib/ringbuffer/ring_buffer_vfs.c | 6 +++--- lttng-abi.c | 8 ++++---- lttng-context-callstack.c | 4 ++-- lttng-context-cgroup-ns.c | 2 +- lttng-context-cpu-id.c | 2 +- lttng-context-egid.c | 2 +- lttng-context-euid.c | 2 +- lttng-context-gid.c | 2 +- lttng-context-hostname.c | 2 +- lttng-context-interruptible.c | 2 +- lttng-context-ipc-ns.c | 2 +- lttng-context-migratable.c | 2 +- lttng-context-mnt-ns.c | 2 +- lttng-context-need-reschedule.c | 2 +- lttng-context-net-ns.c | 2 +- lttng-context-nice.c | 2 +- lttng-context-perf-counters.c | 2 +- lttng-context-pid-ns.c | 2 +- lttng-context-pid.c | 2 +- lttng-context-ppid.c | 2 +- lttng-context-preemptible.c | 2 +- lttng-context-prio.c | 2 +- lttng-context-procname.c | 2 +- lttng-context-sgid.c | 2 +- lttng-context-suid.c | 2 +- lttng-context-tid.c | 2 +- lttng-context-uid.c | 2 +- lttng-context-user-ns.c | 2 +- lttng-context-uts-ns.c | 2 +- lttng-context-vegid.c | 2 +- lttng-context-veuid.c | 2 +- lttng-context-vgid.c | 2 +- lttng-context-vpid.c | 2 +- lttng-context-vppid.c | 2 +- lttng-context-vsgid.c | 2 +- lttng-context-vsuid.c | 2 +- lttng-context-vtid.c | 2 +- lttng-context-vuid.c | 2 +- lttng-events.c | 4 ++-- lttng-ring-buffer-client.h | 4 ++-- lttng-ring-buffer-metadata-client.h | 2 +- lttng-tracer-core.h | 2 +- probes/Kbuild | 2 +- probes/lttng-kprobes.c | 2 +- probes/lttng-kretprobes.c | 2 +- probes/lttng-tracepoint-event-impl.h | 4 ++-- probes/lttng-uprobes.c | 2 +- tests/Kbuild | 2 +- wrapper/ringbuffer/api.h | 2 -- wrapper/ringbuffer/backend.h | 2 -- wrapper/ringbuffer/backend_internal.h | 3 --- wrapper/ringbuffer/backend_types.h | 2 -- wrapper/ringbuffer/config.h | 2 -- wrapper/ringbuffer/frontend.h | 2 -- wrapper/ringbuffer/frontend_api.h | 2 -- wrapper/ringbuffer/frontend_internal.h | 2 -- wrapper/ringbuffer/frontend_types.h | 2 -- wrapper/ringbuffer/iterator.h | 2 -- wrapper/ringbuffer/nohz.h | 2 -- wrapper/ringbuffer/vatomic.h | 2 -- wrapper/ringbuffer/vfs.h | 2 -- 81 files changed, 108 insertions(+), 134 deletions(-) rename {lib => include}/ringbuffer/api.h (70%) rename {lib => include}/ringbuffer/backend.h (99%) rename {lib => include}/ringbuffer/backend_internal.h (98%) rename {lib => include}/ringbuffer/backend_types.h (99%) rename {lib => include}/ringbuffer/config.h (99%) rename {lib => include}/ringbuffer/frontend.h (98%) rename {lib => include}/ringbuffer/frontend_api.h (99%) rename {lib => include}/ringbuffer/frontend_internal.h (98%) rename {lib => include}/ringbuffer/frontend_types.h (98%) rename {lib => include}/ringbuffer/iterator.h (93%) rename {lib => include}/ringbuffer/nohz.h (96%) rename {lib => include}/ringbuffer/vatomic.h (98%) rename {lib => include}/ringbuffer/vfs.h (99%) delete mode 100644 wrapper/ringbuffer/api.h delete mode 100644 wrapper/ringbuffer/backend.h delete mode 100644 wrapper/ringbuffer/backend_internal.h delete mode 100644 wrapper/ringbuffer/backend_types.h delete mode 100644 wrapper/ringbuffer/config.h delete mode 100644 wrapper/ringbuffer/frontend.h delete mode 100644 wrapper/ringbuffer/frontend_api.h delete mode 100644 wrapper/ringbuffer/frontend_internal.h delete mode 100644 wrapper/ringbuffer/frontend_types.h delete mode 100644 wrapper/ringbuffer/iterator.h delete mode 100644 wrapper/ringbuffer/nohz.h delete mode 100644 wrapper/ringbuffer/vatomic.h delete mode 100644 wrapper/ringbuffer/vfs.h diff --git a/Makefile b/Makefile index 6e6c2fe3..07c21ea4 100644 --- a/Makefile +++ b/Makefile @@ -29,7 +29,7 @@ ifneq ($(KERNELRELEASE),) include $(TOP_LTTNG_MODULES_DIR)/Kbuild.common - ccflags-y += -I$(TOP_LTTNG_MODULES_DIR) + ccflags-y += -I$(TOP_LTTNG_MODULES_DIR) -I$(TOP_LTTNG_MODULES_DIR)/include obj-$(CONFIG_LTTNG) += lttng-ring-buffer-client-discard.o obj-$(CONFIG_LTTNG) += lttng-ring-buffer-client-overwrite.o diff --git a/lib/ringbuffer/api.h b/include/ringbuffer/api.h similarity index 70% rename from lib/ringbuffer/api.h rename to include/ringbuffer/api.h index e469d46c..3ad7725a 100644 --- a/lib/ringbuffer/api.h +++ b/include/ringbuffer/api.h @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: (GPL-2.0-only OR LGPL-2.1-only) * - * lib/ringbuffer/api.h + * ringbuffer/api.h * * Ring Buffer API. * @@ -10,15 +10,15 @@ #ifndef _LIB_RING_BUFFER_API_H #define _LIB_RING_BUFFER_API_H -#include -#include -#include +#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 * within the client. */ -#include +#include #endif /* _LIB_RING_BUFFER_API_H */ diff --git a/lib/ringbuffer/backend.h b/include/ringbuffer/backend.h similarity index 99% rename from lib/ringbuffer/backend.h rename to include/ringbuffer/backend.h index da4e92b9..1f499c90 100644 --- a/lib/ringbuffer/backend.h +++ b/include/ringbuffer/backend.h @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: (GPL-2.0-only OR LGPL-2.1-only) * - * lib/ringbuffer/backend.h + * ringbuffer/backend.h * * Ring buffer backend (API). * @@ -24,8 +24,8 @@ #include /* Internal helpers */ -#include -#include +#include +#include /* Ring buffer backend API */ diff --git a/lib/ringbuffer/backend_internal.h b/include/ringbuffer/backend_internal.h similarity index 98% rename from lib/ringbuffer/backend_internal.h rename to include/ringbuffer/backend_internal.h index 5ad6fac2..aab408fb 100644 --- a/lib/ringbuffer/backend_internal.h +++ b/include/ringbuffer/backend_internal.h @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: (GPL-2.0-only OR LGPL-2.1-only) * - * lib/ringbuffer/backend_internal.h + * ringbuffer/backend_internal.h * * Ring buffer backend (internal helpers). * @@ -11,9 +11,10 @@ #define _LIB_RING_BUFFER_BACKEND_INTERNAL_H #include -#include -#include -#include +#include +#include +#include +#include #include #include diff --git a/lib/ringbuffer/backend_types.h b/include/ringbuffer/backend_types.h similarity index 99% rename from lib/ringbuffer/backend_types.h rename to include/ringbuffer/backend_types.h index fa6baaa0..cfeecf4f 100644 --- a/lib/ringbuffer/backend_types.h +++ b/include/ringbuffer/backend_types.h @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: (GPL-2.0-only OR LGPL-2.1-only) * - * lib/ringbuffer/backend_types.h + * ringbuffer/backend_types.h * * Ring buffer backend (types). * diff --git a/lib/ringbuffer/config.h b/include/ringbuffer/config.h similarity index 99% rename from lib/ringbuffer/config.h rename to include/ringbuffer/config.h index dd53c4be..1b01935b 100644 --- a/lib/ringbuffer/config.h +++ b/include/ringbuffer/config.h @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: (GPL-2.0-only OR LGPL-2.1-only) * - * lib/ringbuffer/config.h + * ringbuffer/config.h * * Ring buffer configuration header. Note: after declaring the standard inline * functions, clients should also include linux/ringbuffer/api.h. @@ -301,6 +301,6 @@ int lib_ring_buffer_check_config(const struct lib_ring_buffer_config *config, return 0; } -#include +#include #endif /* _LIB_RING_BUFFER_CONFIG_H */ diff --git a/lib/ringbuffer/frontend.h b/include/ringbuffer/frontend.h similarity index 98% rename from lib/ringbuffer/frontend.h rename to include/ringbuffer/frontend.h index f67edc06..41fec2a0 100644 --- a/lib/ringbuffer/frontend.h +++ b/include/ringbuffer/frontend.h @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: (GPL-2.0-only OR LGPL-2.1-only) * - * lib/ringbuffer/frontend.h + * ringbuffer/frontend.h * * Ring Buffer Library Synchronization Header (API). * @@ -33,7 +33,7 @@ #include /* Internal helpers */ -#include +#include /* Max ring buffer nesting count, see lib_ring_buffer_get_cpu(). */ #define RING_BUFFER_MAX_NESTING 4 diff --git a/lib/ringbuffer/frontend_api.h b/include/ringbuffer/frontend_api.h similarity index 99% rename from lib/ringbuffer/frontend_api.h rename to include/ringbuffer/frontend_api.h index 3c46a177..3fa6c82f 100644 --- a/lib/ringbuffer/frontend_api.h +++ b/include/ringbuffer/frontend_api.h @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: (GPL-2.0-only OR LGPL-2.1-only) * - * lib/ringbuffer/frontend_api.h + * ringbuffer/frontend_api.h * * Ring Buffer Library Synchronization Header (buffer write API). * @@ -13,7 +13,7 @@ #ifndef _LIB_RING_BUFFER_FRONTEND_API_H #define _LIB_RING_BUFFER_FRONTEND_API_H -#include +#include #include #include #include diff --git a/lib/ringbuffer/frontend_internal.h b/include/ringbuffer/frontend_internal.h similarity index 98% rename from lib/ringbuffer/frontend_internal.h rename to include/ringbuffer/frontend_internal.h index 39f2b770..723656bc 100644 --- a/lib/ringbuffer/frontend_internal.h +++ b/include/ringbuffer/frontend_internal.h @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: (GPL-2.0-only OR LGPL-2.1-only) * - * linux/ringbuffer/frontend_internal.h + * ringbuffer/frontend_internal.h * * Ring Buffer Library Synchronization Header (internal helpers). * @@ -12,9 +12,9 @@ #ifndef _LIB_RING_BUFFER_FRONTEND_INTERNAL_H #define _LIB_RING_BUFFER_FRONTEND_INTERNAL_H -#include -#include -#include +#include +#include +#include #include /* For per-CPU read-side iterator */ /* Buffer offset macros */ diff --git a/lib/ringbuffer/frontend_types.h b/include/ringbuffer/frontend_types.h similarity index 98% rename from lib/ringbuffer/frontend_types.h rename to include/ringbuffer/frontend_types.h index 3fd63452..b04c085b 100644 --- a/lib/ringbuffer/frontend_types.h +++ b/include/ringbuffer/frontend_types.h @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: (GPL-2.0-only OR LGPL-2.1-only) * - * lib/ringbuffer/frontend_types.h + * ringbuffer/frontend_types.h * * Ring Buffer Library Synchronization Header (types). * @@ -13,8 +13,8 @@ #define _LIB_RING_BUFFER_FRONTEND_TYPES_H #include -#include -#include +#include +#include #include /* For per-CPU read-side iterator */ #include diff --git a/lib/ringbuffer/iterator.h b/include/ringbuffer/iterator.h similarity index 93% rename from lib/ringbuffer/iterator.h rename to include/ringbuffer/iterator.h index 06fbcd1b..a006ed00 100644 --- a/lib/ringbuffer/iterator.h +++ b/include/ringbuffer/iterator.h @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: (GPL-2.0-only OR LGPL-2.1-only) * - * lib/ringbuffer/iterator.h + * ringbuffer/iterator.h * * Ring buffer and channel iterators. * @@ -10,9 +10,9 @@ #ifndef _LIB_RING_BUFFER_ITERATOR_H #define _LIB_RING_BUFFER_ITERATOR_H -#include -#include -#include +#include +#include +#include /* * lib_ring_buffer_get_next_record advances the buffer read position to the next diff --git a/lib/ringbuffer/nohz.h b/include/ringbuffer/nohz.h similarity index 96% rename from lib/ringbuffer/nohz.h rename to include/ringbuffer/nohz.h index 1d28d279..eba25418 100644 --- a/lib/ringbuffer/nohz.h +++ b/include/ringbuffer/nohz.h @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: (GPL-2.0-only OR LGPL-2.1-only) * - * lib/ringbuffer/nohz.h + * ringbuffer/nohz.h * * Copyright (C) 2011-2012 Mathieu Desnoyers */ diff --git a/lib/ringbuffer/vatomic.h b/include/ringbuffer/vatomic.h similarity index 98% rename from lib/ringbuffer/vatomic.h rename to include/ringbuffer/vatomic.h index 6fdc4d1b..bc142f7d 100644 --- a/lib/ringbuffer/vatomic.h +++ b/include/ringbuffer/vatomic.h @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: (GPL-2.0-only OR LGPL-2.1-only) * - * lib/ringbuffer/vatomic.h + * ringbuffer/vatomic.h * * Copyright (C) 2010-2012 Mathieu Desnoyers */ diff --git a/lib/ringbuffer/vfs.h b/include/ringbuffer/vfs.h similarity index 99% rename from lib/ringbuffer/vfs.h rename to include/ringbuffer/vfs.h index ee23a624..5e13068c 100644 --- a/lib/ringbuffer/vfs.h +++ b/include/ringbuffer/vfs.h @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: (GPL-2.0-only OR LGPL-2.1-only) * - * lib/ringbuffer/vfs.h + * ringbuffer/vfs.h * * Wait-free ring buffer VFS file operations. * diff --git a/lib/Kbuild b/lib/Kbuild index eb420800..6818cd95 100644 --- a/lib/Kbuild +++ b/lib/Kbuild @@ -4,7 +4,7 @@ TOP_LTTNG_MODULES_DIR := $(shell dirname $(lastword $(MAKEFILE_LIST)))/.. include $(TOP_LTTNG_MODULES_DIR)/Kbuild.common -ccflags-y += -I$(TOP_LTTNG_MODULES_DIR) +ccflags-y += -I$(TOP_LTTNG_MODULES_DIR) -I$(TOP_LTTNG_MODULES_DIR)/include obj-$(CONFIG_LTTNG) += lttng-lib-ring-buffer.o diff --git a/lib/ringbuffer/ring_buffer_backend.c b/lib/ringbuffer/ring_buffer_backend.c index 2a47948e..d6547d7d 100644 --- a/lib/ringbuffer/ring_buffer_backend.c +++ b/lib/ringbuffer/ring_buffer_backend.c @@ -18,9 +18,9 @@ #include #include /* for wrapper_vmalloc_sync_mappings() */ -#include -#include -#include +#include +#include +#include /** * lib_ring_buffer_backend_allocate - allocate a channel buffer diff --git a/lib/ringbuffer/ring_buffer_frontend.c b/lib/ringbuffer/ring_buffer_frontend.c index 91cf0ae5..fca37fbc 100644 --- a/lib/ringbuffer/ring_buffer_frontend.c +++ b/lib/ringbuffer/ring_buffer_frontend.c @@ -42,11 +42,11 @@ #include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include #include #include diff --git a/lib/ringbuffer/ring_buffer_iterator.c b/lib/ringbuffer/ring_buffer_iterator.c index 00faa729..15d7c75c 100644 --- a/lib/ringbuffer/ring_buffer_iterator.c +++ b/lib/ringbuffer/ring_buffer_iterator.c @@ -9,7 +9,7 @@ * Copyright (C) 2010-2012 Mathieu Desnoyers */ -#include +#include #include #include #include diff --git a/lib/ringbuffer/ring_buffer_mmap.c b/lib/ringbuffer/ring_buffer_mmap.c index c5abe847..34174a58 100644 --- a/lib/ringbuffer/ring_buffer_mmap.c +++ b/lib/ringbuffer/ring_buffer_mmap.c @@ -13,9 +13,9 @@ #include #include -#include -#include -#include +#include +#include +#include /* * fault() vm_op implementation for ring buffer file mapping. diff --git a/lib/ringbuffer/ring_buffer_splice.c b/lib/ringbuffer/ring_buffer_splice.c index f0b5479a..cd803a70 100644 --- a/lib/ringbuffer/ring_buffer_splice.c +++ b/lib/ringbuffer/ring_buffer_splice.c @@ -15,9 +15,9 @@ #include #include -#include -#include -#include +#include +#include +#include #if 0 #define printk_dbg(fmt, args...) printk(fmt, args) diff --git a/lib/ringbuffer/ring_buffer_vfs.c b/lib/ringbuffer/ring_buffer_vfs.c index af753b9b..2be550c4 100644 --- a/lib/ringbuffer/ring_buffer_vfs.c +++ b/lib/ringbuffer/ring_buffer_vfs.c @@ -11,9 +11,9 @@ #include #include -#include -#include -#include +#include +#include +#include #include #include diff --git a/lttng-abi.c b/lttng-abi.c index 4051264e..1b5239e5 100644 --- a/lttng-abi.c +++ b/lttng-abi.c @@ -31,9 +31,9 @@ #include #include #include /* for wrapper_vmalloc_sync_mappings() */ -#include -#include -#include +#include +#include +#include #include #include #include @@ -43,7 +43,7 @@ #include #include #include -#include +#include /* * This is LTTng's own personal way to create a system call as an external diff --git a/lttng-context-callstack.c b/lttng-context-callstack.c index 1e791f9c..e8be78fa 100644 --- a/lttng-context-callstack.c +++ b/lttng-context-callstack.c @@ -44,8 +44,8 @@ #include #include #include "lttng-events.h" -#include "wrapper/ringbuffer/backend.h" -#include "wrapper/ringbuffer/frontend.h" +#include +#include #include "wrapper/vmalloc.h" #include "lttng-tracer.h" #include "lttng-endian.h" diff --git a/lttng-context-cgroup-ns.c b/lttng-context-cgroup-ns.c index ced8c124..eebedeb5 100644 --- a/lttng-context-cgroup-ns.c +++ b/lttng-context-cgroup-ns.c @@ -14,7 +14,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/lttng-context-cpu-id.c b/lttng-context-cpu-id.c index 20c186a4..1f79a5e9 100644 --- a/lttng-context-cpu-id.c +++ b/lttng-context-cpu-id.c @@ -11,7 +11,7 @@ #include #include #include -#include +#include #include #include diff --git a/lttng-context-egid.c b/lttng-context-egid.c index 6ec39224..535402a2 100644 --- a/lttng-context-egid.c +++ b/lttng-context-egid.c @@ -13,7 +13,7 @@ #include #include #include -#include +#include #include #include diff --git a/lttng-context-euid.c b/lttng-context-euid.c index 2895cef9..3e6d03f9 100644 --- a/lttng-context-euid.c +++ b/lttng-context-euid.c @@ -13,7 +13,7 @@ #include #include #include -#include +#include #include #include diff --git a/lttng-context-gid.c b/lttng-context-gid.c index ebdbc737..0508c9ba 100644 --- a/lttng-context-gid.c +++ b/lttng-context-gid.c @@ -13,7 +13,7 @@ #include #include #include -#include +#include #include #include diff --git a/lttng-context-hostname.c b/lttng-context-hostname.c index a16da350..b8fa5149 100644 --- a/lttng-context-hostname.c +++ b/lttng-context-hostname.c @@ -12,7 +12,7 @@ #include #include #include -#include +#include #include #include diff --git a/lttng-context-interruptible.c b/lttng-context-interruptible.c index c9faaa7f..62e8583d 100644 --- a/lttng-context-interruptible.c +++ b/lttng-context-interruptible.c @@ -12,7 +12,7 @@ #include #include #include -#include +#include #include #include diff --git a/lttng-context-ipc-ns.c b/lttng-context-ipc-ns.c index 7171928c..61c193ca 100644 --- a/lttng-context-ipc-ns.c +++ b/lttng-context-ipc-ns.c @@ -14,7 +14,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/lttng-context-migratable.c b/lttng-context-migratable.c index 08a55f4b..1e7cdeab 100644 --- a/lttng-context-migratable.c +++ b/lttng-context-migratable.c @@ -12,7 +12,7 @@ #include #include #include -#include +#include #include #include diff --git a/lttng-context-mnt-ns.c b/lttng-context-mnt-ns.c index 539b043b..5d396aef 100644 --- a/lttng-context-mnt-ns.c +++ b/lttng-context-mnt-ns.c @@ -14,7 +14,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/lttng-context-need-reschedule.c b/lttng-context-need-reschedule.c index dc404076..2b16c270 100644 --- a/lttng-context-need-reschedule.c +++ b/lttng-context-need-reschedule.c @@ -12,7 +12,7 @@ #include #include #include -#include +#include #include #include diff --git a/lttng-context-net-ns.c b/lttng-context-net-ns.c index 06088a51..74cf8f82 100644 --- a/lttng-context-net-ns.c +++ b/lttng-context-net-ns.c @@ -15,7 +15,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/lttng-context-nice.c b/lttng-context-nice.c index 271f2049..095462eb 100644 --- a/lttng-context-nice.c +++ b/lttng-context-nice.c @@ -11,7 +11,7 @@ #include #include #include -#include +#include #include #include diff --git a/lttng-context-perf-counters.c b/lttng-context-perf-counters.c index be26e495..05a28ab5 100644 --- a/lttng-context-perf-counters.c +++ b/lttng-context-perf-counters.c @@ -14,7 +14,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/lttng-context-pid-ns.c b/lttng-context-pid-ns.c index 90c21dea..e0f5636a 100644 --- a/lttng-context-pid-ns.c +++ b/lttng-context-pid-ns.c @@ -14,7 +14,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/lttng-context-pid.c b/lttng-context-pid.c index b8155ea8..a84a284c 100644 --- a/lttng-context-pid.c +++ b/lttng-context-pid.c @@ -11,7 +11,7 @@ #include #include #include -#include +#include #include #include diff --git a/lttng-context-ppid.c b/lttng-context-ppid.c index 13a521bd..44956c7e 100644 --- a/lttng-context-ppid.c +++ b/lttng-context-ppid.c @@ -12,7 +12,7 @@ #include #include #include -#include +#include #include #include diff --git a/lttng-context-preemptible.c b/lttng-context-preemptible.c index 95a38547..0bd8e912 100644 --- a/lttng-context-preemptible.c +++ b/lttng-context-preemptible.c @@ -12,7 +12,7 @@ #include #include #include -#include +#include #include #include diff --git a/lttng-context-prio.c b/lttng-context-prio.c index 6441b5f1..84d5c5bf 100644 --- a/lttng-context-prio.c +++ b/lttng-context-prio.c @@ -11,7 +11,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/lttng-context-procname.c b/lttng-context-procname.c index fc40f6cf..3fd82369 100644 --- a/lttng-context-procname.c +++ b/lttng-context-procname.c @@ -11,7 +11,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/lttng-context-sgid.c b/lttng-context-sgid.c index 81fa3f10..a729d0bb 100644 --- a/lttng-context-sgid.c +++ b/lttng-context-sgid.c @@ -13,7 +13,7 @@ #include #include #include -#include +#include #include #include diff --git a/lttng-context-suid.c b/lttng-context-suid.c index 5f1ce3cd..79087471 100644 --- a/lttng-context-suid.c +++ b/lttng-context-suid.c @@ -13,7 +13,7 @@ #include #include #include -#include +#include #include #include diff --git a/lttng-context-tid.c b/lttng-context-tid.c index efeca439..144b081b 100644 --- a/lttng-context-tid.c +++ b/lttng-context-tid.c @@ -11,7 +11,7 @@ #include #include #include -#include +#include #include #include diff --git a/lttng-context-uid.c b/lttng-context-uid.c index 3942e94a..c639dc18 100644 --- a/lttng-context-uid.c +++ b/lttng-context-uid.c @@ -13,7 +13,7 @@ #include #include #include -#include +#include #include #include diff --git a/lttng-context-user-ns.c b/lttng-context-user-ns.c index 45db066d..3bee6d65 100644 --- a/lttng-context-user-ns.c +++ b/lttng-context-user-ns.c @@ -14,7 +14,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/lttng-context-uts-ns.c b/lttng-context-uts-ns.c index 26bdfa83..02192e7f 100644 --- a/lttng-context-uts-ns.c +++ b/lttng-context-uts-ns.c @@ -14,7 +14,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/lttng-context-vegid.c b/lttng-context-vegid.c index 029658b6..abd81aa3 100644 --- a/lttng-context-vegid.c +++ b/lttng-context-vegid.c @@ -13,7 +13,7 @@ #include #include #include -#include +#include #include #include diff --git a/lttng-context-veuid.c b/lttng-context-veuid.c index 211a1651..f032b3a6 100644 --- a/lttng-context-veuid.c +++ b/lttng-context-veuid.c @@ -13,7 +13,7 @@ #include #include #include -#include +#include #include #include diff --git a/lttng-context-vgid.c b/lttng-context-vgid.c index a7b70d84..5c70003c 100644 --- a/lttng-context-vgid.c +++ b/lttng-context-vgid.c @@ -13,7 +13,7 @@ #include #include #include -#include +#include #include #include diff --git a/lttng-context-vpid.c b/lttng-context-vpid.c index 544215cb..979d52aa 100644 --- a/lttng-context-vpid.c +++ b/lttng-context-vpid.c @@ -11,7 +11,7 @@ #include #include #include -#include +#include #include #include diff --git a/lttng-context-vppid.c b/lttng-context-vppid.c index 87dd3d0d..cedf6804 100644 --- a/lttng-context-vppid.c +++ b/lttng-context-vppid.c @@ -12,7 +12,7 @@ #include #include #include -#include +#include #include #include diff --git a/lttng-context-vsgid.c b/lttng-context-vsgid.c index b82e4eab..82ada637 100644 --- a/lttng-context-vsgid.c +++ b/lttng-context-vsgid.c @@ -13,7 +13,7 @@ #include #include #include -#include +#include #include #include diff --git a/lttng-context-vsuid.c b/lttng-context-vsuid.c index 71a40d59..fab50726 100644 --- a/lttng-context-vsuid.c +++ b/lttng-context-vsuid.c @@ -13,7 +13,7 @@ #include #include #include -#include +#include #include #include diff --git a/lttng-context-vtid.c b/lttng-context-vtid.c index a2d90bb9..74198d02 100644 --- a/lttng-context-vtid.c +++ b/lttng-context-vtid.c @@ -11,7 +11,7 @@ #include #include #include -#include +#include #include #include diff --git a/lttng-context-vuid.c b/lttng-context-vuid.c index dd8eab89..13fb70ef 100644 --- a/lttng-context-vuid.c +++ b/lttng-context-vuid.c @@ -13,7 +13,7 @@ #include #include #include -#include +#include #include #include diff --git a/lttng-events.c b/lttng-events.c index 49a181b6..d22bf327 100644 --- a/lttng-events.c +++ b/lttng-events.c @@ -41,8 +41,8 @@ #include #include #include -#include -#include +#include +#include #include #define METADATA_CACHE_DEFAULT_SIZE 4096 diff --git a/lttng-ring-buffer-client.h b/lttng-ring-buffer-client.h index ecdc4adf..9e204caa 100644 --- a/lttng-ring-buffer-client.h +++ b/lttng-ring-buffer-client.h @@ -14,7 +14,7 @@ #include #include #include -#include +#include #define LTTNG_COMPACT_EVENT_BITS 5 #define LTTNG_COMPACT_TSC_BITS 27 @@ -191,7 +191,7 @@ size_t record_header_size(const struct lib_ring_buffer_config *config, return offset - orig_offset; } -#include +#include static void lttng_write_event_header_slow(const struct lib_ring_buffer_config *config, diff --git a/lttng-ring-buffer-metadata-client.h b/lttng-ring-buffer-metadata-client.h index fb71ad22..9b9ac2c2 100644 --- a/lttng-ring-buffer-metadata-client.h +++ b/lttng-ring-buffer-metadata-client.h @@ -51,7 +51,7 @@ size_t record_header_size(const struct lib_ring_buffer_config *config, return 0; } -#include +#include static u64 client_ring_buffer_clock_read(struct channel *chan) { diff --git a/lttng-tracer-core.h b/lttng-tracer-core.h index 514ae3f8..18716738 100644 --- a/lttng-tracer-core.h +++ b/lttng-tracer-core.h @@ -19,7 +19,7 @@ #define RING_BUFFER_ALIGN #endif -#include +#include struct lttng_session; struct lttng_channel; diff --git a/probes/Kbuild b/probes/Kbuild index a871a4b1..effd6f95 100644 --- a/probes/Kbuild +++ b/probes/Kbuild @@ -4,7 +4,7 @@ TOP_LTTNG_MODULES_DIR := $(shell dirname $(lastword $(MAKEFILE_LIST)))/.. include $(TOP_LTTNG_MODULES_DIR)/Kbuild.common -ccflags-y += -I$(TOP_LTTNG_MODULES_DIR) +ccflags-y += -I$(TOP_LTTNG_MODULES_DIR) -I$(TOP_LTTNG_MODULES_DIR)/include obj-$(CONFIG_LTTNG) += lttng-probe-sched.o obj-$(CONFIG_LTTNG) += lttng-probe-irq.o diff --git a/probes/lttng-kprobes.c b/probes/lttng-kprobes.c index d0a48d28..6a134732 100644 --- a/probes/lttng-kprobes.c +++ b/probes/lttng-kprobes.c @@ -11,7 +11,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/probes/lttng-kretprobes.c b/probes/lttng-kretprobes.c index 133158fe..e95ef7d5 100644 --- a/probes/lttng-kretprobes.c +++ b/probes/lttng-kretprobes.c @@ -12,7 +12,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/probes/lttng-tracepoint-event-impl.h b/probes/lttng-tracepoint-event-impl.h index 48639152..5dee7fbe 100644 --- a/probes/lttng-tracepoint-event-impl.h +++ b/probes/lttng-tracepoint-event-impl.h @@ -16,8 +16,8 @@ #include #include #include /* for wrapper_vmalloc_sync_mappings() */ -#include -#include +#include +#include #include #include #include diff --git a/probes/lttng-uprobes.c b/probes/lttng-uprobes.c index 82bd4fd4..c29e1814 100644 --- a/probes/lttng-uprobes.c +++ b/probes/lttng-uprobes.c @@ -18,7 +18,7 @@ #include #include #include -#include +#include #include #include diff --git a/tests/Kbuild b/tests/Kbuild index 3e2edf5b..fa674080 100644 --- a/tests/Kbuild +++ b/tests/Kbuild @@ -4,7 +4,7 @@ TOP_LTTNG_MODULES_DIR := $(shell dirname $(lastword $(MAKEFILE_LIST)))/.. include $(TOP_LTTNG_MODULES_DIR)/Kbuild.common -ccflags-y += -I$(TOP_LTTNG_MODULES_DIR) +ccflags-y += -I$(TOP_LTTNG_MODULES_DIR) -I$(TOP_LTTNG_MODULES_DIR)/include obj-$(CONFIG_LTTNG) += lttng-test.o lttng-test-objs := probes/lttng-test.o diff --git a/wrapper/ringbuffer/api.h b/wrapper/ringbuffer/api.h deleted file mode 100644 index 73aa8746..00000000 --- a/wrapper/ringbuffer/api.h +++ /dev/null @@ -1,2 +0,0 @@ -/* SPDX-License-Identifier: (GPL-2.0-only or LGPL-2.1-only) */ -#include diff --git a/wrapper/ringbuffer/backend.h b/wrapper/ringbuffer/backend.h deleted file mode 100644 index 48641606..00000000 --- a/wrapper/ringbuffer/backend.h +++ /dev/null @@ -1,2 +0,0 @@ -/* SPDX-License-Identifier: (GPL-2.0-only or LGPL-2.1-only) */ -#include diff --git a/wrapper/ringbuffer/backend_internal.h b/wrapper/ringbuffer/backend_internal.h deleted file mode 100644 index d48c2317..00000000 --- a/wrapper/ringbuffer/backend_internal.h +++ /dev/null @@ -1,3 +0,0 @@ -/* SPDX-License-Identifier: (GPL-2.0-only or LGPL-2.1-only) */ -#include -#include diff --git a/wrapper/ringbuffer/backend_types.h b/wrapper/ringbuffer/backend_types.h deleted file mode 100644 index ff237c03..00000000 --- a/wrapper/ringbuffer/backend_types.h +++ /dev/null @@ -1,2 +0,0 @@ -/* SPDX-License-Identifier: (GPL-2.0-only or LGPL-2.1-only) */ -#include diff --git a/wrapper/ringbuffer/config.h b/wrapper/ringbuffer/config.h deleted file mode 100644 index e1f0a965..00000000 --- a/wrapper/ringbuffer/config.h +++ /dev/null @@ -1,2 +0,0 @@ -/* SPDX-License-Identifier: (GPL-2.0-only or LGPL-2.1-only) */ -#include diff --git a/wrapper/ringbuffer/frontend.h b/wrapper/ringbuffer/frontend.h deleted file mode 100644 index 35421581..00000000 --- a/wrapper/ringbuffer/frontend.h +++ /dev/null @@ -1,2 +0,0 @@ -/* SPDX-License-Identifier: (GPL-2.0-only or LGPL-2.1-only) */ -#include diff --git a/wrapper/ringbuffer/frontend_api.h b/wrapper/ringbuffer/frontend_api.h deleted file mode 100644 index 53187bf5..00000000 --- a/wrapper/ringbuffer/frontend_api.h +++ /dev/null @@ -1,2 +0,0 @@ -/* SPDX-License-Identifier: (GPL-2.0-only or LGPL-2.1-only) */ -#include diff --git a/wrapper/ringbuffer/frontend_internal.h b/wrapper/ringbuffer/frontend_internal.h deleted file mode 100644 index c14757aa..00000000 --- a/wrapper/ringbuffer/frontend_internal.h +++ /dev/null @@ -1,2 +0,0 @@ -/* SPDX-License-Identifier: (GPL-2.0-only or LGPL-2.1-only) */ -#include diff --git a/wrapper/ringbuffer/frontend_types.h b/wrapper/ringbuffer/frontend_types.h deleted file mode 100644 index 8f6b72f2..00000000 --- a/wrapper/ringbuffer/frontend_types.h +++ /dev/null @@ -1,2 +0,0 @@ -/* SPDX-License-Identifier: (GPL-2.0-only or LGPL-2.1-only) */ -#include diff --git a/wrapper/ringbuffer/iterator.h b/wrapper/ringbuffer/iterator.h deleted file mode 100644 index 08586d33..00000000 --- a/wrapper/ringbuffer/iterator.h +++ /dev/null @@ -1,2 +0,0 @@ -/* SPDX-License-Identifier: (GPL-2.0-only or LGPL-2.1-only) */ -#include diff --git a/wrapper/ringbuffer/nohz.h b/wrapper/ringbuffer/nohz.h deleted file mode 100644 index 33568ed5..00000000 --- a/wrapper/ringbuffer/nohz.h +++ /dev/null @@ -1,2 +0,0 @@ -/* SPDX-License-Identifier: (GPL-2.0-only or LGPL-2.1-only) */ -#include diff --git a/wrapper/ringbuffer/vatomic.h b/wrapper/ringbuffer/vatomic.h deleted file mode 100644 index a5e8c76a..00000000 --- a/wrapper/ringbuffer/vatomic.h +++ /dev/null @@ -1,2 +0,0 @@ -/* SPDX-License-Identifier: (GPL-2.0-only or LGPL-2.1-only) */ -#include diff --git a/wrapper/ringbuffer/vfs.h b/wrapper/ringbuffer/vfs.h deleted file mode 100644 index 65918408..00000000 --- a/wrapper/ringbuffer/vfs.h +++ /dev/null @@ -1,2 +0,0 @@ -/* SPDX-License-Identifier: (GPL-2.0-only or LGPL-2.1-only) */ -#include -- 2.34.1