From: Mathieu Desnoyers Date: Tue, 15 Mar 2016 15:16:43 +0000 (-0400) Subject: Use system include paths in probes X-Git-Tag: v2.8.0-rc1~11 X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=156a3977f8fa114924d7bbd2bd04c94fd2ac0649;p=lttng-modules.git Use system include paths in probes Signed-off-by: Mathieu Desnoyers --- diff --git a/probes/lttng-ftrace.c b/probes/lttng-ftrace.c index 56cfa56a..d8523198 100644 --- a/probes/lttng-ftrace.c +++ b/probes/lttng-ftrace.c @@ -33,11 +33,11 @@ #include #include #include -#include "../lttng-events.h" -#include "../wrapper/ringbuffer/frontend_types.h" -#include "../wrapper/ftrace.h" -#include "../wrapper/vmalloc.h" -#include "../lttng-tracer.h" +#include +#include +#include +#include +#include static void lttng_ftrace_handler(unsigned long ip, unsigned long parent_ip, void **data) diff --git a/probes/lttng-kprobes.c b/probes/lttng-kprobes.c index c2547f0a..daf14cec 100644 --- a/probes/lttng-kprobes.c +++ b/probes/lttng-kprobes.c @@ -23,11 +23,11 @@ #include #include #include -#include "../lttng-events.h" -#include "../wrapper/ringbuffer/frontend_types.h" -#include "../wrapper/vmalloc.h" -#include "../wrapper/irqflags.h" -#include "../lttng-tracer.h" +#include +#include +#include +#include +#include static int lttng_kprobes_handler_pre(struct kprobe *p, struct pt_regs *regs) diff --git a/probes/lttng-kretprobes.c b/probes/lttng-kretprobes.c index f4911f99..498df620 100644 --- a/probes/lttng-kretprobes.c +++ b/probes/lttng-kretprobes.c @@ -24,11 +24,11 @@ #include #include #include -#include "../lttng-events.h" -#include "../wrapper/ringbuffer/frontend_types.h" -#include "../wrapper/vmalloc.h" -#include "../wrapper/irqflags.h" -#include "../lttng-tracer.h" +#include +#include +#include +#include +#include enum lttng_kretprobe_type { EVENT_ENTRY = 0, diff --git a/probes/lttng-probe-asoc.c b/probes/lttng-probe-asoc.c index 8da64b88..75234ecd 100644 --- a/probes/lttng-probe-asoc.c +++ b/probes/lttng-probe-asoc.c @@ -24,7 +24,7 @@ #include #include #include -#include "../lttng-tracer.h" +#include /* * Create the tracepoint static inlines from the kernel to validate that our @@ -37,9 +37,9 @@ */ #define LTTNG_PACKAGE_BUILD #define CREATE_TRACE_POINTS -#define TRACE_INCLUDE_PATH ../instrumentation/events/lttng-module +#define TRACE_INCLUDE_PATH instrumentation/events/lttng-module -#include "../instrumentation/events/lttng-module/asoc.h" +#include MODULE_LICENSE("GPL and additional rights"); MODULE_AUTHOR("Wade Farnsworth , Paul Woegerer , and Andrew Gabbasov "); diff --git a/probes/lttng-probe-block.c b/probes/lttng-probe-block.c index d363d4de..827ead21 100644 --- a/probes/lttng-probe-block.c +++ b/probes/lttng-probe-block.c @@ -22,8 +22,8 @@ #include #include -#include "../lttng-tracer.h" -#include "../lttng-kernel-version.h" +#include +#include /* * Create the tracepoint static inlines from the kernel to validate that our @@ -31,16 +31,16 @@ */ #include -#include "../wrapper/tracepoint.h" +#include /* * Create LTTng tracepoint probes. */ #define LTTNG_PACKAGE_BUILD #define CREATE_TRACE_POINTS -#define TRACE_INCLUDE_PATH ../instrumentation/events/lttng-module +#define TRACE_INCLUDE_PATH instrumentation/events/lttng-module -#include "../instrumentation/events/lttng-module/block.h" +#include MODULE_LICENSE("GPL and additional rights"); MODULE_AUTHOR("Mathieu Desnoyers "); diff --git a/probes/lttng-probe-btrfs.c b/probes/lttng-probe-btrfs.c index 5f66d37e..89fa3517 100644 --- a/probes/lttng-probe-btrfs.c +++ b/probes/lttng-probe-btrfs.c @@ -27,7 +27,7 @@ #include <../fs/btrfs/transaction.h> #include <../fs/btrfs/volumes.h> #include -#include "../lttng-tracer.h" +#include /* * Create the tracepoint static inlines from the kernel to validate that our @@ -40,9 +40,9 @@ */ #define LTTNG_PACKAGE_BUILD #define CREATE_TRACE_POINTS -#define TRACE_INCLUDE_PATH ../instrumentation/events/lttng-module +#define TRACE_INCLUDE_PATH instrumentation/events/lttng-module -#include "../instrumentation/events/lttng-module/btrfs.h" +#include MODULE_LICENSE("GPL and additional rights"); MODULE_AUTHOR("Andrew Gabbasov "); diff --git a/probes/lttng-probe-compaction.c b/probes/lttng-probe-compaction.c index 86ef375e..939ca9dd 100644 --- a/probes/lttng-probe-compaction.c +++ b/probes/lttng-probe-compaction.c @@ -22,7 +22,7 @@ */ #include -#include "../lttng-tracer.h" +#include /* * Create the tracepoint static inlines from the kernel to validate that our @@ -35,9 +35,9 @@ */ #define LTTNG_PACKAGE_BUILD #define CREATE_TRACE_POINTS -#define TRACE_INCLUDE_PATH ../instrumentation/events/lttng-module +#define TRACE_INCLUDE_PATH instrumentation/events/lttng-module -#include "../instrumentation/events/lttng-module/compaction.h" +#include MODULE_LICENSE("GPL and additional rights"); MODULE_AUTHOR("Andrew Gabbasov "); diff --git a/probes/lttng-probe-ext3.c b/probes/lttng-probe-ext3.c index ad5e63c8..00518be8 100644 --- a/probes/lttng-probe-ext3.c +++ b/probes/lttng-probe-ext3.c @@ -25,7 +25,7 @@ #include #include #include -#include "../lttng-tracer.h" +#include #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,4,0)) #include <../fs/ext3/ext3.h> @@ -44,9 +44,9 @@ */ #define LTTNG_PACKAGE_BUILD #define CREATE_TRACE_POINTS -#define TRACE_INCLUDE_PATH ../instrumentation/events/lttng-module +#define TRACE_INCLUDE_PATH instrumentation/events/lttng-module -#include "../instrumentation/events/lttng-module/ext3.h" +#include MODULE_LICENSE("GPL and additional rights"); MODULE_AUTHOR("Wade Farnsworth , Paul Woegerer , and Andrew Gabbasov "); diff --git a/probes/lttng-probe-ext4.c b/probes/lttng-probe-ext4.c index 157c9db4..470192c5 100644 --- a/probes/lttng-probe-ext4.c +++ b/probes/lttng-probe-ext4.c @@ -27,7 +27,7 @@ #include <../fs/ext4/mballoc.h> #include <../fs/ext4/ext4_extents.h> #include -#include "../lttng-tracer.h" +#include /* * Create the tracepoint static inlines from the kernel to validate that our @@ -35,17 +35,17 @@ */ #include -#include "../lttng-kernel-version.h" -#include "../wrapper/tracepoint.h" +#include +#include /* * Create LTTng tracepoint probes. */ #define LTTNG_PACKAGE_BUILD #define CREATE_TRACE_POINTS -#define TRACE_INCLUDE_PATH ../instrumentation/events/lttng-module +#define TRACE_INCLUDE_PATH instrumentation/events/lttng-module -#include "../instrumentation/events/lttng-module/ext4.h" +#include MODULE_LICENSE("GPL and additional rights"); MODULE_AUTHOR("Andrew Gabbasov "); diff --git a/probes/lttng-probe-gpio.c b/probes/lttng-probe-gpio.c index a156722d..f08b8972 100644 --- a/probes/lttng-probe-gpio.c +++ b/probes/lttng-probe-gpio.c @@ -22,7 +22,7 @@ */ #include -#include "../lttng-tracer.h" +#include /* * Create the tracepoint static inlines from the kernel to validate that our @@ -35,9 +35,9 @@ */ #define LTTNG_PACKAGE_BUILD #define CREATE_TRACE_POINTS -#define TRACE_INCLUDE_PATH ../instrumentation/events/lttng-module +#define TRACE_INCLUDE_PATH instrumentation/events/lttng-module -#include "../instrumentation/events/lttng-module/gpio.h" +#include MODULE_LICENSE("GPL and additional rights"); MODULE_AUTHOR("Wade Farnsworth "); diff --git a/probes/lttng-probe-irq.c b/probes/lttng-probe-irq.c index 74a480e5..3483e0f7 100644 --- a/probes/lttng-probe-irq.c +++ b/probes/lttng-probe-irq.c @@ -22,7 +22,7 @@ #include #include -#include "../lttng-tracer.h" +#include /* * Create the tracepoint static inlines from the kernel to validate that our @@ -30,16 +30,16 @@ */ #include -#include "../wrapper/tracepoint.h" +#include /* * Create LTTng tracepoint probes. */ #define LTTNG_PACKAGE_BUILD #define CREATE_TRACE_POINTS -#define TRACE_INCLUDE_PATH ../instrumentation/events/lttng-module +#define TRACE_INCLUDE_PATH instrumentation/events/lttng-module -#include "../instrumentation/events/lttng-module/irq.h" +#include MODULE_LICENSE("GPL and additional rights"); MODULE_AUTHOR("Mathieu Desnoyers "); diff --git a/probes/lttng-probe-jbd.c b/probes/lttng-probe-jbd.c index 2b255e4c..d632ca13 100644 --- a/probes/lttng-probe-jbd.c +++ b/probes/lttng-probe-jbd.c @@ -22,7 +22,7 @@ */ #include -#include "../lttng-tracer.h" +#include /* * Create the tracepoint static inlines from the kernel to validate that our @@ -35,9 +35,9 @@ */ #define LTTNG_PACKAGE_BUILD #define CREATE_TRACE_POINTS -#define TRACE_INCLUDE_PATH ../instrumentation/events/lttng-module +#define TRACE_INCLUDE_PATH instrumentation/events/lttng-module -#include "../instrumentation/events/lttng-module/jbd.h" +#include MODULE_LICENSE("GPL and additional rights"); MODULE_AUTHOR("Wade Farnsworth , Paul Woegerer , and Andrew Gabbasov "); diff --git a/probes/lttng-probe-jbd2.c b/probes/lttng-probe-jbd2.c index 2fee3722..2232e9cd 100644 --- a/probes/lttng-probe-jbd2.c +++ b/probes/lttng-probe-jbd2.c @@ -22,7 +22,7 @@ */ #include -#include "../lttng-tracer.h" +#include /* * Create the tracepoint static inlines from the kernel to validate that our @@ -30,16 +30,16 @@ */ #include -#include "../wrapper/tracepoint.h" +#include /* * Create LTTng tracepoint probes. */ #define LTTNG_PACKAGE_BUILD #define CREATE_TRACE_POINTS -#define TRACE_INCLUDE_PATH ../instrumentation/events/lttng-module +#define TRACE_INCLUDE_PATH instrumentation/events/lttng-module -#include "../instrumentation/events/lttng-module/jbd2.h" +#include MODULE_LICENSE("GPL and additional rights"); MODULE_AUTHOR("Wade Farnsworth and Andrew Gabbasov "); diff --git a/probes/lttng-probe-kmem.c b/probes/lttng-probe-kmem.c index 350d9173..ae3dc8b4 100644 --- a/probes/lttng-probe-kmem.c +++ b/probes/lttng-probe-kmem.c @@ -25,10 +25,10 @@ * This page_alloc.h wrapper needs to be included before gfpflags.h because it * overrides a function with a define. */ -#include "../wrapper/page_alloc.h" +#include #include #include -#include "../lttng-tracer.h" +#include /* * Create the tracepoint static inlines from the kernel to validate that our @@ -36,16 +36,16 @@ */ #include -#include "../wrapper/tracepoint.h" +#include /* * Create LTTng tracepoint probes. */ #define LTTNG_PACKAGE_BUILD #define CREATE_TRACE_POINTS -#define TRACE_INCLUDE_PATH ../instrumentation/events/lttng-module +#define TRACE_INCLUDE_PATH instrumentation/events/lttng-module -#include "../instrumentation/events/lttng-module/kmem.h" +#include MODULE_LICENSE("GPL and additional rights"); MODULE_AUTHOR("Wade Farnsworth and Andrew Gabbasov "); diff --git a/probes/lttng-probe-kvm-x86-mmu.c b/probes/lttng-probe-kvm-x86-mmu.c index 5231615d..ca5444ac 100644 --- a/probes/lttng-probe-kvm-x86-mmu.c +++ b/probes/lttng-probe-kvm-x86-mmu.c @@ -22,8 +22,8 @@ #include #include -#include "../lttng-tracer.h" -#include "../lttng-kernel-version.h" +#include +#include #if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,1,0)) #include @@ -35,7 +35,7 @@ * Create the tracepoint static inlines from the kernel to validate that our * trace event macros match the kernel we run on. */ -#include "../wrapper/tracepoint.h" +#include #include <../../arch/x86/kvm/mmutrace.h> @@ -48,8 +48,8 @@ #define LTTNG_PACKAGE_BUILD #define CREATE_TRACE_POINTS -#define TRACE_INCLUDE_PATH ../instrumentation/events/lttng-module/arch/x86/kvm -#include "../instrumentation/events/lttng-module/arch/x86/kvm/mmutrace.h" +#define TRACE_INCLUDE_PATH instrumentation/events/lttng-module/arch/x86/kvm +#include MODULE_LICENSE("GPL and additional rights"); MODULE_AUTHOR("Mathieu Desnoyers "); diff --git a/probes/lttng-probe-kvm-x86.c b/probes/lttng-probe-kvm-x86.c index 9b2054d8..fa3f9dcc 100644 --- a/probes/lttng-probe-kvm-x86.c +++ b/probes/lttng-probe-kvm-x86.c @@ -22,8 +22,8 @@ #include #include -#include "../lttng-tracer.h" -#include "../lttng-kernel-version.h" +#include +#include #if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,1,0)) #include @@ -37,7 +37,7 @@ */ #include -#include "../wrapper/tracepoint.h" +#include /* * Create LTTng tracepoint probes. @@ -45,8 +45,8 @@ #define LTTNG_PACKAGE_BUILD #define CREATE_TRACE_POINTS -#define TRACE_INCLUDE_PATH ../instrumentation/events/lttng-module/arch/x86/kvm -#include "../instrumentation/events/lttng-module/arch/x86/kvm/trace.h" +#define TRACE_INCLUDE_PATH instrumentation/events/lttng-module/arch/x86/kvm +#include MODULE_LICENSE("GPL and additional rights"); MODULE_AUTHOR("Mathieu Desnoyers "); diff --git a/probes/lttng-probe-kvm.c b/probes/lttng-probe-kvm.c index e027c800..66e90fb8 100644 --- a/probes/lttng-probe-kvm.c +++ b/probes/lttng-probe-kvm.c @@ -22,7 +22,7 @@ #include #include -#include "../lttng-tracer.h" +#include /* * Create the tracepoint static inlines from the kernel to validate that our @@ -30,16 +30,16 @@ */ #include -#include "../wrapper/tracepoint.h" +#include /* * Create LTTng tracepoint probes. */ #define LTTNG_PACKAGE_BUILD #define CREATE_TRACE_POINTS -#define TRACE_INCLUDE_PATH ../instrumentation/events/lttng-module +#define TRACE_INCLUDE_PATH instrumentation/events/lttng-module -#include "../instrumentation/events/lttng-module/kvm.h" +#include MODULE_LICENSE("GPL and additional rights"); MODULE_AUTHOR("Mathieu Desnoyers "); diff --git a/probes/lttng-probe-lock.c b/probes/lttng-probe-lock.c index 50f24c08..4e59da85 100644 --- a/probes/lttng-probe-lock.c +++ b/probes/lttng-probe-lock.c @@ -23,7 +23,7 @@ #include #include -#include "../lttng-tracer.h" +#include /* * Create the tracepoint static inlines from the kernel to validate that our @@ -35,16 +35,16 @@ #include #endif -#include "../wrapper/tracepoint.h" +#include /* * Create LTTng tracepoint probes. */ #define LTTNG_PACKAGE_BUILD #define CREATE_TRACE_POINTS -#define TRACE_INCLUDE_PATH ../instrumentation/events/lttng-module +#define TRACE_INCLUDE_PATH instrumentation/events/lttng-module -#include "../instrumentation/events/lttng-module/lock.h" +#include MODULE_LICENSE("GPL and additional rights"); MODULE_AUTHOR("Wade Farnsworth and Andrew Gabbasov "); diff --git a/probes/lttng-probe-module.c b/probes/lttng-probe-module.c index 467668d7..f2d1f290 100644 --- a/probes/lttng-probe-module.c +++ b/probes/lttng-probe-module.c @@ -22,7 +22,7 @@ */ #include -#include "../lttng-tracer.h" +#include /* * Create the tracepoint static inlines from the kernel to validate that our @@ -30,16 +30,16 @@ */ #include -#include "../wrapper/tracepoint.h" +#include /* * Create LTTng tracepoint probes. */ #define LTTNG_PACKAGE_BUILD #define CREATE_TRACE_POINTS -#define TRACE_INCLUDE_PATH ../instrumentation/events/lttng-module +#define TRACE_INCLUDE_PATH instrumentation/events/lttng-module -#include "../instrumentation/events/lttng-module/module.h" +#include MODULE_LICENSE("GPL and additional rights"); MODULE_AUTHOR("Wade Farnsworth and Andrew Gabbasov "); diff --git a/probes/lttng-probe-napi.c b/probes/lttng-probe-napi.c index 3500f507..765878fd 100644 --- a/probes/lttng-probe-napi.c +++ b/probes/lttng-probe-napi.c @@ -22,7 +22,7 @@ */ #include -#include "../lttng-tracer.h" +#include /* * Create the tracepoint static inlines from the kernel to validate that our @@ -30,16 +30,16 @@ */ #include -#include "../wrapper/tracepoint.h" +#include /* * Create LTTng tracepoint probes. */ #define LTTNG_PACKAGE_BUILD #define CREATE_TRACE_POINTS -#define TRACE_INCLUDE_PATH ../instrumentation/events/lttng-module +#define TRACE_INCLUDE_PATH instrumentation/events/lttng-module -#include "../instrumentation/events/lttng-module/napi.h" +#include MODULE_LICENSE("GPL and additional rights"); MODULE_AUTHOR("Wade Farnsworth "); diff --git a/probes/lttng-probe-net.c b/probes/lttng-probe-net.c index f46f5c9d..61876638 100644 --- a/probes/lttng-probe-net.c +++ b/probes/lttng-probe-net.c @@ -22,7 +22,7 @@ */ #include -#include "../lttng-tracer.h" +#include /* * Create the tracepoint static inlines from the kernel to validate that our @@ -35,9 +35,9 @@ */ #define LTTNG_PACKAGE_BUILD #define CREATE_TRACE_POINTS -#define TRACE_INCLUDE_PATH ../instrumentation/events/lttng-module +#define TRACE_INCLUDE_PATH instrumentation/events/lttng-module -#include "../instrumentation/events/lttng-module/net.h" +#include MODULE_LICENSE("GPL and additional rights"); MODULE_AUTHOR("Wade Farnsworth "); diff --git a/probes/lttng-probe-power.c b/probes/lttng-probe-power.c index 275cc650..834e85cf 100644 --- a/probes/lttng-probe-power.c +++ b/probes/lttng-probe-power.c @@ -22,7 +22,7 @@ */ #include -#include "../lttng-tracer.h" +#include /* * Create the tracepoint static inlines from the kernel to validate that our @@ -30,16 +30,16 @@ */ #include -#include "../wrapper/tracepoint.h" +#include /* * Create LTTng tracepoint probes. */ #define LTTNG_PACKAGE_BUILD #define CREATE_TRACE_POINTS -#define TRACE_INCLUDE_PATH ../instrumentation/events/lttng-module +#define TRACE_INCLUDE_PATH instrumentation/events/lttng-module -#include "../instrumentation/events/lttng-module/power.h" +#include MODULE_LICENSE("GPL and additional rights"); MODULE_AUTHOR("Wade Farnsworth and Andrew Gabbasov "); diff --git a/probes/lttng-probe-printk.c b/probes/lttng-probe-printk.c index 41f3a7b9..6c02531c 100644 --- a/probes/lttng-probe-printk.c +++ b/probes/lttng-probe-printk.c @@ -22,7 +22,7 @@ */ #include -#include "../lttng-tracer.h" +#include /* * Create the tracepoint static inlines from the kernel to validate that our @@ -35,9 +35,9 @@ */ #define LTTNG_PACKAGE_BUILD #define CREATE_TRACE_POINTS -#define TRACE_INCLUDE_PATH ../instrumentation/events/lttng-module +#define TRACE_INCLUDE_PATH instrumentation/events/lttng-module -#include "../instrumentation/events/lttng-module/printk.h" +#include MODULE_LICENSE("GPL and additional rights"); MODULE_AUTHOR("Andrew Gabbasov "); diff --git a/probes/lttng-probe-random.c b/probes/lttng-probe-random.c index 483a605e..ebcd4319 100644 --- a/probes/lttng-probe-random.c +++ b/probes/lttng-probe-random.c @@ -22,7 +22,7 @@ */ #include -#include "../lttng-tracer.h" +#include /* * Create the tracepoint static inlines from the kernel to validate that our @@ -35,9 +35,9 @@ */ #define LTTNG_PACKAGE_BUILD #define CREATE_TRACE_POINTS -#define TRACE_INCLUDE_PATH ../instrumentation/events/lttng-module +#define TRACE_INCLUDE_PATH instrumentation/events/lttng-module -#include "../instrumentation/events/lttng-module/random.h" +#include MODULE_LICENSE("GPL and additional rights"); MODULE_AUTHOR("Andrew Gabbasov "); diff --git a/probes/lttng-probe-rcu.c b/probes/lttng-probe-rcu.c index 874a6738..84d5bed1 100644 --- a/probes/lttng-probe-rcu.c +++ b/probes/lttng-probe-rcu.c @@ -23,7 +23,7 @@ #include #include -#include "../lttng-tracer.h" +#include /* * Create the tracepoint static inlines from the kernel to validate that our @@ -36,9 +36,9 @@ */ #define LTTNG_PACKAGE_BUILD #define CREATE_TRACE_POINTS -#define TRACE_INCLUDE_PATH ../instrumentation/events/lttng-module +#define TRACE_INCLUDE_PATH instrumentation/events/lttng-module -#include "../instrumentation/events/lttng-module/rcu.h" +#include MODULE_LICENSE("GPL and additional rights"); MODULE_AUTHOR("Andrew Gabbasov "); diff --git a/probes/lttng-probe-regmap.c b/probes/lttng-probe-regmap.c index f6856658..88a4b8b9 100644 --- a/probes/lttng-probe-regmap.c +++ b/probes/lttng-probe-regmap.c @@ -23,8 +23,8 @@ #include #include -#include "../lttng-kernel-version.h" -#include "../lttng-tracer.h" +#include +#include /* * Create the tracepoint static inlines from the kernel to validate that our @@ -40,9 +40,9 @@ */ #define LTTNG_PACKAGE_BUILD #define CREATE_TRACE_POINTS -#define TRACE_INCLUDE_PATH ../instrumentation/events/lttng-module +#define TRACE_INCLUDE_PATH instrumentation/events/lttng-module -#include "../instrumentation/events/lttng-module/regmap.h" +#include MODULE_LICENSE("GPL and additional rights"); MODULE_AUTHOR("Andrew Gabbasov "); diff --git a/probes/lttng-probe-regulator.c b/probes/lttng-probe-regulator.c index 735b2c88..4e393032 100644 --- a/probes/lttng-probe-regulator.c +++ b/probes/lttng-probe-regulator.c @@ -22,7 +22,7 @@ */ #include -#include "../lttng-tracer.h" +#include /* * Create the tracepoint static inlines from the kernel to validate that our @@ -35,9 +35,9 @@ */ #define LTTNG_PACKAGE_BUILD #define CREATE_TRACE_POINTS -#define TRACE_INCLUDE_PATH ../instrumentation/events/lttng-module +#define TRACE_INCLUDE_PATH instrumentation/events/lttng-module -#include "../instrumentation/events/lttng-module/regulator.h" +#include MODULE_LICENSE("GPL and additional rights"); MODULE_AUTHOR("Wade Farnsworth "); diff --git a/probes/lttng-probe-rpm.c b/probes/lttng-probe-rpm.c index 55c11c31..687a5426 100644 --- a/probes/lttng-probe-rpm.c +++ b/probes/lttng-probe-rpm.c @@ -23,7 +23,7 @@ #include #include -#include "../lttng-tracer.h" +#include /* * Create the tracepoint static inlines from the kernel to validate that our @@ -36,9 +36,9 @@ */ #define LTTNG_PACKAGE_BUILD #define CREATE_TRACE_POINTS -#define TRACE_INCLUDE_PATH ../instrumentation/events/lttng-module +#define TRACE_INCLUDE_PATH instrumentation/events/lttng-module -#include "../instrumentation/events/lttng-module/rpm.h" +#include MODULE_LICENSE("GPL and additional rights"); MODULE_AUTHOR("Andrew Gabbasov "); diff --git a/probes/lttng-probe-sched.c b/probes/lttng-probe-sched.c index e132260f..62156ebf 100644 --- a/probes/lttng-probe-sched.c +++ b/probes/lttng-probe-sched.c @@ -21,7 +21,7 @@ */ #include -#include "../lttng-tracer.h" +#include /* * Create the tracepoint static inlines from the kernel to validate that our @@ -29,16 +29,16 @@ */ #include -#include "../wrapper/tracepoint.h" +#include /* * Create LTTng tracepoint probes. */ #define LTTNG_PACKAGE_BUILD #define CREATE_TRACE_POINTS -#define TRACE_INCLUDE_PATH ../instrumentation/events/lttng-module +#define TRACE_INCLUDE_PATH instrumentation/events/lttng-module -#include "../instrumentation/events/lttng-module/sched.h" +#include MODULE_LICENSE("GPL and additional rights"); MODULE_AUTHOR("Mathieu Desnoyers "); diff --git a/probes/lttng-probe-scsi.c b/probes/lttng-probe-scsi.c index 77273948..5cd5968c 100644 --- a/probes/lttng-probe-scsi.c +++ b/probes/lttng-probe-scsi.c @@ -23,7 +23,7 @@ #include #include -#include "../lttng-tracer.h" +#include /* * Create the tracepoint static inlines from the kernel to validate that our @@ -36,9 +36,9 @@ */ #define LTTNG_PACKAGE_BUILD #define CREATE_TRACE_POINTS -#define TRACE_INCLUDE_PATH ../instrumentation/events/lttng-module +#define TRACE_INCLUDE_PATH instrumentation/events/lttng-module -#include "../instrumentation/events/lttng-module/scsi.h" +#include MODULE_LICENSE("GPL and additional rights"); MODULE_AUTHOR("Wade Farnsworth and Andrew Gabbasov "); diff --git a/probes/lttng-probe-signal.c b/probes/lttng-probe-signal.c index 305b5144..e11b13c9 100644 --- a/probes/lttng-probe-signal.c +++ b/probes/lttng-probe-signal.c @@ -21,7 +21,7 @@ */ #include -#include "../lttng-tracer.h" +#include /* * Create the tracepoint static inlines from the kernel to validate that our @@ -34,9 +34,9 @@ */ #define LTTNG_PACKAGE_BUILD #define CREATE_TRACE_POINTS -#define TRACE_INCLUDE_PATH ../instrumentation/events/lttng-module +#define TRACE_INCLUDE_PATH instrumentation/events/lttng-module -#include "../instrumentation/events/lttng-module/signal.h" +#include MODULE_LICENSE("GPL and additional rights"); MODULE_AUTHOR("Mathieu Desnoyers "); diff --git a/probes/lttng-probe-skb.c b/probes/lttng-probe-skb.c index 196ccd7b..9e1ca716 100644 --- a/probes/lttng-probe-skb.c +++ b/probes/lttng-probe-skb.c @@ -22,7 +22,7 @@ */ #include -#include "../lttng-tracer.h" +#include /* * Create the tracepoint static inlines from the kernel to validate that our @@ -30,16 +30,16 @@ */ #include -#include "../wrapper/tracepoint.h" +#include /* * Create LTTng tracepoint probes. */ #define LTTNG_PACKAGE_BUILD #define CREATE_TRACE_POINTS -#define TRACE_INCLUDE_PATH ../instrumentation/events/lttng-module +#define TRACE_INCLUDE_PATH instrumentation/events/lttng-module -#include "../instrumentation/events/lttng-module/skb.h" +#include MODULE_LICENSE("GPL and additional rights"); MODULE_AUTHOR("Wade Farnsworth and Andrew Gabbasov "); diff --git a/probes/lttng-probe-sock.c b/probes/lttng-probe-sock.c index 96dbcb43..6cd7d057 100644 --- a/probes/lttng-probe-sock.c +++ b/probes/lttng-probe-sock.c @@ -22,7 +22,7 @@ */ #include -#include "../lttng-tracer.h" +#include /* * Create the tracepoint static inlines from the kernel to validate that our @@ -35,9 +35,9 @@ */ #define LTTNG_PACKAGE_BUILD #define CREATE_TRACE_POINTS -#define TRACE_INCLUDE_PATH ../instrumentation/events/lttng-module +#define TRACE_INCLUDE_PATH instrumentation/events/lttng-module -#include "../instrumentation/events/lttng-module/sock.h" +#include MODULE_LICENSE("GPL and additional rights"); MODULE_AUTHOR("Wade Farnsworth "); diff --git a/probes/lttng-probe-statedump.c b/probes/lttng-probe-statedump.c index d5b2957f..91e892a9 100644 --- a/probes/lttng-probe-statedump.c +++ b/probes/lttng-probe-statedump.c @@ -28,8 +28,8 @@ #include #include #include -#include "../lttng-events.h" -#include "../lttng-tracer.h" +#include +#include /* * Create LTTng tracepoint probes. @@ -37,10 +37,10 @@ #define LTTNG_PACKAGE_BUILD #define CREATE_TRACE_POINTS #define TP_SESSION_CHECK -#define TRACE_INCLUDE_PATH ../instrumentation/events/lttng-module +#define TRACE_INCLUDE_PATH instrumentation/events/lttng-module #define TRACE_INCLUDE_FILE lttng-statedump -#include "../instrumentation/events/lttng-module/lttng-statedump.h" +#include MODULE_LICENSE("GPL and additional rights"); MODULE_AUTHOR("Mathieu Desnoyers "); diff --git a/probes/lttng-probe-sunrpc.c b/probes/lttng-probe-sunrpc.c index 258dbc18..8d37414c 100644 --- a/probes/lttng-probe-sunrpc.c +++ b/probes/lttng-probe-sunrpc.c @@ -22,7 +22,7 @@ */ #include -#include "../lttng-tracer.h" +#include /* * Create the tracepoint static inlines from the kernel to validate that our @@ -35,9 +35,9 @@ */ #define LTTNG_PACKAGE_BUILD #define CREATE_TRACE_POINTS -#define TRACE_INCLUDE_PATH ../instrumentation/events/lttng-module +#define TRACE_INCLUDE_PATH instrumentation/events/lttng-module -#include "../instrumentation/events/lttng-module/rpc.h" +#include MODULE_LICENSE("GPL and additional rights"); MODULE_AUTHOR("Andrew Gabbasov "); diff --git a/probes/lttng-probe-timer.c b/probes/lttng-probe-timer.c index f86f7120..19e3ae5f 100644 --- a/probes/lttng-probe-timer.c +++ b/probes/lttng-probe-timer.c @@ -21,7 +21,7 @@ */ #include -#include "../lttng-tracer.h" +#include /* * Create the tracepoint static inlines from the kernel to validate that our @@ -31,16 +31,16 @@ #include #include -#include "../wrapper/tracepoint.h" +#include /* * Create LTTng tracepoint probes. */ #define LTTNG_PACKAGE_BUILD #define CREATE_TRACE_POINTS -#define TRACE_INCLUDE_PATH ../instrumentation/events/lttng-module +#define TRACE_INCLUDE_PATH instrumentation/events/lttng-module -#include "../instrumentation/events/lttng-module/timer.h" +#include MODULE_LICENSE("GPL and additional rights"); MODULE_AUTHOR("Mathieu Desnoyers "); diff --git a/probes/lttng-probe-udp.c b/probes/lttng-probe-udp.c index ed3eb351..e915d913 100644 --- a/probes/lttng-probe-udp.c +++ b/probes/lttng-probe-udp.c @@ -22,7 +22,7 @@ */ #include -#include "../lttng-tracer.h" +#include /* * Create the tracepoint static inlines from the kernel to validate that our @@ -35,9 +35,9 @@ */ #define LTTNG_PACKAGE_BUILD #define CREATE_TRACE_POINTS -#define TRACE_INCLUDE_PATH ../instrumentation/events/lttng-module +#define TRACE_INCLUDE_PATH instrumentation/events/lttng-module -#include "../instrumentation/events/lttng-module/udp.h" +#include MODULE_LICENSE("GPL and additional rights"); MODULE_AUTHOR("Wade Farnsworth "); diff --git a/probes/lttng-probe-user.c b/probes/lttng-probe-user.c index cdf7955b..e92107d9 100644 --- a/probes/lttng-probe-user.c +++ b/probes/lttng-probe-user.c @@ -20,7 +20,7 @@ #include #include -#include "lttng-probe-user.h" +#include /* * Calculate string length. Include final null terminating character if there is diff --git a/probes/lttng-probe-v4l2.c b/probes/lttng-probe-v4l2.c index bdb38fdb..bae153bc 100644 --- a/probes/lttng-probe-v4l2.c +++ b/probes/lttng-probe-v4l2.c @@ -24,7 +24,7 @@ #include #include #include -#include "../lttng-tracer.h" +#include /* * Create the tracepoint static inlines from the kernel to validate that our * trace event macros match the kernel we run on. @@ -36,9 +36,9 @@ */ #define LTTNG_PACKAGE_BUILD #define CREATE_TRACE_POINTS -#define TRACE_INCLUDE_PATH ../instrumentation/events/lttng-module +#define TRACE_INCLUDE_PATH instrumentation/events/lttng-module -#include "../instrumentation/events/lttng-module/v4l2.h" +#include MODULE_LICENSE("GPL and additional rights"); MODULE_AUTHOR("Wade Farnsworth "); diff --git a/probes/lttng-probe-vmscan.c b/probes/lttng-probe-vmscan.c index c1e84a77..19d6b777 100644 --- a/probes/lttng-probe-vmscan.c +++ b/probes/lttng-probe-vmscan.c @@ -22,7 +22,7 @@ */ #include -#include "../lttng-tracer.h" +#include /* * Create the tracepoint static inlines from the kernel to validate that our @@ -30,16 +30,16 @@ */ #include -#include "../lttng-kernel-version.h" +#include /* * Create LTTng tracepoint probes. */ #define LTTNG_PACKAGE_BUILD #define CREATE_TRACE_POINTS -#define TRACE_INCLUDE_PATH ../instrumentation/events/lttng-module +#define TRACE_INCLUDE_PATH instrumentation/events/lttng-module -#include "../instrumentation/events/lttng-module/mm_vmscan.h" +#include MODULE_LICENSE("GPL and additional rights"); MODULE_AUTHOR("Wade Farnsworth , Paul Woegerer , and Andrew Gabbasov "); diff --git a/probes/lttng-probe-workqueue.c b/probes/lttng-probe-workqueue.c index 044536e0..9d3192e3 100644 --- a/probes/lttng-probe-workqueue.c +++ b/probes/lttng-probe-workqueue.c @@ -23,7 +23,7 @@ #include #include -#include "../lttng-tracer.h" +#include struct cpu_workqueue_struct; struct pool_workqueue; @@ -34,16 +34,16 @@ struct pool_workqueue; */ #include -#include "../wrapper/tracepoint.h" +#include /* * Create LTTng tracepoint probes. */ #define LTTNG_PACKAGE_BUILD #define CREATE_TRACE_POINTS -#define TRACE_INCLUDE_PATH ../instrumentation/events/lttng-module +#define TRACE_INCLUDE_PATH instrumentation/events/lttng-module -#include "../instrumentation/events/lttng-module/workqueue.h" +#include MODULE_LICENSE("GPL and additional rights"); MODULE_AUTHOR("Andrew Gabbasov "); diff --git a/probes/lttng-probe-writeback.c b/probes/lttng-probe-writeback.c index 71752d7d..45e3f182 100644 --- a/probes/lttng-probe-writeback.c +++ b/probes/lttng-probe-writeback.c @@ -24,7 +24,7 @@ #include #include #include -#include "../lttng-tracer.h" +#include /* * Create the tracepoint static inlines from the kernel to validate that our @@ -32,8 +32,8 @@ */ #include -#include "../lttng-kernel-version.h" -#include "../wrapper/writeback.h" +#include +#include /* #if */ @@ -46,9 +46,9 @@ */ #define LTTNG_PACKAGE_BUILD #define CREATE_TRACE_POINTS -#define TRACE_INCLUDE_PATH ../instrumentation/events/lttng-module +#define TRACE_INCLUDE_PATH instrumentation/events/lttng-module -#include "../instrumentation/events/lttng-module/writeback.h" +#include MODULE_LICENSE("GPL and additional rights"); MODULE_AUTHOR("Andrew Gabbasov "); diff --git a/probes/lttng-probe-x86-exceptions.c b/probes/lttng-probe-x86-exceptions.c index a8c9bf32..ae239e42 100644 --- a/probes/lttng-probe-x86-exceptions.c +++ b/probes/lttng-probe-x86-exceptions.c @@ -21,7 +21,7 @@ */ #include -#include "../lttng-tracer.h" +#include /* * Create the tracepoint static inlines from the kernel to validate that our @@ -29,7 +29,7 @@ */ #include -#include "../wrapper/tracepoint.h" +#include #undef TRACE_INCLUDE_PATH #undef TRACE_INCLUDE_FILE @@ -39,9 +39,9 @@ */ #define LTTNG_PACKAGE_BUILD #define CREATE_TRACE_POINTS -#define TRACE_INCLUDE_PATH ../instrumentation/events/lttng-module/arch/x86 +#define TRACE_INCLUDE_PATH instrumentation/events/lttng-module/arch/x86 -#include "../instrumentation/events/lttng-module/arch/x86/exceptions.h" +#include MODULE_LICENSE("GPL and additional rights"); MODULE_AUTHOR("Mathieu Desnoyers "); diff --git a/probes/lttng-probe-x86-irq-vectors.c b/probes/lttng-probe-x86-irq-vectors.c index 39c9db22..bc4b9a9c 100644 --- a/probes/lttng-probe-x86-irq-vectors.c +++ b/probes/lttng-probe-x86-irq-vectors.c @@ -21,7 +21,7 @@ */ #include -#include "../lttng-tracer.h" +#include /* * Create the tracepoint static inlines from the kernel to validate that our @@ -29,7 +29,7 @@ */ #include -#include "../wrapper/tracepoint.h" +#include #undef TRACE_INCLUDE_PATH #undef TRACE_INCLUDE_FILE @@ -41,7 +41,7 @@ #define CREATE_TRACE_POINTS #define TRACE_INCLUDE_PATH ../instrumentation/events/lttng-module/arch/x86 -#include "../instrumentation/events/lttng-module/arch/x86/irq_vectors.h" +#include MODULE_LICENSE("GPL and additional rights"); MODULE_AUTHOR("Mathieu Desnoyers "); diff --git a/probes/lttng-test.c b/probes/lttng-test.c index bd9f5f89..54be4c7c 100644 --- a/probes/lttng-test.c +++ b/probes/lttng-test.c @@ -25,18 +25,18 @@ #include #include -#include "../lttng-events.h" -#include "../lttng-tracer.h" -#include "../wrapper/tracepoint.h" -#include "../wrapper/kstrtox.h" +#include +#include +#include +#include #define TP_MODULE_NOAUTOLOAD #define LTTNG_PACKAGE_BUILD #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-test #define LTTNG_INSTRUMENTATION -#include "../instrumentation/events/lttng-module/lttng-test.h" +#include DEFINE_TRACE(lttng_test_filter_event); diff --git a/probes/lttng.c b/probes/lttng.c index e1033d66..7d063ff7 100644 --- a/probes/lttng.c +++ b/probes/lttng.c @@ -28,8 +28,8 @@ #include #include #include -#include "../wrapper/vmalloc.h" -#include "../lttng-events.h" +#include +#include #define TP_MODULE_NOAUTOLOAD #define LTTNG_PACKAGE_BUILD @@ -38,7 +38,7 @@ #define TRACE_INCLUDE_FILE lttng #define LTTNG_INSTRUMENTATION -#include "../instrumentation/events/lttng-module/lttng.h" +#include /* Events written through logger are truncated at 1024 bytes */ #define LTTNG_LOGGER_COUNT_MAX 1024