From 3d3a2bb817fcab854dc3a90dd80e073869bbccb4 Mon Sep 17 00:00:00 2001
From: Michael Jeanson <mjeanson@efficios.com>
Date: Wed, 17 Mar 2021 15:27:10 -0400
Subject: [PATCH] Namespace lttng/align.h as lttng/ust-align.h

Since the 'lttng/' header directory is shared between ust and tools,
namespace this common name header with 'ust-' to match the same pattern
as the other files.

Change-Id: Iad25ad76b75e87e040b4d7dd9f461ce6522ac361
Signed-off-by: Michael Jeanson <mjeanson@efficios.com>
Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
---
 include/Makefile.am                      | 2 +-
 include/lttng/ringbuffer-context.h       | 5 +++--
 include/lttng/{align.h => ust-align.h}   | 6 +++---
 libcounter/shm.c                         | 5 ++++-
 liblttng-ust/lttng-bytecode-specialize.c | 2 +-
 liblttng-ust/lttng-ust-elf.c             | 6 +++---
 libringbuffer/ring_buffer_backend.c      | 3 ++-
 libringbuffer/ring_buffer_frontend.c     | 5 +++--
 libringbuffer/ringbuffer-config.h        | 5 +++--
 libringbuffer/shm.c                      | 5 ++++-
 10 files changed, 27 insertions(+), 17 deletions(-)
 rename include/lttng/{align.h => ust-align.h} (94%)

diff --git a/include/Makefile.am b/include/Makefile.am
index a113bf13..80b32785 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -22,7 +22,7 @@ nobase_include_HEADERS = \
 	lttng/ust.h \
 	lttng/ust-endian.h \
 	lttng/ringbuffer-context.h \
-	lttng/align.h \
+	lttng/ust-align.h \
 	lttng/ust-bug.h \
 	lttng/ust-error.h \
 	lttng/tracef.h \
diff --git a/include/lttng/ringbuffer-context.h b/include/lttng/ringbuffer-context.h
index 614150da..e42c3f52 100644
--- a/include/lttng/ringbuffer-context.h
+++ b/include/lttng/ringbuffer-context.h
@@ -10,12 +10,13 @@
 #define _LTTNG_RING_BUFFER_CONTEXT_H
 
 #include <errno.h>
-#include <lttng/ust-tracer.h>
 #include <stdint.h>
 #include <stddef.h>
 #include <urcu/arch.h>
 #include <string.h>
-#include <lttng/align.h>
+
+#include <lttng/ust-tracer.h>
+#include <lttng/ust-align.h>
 #include <lttng/ust-compiler.h>
 
 struct lttng_ust_lib_ring_buffer;
diff --git a/include/lttng/align.h b/include/lttng/ust-align.h
similarity index 94%
rename from include/lttng/align.h
rename to include/lttng/ust-align.h
index fbe87f19..00da854e 100644
--- a/include/lttng/align.h
+++ b/include/lttng/ust-align.h
@@ -4,8 +4,8 @@
  * Copyright (C) 2010-2011 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  */
 
-#ifndef _LTTNG_ALIGN_H
-#define _LTTNG_ALIGN_H
+#ifndef _LTTNG_UST_ALIGN_H
+#define _LTTNG_UST_ALIGN_H
 
 #include <lttng/ust-bug.h>
 
@@ -40,4 +40,4 @@
 		(((align_drift) - (alignment)) & ((alignment) - 1));	       \
 	})
 
-#endif /* _LTTNG_ALIGN_H */
+#endif /* _LTTNG_UST_ALIGN_H */
diff --git a/libcounter/shm.c b/libcounter/shm.c
index 1689ad45..d9bccafc 100644
--- a/libcounter/shm.c
+++ b/libcounter/shm.c
@@ -17,14 +17,17 @@
 #include <stdio.h>
 #include <signal.h>
 #include <dirent.h>
-#include <lttng/align.h>
 #include <limits.h>
 #include <stdbool.h>
 #include <stdint.h>
+
 #ifdef HAVE_LIBNUMA
 #include <numa.h>
 #include <numaif.h>
 #endif
+
+#include <lttng/ust-align.h>
+
 #include <ust-helper.h>
 #include <ust-fd.h>
 #include "../libringbuffer/mmap.h"
diff --git a/liblttng-ust/lttng-bytecode-specialize.c b/liblttng-ust/lttng-bytecode-specialize.c
index cb7480b3..28b0ea72 100644
--- a/liblttng-ust/lttng-bytecode-specialize.c
+++ b/liblttng-ust/lttng-bytecode-specialize.c
@@ -10,7 +10,7 @@
 #include <stddef.h>
 #include <stdint.h>
 
-#include <lttng/align.h>
+#include <lttng/ust-align.h>
 
 #include "context-internal.h"
 #include "lttng-bytecode.h"
diff --git a/liblttng-ust/lttng-ust-elf.c b/liblttng-ust/lttng-ust-elf.c
index ebc231e0..8a02ceb3 100644
--- a/liblttng-ust/lttng-ust-elf.c
+++ b/liblttng-ust/lttng-ust-elf.c
@@ -6,9 +6,6 @@
 
 #define _LGPL_SOURCE
 #include <fcntl.h>
-#include <ust-helper.h>
-#include <lttng/align.h>
-#include <ust-elf.h>
 #include <stdbool.h>
 #include <stdint.h>
 #include <string.h>
@@ -16,6 +13,9 @@
 #include <sys/types.h>
 #include <unistd.h>
 
+#include <lttng/ust-align.h>
+
+#include <ust-elf.h>
 #include <ust-fd.h>
 
 #include "lttng-tracer-core.h"
diff --git a/libringbuffer/ring_buffer_backend.c b/libringbuffer/ring_buffer_backend.c
index f1f34898..26420188 100644
--- a/libringbuffer/ring_buffer_backend.c
+++ b/libringbuffer/ring_buffer_backend.c
@@ -11,8 +11,9 @@
 #include <urcu/arch.h>
 #include <limits.h>
 
-#include <lttng/align.h>
+#include <lttng/ust-align.h>
 #include <lttng/ringbuffer-context.h>
+
 #include "ringbuffer-config.h"
 #include "vatomic.h"
 #include "backend.h"
diff --git a/libringbuffer/ring_buffer_frontend.c b/libringbuffer/ring_buffer_frontend.c
index 45ff7dee..23122865 100644
--- a/libringbuffer/ring_buffer_frontend.c
+++ b/libringbuffer/ring_buffer_frontend.c
@@ -52,9 +52,10 @@
 #include <poll.h>
 #include <ust-helper.h>
 
-#include <lttng/align.h>
-#include "smp.h"
+#include <lttng/ust-align.h>
 #include <lttng/ringbuffer-context.h>
+
+#include "smp.h"
 #include "ringbuffer-config.h"
 #include "vatomic.h"
 #include "backend.h"
diff --git a/libringbuffer/ringbuffer-config.h b/libringbuffer/ringbuffer-config.h
index 1052ed6f..0d33ace2 100644
--- a/libringbuffer/ringbuffer-config.h
+++ b/libringbuffer/ringbuffer-config.h
@@ -11,13 +11,14 @@
 #define _LTTNG_RING_BUFFER_CONFIG_H
 
 #include <errno.h>
-#include <lttng/ust-tracer.h>
 #include <stdint.h>
 #include <stddef.h>
 #include <urcu/arch.h>
 #include <string.h>
-#include <lttng/align.h>
+
+#include <lttng/ust-align.h>
 #include <lttng/ust-compiler.h>
+#include <lttng/ust-tracer.h>
 
 struct lttng_ust_lib_ring_buffer;
 struct lttng_ust_lib_ring_buffer_channel;
diff --git a/libringbuffer/shm.c b/libringbuffer/shm.c
index 58050468..6f5c9f5f 100644
--- a/libringbuffer/shm.c
+++ b/libringbuffer/shm.c
@@ -16,14 +16,17 @@
 #include <stdio.h>
 #include <signal.h>
 #include <dirent.h>
-#include <lttng/align.h>
 #include <limits.h>
 #include <stdbool.h>
 #include <stdint.h>
+
 #ifdef HAVE_LIBNUMA
 #include <numa.h>
 #include <numaif.h>
 #endif
+
+#include <lttng/ust-align.h>
+
 #include <ust-helper.h>
 #include <ust-fd.h>
 #include "mmap.h"
-- 
2.34.1