From: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Date: Wed, 17 Mar 2021 20:01:53 +0000 (-0400)
Subject: counter-config.h should be private
X-Git-Tag: v2.13.0-rc1~256
X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=9f25e89278018f23d20882d559fdd6fefabee0f9;p=lttng-ust.git

counter-config.h should be private

Move it to libcounter/.

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

diff --git a/include/Makefile.am b/include/Makefile.am
index 8c741b06..9fa16492 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -32,7 +32,6 @@ nobase_include_HEADERS = \
 	lttng/ust-clock.h \
 	lttng/ust-getcpu.h \
 	lttng/ust-elf.h \
-	lttng/counter-config.h \
 	lttng/ust-libc-wrapper.h \
 	lttng/urcu/pointer.h \
 	lttng/urcu/urcu-ust.h \
diff --git a/include/lttng/counter-config.h b/include/lttng/counter-config.h
deleted file mode 100644
index f81fbfd2..00000000
--- a/include/lttng/counter-config.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * SPDX-License-Identifier: MIT
- *
- * Copyright (C) 2020 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
- *
- * LTTng Counters Configuration
- */
-
-#ifndef _LTTNG_COUNTER_CONFIG_H
-#define _LTTNG_COUNTER_CONFIG_H
-
-#include <stdint.h>
-
-enum lib_counter_config_alloc {
-	COUNTER_ALLOC_PER_CPU =	(1 << 0),
-	COUNTER_ALLOC_GLOBAL  = (1 << 1),
-};
-
-enum lib_counter_config_sync {
-	COUNTER_SYNC_PER_CPU,
-	COUNTER_SYNC_GLOBAL,
-};
-
-struct lib_counter_config {
-	uint32_t alloc;	/* enum lib_counter_config_alloc flags */
-	enum lib_counter_config_sync sync;
-	enum {
-		COUNTER_ARITHMETIC_MODULAR,
-		COUNTER_ARITHMETIC_SATURATE,	/* TODO */
-	} arithmetic;
-	enum {
-		COUNTER_SIZE_8_BIT	= 1,
-		COUNTER_SIZE_16_BIT	= 2,
-		COUNTER_SIZE_32_BIT	= 4,
-		COUNTER_SIZE_64_BIT	= 8,
-	} counter_size;
-};
-
-#endif /* _LTTNG_COUNTER_CONFIG_H */
diff --git a/libcounter/Makefile.am b/libcounter/Makefile.am
index e716b085..6407d7ad 100644
--- a/libcounter/Makefile.am
+++ b/libcounter/Makefile.am
@@ -7,7 +7,8 @@ noinst_LTLIBRARIES = libcounter.la
 
 libcounter_la_SOURCES = \
 	counter.c smp.c smp.h shm.c shm.h shm_internal.h shm_types.h \
-	counter-api.h counter.h counter-internal.h counter-types.h
+	counter-api.h counter.h counter-internal.h counter-types.h \
+	counter-config.h
 
 libcounter_la_LIBADD = \
 	-lpthread \
diff --git a/libcounter/counter-config.h b/libcounter/counter-config.h
new file mode 100644
index 00000000..f81fbfd2
--- /dev/null
+++ b/libcounter/counter-config.h
@@ -0,0 +1,39 @@
+/*
+ * SPDX-License-Identifier: MIT
+ *
+ * Copyright (C) 2020 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
+ *
+ * LTTng Counters Configuration
+ */
+
+#ifndef _LTTNG_COUNTER_CONFIG_H
+#define _LTTNG_COUNTER_CONFIG_H
+
+#include <stdint.h>
+
+enum lib_counter_config_alloc {
+	COUNTER_ALLOC_PER_CPU =	(1 << 0),
+	COUNTER_ALLOC_GLOBAL  = (1 << 1),
+};
+
+enum lib_counter_config_sync {
+	COUNTER_SYNC_PER_CPU,
+	COUNTER_SYNC_GLOBAL,
+};
+
+struct lib_counter_config {
+	uint32_t alloc;	/* enum lib_counter_config_alloc flags */
+	enum lib_counter_config_sync sync;
+	enum {
+		COUNTER_ARITHMETIC_MODULAR,
+		COUNTER_ARITHMETIC_SATURATE,	/* TODO */
+	} arithmetic;
+	enum {
+		COUNTER_SIZE_8_BIT	= 1,
+		COUNTER_SIZE_16_BIT	= 2,
+		COUNTER_SIZE_32_BIT	= 4,
+		COUNTER_SIZE_64_BIT	= 8,
+	} counter_size;
+};
+
+#endif /* _LTTNG_COUNTER_CONFIG_H */
diff --git a/libcounter/counter-types.h b/libcounter/counter-types.h
index d57b7e10..2b71c93b 100644
--- a/libcounter/counter-types.h
+++ b/libcounter/counter-types.h
@@ -13,7 +13,7 @@
 #include <stddef.h>
 #include <stdbool.h>
 #include <sys/types.h>
-#include <lttng/counter-config.h>
+#include "counter-config.h"
 #include <lttng/ust-config.h>
 #include "shm_types.h"