X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;ds=sidebyside;f=wrapper%2Ftrace-clock.h;h=1140b94bcd1de2ae292a5dc9c4f9ffd4653271aa;hb=a3ccff4ffbfa87702cf3bc4693f86c2aaac27be2;hp=11bef42b195ea97f44cf88daa2bc4c06a6003e3a;hpb=cff67ebe90fc083a014bf8b2dae0c120b3201d1d;p=lttng-modules.git

diff --git a/wrapper/trace-clock.h b/wrapper/trace-clock.h
index 11bef42b..1140b94b 100644
--- a/wrapper/trace-clock.h
+++ b/wrapper/trace-clock.h
@@ -7,8 +7,8 @@
  * Dual LGPL v2.1/GPL v2 license.
  */
 
-#ifndef _LTT_TRACE_CLOCK_H
-#define _LTT_TRACE_CLOCK_H
+#ifndef _LTTNG_TRACE_CLOCK_H
+#define _LTTNG_TRACE_CLOCK_H
 
 #ifdef CONFIG_HAVE_TRACE_CLOCK
 #include <linux/trace-clock.h>
@@ -44,18 +44,24 @@ static inline u64 trace_clock_read64(void)
 	return (u64) trace_clock_monotonic_wrapper();
 }
 
-static inline u64 trace_clock_frequency(void)
+static inline u64 trace_clock_freq(void)
 {
-	return (u64)NSEC_PER_SEC;
+	return (u64) NSEC_PER_SEC;
 }
 
-static inline u32 trace_clock_freq_scale(void)
+static inline const char *trace_clock_uuid(void)
 {
-	return 1;
+	return "CLOCK_MONOTONIC";
 }
 
 static inline int get_trace_clock(void)
 {
+	/*
+	 * LTTng: Using mainline kernel monotonic clock. NMIs will not be
+	 * traced, and expect significant performance degradation compared to
+	 * the LTTng trace clocks. Integration of the LTTng 0.x trace clocks
+	 * into LTTng 2.0 is planned in a near future.
+	 */
 	printk(KERN_WARNING "LTTng: Using mainline kernel monotonic clock.\n");
 	printk(KERN_WARNING "  * NMIs will not be traced,\n");
 	printk(KERN_WARNING "  * expect significant performance degradation compared to the\n");
@@ -63,8 +69,6 @@ static inline int get_trace_clock(void)
 	printk(KERN_WARNING "Integration of the LTTng 0.x trace clocks into LTTng 2.0 is planned\n");
 	printk(KERN_WARNING "in a near future.\n");
 
-#warning "LTTng: Using mainline kernel monotonic clock. NMIs will not be traced, and expect significant performance degradation compared to the LTTng trace clocks. Integration of the LTTng 0.x trace clocks into LTTng 2.0 is planned in a near future."
-
 	return 0;
 }
 
@@ -74,4 +78,4 @@ static inline void put_trace_clock(void)
 
 #endif /* CONFIG_HAVE_TRACE_CLOCK */
 
-#endif /* _LTT_TRACE_CLOCK_H */
+#endif /* _LTTNG_TRACE_CLOCK_H */