X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=liblttng-ust%2Fclock.h;h=388ed658cbb9761a3c206c890ed620a396d3f92b;hb=22389ecb8b7867bc1d21b1e11ba7572be8eca81f;hp=82a7b45cd5294a3f35c63e172ea8105d0e5c2e0d;hpb=939950af98d044a3b0632cad5293f91cb1493ef8;p=lttng-ust.git

diff --git a/liblttng-ust/clock.h b/liblttng-ust/clock.h
index 82a7b45c..388ed658 100644
--- a/liblttng-ust/clock.h
+++ b/liblttng-ust/clock.h
@@ -25,23 +25,28 @@
 #include <stdint.h>
 #include <stddef.h>
 #include <stdio.h>
+#include <urcu/system.h>
+#include <urcu/arch.h>
+#include <lttng/ust-clock.h>
 
-/*
- * Includes final \0.
- */
-#define CLOCK_UUID_LEN		37
+#include "lttng-ust-uuid.h"
 
-/* TRACE CLOCK */
+struct lttng_trace_clock {
+	uint64_t (*read64)(void);
+	uint64_t (*freq)(void);
+	int (*uuid)(char *uuid);
+	const char *(*name)(void);
+	const char *(*description)(void);
+};
 
-/*
- * Currently using the kernel MONOTONIC clock, waiting for kernel-side
- * LTTng to implement mmap'd trace clock.
- */
+extern struct lttng_trace_clock *lttng_trace_clock;
+
+void lttng_ust_clock_init(void);
 
-/* Choosing correct trace clock */
+/* Use the kernel MONOTONIC clock. */
 
 static __inline__
-uint64_t trace_clock_read64(void)
+uint64_t trace_clock_read64_monotonic(void)
 {
 	struct timespec ts;
 
@@ -50,13 +55,13 @@ uint64_t trace_clock_read64(void)
 }
 
 static __inline__
-uint64_t trace_clock_freq(void)
+uint64_t trace_clock_freq_monotonic(void)
 {
 	return 1000000000ULL;
 }
 
 static __inline__
-const int trace_clock_uuid(char *uuid)
+int trace_clock_uuid_monotonic(char *uuid)
 {
 	int ret = 0;
 	size_t len;
@@ -71,15 +76,93 @@ const int trace_clock_uuid(char *uuid)
 	if (!fp) {
 		return -ENOENT;
 	}
-	len = fread(uuid, 1, CLOCK_UUID_LEN - 1, fp);
-	if (len < CLOCK_UUID_LEN - 1) {
+	len = fread(uuid, 1, LTTNG_UST_UUID_STR_LEN - 1, fp);
+	if (len < LTTNG_UST_UUID_STR_LEN - 1) {
 		ret = -EINVAL;
 		goto end;
 	}
-	uuid[CLOCK_UUID_LEN - 1] = '\0';
+	uuid[LTTNG_UST_UUID_STR_LEN - 1] = '\0';
 end:
 	fclose(fp);
 	return ret;
 }
 
+static __inline__
+const char *trace_clock_name_monotonic(void)
+{
+	return "monotonic";
+}
+
+static __inline__
+const char *trace_clock_description_monotonic(void)
+{
+	return "Monotonic Clock";
+}
+
+static __inline__
+uint64_t trace_clock_read64(void)
+{
+	struct lttng_trace_clock *ltc = CMM_LOAD_SHARED(lttng_trace_clock);
+
+	if (caa_likely(!ltc)) {
+		return trace_clock_read64_monotonic();
+	} else {
+		cmm_read_barrier_depends();	/* load ltc before content */
+		return ltc->read64();
+	}
+}
+
+static __inline__
+uint64_t trace_clock_freq(void)
+{
+	struct lttng_trace_clock *ltc = CMM_LOAD_SHARED(lttng_trace_clock);
+
+	if (!ltc) {
+		return trace_clock_freq_monotonic();
+	} else {
+		cmm_read_barrier_depends();	/* load ltc before content */
+		return ltc->freq();
+	}
+}
+
+static __inline__
+int trace_clock_uuid(char *uuid)
+{
+	struct lttng_trace_clock *ltc = CMM_LOAD_SHARED(lttng_trace_clock);
+
+	cmm_read_barrier_depends();	/* load ltc before content */
+	/* Use default UUID cb when NULL */
+	if (!ltc || !ltc->uuid) {
+		return trace_clock_uuid_monotonic(uuid);
+	} else {
+		return ltc->uuid(uuid);
+	}
+}
+
+static __inline__
+const char *trace_clock_name(void)
+{
+	struct lttng_trace_clock *ltc = CMM_LOAD_SHARED(lttng_trace_clock);
+
+	if (!ltc) {
+		return trace_clock_name_monotonic();
+	} else {
+		cmm_read_barrier_depends();	/* load ltc before content */
+		return ltc->name();
+	}
+}
+
+static __inline__
+const char *trace_clock_description(void)
+{
+	struct lttng_trace_clock *ltc = CMM_LOAD_SHARED(lttng_trace_clock);
+
+	if (!ltc) {
+		return trace_clock_description_monotonic();
+	} else {
+		cmm_read_barrier_depends();	/* load ltc before content */
+		return ltc->description();
+	}
+}
+
 #endif /* _UST_CLOCK_H */