X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=instrumentation%2Fevents%2Flttng-module%2Ftimer.h;h=263f6213c5a66b7796746f666d545a3c2de71ca9;hb=369708f464bedc0682151df9308cebfa14dbdb2b;hp=eb225eb9de21e624cd7ea1cbf6b46a31a48d6948;hpb=6ec43db836429730c1431809049197a4fbe820fa;p=lttng-modules.git

diff --git a/instrumentation/events/lttng-module/timer.h b/instrumentation/events/lttng-module/timer.h
index eb225eb9..263f6213 100644
--- a/instrumentation/events/lttng-module/timer.h
+++ b/instrumentation/events/lttng-module/timer.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
 #undef TRACE_SYSTEM
 #define TRACE_SYSTEM timer
 
@@ -10,12 +11,13 @@
 #define _TRACE_TIMER_DEF_
 #include <linux/hrtimer.h>
 #include <linux/timer.h>
-#include <linux/version.h>
 
 struct timer_list;
 
 #endif /* _TRACE_TIMER_DEF_ */
 
+#define lttng_ktime_get_tv64(kt)	(kt)
+
 LTTNG_TRACEPOINT_EVENT_CLASS(timer_class,
 
 	TP_PROTO(struct timer_list *timer),
@@ -38,7 +40,6 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE(timer_class, timer_init,
 	TP_ARGS(timer)
 )
 
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,2,0))
 /**
  * timer_start - called when the timer is started
  * @timer:	pointer to struct timer_list
@@ -60,26 +61,6 @@ LTTNG_TRACEPOINT_EVENT(timer_start,
 		ctf_integer(unsigned int, flags, flags)
 	)
 )
-#else /* #if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,2,0)) */
-/**
- * timer_start - called when the timer is started
- * @timer:	pointer to struct timer_list
- * @expires:	the timers expiry time
- */
-LTTNG_TRACEPOINT_EVENT(timer_start,
-
-	TP_PROTO(struct timer_list *timer, unsigned long expires),
-
-	TP_ARGS(timer, expires),
-
-	TP_FIELDS(
-		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)
-	)
-)
-#endif /* #else #if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,2,0)) */
 
 /**
  * timer_expire_entry - called immediately before the timer callback
@@ -89,14 +70,15 @@ LTTNG_TRACEPOINT_EVENT(timer_start,
  */
 LTTNG_TRACEPOINT_EVENT(timer_expire_entry,
 
-	TP_PROTO(struct timer_list *timer),
+	TP_PROTO(struct timer_list *timer, unsigned long baseclk),
 
-	TP_ARGS(timer),
+	TP_ARGS(timer, baseclk),
 
 	TP_FIELDS(
 		ctf_integer_hex(void *, timer, timer)
 		ctf_integer(unsigned long, now, jiffies)
 		ctf_integer_hex(void *, function, timer->function)
+		ctf_integer(unsigned long, baseclk, baseclk)
 	)
 )
 
@@ -158,15 +140,18 @@ LTTNG_TRACEPOINT_EVENT_MAP(hrtimer_start,
 
 	timer_hrtimer_start,
 
-	TP_PROTO(struct hrtimer *hrtimer),
+	TP_PROTO(struct hrtimer *hrtimer, enum hrtimer_mode mode),
 
-	TP_ARGS(hrtimer),
+	TP_ARGS(hrtimer, mode),
 
 	TP_FIELDS(
 		ctf_integer_hex(void *, hrtimer, hrtimer)
 		ctf_integer_hex(void *, function, hrtimer->function)
-		ctf_integer(s64, expires, hrtimer_get_expires(hrtimer).tv64)
-		ctf_integer(s64, softexpires, hrtimer_get_softexpires(hrtimer).tv64)
+		ctf_integer(s64, expires,
+			lttng_ktime_get_tv64(hrtimer_get_expires(hrtimer)))
+		ctf_integer(s64, softexpires,
+			lttng_ktime_get_tv64(hrtimer_get_softexpires(hrtimer)))
+		ctf_integer(enum hrtimer_mode, mode, mode)
 	)
 )
 
@@ -188,7 +173,7 @@ LTTNG_TRACEPOINT_EVENT_MAP(hrtimer_expire_entry,
 
 	TP_FIELDS(
 		ctf_integer_hex(void *, hrtimer, hrtimer)
-		ctf_integer(s64, now, now->tv64)
+		ctf_integer(s64, now, lttng_ktime_get_tv64(*now))
 		ctf_integer_hex(void *, function, hrtimer->function)
 	)
 )
@@ -244,18 +229,18 @@ LTTNG_TRACEPOINT_EVENT_MAP(itimer_state,
 
 	timer_itimer_state,
 
-	TP_PROTO(int which, const struct itimerval *const value,
-		 cputime_t expires),
+	TP_PROTO(int which, const struct itimerspec64 *const value,
+		 unsigned long long expires),
 
 	TP_ARGS(which, value, expires),
 
 	TP_FIELDS(
 		ctf_integer(int, which, which)
-		ctf_integer(cputime_t, expires, expires)
+		ctf_integer(unsigned long long, expires, expires)
 		ctf_integer(long, value_sec, value->it_value.tv_sec)
-		ctf_integer(long, value_usec, value->it_value.tv_usec)
+		ctf_integer(long, value_nsec, value->it_value.tv_nsec)
 		ctf_integer(long, interval_sec, value->it_interval.tv_sec)
-		ctf_integer(long, interval_usec, value->it_interval.tv_usec)
+		ctf_integer(long, interval_nsec, value->it_interval.tv_nsec)
 	)
 )
 
@@ -269,14 +254,14 @@ LTTNG_TRACEPOINT_EVENT_MAP(itimer_expire,
 
 	timer_itimer_expire,
 
-	TP_PROTO(int which, struct pid *pid, cputime_t now),
+	TP_PROTO(int which, struct pid *pid, unsigned long long now),
 
 	TP_ARGS(which, pid, now),
 
 	TP_FIELDS(
 		ctf_integer(int , which, which)
 		ctf_integer(pid_t, pid, pid_nr(pid))
-		ctf_integer(cputime_t, now, now)
+		ctf_integer(unsigned long long, now, now)
 	)
 )