libs: use system include paths

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

diff --git a/lib/align.h b/lib/align.h
index a21169ea62bfce36faf9824be9fd0389fca5554b..5b91ae87410bdff7c031dbae5b8feb6a52b0c7ec 100644 (file)
--- a/lib/align.h
+++ b/lib/align.h
@@ -24,7 +24,7 @@
 #ifdef __KERNEL__
 
 #include <linux/types.h>
-#include "bug.h"
+#include <lib/bug.h>
 
 #define ALIGN_FLOOR(x, a)      __ALIGN_FLOOR_MASK(x, (typeof(x)) (a) - 1)
 #define __ALIGN_FLOOR_MASK(x, mask)    ((x) & ~(mask))

diff --git a/lib/bitfield.h b/lib/bitfield.h
index 0af1c39d196a92e11d698bf8e2cc365324de3357..a3927a566a491e72170d792ac4992253b1073922 100644 (file)
--- a/lib/bitfield.h
+++ b/lib/bitfield.h
@@ -27,7 +27,7 @@
  * SOFTWARE.
  */
 
-#include "../lttng-endian.h"
+#include <lttng-endian.h>
 
 #ifndef CHAR_BIT
 #define CHAR_BIT 8

diff --git a/lib/prio_heap/lttng_prio_heap.c b/lib/prio_heap/lttng_prio_heap.c
index d296da0c2a1f85dfdb7b47e3201756466d056355..6db7f524008c332dfa426f5dbf7c8a5d4b9361b7 100644 (file)
--- a/lib/prio_heap/lttng_prio_heap.c
+++ b/lib/prio_heap/lttng_prio_heap.c
@@ -25,7 +25,7 @@
  */
 
 #include <linux/slab.h>
-#include "lttng_prio_heap.h"
+#include <lib/prio_heap/lttng_prio_heap.h>
 
 #ifdef DEBUG_HEAP
 void lttng_check_heap(const struct lttng_ptr_heap *heap)

diff --git a/lib/ringbuffer/api.h b/lib/ringbuffer/api.h
index fbac7110706f76c411c5561975332074491a68d6..4383b14e0c3bd122b25c8d8cc0f9aef34d14ad7c 100644 (file)
--- a/lib/ringbuffer/api.h
+++ b/lib/ringbuffer/api.h
@@ -23,15 +23,15 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "../../wrapper/ringbuffer/backend.h"
-#include "../../wrapper/ringbuffer/frontend.h"
-#include "../../wrapper/ringbuffer/vfs.h"
+#include <wrapper/ringbuffer/backend.h>
+#include <wrapper/ringbuffer/frontend.h>
+#include <wrapper/ringbuffer/vfs.h>
 
 /*
  * ring_buffer_frontend_api.h contains static inline functions that depend on
- * client static inlines. Hence the inclusion of this "api" header only
+ * client static inlines. Hence the inclusion of this >api> header only
  * within the client.
  */
-#include "../../wrapper/ringbuffer/frontend_api.h"
+#include <wrapper/ringbuffer/frontend_api.h>
 
 #endif /* _LIB_RING_BUFFER_API_H */

diff --git a/lib/ringbuffer/backend.h b/lib/ringbuffer/backend.h
index 6f3296bc9491b2983f85ea82f2f88af2ebb6cd4c..c0142071666bed5df347b3ab96d3762e9830ddf9 100644 (file)
--- a/lib/ringbuffer/backend.h
+++ b/lib/ringbuffer/backend.h
@@ -37,8 +37,8 @@
 #include <linux/uaccess.h>
 
 /* Internal helpers */
-#include "../../wrapper/ringbuffer/backend_internal.h"
-#include "../../wrapper/ringbuffer/frontend_internal.h"
+#include <wrapper/ringbuffer/backend_internal.h>
+#include <wrapper/ringbuffer/frontend_internal.h>
 
 /* Ring buffer backend API */
 

diff --git a/lib/ringbuffer/backend_internal.h b/lib/ringbuffer/backend_internal.h
index 04a7ae17db7ea7fcba964f1d64092c5de7409b22..d18967d6738d48721eed9d1471c0140d02b99629 100644 (file)
--- a/lib/ringbuffer/backend_internal.h
+++ b/lib/ringbuffer/backend_internal.h
@@ -23,9 +23,9 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "../../wrapper/ringbuffer/config.h"
-#include "../../wrapper/ringbuffer/backend_types.h"
-#include "../../wrapper/ringbuffer/frontend_types.h"
+#include <wrapper/ringbuffer/config.h>
+#include <wrapper/ringbuffer/backend_types.h>
+#include <wrapper/ringbuffer/frontend_types.h>
 #include <linux/string.h>
 #include <linux/uaccess.h>
 

diff --git a/lib/ringbuffer/config.h b/lib/ringbuffer/config.h
index 8fa2c55bdd45375d08ea2570336e9fff1011f984..b8169afe036b21d954b0781a7bb661ace00ad328 100644 (file)
--- a/lib/ringbuffer/config.h
+++ b/lib/ringbuffer/config.h
@@ -26,8 +26,8 @@
 
 #include <linux/types.h>
 #include <linux/percpu.h>
-#include "../align.h"
-#include "../../lttng-tracer-core.h"
+#include <lib/align.h>
+#include <lttng-tracer-core.h>
 
 struct lib_ring_buffer;
 struct channel;

diff --git a/lib/ringbuffer/frontend.h b/lib/ringbuffer/frontend.h
index 4473e86f37592fdce2c286373ee0859342cbafaa..4955b3dd9accf320b76c836838e6ba0406c85ea4 100644 (file)
--- a/lib/ringbuffer/frontend.h
+++ b/lib/ringbuffer/frontend.h
@@ -49,7 +49,7 @@
 #include <asm/local.h>
 
 /* Internal helpers */
-#include "../../wrapper/ringbuffer/frontend_internal.h"
+#include <wrapper/ringbuffer/frontend_internal.h>
 
 /* Buffer creation/removal and setup operations */
 

diff --git a/lib/ringbuffer/frontend_api.h b/lib/ringbuffer/frontend_api.h
index b622bd7e865cae4079a4a91c2bab87eed34ebb32..b92ff290c300f07e90498612719fdfe190d9d79a 100644 (file)
--- a/lib/ringbuffer/frontend_api.h
+++ b/lib/ringbuffer/frontend_api.h
@@ -29,8 +29,8 @@
  * See linux/ringbuffer/frontend.h for channel allocation and read-side API.
  */
 
-#include "../../wrapper/ringbuffer/frontend.h"
-#include "../../wrapper/percpu-defs.h"
+#include <wrapper/ringbuffer/frontend.h>
+#include <wrapper/percpu-defs.h>
 #include <linux/errno.h>
 #include <linux/prefetch.h>
 

diff --git a/lib/ringbuffer/frontend_internal.h b/lib/ringbuffer/frontend_internal.h
index d170e9abd46b27b2cf269bfd1ae40ea33413e8ac..b13edd10b7e80c2803d07343b1edcc1dbe0c0883 100644 (file)
--- a/lib/ringbuffer/frontend_internal.h
+++ b/lib/ringbuffer/frontend_internal.h
@@ -28,10 +28,10 @@
  * See ring_buffer_frontend.c for more information on wait-free algorithms.
  */
 
-#include "../../wrapper/ringbuffer/config.h"
-#include "../../wrapper/ringbuffer/backend_types.h"
-#include "../../wrapper/ringbuffer/frontend_types.h"
-#include "../../lib/prio_heap/lttng_prio_heap.h"       /* For per-CPU read-side iterator */
+#include <wrapper/ringbuffer/config.h>
+#include <wrapper/ringbuffer/backend_types.h>
+#include <wrapper/ringbuffer/frontend_types.h>
+#include <lib/prio_heap/lttng_prio_heap.h>     /* For per-CPU read-side iterator */
 
 /* Buffer offset macros */
 

diff --git a/lib/ringbuffer/frontend_types.h b/lib/ringbuffer/frontend_types.h
index 9fc3a30a90319ffa89a20c3b243160fb830372a8..46bf8d27efda7741fc407e79c0553bdff6ab9702 100644 (file)
--- a/lib/ringbuffer/frontend_types.h
+++ b/lib/ringbuffer/frontend_types.h
@@ -29,10 +29,10 @@
  */
 
 #include <linux/kref.h>
-#include "../../wrapper/ringbuffer/config.h"
-#include "../../wrapper/ringbuffer/backend_types.h"
-#include "../../wrapper/spinlock.h"
-#include "../../lib/prio_heap/lttng_prio_heap.h"       /* For per-CPU read-side iterator */
+#include <wrapper/ringbuffer/config.h>
+#include <wrapper/ringbuffer/backend_types.h>
+#include <wrapper/spinlock.h>
+#include <lib/prio_heap/lttng_prio_heap.h>     /* For per-CPU read-side iterator */
 
 /*
  * A switch is done during tracing or as a final flush after tracing (so it

diff --git a/lib/ringbuffer/iterator.h b/lib/ringbuffer/iterator.h
index b0e17644c698e96a55aa9886f2522b00aff5315a..6ed5b3b64f70230733abc227c3850b51e1aa984b 100644 (file)
--- a/lib/ringbuffer/iterator.h
+++ b/lib/ringbuffer/iterator.h
@@ -26,9 +26,9 @@
  *     Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  */
 
-#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>
 
 /*
  * lib_ring_buffer_get_next_record advances the buffer read position to the next