+/* SPDX-License-Identifier: GPL-2.0-only */
#undef TRACE_SYSTEM
#define TRACE_SYSTEM timer
#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),
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
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
*/
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)
)
)
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)
)
)
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)
)
)
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)
)
)
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)
)
)