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>

diff --git a/src/common/Makefile.am b/src/common/Makefile.am
index 177ef070dcbacdb8e4c5a4c596d2ef32c54a081c..619276ede2009d95680ee190fc516388d036c2f8 100644 (file)
--- 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 (file)
index 0000000..a0bf249
--- /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 e4434bc075b08a3c8c7ad160594b781b60cbb0e3..3561a722db657580483a301beab6e7ff9c6dd919 100644 (file)
--- 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 203cce063d2595b12b84cbb7f18948d970fca712..22e82f4f1f3bd75ee8fb07d22255c40dcd8a6fee 100644 (file)
--- 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__