X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;ds=sidebyside;f=instrumentation%2Fevents%2Flttng-module%2Ftimer.h;h=9c02c9676a88b4c658228bbedadd00bfcbbcc7a3;hb=507143bc5de50c0e5493d63fb5c300fa42326842;hp=8a813ebf0cecddfeee8f8d5fa7de7a6f200fee35;hpb=32328e6c9b05660f5290e86a284f6c22fc547748;p=lttng-modules.git

diff --git a/instrumentation/events/lttng-module/timer.h b/instrumentation/events/lttng-module/timer.h
index 8a813ebf..9c02c967 100644
--- a/instrumentation/events/lttng-module/timer.h
+++ b/instrumentation/events/lttng-module/timer.h
@@ -4,7 +4,7 @@
 #if !defined(LTTNG_TRACE_TIMER_H) || defined(TRACE_HEADER_MULTI_READ)
 #define LTTNG_TRACE_TIMER_H
 
-#include "../../../probes/lttng-tracepoint-event.h"
+#include <probes/lttng-tracepoint-event.h>
 
 #ifndef _TRACE_TIMER_DEF_
 #define _TRACE_TIMER_DEF_
@@ -16,6 +16,12 @@ struct timer_list;
 
 #endif /* _TRACE_TIMER_DEF_ */
 
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,10,0))
+#define lttng_ktime_get_tv64(kt)	(kt)
+#else /* #if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,10,0)) */
+#define lttng_ktime_get_tv64(kt)	((kt).tv64)
+#endif /* #else #if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,10,0)) */
+
 LTTNG_TRACEPOINT_EVENT_CLASS(timer_class,
 
 	TP_PROTO(struct timer_list *timer),
@@ -23,7 +29,7 @@ LTTNG_TRACEPOINT_EVENT_CLASS(timer_class,
 	TP_ARGS(timer),
 
 	TP_FIELDS(
-		ctf_integer(void *, timer, timer)
+		ctf_integer_hex(void *, timer, timer)
 	)
 )
 
@@ -53,8 +59,8 @@ LTTNG_TRACEPOINT_EVENT(timer_start,
 	TP_ARGS(timer, expires, flags),
 
 	TP_FIELDS(
-		ctf_integer(void *, timer, timer)
-		ctf_integer(void *, function, timer->function)
+		ctf_integer_hex(void *, timer, timer)
+		ctf_integer_hex(void *, function, timer->function)
 		ctf_integer(unsigned long, expires, expires)
 		ctf_integer(unsigned long, now, jiffies)
 		ctf_integer(unsigned int, flags, flags)
@@ -73,8 +79,8 @@ LTTNG_TRACEPOINT_EVENT(timer_start,
 	TP_ARGS(timer, expires),
 
 	TP_FIELDS(
-		ctf_integer(void *, timer, timer)
-		ctf_integer(void *, function, timer->function)
+		ctf_integer_hex(void *, timer, timer)
+		ctf_integer_hex(void *, function, timer->function)
 		ctf_integer(unsigned long, expires, expires)
 		ctf_integer(unsigned long, now, jiffies)
 	)
@@ -94,9 +100,9 @@ LTTNG_TRACEPOINT_EVENT(timer_expire_entry,
 	TP_ARGS(timer),
 
 	TP_FIELDS(
-		ctf_integer(void *, timer, timer)
+		ctf_integer_hex(void *, timer, timer)
 		ctf_integer(unsigned long, now, jiffies)
-		ctf_integer(void *, function, timer->function)
+		ctf_integer_hex(void *, function, timer->function)
 	)
 )
 
@@ -144,7 +150,7 @@ LTTNG_TRACEPOINT_EVENT_MAP(hrtimer_init,
 	TP_ARGS(hrtimer, clockid, mode),
 
 	TP_FIELDS(
-		ctf_integer(void *, hrtimer, hrtimer)
+		ctf_integer_hex(void *, hrtimer, hrtimer)
 		ctf_integer(clockid_t, clockid, clockid)
 		ctf_integer(enum hrtimer_mode, mode, mode)
 	)
@@ -163,10 +169,12 @@ LTTNG_TRACEPOINT_EVENT_MAP(hrtimer_start,
 	TP_ARGS(hrtimer),
 
 	TP_FIELDS(
-		ctf_integer(void *, hrtimer, hrtimer)
-		ctf_integer(void *, function, hrtimer->function)
-		ctf_integer(s64, expires, hrtimer_get_expires(hrtimer).tv64)
-		ctf_integer(s64, softexpires, hrtimer_get_softexpires(hrtimer).tv64)
+		ctf_integer_hex(void *, hrtimer, hrtimer)
+		ctf_integer_hex(void *, function, hrtimer->function)
+		ctf_integer(s64, expires,
+			lttng_ktime_get_tv64(hrtimer_get_expires(hrtimer)))
+		ctf_integer(s64, softexpires,
+			lttng_ktime_get_tv64(hrtimer_get_softexpires(hrtimer)))
 	)
 )
 
@@ -187,9 +195,9 @@ LTTNG_TRACEPOINT_EVENT_MAP(hrtimer_expire_entry,
 	TP_ARGS(hrtimer, now),
 
 	TP_FIELDS(
-		ctf_integer(void *, hrtimer, hrtimer)
-		ctf_integer(s64, now, now->tv64)
-		ctf_integer(void *, function, hrtimer->function)
+		ctf_integer_hex(void *, hrtimer, hrtimer)
+		ctf_integer(s64, now, lttng_ktime_get_tv64(*now))
+		ctf_integer_hex(void *, function, hrtimer->function)
 	)
 )
 
@@ -200,7 +208,7 @@ LTTNG_TRACEPOINT_EVENT_CLASS(timer_hrtimer_class,
 	TP_ARGS(hrtimer),
 
 	TP_FIELDS(
-		ctf_integer(void *, hrtimer, hrtimer)
+		ctf_integer_hex(void *, hrtimer, hrtimer)
 	)
 )
 
@@ -283,4 +291,4 @@ LTTNG_TRACEPOINT_EVENT_MAP(itimer_expire,
 #endif /*  LTTNG_TRACE_TIMER_H */
 
 /* This part must be outside protection */
-#include "../../../probes/define_trace.h"
+#include <probes/define_trace.h>