X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=instrumentation%2Fevents%2Flttng-module%2Fnapi.h;h=20e0d61dae5c09484dc210414f6d2e5c64601860;hb=f127e61ee231d002fb9a7803643a157e06f6d2e2;hp=26b10ba1b99db10f22623cd0c3a028a7c02c4d0d;hpb=d3ac4d63d21c643df5b09d9d7888eb0c4122379c;p=lttng-modules.git

diff --git a/instrumentation/events/lttng-module/napi.h b/instrumentation/events/lttng-module/napi.h
index 26b10ba1..20e0d61d 100644
--- a/instrumentation/events/lttng-module/napi.h
+++ b/instrumentation/events/lttng-module/napi.h
@@ -1,38 +1,30 @@
 #undef TRACE_SYSTEM
 #define TRACE_SYSTEM napi
 
-#if !defined(_TRACE_NAPI_H_) || defined(TRACE_HEADER_MULTI_READ)
-#define _TRACE_NAPI_H_
+#if !defined(LTTNG_TRACE_NAPI_H) || defined(TRACE_HEADER_MULTI_READ)
+#define LTTNG_TRACE_NAPI_H
 
+#include "../../../probes/lttng-tracepoint-event.h"
 #include <linux/netdevice.h>
-#include <linux/tracepoint.h>
 #include <linux/ftrace.h>
 
 #define NO_DEV "(no_device)"
 
-TRACE_EVENT(napi_poll,
+LTTNG_TRACEPOINT_EVENT(napi_poll,
 
 	TP_PROTO(struct napi_struct *napi),
 
 	TP_ARGS(napi),
 
-	TP_STRUCT__entry(
-		__field(	struct napi_struct *,	napi)
-		__string(	dev_name, napi->dev ? napi->dev->name : NO_DEV)
-	),
-
-	TP_fast_assign(
-		tp_assign(napi, napi)
-		tp_strcpy(dev_name, napi->dev ? napi->dev->name : NO_DEV)
-	),
-
-	TP_printk("napi poll on napi struct %p for device %s",
-		__entry->napi, __get_str(dev_name))
+	TP_FIELDS(
+		ctf_integer(struct napi_struct *, napi, napi)
+		ctf_string(dev_name, napi->dev ? napi->dev->name : NO_DEV)
+	)
 )
 
 #undef NO_DEV
 
-#endif /* _TRACE_NAPI_H_ */
+#endif /* LTTNG_TRACE_NAPI_H */
 
 /* This part must be outside protection */
 #include "../../../probes/define_trace.h"