projects
/
lttng-modules.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rename LTTng instrumentation macros
[lttng-modules.git]
/
instrumentation
/
events
/
lttng-module
/
module.h
diff --git
a/instrumentation/events/lttng-module/module.h
b/instrumentation/events/lttng-module/module.h
index 2e83431a87e3589e350c859116936bfa84cb812f..83d191f497f83748f575ecae68e36f245b107d0a 100644
(file)
--- a/
instrumentation/events/lttng-module/module.h
+++ b/
instrumentation/events/lttng-module/module.h
@@
-11,10
+11,11
@@
#define TRACE_SYSTEM module
#endif
#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
#ifdef CONFIG_MODULES
@@
-22,13
+23,9
@@
#define _TRACE_MODULE_DEF
struct module;
#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
#endif
-
TRACE
_EVENT(module_load,
+
LTTNG_TRACEPOINT
_EVENT(module_load,
TP_PROTO(struct module *mod),
TP_PROTO(struct module *mod),
@@
-40,14
+37,14
@@
TRACE_EVENT(module_load,
),
TP_fast_assign(
),
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))
)
),
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),
TP_PROTO(struct module *mod),
@@
-58,7
+55,7
@@
TRACE_EVENT(module_free,
),
TP_fast_assign(
),
TP_fast_assign(
- tp_strcpy(name, mod->name)
;
+ tp_strcpy(name, mod->name)
),
TP_printk("%s", __get_str(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 */
#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),
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 )
TP_STRUCT__entry(
__field( unsigned long, ip )
@@
-80,31
+83,47
@@
DECLARE_EVENT_CLASS(module_refcnt,
),
TP_fast_assign(
),
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)
)
),
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)
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)
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 */
)
#endif /* CONFIG_MODULE_UNLOAD */
-
TRACE
_EVENT(module_request,
+
LTTNG_TRACEPOINT
_EVENT(module_request,
TP_PROTO(char *name, bool wait, unsigned long ip),
TP_PROTO(char *name, bool wait, unsigned long ip),
@@
-117,9
+136,9
@@
TRACE_EVENT(module_request,
),
TP_fast_assign(
),
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",
),
TP_printk("%s wait=%d call_site=%pf",
@@
-128,7
+147,7
@@
TRACE_EVENT(module_request,
#endif /* CONFIG_MODULES */
#endif /* CONFIG_MODULES */
-#endif /* _TRACE_MODULE_H */
+#endif /*
LTTNG
_TRACE_MODULE_H */
/* This part must be outside protection */
#include "../../../probes/define_trace.h"
/* This part must be outside protection */
#include "../../../probes/define_trace.h"
This page took
0.025959 seconds
and
4
git commands to generate.