fix: y2038: itimer: change implementation to timespec64 (v5.5)

[lttng-modules.git] / instrumentation / events / lttng-module / timer.h

diff --git a/instrumentation/events/lttng-module/timer.h b/instrumentation/events/lttng-module/timer.h
index 8703ea0b89b4c50405388d3944d4d67c1695e7e6..1a45d82b38b7f44202361a8d244bc416bdfd94e8 100644 (file)
--- a/instrumentation/events/lttng-module/timer.h
+++ b/instrumentation/events/lttng-module/timer.h
@@ -89,6 +89,27 @@ LTTNG_TRACEPOINT_EVENT(timer_start,
 )
 #endif /* #else #if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,2,0)) */
 
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5,2,0))
+/**
+ * timer_expire_entry - called immediately before the timer callback
+ * @timer:     pointer to struct timer_list
+ *
+ * Allows to determine the timer latency.
+ */
+LTTNG_TRACEPOINT_EVENT(timer_expire_entry,
+
+       TP_PROTO(struct timer_list *timer, unsigned long baseclk),
+
+       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)
+       )
+)
+#else
 /**
  * timer_expire_entry - called immediately before the timer callback
  * @timer:     pointer to struct timer_list
@@ -107,6 +128,7 @@ LTTNG_TRACEPOINT_EVENT(timer_expire_entry,
                ctf_integer_hex(void *, function, timer->function)
        )
 )
+#endif
 
 /**
  * timer_expire_exit - called immediately after the timer callback returns
@@ -272,7 +294,26 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP(timer_hrtimer_class, hrtimer_cancel,
  *             zero, otherwise it is started
  * @expires:   the itimers expiry time
  */
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,11,0))
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5,5,0))
+LTTNG_TRACEPOINT_EVENT_MAP(itimer_state,
+
+       timer_itimer_state,
+
+       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(unsigned long long, expires, expires)
+               ctf_integer(long, value_sec, value->it_value.tv_sec)
+               ctf_integer(long, value_nsec, value->it_value.tv_nsec)
+               ctf_integer(long, interval_sec, value->it_interval.tv_sec)
+               ctf_integer(long, interval_nsec, value->it_interval.tv_nsec)
+       )
+)
+#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(4,11,0))
 LTTNG_TRACEPOINT_EVENT_MAP(itimer_state,
 
        timer_itimer_state,