From a071f25d89c4ef76ffe7bdfcaeb783bc9cfc1211 Mon Sep 17 00:00:00 2001
From: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Date: Wed, 6 May 2020 09:36:45 -0400
Subject: [PATCH] Cleanup: Move headers from lib/ to include/lttng/

Adapt includes accordingly.

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
---
 LICENSE                                                      | 4 ++--
 {lib => include/lttng}/align.h                               | 4 ++--
 {lib => include/lttng}/bitfield.h                            | 0
 {lib => include/lttng}/bug.h                                 | 2 +-
 lib/prio_heap/lttng_prio_heap.h => include/lttng/prio_heap.h | 2 +-
 include/ringbuffer/config.h                                  | 2 +-
 include/ringbuffer/frontend_internal.h                       | 2 +-
 include/ringbuffer/frontend_types.h                          | 2 +-
 lib/prio_heap/lttng_prio_heap.c                              | 2 +-
 lttng-filter-specialize.c                                    | 2 +-
 lttng-ring-buffer-client.h                                   | 2 +-
 lttng-syscalls.c                                             | 2 +-
 12 files changed, 13 insertions(+), 13 deletions(-)
 rename {lib => include/lttng}/align.h (97%)
 rename {lib => include/lttng}/bitfield.h (100%)
 rename {lib => include/lttng}/bug.h (98%)
 rename lib/prio_heap/lttng_prio_heap.h => include/lttng/prio_heap.h (99%)

diff --git a/LICENSE b/LICENSE
index 9b8e8b31..caf91c66 100644
--- a/LICENSE
+++ b/LICENSE
@@ -23,9 +23,9 @@ wrapper/list.h
 These files are licensed under an MIT-style license. See LICENSES/MIT
 for details.
 
-lib/prio_heap/lttng_prio_heap.h
+include/lttng/prio_heap.h
 lib/prio_heap/lttng_prio_heap.c
-lib/bitfield.h
+include/lttng/bitfield.h
 filter-bytecode.h
 lttng-filter-interpreter.c
 lttng-filter-specialize.c
diff --git a/lib/align.h b/include/lttng/align.h
similarity index 97%
rename from lib/align.h
rename to include/lttng/align.h
index c0695494..964ed1a8 100644
--- a/lib/align.h
+++ b/include/lttng/align.h
@@ -1,6 +1,6 @@
 /* SPDX-License-Identifier: (GPL-2.0-only or LGPL-2.1-only)
  *
- * lib/align.h
+ * lttng/align.h
  *
  * Copyright (C) 2010-2012 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  */
@@ -11,7 +11,7 @@
 #ifdef __KERNEL__
 
 #include <linux/types.h>
-#include <lib/bug.h>
+#include <lttng/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/include/lttng/bitfield.h
similarity index 100%
rename from lib/bitfield.h
rename to include/lttng/bitfield.h
diff --git a/lib/bug.h b/include/lttng/bug.h
similarity index 98%
rename from lib/bug.h
rename to include/lttng/bug.h
index ea73f158..0a2c5e4b 100644
--- a/lib/bug.h
+++ b/include/lttng/bug.h
@@ -1,6 +1,6 @@
 /* SPDX-License-Identifier: (GPL-2.0-only or LGPL-2.1-only)
  *
- * lib/bug.h
+ * lttng/bug.h
  *
  * Copyright (C) 2010-2012 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  */
diff --git a/lib/prio_heap/lttng_prio_heap.h b/include/lttng/prio_heap.h
similarity index 99%
rename from lib/prio_heap/lttng_prio_heap.h
rename to include/lttng/prio_heap.h
index f97f33f3..d01cbe61 100644
--- a/lib/prio_heap/lttng_prio_heap.h
+++ b/include/lttng/prio_heap.h
@@ -1,6 +1,6 @@
 /* SPDX-License-Identifier: MIT
  *
- * lttng_prio_heap.h
+ * lttng/prio_heap.h
  *
  * Priority heap containing pointers. Based on CLRS, chapter 6.
  *
diff --git a/include/ringbuffer/config.h b/include/ringbuffer/config.h
index 1b01935b..1549c108 100644
--- a/include/ringbuffer/config.h
+++ b/include/ringbuffer/config.h
@@ -13,7 +13,7 @@
 
 #include <linux/types.h>
 #include <linux/percpu.h>
-#include <lib/align.h>
+#include <lttng/align.h>
 #include <lttng-tracer-core.h>
 
 struct lib_ring_buffer;
diff --git a/include/ringbuffer/frontend_internal.h b/include/ringbuffer/frontend_internal.h
index 723656bc..680c65bb 100644
--- a/include/ringbuffer/frontend_internal.h
+++ b/include/ringbuffer/frontend_internal.h
@@ -15,7 +15,7 @@
 #include <ringbuffer/config.h>
 #include <ringbuffer/backend_types.h>
 #include <ringbuffer/frontend_types.h>
-#include <lib/prio_heap/lttng_prio_heap.h>	/* For per-CPU read-side iterator */
+#include <lttng/prio_heap.h>	/* For per-CPU read-side iterator */
 
 /* Buffer offset macros */
 
diff --git a/include/ringbuffer/frontend_types.h b/include/ringbuffer/frontend_types.h
index b04c085b..d5c4916b 100644
--- a/include/ringbuffer/frontend_types.h
+++ b/include/ringbuffer/frontend_types.h
@@ -15,7 +15,7 @@
 #include <linux/kref.h>
 #include <ringbuffer/config.h>
 #include <ringbuffer/backend_types.h>
-#include <lib/prio_heap/lttng_prio_heap.h>	/* For per-CPU read-side iterator */
+#include <lttng/prio_heap.h>	/* For per-CPU read-side iterator */
 #include <lttng-cpuhotplug.h>
 
 /*
diff --git a/lib/prio_heap/lttng_prio_heap.c b/lib/prio_heap/lttng_prio_heap.c
index 04438bbf..0b85ddbe 100644
--- a/lib/prio_heap/lttng_prio_heap.c
+++ b/lib/prio_heap/lttng_prio_heap.c
@@ -8,7 +8,7 @@
  */
 
 #include <linux/slab.h>
-#include <lib/prio_heap/lttng_prio_heap.h>
+#include <lttng/prio_heap.h>
 #include <wrapper/vmalloc.h>
 
 #ifdef DEBUG_HEAP
diff --git a/lttng-filter-specialize.c b/lttng-filter-specialize.c
index 3dc82d84..f0da47ed 100644
--- a/lttng-filter-specialize.c
+++ b/lttng-filter-specialize.c
@@ -9,7 +9,7 @@
 
 #include <linux/slab.h>
 #include <lttng-filter.h>
-#include "lib/align.h"
+#include <lttng/align.h>
 
 static ssize_t bytecode_reserve_data(struct bytecode_runtime *runtime,
 		size_t align, size_t len)
diff --git a/lttng-ring-buffer-client.h b/lttng-ring-buffer-client.h
index 9e204caa..67804d3a 100644
--- a/lttng-ring-buffer-client.h
+++ b/lttng-ring-buffer-client.h
@@ -9,7 +9,7 @@
 
 #include <linux/module.h>
 #include <linux/types.h>
-#include <lib/bitfield.h>
+#include <lttng/bitfield.h>
 #include <wrapper/vmalloc.h>	/* for wrapper_vmalloc_sync_mappings() */
 #include <wrapper/trace-clock.h>
 #include <lttng-events.h>
diff --git a/lttng-syscalls.c b/lttng-syscalls.c
index 7720f4ea..a376bcbe 100644
--- a/lttng-syscalls.c
+++ b/lttng-syscalls.c
@@ -22,7 +22,7 @@
 #include <asm/ptrace.h>
 #include <asm/syscall.h>
 
-#include <lib/bitfield.h>
+#include <lttng/bitfield.h>
 #include <wrapper/tracepoint.h>
 #include <wrapper/file.h>
 #include <wrapper/rcu.h>
-- 
2.34.1