Move leftover relative include paths to system paths

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>

diff --git a/instrumentation/events/lttng-module/arch/x86/exceptions.h b/instrumentation/events/lttng-module/arch/x86/exceptions.h
index 7764a5dc2367f156f14f99ae9b8db90f8df0b53d..a4546ccaed1a9e65b10ae0d084218cd41017fbb2 100644 (file)
--- a/instrumentation/events/lttng-module/arch/x86/exceptions.h
+++ b/instrumentation/events/lttng-module/arch/x86/exceptions.h
@@ -44,7 +44,7 @@ LTTNG_EXCEPTIONS_TRACEPOINT_EVENT_INSTANCE_MAP(page_fault_kernel,
 #endif /* LTTNG_TRACE_EXCEPTIONS_H */
 
 #undef TRACE_INCLUDE_PATH
-#define TRACE_INCLUDE_PATH ../instrumentation/events/lttng-module/arch/x86
+#define TRACE_INCLUDE_PATH instrumentation/events/lttng-module/arch/x86
 #undef TRACE_INCLUDE_FILE
 #define TRACE_INCLUDE_FILE exceptions
 

diff --git a/instrumentation/events/lttng-module/arch/x86/irq_vectors.h b/instrumentation/events/lttng-module/arch/x86/irq_vectors.h
index 8207459f7f1003d8a9e4724a1676f8914fce13dc..c522aa7a976b3408e215deac30a9322cb8bb2c17 100644 (file)
--- a/instrumentation/events/lttng-module/arch/x86/irq_vectors.h
+++ b/instrumentation/events/lttng-module/arch/x86/irq_vectors.h
@@ -107,7 +107,7 @@ LTTNG_IRQ_VECTOR_TRACEPOINT_EVENT_INSTANCE_MAP(thermal_apic,
 #endif /* LTTNG_TRACE_IRQ_VECTORS_H */
 
 #undef TRACE_INCLUDE_PATH
-#define TRACE_INCLUDE_PATH ../instrumentation/events/lttng-module/arch/x86
+#define TRACE_INCLUDE_PATH instrumentation/events/lttng-module/arch/x86
 #undef TRACE_INCLUDE_FILE
 #define TRACE_INCLUDE_FILE irq_vectors
 

diff --git a/instrumentation/events/lttng-module/arch/x86/kvm/mmutrace.h b/instrumentation/events/lttng-module/arch/x86/kvm/mmutrace.h
index cc198366bedd23b2e9024f57786ba8af893f1b8c..ad09313df1fb25d6ff104dc0e1e1d157c796a22c 100644 (file)
--- a/instrumentation/events/lttng-module/arch/x86/kvm/mmutrace.h
+++ b/instrumentation/events/lttng-module/arch/x86/kvm/mmutrace.h
@@ -210,7 +210,7 @@ LTTNG_TRACEPOINT_EVENT_MAP(
 #endif /* LTTNG_TRACE_KVM_MMU_H */
 
 #undef TRACE_INCLUDE_PATH
-#define TRACE_INCLUDE_PATH ../instrumentation/events/lttng-module/arch/x86/kvm
+#define TRACE_INCLUDE_PATH instrumentation/events/lttng-module/arch/x86/kvm
 #undef TRACE_INCLUDE_FILE
 #define TRACE_INCLUDE_FILE mmutrace
 

diff --git a/instrumentation/events/lttng-module/arch/x86/kvm/trace.h b/instrumentation/events/lttng-module/arch/x86/kvm/trace.h
index d6c8dbed024cd5ed157c378ec4a35ce2060eec3f..4d8e76316780aad4080dee76a166ec868a421949 100644 (file)
--- a/instrumentation/events/lttng-module/arch/x86/kvm/trace.h
+++ b/instrumentation/events/lttng-module/arch/x86/kvm/trace.h
@@ -515,7 +515,7 @@ LTTNG_TRACEPOINT_EVENT_MAP(kvm_track_tsc, kvm_x86_track_tsc,
 #endif /* LTTNG_TRACE_KVM_H */
 
 #undef TRACE_INCLUDE_PATH
-#define TRACE_INCLUDE_PATH ../instrumentation/events/lttng-module/arch/x86/kvm
+#define TRACE_INCLUDE_PATH instrumentation/events/lttng-module/arch/x86/kvm
 #undef TRACE_INCLUDE_FILE
 #define TRACE_INCLUDE_FILE trace
 

diff --git a/lib/ringbuffer/config.h b/lib/ringbuffer/config.h
index b8169afe036b21d954b0781a7bb661ace00ad328..63189b950faa68fa4e5e348c41f1aba55dcdc098 100644 (file)
--- a/lib/ringbuffer/config.h
+++ b/lib/ringbuffer/config.h
@@ -310,6 +310,6 @@ int lib_ring_buffer_check_config(const struct lib_ring_buffer_config *config,
        return 0;
 }
 
-#include "../../wrapper/ringbuffer/vatomic.h"
+#include <wrapper/ringbuffer/vatomic.h>
 
 #endif /* _LIB_RING_BUFFER_CONFIG_H */

diff --git a/lib/ringbuffer/ring_buffer_backend.c b/lib/ringbuffer/ring_buffer_backend.c
index 83a6e39b4b2df692c955c6930f04d432e4a2c88a..f34c7ccc4ce7e6096171ba5cd55877a0e39fa908 100644 (file)
--- a/lib/ringbuffer/ring_buffer_backend.c
+++ b/lib/ringbuffer/ring_buffer_backend.c
@@ -28,10 +28,10 @@
 #include <linux/cpu.h>
 #include <linux/mm.h>
 
-#include "../../wrapper/vmalloc.h"     /* for wrapper_vmalloc_sync_all() */
-#include "../../wrapper/ringbuffer/config.h"
-#include "../../wrapper/ringbuffer/backend.h"
-#include "../../wrapper/ringbuffer/frontend.h"
+#include <wrapper/vmalloc.h>   /* for wrapper_vmalloc_sync_all() */
+#include <wrapper/ringbuffer/config.h>
+#include <wrapper/ringbuffer/backend.h>
+#include <wrapper/ringbuffer/frontend.h>
 
 /**
  * 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 dbe52c157c71be0ec560bbc6b97dc77d1b1e27ea..9ebdd5fbeefab0090d4353e42cf768e462b1647e 100644 (file)
--- a/lib/ringbuffer/ring_buffer_frontend.c
+++ b/lib/ringbuffer/ring_buffer_frontend.c
@@ -55,14 +55,14 @@
 #include <linux/module.h>
 #include <linux/percpu.h>
 
-#include "../../wrapper/ringbuffer/config.h"
-#include "../../wrapper/ringbuffer/backend.h"
-#include "../../wrapper/ringbuffer/frontend.h"
-#include "../../wrapper/ringbuffer/iterator.h"
-#include "../../wrapper/ringbuffer/nohz.h"
-#include "../../wrapper/atomic.h"
-#include "../../wrapper/kref.h"
-#include "../../wrapper/percpu-defs.h"
+#include <wrapper/ringbuffer/config.h>
+#include <wrapper/ringbuffer/backend.h>
+#include <wrapper/ringbuffer/frontend.h>
+#include <wrapper/ringbuffer/iterator.h>
+#include <wrapper/ringbuffer/nohz.h>
+#include <wrapper/atomic.h>
+#include <wrapper/kref.h>
+#include <wrapper/percpu-defs.h>
 
 /*
  * Internal structure representing offsets to use at a sub-buffer switch.

diff --git a/lib/ringbuffer/ring_buffer_iterator.c b/lib/ringbuffer/ring_buffer_iterator.c
index c6e5225669de3c044422f8451575fe6004ff655a..47e151bfce4c13ed9a525e465e98c17d7bfcfc55 100644 (file)
--- a/lib/ringbuffer/ring_buffer_iterator.c
+++ b/lib/ringbuffer/ring_buffer_iterator.c
@@ -25,8 +25,8 @@
  *     Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  */
 
-#include "../../wrapper/ringbuffer/iterator.h"
-#include "../../wrapper/file.h"
+#include <wrapper/ringbuffer/iterator.h>
+#include <wrapper/file.h>
 #include <linux/jiffies.h>
 #include <linux/delay.h>
 #include <linux/module.h>

diff --git a/lib/ringbuffer/ring_buffer_mmap.c b/lib/ringbuffer/ring_buffer_mmap.c
index 2cc0dd24df0aa1749353c125c3a1f213b9cf672b..35d30e7ec75d2426d4b74f3debb3466eb07b74ba 100644 (file)
--- a/lib/ringbuffer/ring_buffer_mmap.c
+++ b/lib/ringbuffer/ring_buffer_mmap.c
@@ -25,9 +25,9 @@
 #include <linux/module.h>
 #include <linux/mm.h>
 
-#include "../../wrapper/ringbuffer/backend.h"
-#include "../../wrapper/ringbuffer/frontend.h"
-#include "../../wrapper/ringbuffer/vfs.h"
+#include <wrapper/ringbuffer/backend.h>
+#include <wrapper/ringbuffer/frontend.h>
+#include <wrapper/ringbuffer/vfs.h>
 
 /*
  * 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 a1988f0bfd4adf847cfd8111931591c1e59152ff..0610caaf9bfedc2a1acf67eb40a0075d8f3e3f64 100644 (file)
--- a/lib/ringbuffer/ring_buffer_splice.c
+++ b/lib/ringbuffer/ring_buffer_splice.c
@@ -27,10 +27,10 @@
 #include <linux/fs.h>
 #include <linux/version.h>
 
-#include "../../wrapper/splice.h"
-#include "../../wrapper/ringbuffer/backend.h"
-#include "../../wrapper/ringbuffer/frontend.h"
-#include "../../wrapper/ringbuffer/vfs.h"
+#include <wrapper/splice.h>
+#include <wrapper/ringbuffer/backend.h>
+#include <wrapper/ringbuffer/frontend.h>
+#include <wrapper/ringbuffer/vfs.h>
 
 #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 4389b5f6562ff9e03326cd1724f1b6086123ae79..f1a8bab781cd2f5829c552067eefdb2365c1f2e7 100644 (file)
--- a/lib/ringbuffer/ring_buffer_vfs.c
+++ b/lib/ringbuffer/ring_buffer_vfs.c
@@ -24,11 +24,11 @@
 #include <linux/fs.h>
 #include <linux/compat.h>
 
-#include "../../wrapper/ringbuffer/backend.h"
-#include "../../wrapper/ringbuffer/frontend.h"
-#include "../../wrapper/ringbuffer/vfs.h"
-#include "../../wrapper/poll.h"
-#include "../../lttng-tracer.h"
+#include <wrapper/ringbuffer/backend.h>
+#include <wrapper/ringbuffer/frontend.h>
+#include <wrapper/ringbuffer/vfs.h>
+#include <wrapper/poll.h>
+#include <lttng-tracer.h>
 
 static int put_ulong(unsigned long val, unsigned long arg)
 {

diff --git a/lttng-syscalls.c b/lttng-syscalls.c
index b759e847a38b7b1842a821ce926af0aaadd56349..f4e05b080f5de3356b4f3f8ce7bfd59f486ef34a 100644 (file)
--- a/lttng-syscalls.c
+++ b/lttng-syscalls.c
@@ -92,7 +92,7 @@ struct user_msghdr;
 #define LTTNG_PACKAGE_BUILD
 #define CREATE_TRACE_POINTS
 #define TP_MODULE_NOINIT
-#define TRACE_INCLUDE_PATH ../instrumentation/syscalls/headers
+#define TRACE_INCLUDE_PATH instrumentation/syscalls/headers
 
 #define PARAMS(args...)        args
 

diff --git a/probes/lttng-probe-x86-irq-vectors.c b/probes/lttng-probe-x86-irq-vectors.c
index bc4b9a9cf5a85efda9f26925038ab741d6734c5a..7395c7938c4e26de76645621f8717c003776a9ea 100644 (file)
--- a/probes/lttng-probe-x86-irq-vectors.c
+++ b/probes/lttng-probe-x86-irq-vectors.c
@@ -39,7 +39,7 @@
  */
 #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/irq_vectors.h>
 

diff --git a/probes/lttng.c b/probes/lttng.c
index 7d063ff73cd8f163bb3ccc2e4b1727ae5b7ce7e7..58aa51548d2c1baa00f481d9d43dc3cd4e22870b 100644 (file)
--- a/probes/lttng.c
+++ b/probes/lttng.c
@@ -34,7 +34,7 @@
 #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
 #define LTTNG_INSTRUMENTATION
 

diff --git a/wrapper/ringbuffer/api.h b/wrapper/ringbuffer/api.h
index 182bee2840161f18473dcfc62b5b5ce2be8102fc..d1ffd6dee90daf745386b2345b4ff0ddeec8c8a6 100644 (file)
--- a/wrapper/ringbuffer/api.h
+++ b/wrapper/ringbuffer/api.h
@@ -1 +1 @@
-#include "../../lib/ringbuffer/api.h"
+#include <lib/ringbuffer/api.h>

diff --git a/wrapper/ringbuffer/backend.h b/wrapper/ringbuffer/backend.h
index bfdd39def1a950b998266e62e574516ec193ef20..cdb72093822159c4f11ac56af1d51abdfe95d1c8 100644 (file)
--- a/wrapper/ringbuffer/backend.h
+++ b/wrapper/ringbuffer/backend.h
@@ -1 +1 @@
-#include "../../lib/ringbuffer/backend.h"
+#include <lib/ringbuffer/backend.h>

diff --git a/wrapper/ringbuffer/backend_internal.h b/wrapper/ringbuffer/backend_internal.h
index 00d45e42a60e3142ecc2d9f1256e2dcd4363339d..a2e4db16b2e781ac3ed843203c4ec01b37bde75a 100644 (file)
--- a/wrapper/ringbuffer/backend_internal.h
+++ b/wrapper/ringbuffer/backend_internal.h
@@ -1,2 +1,2 @@
-#include "../../wrapper/inline_memcpy.h"
-#include "../../lib/ringbuffer/backend_internal.h"
+#include <wrapper/inline_memcpy.h>
+#include <lib/ringbuffer/backend_internal.h>

diff --git a/wrapper/ringbuffer/backend_types.h b/wrapper/ringbuffer/backend_types.h
index c59effda7de3d0231ab01c9bab897d1268831ce8..4d7a5ccd5fb6cfa3fa87cd940414358f61dd888a 100644 (file)
--- a/wrapper/ringbuffer/backend_types.h
+++ b/wrapper/ringbuffer/backend_types.h
@@ -1 +1 @@
-#include "../../lib/ringbuffer/backend_types.h"
+#include <lib/ringbuffer/backend_types.h>

diff --git a/wrapper/ringbuffer/config.h b/wrapper/ringbuffer/config.h
index 0ce7a9dac5588bc87e441a813c6b4706add646d7..bbb9df37069b34e478e27875ac1d5cb2371e6f78 100644 (file)
--- a/wrapper/ringbuffer/config.h
+++ b/wrapper/ringbuffer/config.h
@@ -1 +1 @@
-#include "../../lib/ringbuffer/config.h"
+#include <lib/ringbuffer/config.h>

diff --git a/wrapper/ringbuffer/frontend.h b/wrapper/ringbuffer/frontend.h
index 7c6c07052afb1f8428bce2c52cd3aaf3a9c4f25f..2ae49e267e992c9eb774818da7d2eabd79a19520 100644 (file)
--- a/wrapper/ringbuffer/frontend.h
+++ b/wrapper/ringbuffer/frontend.h
@@ -1 +1 @@
-#include "../../lib/ringbuffer/frontend.h"
+#include <lib/ringbuffer/frontend.h>

diff --git a/wrapper/ringbuffer/frontend_api.h b/wrapper/ringbuffer/frontend_api.h
index b03c501cc3f074924625cf966a87d3fcca44d989..d785aadf4a133a8372c3879555c8ff4b56f75527 100644 (file)
--- a/wrapper/ringbuffer/frontend_api.h
+++ b/wrapper/ringbuffer/frontend_api.h
@@ -1 +1 @@
-#include "../../lib/ringbuffer/frontend_api.h"
+#include <lib/ringbuffer/frontend_api.h>

diff --git a/wrapper/ringbuffer/frontend_internal.h b/wrapper/ringbuffer/frontend_internal.h
index 18991014585dc95a1543a4f0c16ac830f00c20a9..b2a4bc58c7b978ca2969e6f47ba42dea50e28b1e 100644 (file)
--- a/wrapper/ringbuffer/frontend_internal.h
+++ b/wrapper/ringbuffer/frontend_internal.h
@@ -1 +1 @@
-#include "../../lib/ringbuffer/frontend_internal.h"
+#include <lib/ringbuffer/frontend_internal.h>

diff --git a/wrapper/ringbuffer/frontend_types.h b/wrapper/ringbuffer/frontend_types.h
index 0c23244b5a2f66109fd4afddfea96e616b0e1530..f2764e54d5ee352565812f054586e8074394e084 100644 (file)
--- a/wrapper/ringbuffer/frontend_types.h
+++ b/wrapper/ringbuffer/frontend_types.h
@@ -1 +1 @@
-#include "../../lib/ringbuffer/frontend_types.h"
+#include <lib/ringbuffer/frontend_types.h>

diff --git a/wrapper/ringbuffer/iterator.h b/wrapper/ringbuffer/iterator.h
index 76e9edbb321bb789734e6d904603797d57bec437..27f6b230fd493de17f7e449739ff68bea303e4e6 100644 (file)
--- a/wrapper/ringbuffer/iterator.h
+++ b/wrapper/ringbuffer/iterator.h
@@ -1 +1 @@
-#include "../../lib/ringbuffer/iterator.h"
+#include <lib/ringbuffer/iterator.h>

diff --git a/wrapper/ringbuffer/nohz.h b/wrapper/ringbuffer/nohz.h
index 9fbb84d2370deac3a128413fef9661406fefb08f..34bd03f5f510dc19d3ffe2a8859e9934d665be1b 100644 (file)
--- a/wrapper/ringbuffer/nohz.h
+++ b/wrapper/ringbuffer/nohz.h
@@ -1 +1 @@
-#include "../../lib/ringbuffer/nohz.h"
+#include <lib/ringbuffer/nohz.h>

diff --git a/wrapper/ringbuffer/vatomic.h b/wrapper/ringbuffer/vatomic.h
index d57844520f62503781ab25d85f38f86e738345c1..7244425b4e2058e24d6df604d6139b5b539b63ce 100644 (file)
--- a/wrapper/ringbuffer/vatomic.h
+++ b/wrapper/ringbuffer/vatomic.h
@@ -1 +1 @@
-#include "../../lib/ringbuffer/vatomic.h"
+#include <lib/ringbuffer/vatomic.h>

diff --git a/wrapper/ringbuffer/vfs.h b/wrapper/ringbuffer/vfs.h
index f8e9ed949da0b84707d7469b8d0a90b92b623b0d..0af99361a26a36ddaa38f1bbd5b04076fa79c39d 100644 (file)
--- a/wrapper/ringbuffer/vfs.h
+++ b/wrapper/ringbuffer/vfs.h
@@ -1 +1 @@
-#include "../../lib/ringbuffer/vfs.h"
+#include <lib/ringbuffer/vfs.h>