projects
/
lttng-modules.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Change integer base to hex for fields representing addresses
[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 3bb75594b1084871463dc2b6b64afba64eb595b0..ed1e3a3b7512500208a51e95182de65ac59c9892 100644
(file)
--- a/
instrumentation/events/lttng-module/module.h
+++ b/
instrumentation/events/lttng-module/module.h
@@
-1,3
+1,4
@@
+/* SPDX-License-Identifier: GPL-2.0 */
/*
* Because linux/module.h has tracepoints in the header, and ftrace.h
* eventually includes this file, define_trace.h includes linux/module.h
/*
* Because linux/module.h has tracepoints in the header, and ftrace.h
* eventually includes this file, define_trace.h includes linux/module.h
@@
-14,7
+15,7
@@
#if !defined(LTTNG_TRACE_MODULE_H) || defined(TRACE_HEADER_MULTI_READ)
#define LTTNG_TRACE_MODULE_H
#if !defined(LTTNG_TRACE_MODULE_H) || defined(TRACE_HEADER_MULTI_READ)
#define LTTNG_TRACE_MODULE_H
-#include
"../../../probes/lttng-tracepoint-event.h"
+#include
<probes/lttng-tracepoint-event.h>
#include <linux/version.h>
#ifdef CONFIG_MODULES
#include <linux/version.h>
#ifdef CONFIG_MODULES
@@
-53,24
+54,16
@@
LTTNG_TRACEPOINT_EVENT(module_free,
LTTNG_TRACEPOINT_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_FIELDS(
TP_FIELDS(
- ctf_integer(unsigned long, ip, ip)
+ ctf_integer
_hex
(unsigned long, ip, ip)
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,19,0))
ctf_integer(int, refcnt, atomic_read(&mod->refcnt))
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,19,0))
ctf_integer(int, refcnt, atomic_read(&mod->refcnt))
-#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35))
- ctf_integer(int, refcnt, __this_cpu_read(mod->refptr->incs) + __this_cpu_read(mod->refptr->decs))
#else
#else
- ctf_integer(int, refcnt,
refcnt
)
+ ctf_integer(int, refcnt,
__this_cpu_read(mod->refptr->incs) + __this_cpu_read(mod->refptr->decs)
)
#endif
ctf_string(name, mod->name)
)
#endif
ctf_string(name, mod->name)
)
@@
-78,28
+71,16
@@
LTTNG_TRACEPOINT_EVENT_CLASS(module_refcnt,
LTTNG_TRACEPOINT_EVENT_INSTANCE(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
)
LTTNG_TRACEPOINT_EVENT_INSTANCE(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 */
@@
-110,7
+91,7
@@
LTTNG_TRACEPOINT_EVENT(module_request,
TP_ARGS(name, wait, ip),
TP_FIELDS(
TP_ARGS(name, wait, ip),
TP_FIELDS(
- ctf_integer(unsigned long, ip, ip)
+ ctf_integer
_hex
(unsigned long, ip, ip)
ctf_integer(bool, wait, wait)
ctf_string(name, name)
)
ctf_integer(bool, wait, wait)
ctf_string(name, name)
)
@@
-121,4
+102,4
@@
LTTNG_TRACEPOINT_EVENT(module_request,
#endif /* LTTNG_TRACE_MODULE_H */
/* This part must be outside protection */
#endif /* LTTNG_TRACE_MODULE_H */
/* This part must be outside protection */
-#include
"../../../probes/define_trace.h"
+#include
<probes/define_trace.h>
This page took
0.025967 seconds
and
4
git commands to generate.