#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_
#include <linux/hrtimer.h>
#include <linux/timer.h>
+#include <linux/version.h>
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),
TP_ARGS(timer),
TP_FIELDS(
- ctf_integer(void *, timer, timer)
+ ctf_integer_hex(void *, timer, 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
+ * @expires: the timers expiry time
+ * @flags: the timers expiry time
+ */
+LTTNG_TRACEPOINT_EVENT(timer_start,
+
+ TP_PROTO(struct timer_list *timer, unsigned long expires,
+ unsigned int flags),
+
+ TP_ARGS(timer, expires, flags),
+
+ 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)
+ 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
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)
)
)
+#endif /* #else #if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,2,0)) */
/**
* timer_expire_entry - called immediately before the timer callback
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)
)
)
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)
)
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)))
)
)
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)
)
)
TP_ARGS(hrtimer),
TP_FIELDS(
- ctf_integer(void *, hrtimer, hrtimer)
+ ctf_integer_hex(void *, hrtimer, hrtimer)
)
)
#endif /* LTTNG_TRACE_TIMER_H */
/* This part must be outside protection */
-#include "../../../probes/define_trace.h"
+#include <probes/define_trace.h>