X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=instrumentation%2Fevents%2Flttng-module%2Fnapi.h;h=46d7ee2cdfcad6a244c40211ae4720f4b93cdf88;hb=360d3efee55154a55c18be32175bee608dcb21df;hp=d6df1817d4c53d7b9df63eb50d9dd0fe73ec3d3d;hpb=3bc29f0a41b3c803245b845db2e1909042e72e9c;p=lttng-modules.git

diff --git a/instrumentation/events/lttng-module/napi.h b/instrumentation/events/lttng-module/napi.h
index d6df1817..46d7ee2c 100644
--- a/instrumentation/events/lttng-module/napi.h
+++ b/instrumentation/events/lttng-module/napi.h
@@ -4,35 +4,47 @@
 #if !defined(LTTNG_TRACE_NAPI_H) || defined(TRACE_HEADER_MULTI_READ)
 #define LTTNG_TRACE_NAPI_H
 
-#include "../../../probes/lttng-tracepoint-event.h"
+#include <probes/lttng-tracepoint-event.h>
 #include <linux/netdevice.h>
 #include <linux/ftrace.h>
 
 #define NO_DEV "(no_device)"
 
+#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(4,8,0))
+
 LTTNG_TRACEPOINT_EVENT(napi_poll,
 
-	TP_PROTO(struct napi_struct *napi),
+	TP_PROTO(struct napi_struct *napi, int work, int budget),
 
-	TP_ARGS(napi),
+	TP_ARGS(napi, work, budget),
 
-	TP_STRUCT__entry(
-		__field(	struct napi_struct *,	napi)
-		__string(	dev_name, napi->dev ? napi->dev->name : NO_DEV)
-	),
+	TP_FIELDS(
+		ctf_integer_hex(struct napi_struct *, napi, napi)
+		ctf_string(dev_name, napi->dev ? napi->dev->name : NO_DEV)
+		ctf_integer(int, work, work)
+		ctf_integer(int, budget, budget)
+	)
+)
+
+#else
 
-	TP_fast_assign(
-		tp_assign(napi, napi)
-		tp_strcpy(dev_name, napi->dev ? napi->dev->name : NO_DEV)
-	),
+LTTNG_TRACEPOINT_EVENT(napi_poll,
 
-	TP_printk("napi poll on napi struct %p for device %s",
-		__entry->napi, __get_str(dev_name))
+	TP_PROTO(struct napi_struct *napi),
+
+	TP_ARGS(napi),
+
+	TP_FIELDS(
+		ctf_integer_hex(struct napi_struct *, napi, napi)
+		ctf_string(dev_name, napi->dev ? napi->dev->name : NO_DEV)
+	)
 )
 
+#endif
+
 #undef NO_DEV
 
 #endif /* LTTNG_TRACE_NAPI_H */
 
 /* This part must be outside protection */
-#include "../../../probes/define_trace.h"
+#include <probes/define_trace.h>