X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=instrumentation%2Fevents%2Flttng-module%2Fmodule.h;h=83d191f497f83748f575ecae68e36f245b107d0a;hb=3bc29f0a41b3c803245b845db2e1909042e72e9c;hp=2e83431a87e3589e350c859116936bfa84cb812f;hpb=b283666ff19841a28b0448c6a867beb2f809f11a;p=deliverable%2Flttng-modules.git

diff --git a/instrumentation/events/lttng-module/module.h b/instrumentation/events/lttng-module/module.h
index 2e83431a..83d191f4 100644
--- a/instrumentation/events/lttng-module/module.h
+++ b/instrumentation/events/lttng-module/module.h
@@ -11,10 +11,11 @@
 #define TRACE_SYSTEM module
 #endif
 
-#if !defined(_TRACE_MODULE_H) || defined(TRACE_HEADER_MULTI_READ)
-#define _TRACE_MODULE_H
+#if !defined(LTTNG_TRACE_MODULE_H) || defined(TRACE_HEADER_MULTI_READ)
+#define LTTNG_TRACE_MODULE_H
 
-#include <linux/tracepoint.h>
+#include "../../../probes/lttng-tracepoint-event.h"
+#include <linux/version.h>
 
 #ifdef CONFIG_MODULES
 
@@ -22,13 +23,9 @@
 #define _TRACE_MODULE_DEF
 struct module;
 
-#define show_module_flags(flags) __print_flags(flags, "",	\
-	{ (1UL << TAINT_PROPRIETARY_MODULE),	"P" },		\
-	{ (1UL << TAINT_FORCED_MODULE),		"F" },		\
-	{ (1UL << TAINT_CRAP),			"C" })
 #endif
 
-TRACE_EVENT(module_load,
+LTTNG_TRACEPOINT_EVENT(module_load,
 
 	TP_PROTO(struct module *mod),
 
@@ -40,14 +37,14 @@ TRACE_EVENT(module_load,
 	),
 
 	TP_fast_assign(
-		tp_assign(taints, mod->taints);
-		tp_strcpy(name, mod->name);
+		tp_assign(taints, mod->taints)
+		tp_strcpy(name, mod->name)
 	),
 
 	TP_printk("%s %s", __get_str(name), show_module_flags(__entry->taints))
 )
 
-TRACE_EVENT(module_free,
+LTTNG_TRACEPOINT_EVENT(module_free,
 
 	TP_PROTO(struct module *mod),
 
@@ -58,7 +55,7 @@ TRACE_EVENT(module_free,
 	),
 
 	TP_fast_assign(
-		tp_strcpy(name, mod->name);
+		tp_strcpy(name, mod->name)
 	),
 
 	TP_printk("%s", __get_str(name))
@@ -67,11 +64,17 @@ TRACE_EVENT(module_free,
 #ifdef CONFIG_MODULE_UNLOAD
 /* trace_module_get/put are only used if CONFIG_MODULE_UNLOAD is defined */
 
-DECLARE_EVENT_CLASS(module_refcnt,
+LTTNG_TRACEPOINT_EVENT_CLASS(module_refcnt,
 
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35))
 	TP_PROTO(struct module *mod, unsigned long ip),
 
 	TP_ARGS(mod, ip),
+#else
+	TP_PROTO(struct module *mod, unsigned long ip, int refcnt),
+
+	TP_ARGS(mod, ip, refcnt),
+#endif
 
 	TP_STRUCT__entry(
 		__field(	unsigned long,	ip		)
@@ -80,31 +83,47 @@ DECLARE_EVENT_CLASS(module_refcnt,
 	),
 
 	TP_fast_assign(
-		tp_assign(ip, ip);
-		tp_assign(refcnt, __this_cpu_read(mod->refptr->incs) + __this_cpu_read(mod->refptr->decs));
-		tp_strcpy(name, mod->name);
+		tp_assign(ip, ip)
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35))
+		tp_assign(refcnt, __this_cpu_read(mod->refptr->incs) + __this_cpu_read(mod->refptr->decs))
+#else
+		tp_assign(refcnt, refcnt)
+#endif
+		tp_strcpy(name, mod->name)
 	),
 
 	TP_printk("%s call_site=%pf refcnt=%d",
 		  __get_str(name), (void *)__entry->ip, __entry->refcnt)
 )
 
-DEFINE_EVENT(module_refcnt, module_get,
+LTTNG_TRACEPOINT_EVENT_INSTANCE(module_refcnt, module_get,
 
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35))
 	TP_PROTO(struct module *mod, unsigned long ip),
 
 	TP_ARGS(mod, ip)
+#else
+	TP_PROTO(struct module *mod, unsigned long ip, int refcnt),
+
+	TP_ARGS(mod, ip, refcnt)
+#endif
 )
 
-DEFINE_EVENT(module_refcnt, module_put,
+LTTNG_TRACEPOINT_EVENT_INSTANCE(module_refcnt, module_put,
 
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35))
 	TP_PROTO(struct module *mod, unsigned long ip),
 
 	TP_ARGS(mod, ip)
+#else
+	TP_PROTO(struct module *mod, unsigned long ip, int refcnt),
+
+	TP_ARGS(mod, ip, refcnt)
+#endif
 )
 #endif /* CONFIG_MODULE_UNLOAD */
 
-TRACE_EVENT(module_request,
+LTTNG_TRACEPOINT_EVENT(module_request,
 
 	TP_PROTO(char *name, bool wait, unsigned long ip),
 
@@ -117,9 +136,9 @@ TRACE_EVENT(module_request,
 	),
 
 	TP_fast_assign(
-		tp_assign(ip, ip);
-		tp_assign(wait, wait);
-		tp_strcpy(name, name);
+		tp_assign(ip, ip)
+		tp_assign(wait, wait)
+		tp_strcpy(name, name)
 	),
 
 	TP_printk("%s wait=%d call_site=%pf",
@@ -128,7 +147,7 @@ TRACE_EVENT(module_request,
 
 #endif /* CONFIG_MODULES */
 
-#endif /* _TRACE_MODULE_H */
+#endif /* LTTNG_TRACE_MODULE_H */
 
 /* This part must be outside protection */
 #include "../../../probes/define_trace.h"