X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fust-clock.h;h=07920e060de574ac9184f2b15896dea8b907fa1b;hp=7d9c99a66a19c3b55209b86fa91d97f062dcf5bf;hb=c70636a7342f34e3be68fcf411cf3e3718b8e73f;hpb=d0b96690836f4b876096f3dc14801f8e25281a77

diff --git a/src/bin/lttng-sessiond/ust-clock.h b/src/bin/lttng-sessiond/ust-clock.h
index 7d9c99a66..07920e060 100644
--- a/src/bin/lttng-sessiond/ust-clock.h
+++ b/src/bin/lttng-sessiond/ust-clock.h
@@ -20,17 +20,31 @@
 #ifndef _UST_CLOCK_H
 #define _UST_CLOCK_H
 
-#include <time.h>
+#include <common/compat/time.h>
 #include <sys/time.h>
 #include <stdint.h>
 #include <stddef.h>
 #include <stdio.h>
-#include <errno.h>
+#include <urcu/system.h>
+#include <urcu/arch.h>
+#include <lttng/ust-clock.h>
 
-#include <common/compat/uuid.h>
+#include <common/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);
+};
+
+extern struct lttng_trace_clock *lttng_trace_clock;
+
+void lttng_ust_clock_init(void);
+
 /*
  * Currently using the kernel MONOTONIC clock, waiting for kernel-side
  * LTTng to implement mmap'd trace clock.
@@ -39,22 +53,27 @@
 /* Choosing correct trace clock */
 
 static __inline__
-uint64_t trace_clock_read64(void)
+uint64_t trace_clock_read64_monotonic(void)
 {
 	struct timespec ts;
 
-	clock_gettime(CLOCK_MONOTONIC, &ts);
+	if (lttng_clock_gettime(CLOCK_MONOTONIC, &ts)) {
+		/* TODO Report error cleanly up the chain. */
+		PERROR("clock_gettime CLOCK_MONOTONIC");
+		ts.tv_sec = 0;
+		ts.tv_nsec = 0;
+	}
 	return ((uint64_t) ts.tv_sec * 1000000000ULL) + ts.tv_nsec;
 }
 
 static __inline__
-uint64_t trace_clock_freq(void)
+uint64_t trace_clock_freq_monotonic(void)
 {
 	return 1000000000ULL;
 }
 
 static __inline__
-int trace_clock_uuid(char *uuid)
+int trace_clock_uuid_monotonic(char *uuid)
 {
 	int ret = 0;
 	size_t len;
@@ -69,15 +88,93 @@ int trace_clock_uuid(char *uuid)
 	if (!fp) {
 		return -ENOENT;
 	}
-	len = fread(uuid, 1, UUID_STR_LEN - 1, fp);
-	if (len < UUID_STR_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[UUID_STR_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 */