From: Mathieu Desnoyers Date: Tue, 15 Mar 2016 15:35:47 +0000 (-0400) Subject: Use system header paths in core implementation files X-Git-Tag: v2.8.0-rc1~9 X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=241ae9a8fb62c3ce467d244e280062c24e73eb7a;p=lttng-modules.git Use system header paths in core implementation files Signed-off-by: Mathieu Desnoyers --- diff --git a/lttng-abi.c b/lttng-abi.c index 54988b79..e046520e 100644 --- a/lttng-abi.c +++ b/lttng-abi.c @@ -44,18 +44,18 @@ #include #include #include -#include "wrapper/vmalloc.h" /* for wrapper_vmalloc_sync_all() */ -#include "wrapper/ringbuffer/vfs.h" -#include "wrapper/ringbuffer/backend.h" -#include "wrapper/ringbuffer/frontend.h" -#include "wrapper/poll.h" -#include "wrapper/file.h" -#include "wrapper/kref.h" -#include "lttng-abi.h" -#include "lttng-abi-old.h" -#include "lttng-events.h" -#include "lttng-tracer.h" -#include "lib/ringbuffer/frontend_types.h" +#include /* for wrapper_vmalloc_sync_all() */ +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include /* * This is LTTng's own personal way to create a system call as an external diff --git a/lttng-calibrate.c b/lttng-calibrate.c index 6f8915e9..55cb1c46 100644 --- a/lttng-calibrate.c +++ b/lttng-calibrate.c @@ -20,8 +20,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "lttng-abi.h" -#include "lttng-events.h" +#include +#include noinline void lttng_calibrate_kretprobe(void) diff --git a/lttng-clock.c b/lttng-clock.c index 4296d6c1..a5a7eaa3 100644 --- a/lttng-clock.c +++ b/lttng-clock.c @@ -22,9 +22,9 @@ #include #include -#include "wrapper/trace-clock.h" -#include "lttng-events.h" -#include "lttng-tracer.h" +#include +#include +#include struct lttng_trace_clock *lttng_trace_clock; EXPORT_SYMBOL_GPL(lttng_trace_clock); diff --git a/lttng-context-cpu-id.c b/lttng-context-cpu-id.c index 94126afd..f2bab8fe 100644 --- a/lttng-context-cpu-id.c +++ b/lttng-context-cpu-id.c @@ -23,10 +23,10 @@ #include #include #include -#include "lttng-events.h" -#include "wrapper/ringbuffer/frontend_types.h" -#include "wrapper/vmalloc.h" -#include "lttng-tracer.h" +#include +#include +#include +#include static size_t cpu_id_get_size(size_t offset) diff --git a/lttng-context-hostname.c b/lttng-context-hostname.c index cd414c09..791fed46 100644 --- a/lttng-context-hostname.c +++ b/lttng-context-hostname.c @@ -24,10 +24,10 @@ #include #include #include -#include "lttng-events.h" -#include "wrapper/ringbuffer/frontend_types.h" -#include "wrapper/vmalloc.h" -#include "lttng-tracer.h" +#include +#include +#include +#include #define LTTNG_HOSTNAME_CTX_LEN (__NEW_UTS_LEN + 1) diff --git a/lttng-context-interruptible.c b/lttng-context-interruptible.c index 295b10dc..8966fa95 100644 --- a/lttng-context-interruptible.c +++ b/lttng-context-interruptible.c @@ -24,10 +24,10 @@ #include #include #include -#include "lttng-events.h" -#include "wrapper/ringbuffer/frontend_types.h" -#include "wrapper/vmalloc.h" -#include "lttng-tracer.h" +#include +#include +#include +#include /* * Interruptible at value -1 means "unknown". diff --git a/lttng-context-migratable.c b/lttng-context-migratable.c index ef0c4edf..4aefce61 100644 --- a/lttng-context-migratable.c +++ b/lttng-context-migratable.c @@ -24,10 +24,10 @@ #include #include #include -#include "lttng-events.h" -#include "wrapper/ringbuffer/frontend_types.h" -#include "wrapper/vmalloc.h" -#include "lttng-tracer.h" +#include +#include +#include +#include static size_t migratable_get_size(size_t offset) diff --git a/lttng-context-need-reschedule.c b/lttng-context-need-reschedule.c index b0ea6d1c..987d917e 100644 --- a/lttng-context-need-reschedule.c +++ b/lttng-context-need-reschedule.c @@ -24,10 +24,10 @@ #include #include #include -#include "lttng-events.h" -#include "wrapper/ringbuffer/frontend_types.h" -#include "wrapper/vmalloc.h" -#include "lttng-tracer.h" +#include +#include +#include +#include static size_t need_reschedule_get_size(size_t offset) diff --git a/lttng-context-nice.c b/lttng-context-nice.c index 2ad3841d..a8823c42 100644 --- a/lttng-context-nice.c +++ b/lttng-context-nice.c @@ -23,10 +23,10 @@ #include #include #include -#include "lttng-events.h" -#include "wrapper/ringbuffer/frontend_types.h" -#include "wrapper/vmalloc.h" -#include "lttng-tracer.h" +#include +#include +#include +#include static size_t nice_get_size(size_t offset) diff --git a/lttng-context-perf-counters.c b/lttng-context-perf-counters.c index 467b7180..239cf0cc 100644 --- a/lttng-context-perf-counters.c +++ b/lttng-context-perf-counters.c @@ -26,11 +26,11 @@ #include #include #include -#include "lttng-events.h" -#include "wrapper/ringbuffer/frontend_types.h" -#include "wrapper/vmalloc.h" -#include "wrapper/perf.h" -#include "lttng-tracer.h" +#include +#include +#include +#include +#include static size_t perf_counter_get_size(size_t offset) diff --git a/lttng-context-pid.c b/lttng-context-pid.c index 3428be60..4cff3076 100644 --- a/lttng-context-pid.c +++ b/lttng-context-pid.c @@ -23,10 +23,10 @@ #include #include #include -#include "lttng-events.h" -#include "wrapper/ringbuffer/frontend_types.h" -#include "wrapper/vmalloc.h" -#include "lttng-tracer.h" +#include +#include +#include +#include static size_t pid_get_size(size_t offset) diff --git a/lttng-context-ppid.c b/lttng-context-ppid.c index 7323b881..8b7c8ed7 100644 --- a/lttng-context-ppid.c +++ b/lttng-context-ppid.c @@ -24,10 +24,10 @@ #include #include #include -#include "lttng-events.h" -#include "wrapper/ringbuffer/frontend_types.h" -#include "wrapper/vmalloc.h" -#include "lttng-tracer.h" +#include +#include +#include +#include static size_t ppid_get_size(size_t offset) diff --git a/lttng-context-preemptible.c b/lttng-context-preemptible.c index 70534147..c8421045 100644 --- a/lttng-context-preemptible.c +++ b/lttng-context-preemptible.c @@ -24,10 +24,10 @@ #include #include #include -#include "lttng-events.h" -#include "wrapper/ringbuffer/frontend_types.h" -#include "wrapper/vmalloc.h" -#include "lttng-tracer.h" +#include +#include +#include +#include /* * We nest twice in preempt disabling within LTTng: one nesting is done diff --git a/lttng-context-prio.c b/lttng-context-prio.c index 5a27e048..8a0839cf 100644 --- a/lttng-context-prio.c +++ b/lttng-context-prio.c @@ -23,11 +23,11 @@ #include #include #include -#include "lttng-events.h" -#include "wrapper/ringbuffer/frontend_types.h" -#include "wrapper/vmalloc.h" -#include "wrapper/kallsyms.h" -#include "lttng-tracer.h" +#include +#include +#include +#include +#include static int (*wrapper_task_prio_sym)(struct task_struct *t); diff --git a/lttng-context-procname.c b/lttng-context-procname.c index 6b5e90ab..f0b9d975 100644 --- a/lttng-context-procname.c +++ b/lttng-context-procname.c @@ -23,10 +23,10 @@ #include #include #include -#include "lttng-events.h" -#include "wrapper/ringbuffer/frontend_types.h" -#include "wrapper/vmalloc.h" -#include "lttng-tracer.h" +#include +#include +#include +#include static size_t procname_get_size(size_t offset) diff --git a/lttng-context-tid.c b/lttng-context-tid.c index 3eded5b3..913c6d5b 100644 --- a/lttng-context-tid.c +++ b/lttng-context-tid.c @@ -23,10 +23,10 @@ #include #include #include -#include "lttng-events.h" -#include "wrapper/ringbuffer/frontend_types.h" -#include "wrapper/vmalloc.h" -#include "lttng-tracer.h" +#include +#include +#include +#include static size_t tid_get_size(size_t offset) diff --git a/lttng-context-vpid.c b/lttng-context-vpid.c index a2080f1b..48236659 100644 --- a/lttng-context-vpid.c +++ b/lttng-context-vpid.c @@ -23,10 +23,10 @@ #include #include #include -#include "lttng-events.h" -#include "wrapper/ringbuffer/frontend_types.h" -#include "wrapper/vmalloc.h" -#include "lttng-tracer.h" +#include +#include +#include +#include static size_t vpid_get_size(size_t offset) diff --git a/lttng-context-vppid.c b/lttng-context-vppid.c index 9e7e54d1..cb5c050e 100644 --- a/lttng-context-vppid.c +++ b/lttng-context-vppid.c @@ -24,10 +24,10 @@ #include #include #include -#include "lttng-events.h" -#include "wrapper/ringbuffer/frontend_types.h" -#include "wrapper/vmalloc.h" -#include "lttng-tracer.h" +#include +#include +#include +#include static size_t vppid_get_size(size_t offset) diff --git a/lttng-context-vtid.c b/lttng-context-vtid.c index 425f3681..ddc29e6e 100644 --- a/lttng-context-vtid.c +++ b/lttng-context-vtid.c @@ -23,10 +23,10 @@ #include #include #include -#include "lttng-events.h" -#include "wrapper/ringbuffer/frontend_types.h" -#include "wrapper/vmalloc.h" -#include "lttng-tracer.h" +#include +#include +#include +#include static size_t vtid_get_size(size_t offset) diff --git a/lttng-context.c b/lttng-context.c index 1121f6ef..9f5cb249 100644 --- a/lttng-context.c +++ b/lttng-context.c @@ -24,9 +24,9 @@ #include #include #include -#include "wrapper/vmalloc.h" /* for wrapper_vmalloc_sync_all() */ -#include "lttng-events.h" -#include "lttng-tracer.h" +#include /* for wrapper_vmalloc_sync_all() */ +#include +#include /* * The filter implementation requires that two consecutive "get" for the diff --git a/lttng-events.c b/lttng-events.c index 71b53017..1f286394 100644 --- a/lttng-events.c +++ b/lttng-events.c @@ -36,21 +36,21 @@ #include #include #include -#include "wrapper/file.h" +#include #include #include #include -#include "wrapper/uuid.h" -#include "wrapper/vmalloc.h" /* for wrapper_vmalloc_sync_all() */ -#include "wrapper/random.h" -#include "wrapper/tracepoint.h" -#include "wrapper/list.h" -#include "lttng-kernel-version.h" -#include "lttng-events.h" -#include "lttng-tracer.h" -#include "lttng-abi-old.h" -#include "wrapper/vzalloc.h" +#include +#include /* for wrapper_vmalloc_sync_all() */ +#include +#include +#include +#include +#include +#include +#include +#include #define METADATA_CACHE_DEFAULT_SIZE 4096 diff --git a/lttng-filter-interpreter.c b/lttng-filter-interpreter.c index 713a9d7d..8323fbbb 100644 --- a/lttng-filter-interpreter.c +++ b/lttng-filter-interpreter.c @@ -22,7 +22,7 @@ #include -#include "lttng-filter.h" +#include /* * get_char should be called with page fault handler disabled if it is expected diff --git a/lttng-filter-specialize.c b/lttng-filter-specialize.c index b82497d2..978ee1a6 100644 --- a/lttng-filter-specialize.c +++ b/lttng-filter-specialize.c @@ -20,7 +20,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "lttng-filter.h" +#include int lttng_filter_specialize_bytecode(struct bytecode_runtime *bytecode) { diff --git a/lttng-filter-validator.c b/lttng-filter-validator.c index 446fc41b..4bf534b5 100644 --- a/lttng-filter-validator.c +++ b/lttng-filter-validator.c @@ -24,8 +24,8 @@ #include #include -#include "wrapper/list.h" -#include "lttng-filter.h" +#include +#include #define MERGE_POINT_TABLE_BITS 7 #define MERGE_POINT_TABLE_SIZE (1U << MERGE_POINT_TABLE_BITS) diff --git a/lttng-filter.c b/lttng-filter.c index e9f549ca..e96fcd30 100644 --- a/lttng-filter.c +++ b/lttng-filter.c @@ -23,7 +23,7 @@ #include #include -#include "lttng-filter.h" +#include static const char *opnames[] = { [ FILTER_OP_UNKNOWN ] = "UNKNOWN", diff --git a/lttng-probes.c b/lttng-probes.c index 0385a79c..dd2b2ce7 100644 --- a/lttng-probes.c +++ b/lttng-probes.c @@ -25,7 +25,7 @@ #include #include -#include "lttng-events.h" +#include /* * probe list is protected by sessions lock. diff --git a/lttng-ring-buffer-client-discard.c b/lttng-ring-buffer-client-discard.c index 0038f11a..62d8793a 100644 --- a/lttng-ring-buffer-client-discard.c +++ b/lttng-ring-buffer-client-discard.c @@ -21,7 +21,7 @@ */ #include -#include "lttng-tracer.h" +#include #define RING_BUFFER_MODE_TEMPLATE RING_BUFFER_DISCARD #define RING_BUFFER_MODE_TEMPLATE_STRING "discard" diff --git a/lttng-ring-buffer-client-mmap-discard.c b/lttng-ring-buffer-client-mmap-discard.c index 6d1d76f8..fa95d0ac 100644 --- a/lttng-ring-buffer-client-mmap-discard.c +++ b/lttng-ring-buffer-client-mmap-discard.c @@ -21,7 +21,7 @@ */ #include -#include "lttng-tracer.h" +#include #define RING_BUFFER_MODE_TEMPLATE RING_BUFFER_DISCARD #define RING_BUFFER_MODE_TEMPLATE_STRING "discard-mmap" diff --git a/lttng-ring-buffer-client-mmap-overwrite.c b/lttng-ring-buffer-client-mmap-overwrite.c index 8164e2a5..76974791 100644 --- a/lttng-ring-buffer-client-mmap-overwrite.c +++ b/lttng-ring-buffer-client-mmap-overwrite.c @@ -21,7 +21,7 @@ */ #include -#include "lttng-tracer.h" +#include #define RING_BUFFER_MODE_TEMPLATE RING_BUFFER_OVERWRITE #define RING_BUFFER_MODE_TEMPLATE_STRING "overwrite-mmap" diff --git a/lttng-ring-buffer-client-overwrite.c b/lttng-ring-buffer-client-overwrite.c index ab6b7a4a..0d20acb4 100644 --- a/lttng-ring-buffer-client-overwrite.c +++ b/lttng-ring-buffer-client-overwrite.c @@ -21,7 +21,7 @@ */ #include -#include "lttng-tracer.h" +#include #define RING_BUFFER_MODE_TEMPLATE RING_BUFFER_OVERWRITE #define RING_BUFFER_MODE_TEMPLATE_STRING "overwrite" diff --git a/lttng-ring-buffer-metadata-client.c b/lttng-ring-buffer-metadata-client.c index c177d450..71f4d562 100644 --- a/lttng-ring-buffer-metadata-client.c +++ b/lttng-ring-buffer-metadata-client.c @@ -21,7 +21,7 @@ */ #include -#include "lttng-tracer.h" +#include #define RING_BUFFER_MODE_TEMPLATE RING_BUFFER_DISCARD #define RING_BUFFER_MODE_TEMPLATE_STRING "metadata" diff --git a/lttng-ring-buffer-metadata-mmap-client.c b/lttng-ring-buffer-metadata-mmap-client.c index 14ffa3ad..c707a059 100644 --- a/lttng-ring-buffer-metadata-mmap-client.c +++ b/lttng-ring-buffer-metadata-mmap-client.c @@ -21,7 +21,7 @@ */ #include -#include "lttng-tracer.h" +#include #define RING_BUFFER_MODE_TEMPLATE RING_BUFFER_DISCARD #define RING_BUFFER_MODE_TEMPLATE_STRING "metadata-mmap" diff --git a/lttng-statedump-impl.c b/lttng-statedump-impl.c index 3dc61b0f..4c1a99d0 100644 --- a/lttng-statedump-impl.c +++ b/lttng-statedump-impl.c @@ -47,17 +47,17 @@ #include #include -#include "lttng-events.h" -#include "lttng-tracer.h" -#include "wrapper/irqdesc.h" -#include "wrapper/spinlock.h" -#include "wrapper/fdtable.h" -#include "wrapper/nsproxy.h" -#include "wrapper/irq.h" -#include "wrapper/tracepoint.h" -#include "wrapper/genhd.h" -#include "wrapper/file.h" -#include "wrapper/time.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #ifdef CONFIG_LTTNG_HAS_LIST_IRQ #include @@ -65,10 +65,10 @@ /* Define the tracepoints, but do not build the probes */ #define CREATE_TRACE_POINTS -#define TRACE_INCLUDE_PATH ../instrumentation/events/lttng-module +#define TRACE_INCLUDE_PATH instrumentation/events/lttng-module #define TRACE_INCLUDE_FILE lttng-statedump #define LTTNG_INSTRUMENTATION -#include "instrumentation/events/lttng-module/lttng-statedump.h" +#include DEFINE_TRACE(lttng_statedump_block_device); DEFINE_TRACE(lttng_statedump_end); diff --git a/lttng-syscalls.c b/lttng-syscalls.c index e691e8bf..b759e847 100644 --- a/lttng-syscalls.c +++ b/lttng-syscalls.c @@ -34,11 +34,11 @@ #include #include -#include "lib/bitfield.h" -#include "wrapper/tracepoint.h" -#include "wrapper/file.h" -#include "wrapper/rcu.h" -#include "lttng-events.h" +#include +#include +#include +#include +#include #ifndef CONFIG_COMPAT # ifndef is_compat_task @@ -99,7 +99,7 @@ struct user_msghdr; /* Handle unknown syscalls */ #undef TRACE_SYSTEM #define TRACE_SYSTEM syscalls_unknown -#include "instrumentation/syscalls/headers/syscalls_unknown.h" +#include #undef TRACE_SYSTEM #define SC_ENTER @@ -130,12 +130,12 @@ struct user_msghdr; #undef TRACE_SYSTEM #define TRACE_SYSTEM syscall_entry_integers #define TRACE_INCLUDE_FILE syscalls_integers -#include "instrumentation/syscalls/headers/syscalls_integers.h" +#include #undef TRACE_INCLUDE_FILE #undef TRACE_SYSTEM #define TRACE_SYSTEM syscall_entry_pointers #define TRACE_INCLUDE_FILE syscalls_pointers -#include "instrumentation/syscalls/headers/syscalls_pointers.h" +#include #undef TRACE_INCLUDE_FILE #undef TRACE_SYSTEM #undef SC_LTTNG_TRACEPOINT_EVENT_CODE @@ -161,12 +161,12 @@ struct user_msghdr; compat_syscall_entry_##_name) #define TRACE_SYSTEM compat_syscall_entry_integers #define TRACE_INCLUDE_FILE compat_syscalls_integers -#include "instrumentation/syscalls/headers/compat_syscalls_integers.h" +#include #undef TRACE_INCLUDE_FILE #undef TRACE_SYSTEM #define TRACE_SYSTEM compat_syscall_entry_pointers #define TRACE_INCLUDE_FILE compat_syscalls_pointers -#include "instrumentation/syscalls/headers/compat_syscalls_pointers.h" +#include #undef TRACE_INCLUDE_FILE #undef TRACE_SYSTEM #undef SC_LTTNG_TRACEPOINT_EVENT_CODE @@ -205,12 +205,12 @@ struct user_msghdr; syscall_exit_##_name) #define TRACE_SYSTEM syscall_exit_integers #define TRACE_INCLUDE_FILE syscalls_integers -#include "instrumentation/syscalls/headers/syscalls_integers.h" +#include #undef TRACE_INCLUDE_FILE #undef TRACE_SYSTEM #define TRACE_SYSTEM syscall_exit_pointers #define TRACE_INCLUDE_FILE syscalls_pointers -#include "instrumentation/syscalls/headers/syscalls_pointers.h" +#include #undef TRACE_INCLUDE_FILE #undef TRACE_SYSTEM #undef SC_LTTNG_TRACEPOINT_EVENT_CODE @@ -237,12 +237,12 @@ struct user_msghdr; compat_syscall_exit_##_name) #define TRACE_SYSTEM compat_syscall_exit_integers #define TRACE_INCLUDE_FILE compat_syscalls_integers -#include "instrumentation/syscalls/headers/compat_syscalls_integers.h" +#include #undef TRACE_INCLUDE_FILE #undef TRACE_SYSTEM #define TRACE_SYSTEM compat_syscall_exit_pointers #define TRACE_INCLUDE_FILE compat_syscalls_pointers -#include "instrumentation/syscalls/headers/compat_syscalls_pointers.h" +#include #undef TRACE_INCLUDE_FILE #undef TRACE_SYSTEM #undef SC_LTTNG_TRACEPOINT_EVENT_CODE @@ -284,8 +284,8 @@ struct trace_syscall_entry { /* Syscall enter tracing table */ static const struct trace_syscall_entry sc_table[] = { -#include "instrumentation/syscalls/headers/syscalls_integers.h" -#include "instrumentation/syscalls/headers/syscalls_pointers.h" +#include +#include }; #undef TRACE_SYSCALL_TABLE @@ -299,8 +299,8 @@ static const struct trace_syscall_entry sc_table[] = { /* Compat syscall enter table */ const struct trace_syscall_entry compat_sc_table[] = { -#include "instrumentation/syscalls/headers/compat_syscalls_integers.h" -#include "instrumentation/syscalls/headers/compat_syscalls_pointers.h" +#include +#include }; #undef SC_ENTER @@ -321,8 +321,8 @@ const struct trace_syscall_entry compat_sc_table[] = { /* Syscall exit table */ static const struct trace_syscall_entry sc_exit_table[] = { -#include "instrumentation/syscalls/headers/syscalls_integers.h" -#include "instrumentation/syscalls/headers/syscalls_pointers.h" +#include +#include }; #undef TRACE_SYSCALL_TABLE @@ -336,8 +336,8 @@ static const struct trace_syscall_entry sc_exit_table[] = { /* Compat syscall exit table */ const struct trace_syscall_entry compat_sc_exit_table[] = { -#include "instrumentation/syscalls/headers/compat_syscalls_integers.h" -#include "instrumentation/syscalls/headers/compat_syscalls_pointers.h" +#include +#include }; #undef SC_EXIT diff --git a/lttng-tracepoint.c b/lttng-tracepoint.c index f8a9cedc..7a50dd28 100644 --- a/lttng-tracepoint.c +++ b/lttng-tracepoint.c @@ -28,8 +28,8 @@ #include #include -#include "lttng-tracepoint.h" -#include "wrapper/list.h" +#include +#include /* * Protect the tracepoint table. lttng_tracepoint_mutex nests within diff --git a/lttng-tracker-pid.c b/lttng-tracker-pid.c index 55bf63c9..02b15c42 100644 --- a/lttng-tracker-pid.c +++ b/lttng-tracker-pid.c @@ -28,10 +28,10 @@ #include #include -#include "wrapper/tracepoint.h" -#include "wrapper/rcu.h" -#include "wrapper/list.h" -#include "lttng-events.h" +#include +#include +#include +#include /* * Hash table is allocated and freed when there are no possible