Fix: do not use diagnostic pragma when GCC version is lower than 4.6.0

[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 a007fd211ac2e800f60f089b6f9e09eac52f82e8..997084ffcb5933786373a528592db750abba7ba3 100644 (file)
--- a/instrumentation/events/lttng-module/timer.h
+++ b/instrumentation/events/lttng-module/timer.h
@@ -45,7 +45,8 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE(timer_class, timer_init,
        TP_ARGS(timer)
 )
 
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,2,0))
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,2,0) || \
+       LTTNG_RHEL_KERNEL_RANGE(3,10,0,957,0,0, 3,11,0,0,0,0))
 /**
  * timer_start - called when the timer is started
  * @timer:     pointer to struct timer_list
@@ -88,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
@@ -106,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