From 5ef57f0b91bef4d6cc2cd77df4d6d82eebf4b0a4 Mon Sep 17 00:00:00 2001
From: Michael Jeanson <mjeanson@efficios.com>
Date: Tue, 6 Apr 2021 16:58:57 -0400
Subject: [PATCH] Split the common part of clock.h

Split clock.h into an internal liblttng-ust header and a common header
to allow access to 'lttng_ust_clock_init' which is part of the private
ABI of liblttng-ust.

Change-Id: Ic23ed01201edaebecb61ff071dd1d38281ff6de8
Signed-off-by: Michael Jeanson <mjeanson@efficios.com>
Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
---
 src/common/Makefile.am         |  1 +
 src/common/clock.h             | 15 +++++++++++++++
 src/lib/lttng-ust-ctl/ustctl.c |  2 +-
 src/lib/lttng-ust/clock.h      |  3 +--
 4 files changed, 18 insertions(+), 3 deletions(-)
 create mode 100644 src/common/clock.h

diff --git a/src/common/Makefile.am b/src/common/Makefile.am
index 177ef070..619276ed 100644
--- a/src/common/Makefile.am
+++ b/src/common/Makefile.am
@@ -10,6 +10,7 @@ noinst_HEADERS = \
 	align.h \
 	bitfield.h \
 	bitmap.h \
+	clock.h \
 	dynamic-type.h \
 	elf.h \
 	logging.h \
diff --git a/src/common/clock.h b/src/common/clock.h
new file mode 100644
index 00000000..a0bf2499
--- /dev/null
+++ b/src/common/clock.h
@@ -0,0 +1,15 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-only
+ *
+ * Copyright (C) 2016 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
+ */
+
+#ifndef _UST_COMMON_CLOCK_H
+#define _UST_COMMON_CLOCK_H
+
+/*
+ * Part of the private ABI between liblttng-ust and liblttng-ust-ctl.
+ */
+void lttng_ust_clock_init(void);
+
+#endif	/* _UST_COMMON_CLOCK_H */
diff --git a/src/lib/lttng-ust-ctl/ustctl.c b/src/lib/lttng-ust-ctl/ustctl.c
index e4434bc0..3561a722 100644
--- a/src/lib/lttng-ust-ctl/ustctl.c
+++ b/src/lib/lttng-ust-ctl/ustctl.c
@@ -27,7 +27,7 @@
 #include "lib/lttng-ust/ust-events-internal.h"
 #include "common/wait.h"
 #include "lib/lttng-ust/lttng-rb-clients.h"
-#include "lib/lttng-ust/clock.h"
+#include "common/clock.h"
 #include "lib/lttng-ust/getenv.h"
 #include "lib/lttng-ust/lttng-tracer-core.h"
 #include "lib/lttng-ust/lttng-counter-client.h"
diff --git a/src/lib/lttng-ust/clock.h b/src/lib/lttng-ust/clock.h
index 203cce06..22e82f4f 100644
--- a/src/lib/lttng-ust/clock.h
+++ b/src/lib/lttng-ust/clock.h
@@ -17,6 +17,7 @@
 #include <urcu/arch.h>
 #include <lttng/ust-clock.h>
 
+#include "common/clock.h"
 #include "lttng-ust-uuid.h"
 
 struct lttng_ust_trace_clock {
@@ -30,8 +31,6 @@ struct lttng_ust_trace_clock {
 extern struct lttng_ust_trace_clock *lttng_ust_trace_clock
 	__attribute__((visibility("hidden")));
 
-void lttng_ust_clock_init(void);
-
 /* Use the kernel MONOTONIC clock. */
 
 static __inline__
-- 
2.34.1