From: Jonathan Rajotte <jonathan.rajotte-julien@efficios.com>
Date: Thu, 9 Nov 2017 22:37:14 +0000 (-0500)
Subject: Cleanup: clock description for metadata was moved to lttng-sessiond
X-Git-Tag: v2.11.0-rc1~33
X-Git-Url: http://git.liburcu.org/?p=lttng-ust.git;a=commitdiff_plain;h=41d1e173b52e80030b05ce7f25a45ae59765e40e

Cleanup: clock description for metadata was moved to lttng-sessiond

Signed-off-by: Jonathan Rajotte <jonathan.rajotte-julien@efficios.com>
Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
---

diff --git a/liblttng-ust/clock.h b/liblttng-ust/clock.h
index a7e8eb7b..d5548e90 100644
--- a/liblttng-ust/clock.h
+++ b/liblttng-ust/clock.h
@@ -57,51 +57,6 @@ uint64_t trace_clock_read64_monotonic(void)
 	return ((uint64_t) ts.tv_sec * 1000000000ULL) + ts.tv_nsec;
 }
 
-static __inline__
-uint64_t trace_clock_freq_monotonic(void)
-{
-	return 1000000000ULL;
-}
-
-static __inline__
-int trace_clock_uuid_monotonic(char *uuid)
-{
-	int ret = 0;
-	size_t len;
-	FILE *fp;
-
-	/*
-	 * boot_id needs to be read once before being used concurrently
-	 * to deal with a Linux kernel race. A fix is proposed for
-	 * upstream, but the work-around is needed for older kernels.
-	 */
-	fp = fopen("/proc/sys/kernel/random/boot_id", "r");
-	if (!fp) {
-		return -ENOENT;
-	}
-	len = fread(uuid, 1, LTTNG_UST_UUID_STR_LEN - 1, fp);
-	if (len < LTTNG_UST_UUID_STR_LEN - 1) {
-		ret = -EINVAL;
-		goto end;
-	}
-	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)
 {
@@ -115,57 +70,4 @@ uint64_t trace_clock_read64(void)
 	}
 }
 
-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 */