projects
/
lttng-modules.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
e0f2366
)
Namespace kernel version macros
author
Michael Jeanson
<mjeanson@efficios.com>
Tue, 9 Feb 2021 18:36:29 +0000
(13:36 -0500)
committer
Mathieu Desnoyers
<mathieu.desnoyers@efficios.com>
Wed, 10 Feb 2021 15:10:35 +0000
(10:10 -0500)
This patch replaces all uses of the LINUX_VERSION_CODE and
KERNEL_VERSION macros by an 'LTTNG_' prefixed version, this will allow
us to override them.
Signed-off-by: Michael Jeanson <mjeanson@efficios.com>
Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Change-Id: I2f6c13372e83564bd517c81ed7e2a696da8ee8ec
99 files changed:
instrumentation/events/lttng-module/9p.h
patch
|
blob
|
blame
|
history
instrumentation/events/lttng-module/arch/x86/exceptions.h
patch
|
blob
|
blame
|
history
instrumentation/events/lttng-module/arch/x86/irq_vectors.h
patch
|
blob
|
blame
|
history
instrumentation/events/lttng-module/arch/x86/kvm/mmutrace.h
patch
|
blob
|
blame
|
history
instrumentation/events/lttng-module/arch/x86/kvm/trace.h
patch
|
blob
|
blame
|
history
instrumentation/events/lttng-module/asoc.h
patch
|
blob
|
blame
|
history
instrumentation/events/lttng-module/block.h
patch
|
blob
|
blame
|
history
instrumentation/events/lttng-module/btrfs.h
patch
|
blob
|
blame
|
history
instrumentation/events/lttng-module/compaction.h
patch
|
blob
|
blame
|
history
instrumentation/events/lttng-module/ext3.h
patch
|
blob
|
blame
|
history
instrumentation/events/lttng-module/ext4.h
patch
|
blob
|
blame
|
history
instrumentation/events/lttng-module/jbd.h
patch
|
blob
|
blame
|
history
instrumentation/events/lttng-module/jbd2.h
patch
|
blob
|
blame
|
history
instrumentation/events/lttng-module/kmem.h
patch
|
blob
|
blame
|
history
instrumentation/events/lttng-module/kvm.h
patch
|
blob
|
blame
|
history
instrumentation/events/lttng-module/lttng-statedump.h
patch
|
blob
|
blame
|
history
instrumentation/events/lttng-module/lttng-test.h
patch
|
blob
|
blame
|
history
instrumentation/events/lttng-module/mm_vmscan.h
patch
|
blob
|
blame
|
history
instrumentation/events/lttng-module/module.h
patch
|
blob
|
blame
|
history
instrumentation/events/lttng-module/napi.h
patch
|
blob
|
blame
|
history
instrumentation/events/lttng-module/net.h
patch
|
blob
|
blame
|
history
instrumentation/events/lttng-module/power.h
patch
|
blob
|
blame
|
history
instrumentation/events/lttng-module/preemptirq.h
patch
|
blob
|
blame
|
history
instrumentation/events/lttng-module/printk.h
patch
|
blob
|
blame
|
history
instrumentation/events/lttng-module/random.h
patch
|
blob
|
blame
|
history
instrumentation/events/lttng-module/rcu.h
patch
|
blob
|
blame
|
history
instrumentation/events/lttng-module/regmap.h
patch
|
blob
|
blame
|
history
instrumentation/events/lttng-module/rpc.h
patch
|
blob
|
blame
|
history
instrumentation/events/lttng-module/sched.h
patch
|
blob
|
blame
|
history
instrumentation/events/lttng-module/scsi.h
patch
|
blob
|
blame
|
history
instrumentation/events/lttng-module/signal.h
patch
|
blob
|
blame
|
history
instrumentation/events/lttng-module/skb.h
patch
|
blob
|
blame
|
history
instrumentation/events/lttng-module/sock.h
patch
|
blob
|
blame
|
history
instrumentation/events/lttng-module/timer.h
patch
|
blob
|
blame
|
history
instrumentation/events/lttng-module/v4l2.h
patch
|
blob
|
blame
|
history
instrumentation/events/lttng-module/workqueue.h
patch
|
blob
|
blame
|
history
instrumentation/events/lttng-module/writeback.h
patch
|
blob
|
blame
|
history
lib/ringbuffer/backend_types.h
patch
|
blob
|
blame
|
history
lib/ringbuffer/frontend_types.h
patch
|
blob
|
blame
|
history
lib/ringbuffer/ring_buffer_backend.c
patch
|
blob
|
blame
|
history
lib/ringbuffer/ring_buffer_frontend.c
patch
|
blob
|
blame
|
history
lib/ringbuffer/ring_buffer_iterator.c
patch
|
blob
|
blame
|
history
lib/ringbuffer/ring_buffer_mmap.c
patch
|
blob
|
blame
|
history
lib/ringbuffer/ring_buffer_splice.c
patch
|
blob
|
blame
|
history
lttng-abi.c
patch
|
blob
|
blame
|
history
lttng-context-cgroup-ns.c
patch
|
blob
|
blame
|
history
lttng-context-ipc-ns.c
patch
|
blob
|
blame
|
history
lttng-context-mnt-ns.c
patch
|
blob
|
blame
|
history
lttng-context-net-ns.c
patch
|
blob
|
blame
|
history
lttng-context-perf-counters.c
patch
|
blob
|
blame
|
history
lttng-context-pid-ns.c
patch
|
blob
|
blame
|
history
lttng-context-user-ns.c
patch
|
blob
|
blame
|
history
lttng-context-uts-ns.c
patch
|
blob
|
blame
|
history
lttng-cpuhotplug.h
patch
|
blob
|
blame
|
history
lttng-events.c
patch
|
blob
|
blame
|
history
lttng-events.h
patch
|
blob
|
blame
|
history
lttng-kernel-version.h
patch
|
blob
|
blame
|
history
lttng-statedump-impl.c
patch
|
blob
|
blame
|
history
lttng-syscalls.c
patch
|
blob
|
blame
|
history
probes/lttng-probe-btrfs.c
patch
|
blob
|
blame
|
history
probes/lttng-probe-ext3.c
patch
|
blob
|
blame
|
history
probes/lttng-probe-kvm-x86-mmu.c
patch
|
blob
|
blame
|
history
probes/lttng-probe-kvm-x86.c
patch
|
blob
|
blame
|
history
probes/lttng-probe-lock.c
patch
|
blob
|
blame
|
history
probes/lttng.c
patch
|
blob
|
blame
|
history
tests/probes/lttng-test.c
patch
|
blob
|
blame
|
history
wrapper/atomic.h
patch
|
blob
|
blame
|
history
wrapper/compiler.h
patch
|
blob
|
blame
|
history
wrapper/fdtable.c
patch
|
blob
|
blame
|
history
wrapper/fdtable.h
patch
|
blob
|
blame
|
history
wrapper/file.h
patch
|
blob
|
blame
|
history
wrapper/fs.h
patch
|
blob
|
blame
|
history
wrapper/irq.h
patch
|
blob
|
blame
|
history
wrapper/irqdesc.c
patch
|
blob
|
blame
|
history
wrapper/irqflags.h
patch
|
blob
|
blame
|
history
wrapper/kallsyms.c
patch
|
blob
|
blame
|
history
wrapper/kallsyms.h
patch
|
blob
|
blame
|
history
wrapper/kprobes.h
patch
|
blob
|
blame
|
history
wrapper/kref.h
patch
|
blob
|
blame
|
history
wrapper/mm.h
patch
|
blob
|
blame
|
history
wrapper/namespace.h
patch
|
blob
|
blame
|
history
wrapper/objtool.h
patch
|
blob
|
blame
|
history
wrapper/page_alloc.c
patch
|
blob
|
blame
|
history
wrapper/page_alloc.h
patch
|
blob
|
blame
|
history
wrapper/percpu-defs.h
patch
|
blob
|
blame
|
history
wrapper/perf.h
patch
|
blob
|
blame
|
history
wrapper/rcu.h
patch
|
blob
|
blame
|
history
wrapper/splice.c
patch
|
blob
|
blame
|
history
wrapper/syscall.h
patch
|
blob
|
blame
|
history
wrapper/time.h
patch
|
blob
|
blame
|
history
wrapper/timer.h
patch
|
blob
|
blame
|
history
wrapper/trace-clock.h
patch
|
blob
|
blame
|
history
wrapper/tracepoint.h
patch
|
blob
|
blame
|
history
wrapper/uaccess.h
patch
|
blob
|
blame
|
history
wrapper/uprobes.h
patch
|
blob
|
blame
|
history
wrapper/user_namespace.h
patch
|
blob
|
blame
|
history
wrapper/uuid.h
patch
|
blob
|
blame
|
history
wrapper/vmalloc.h
patch
|
blob
|
blame
|
history
wrapper/writeback.h
patch
|
blob
|
blame
|
history
diff --git
a/instrumentation/events/lttng-module/9p.h
b/instrumentation/events/lttng-module/9p.h
index bc6e01ad98c061c3afed382d07e8bdd591562bbf..9885fe0aa3882ca78a2febc2156188dde4e71b78 100644
(file)
--- a/
instrumentation/events/lttng-module/9p.h
+++ b/
instrumentation/events/lttng-module/9p.h
@@
-6,9
+6,9
@@
#define LTTNG_TRACE_9P_H
#include <probes/lttng-tracepoint-event.h>
#define LTTNG_TRACE_9P_H
#include <probes/lttng-tracepoint-event.h>
-#include <l
inux/
version.h>
+#include <l
ttng-kernel-
version.h>
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(4,14,0))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(4,14,0))
LTTNG_TRACEPOINT_EVENT(9p_client_req,
TP_PROTO(struct p9_client *clnt, int8_t type, int tag),
LTTNG_TRACEPOINT_EVENT(9p_client_req,
TP_PROTO(struct p9_client *clnt, int8_t type, int tag),
diff --git
a/instrumentation/events/lttng-module/arch/x86/exceptions.h
b/instrumentation/events/lttng-module/arch/x86/exceptions.h
index ac86a58af39dc641248d3dfdc9c725dc04d130c6..4c1640c2278a47746cd4a8ba9f260640e670cd31 100644
(file)
--- a/
instrumentation/events/lttng-module/arch/x86/exceptions.h
+++ b/
instrumentation/events/lttng-module/arch/x86/exceptions.h
@@
-3,7
+3,7
@@
#define LTTNG_TRACE_EXCEPTIONS_H
#include <probes/lttng-tracepoint-event.h>
#define LTTNG_TRACE_EXCEPTIONS_H
#include <probes/lttng-tracepoint-event.h>
-#include <l
inux/
version.h>
+#include <l
ttng-kernel-
version.h>
#undef TRACE_SYSTEM
#define TRACE_SYSTEM x86_exceptions
#undef TRACE_SYSTEM
#define TRACE_SYSTEM x86_exceptions
diff --git
a/instrumentation/events/lttng-module/arch/x86/irq_vectors.h
b/instrumentation/events/lttng-module/arch/x86/irq_vectors.h
index d9f92ec2879a5b3c27c07d470904c7a1291c9a11..7ec5add5eb174dc00d3b626d8a0859acad53ed04 100644
(file)
--- a/
instrumentation/events/lttng-module/arch/x86/irq_vectors.h
+++ b/
instrumentation/events/lttng-module/arch/x86/irq_vectors.h
@@
-3,7
+3,7
@@
#define LTTNG_TRACE_IRQ_VECTORS_H
#include <probes/lttng-tracepoint-event.h>
#define LTTNG_TRACE_IRQ_VECTORS_H
#include <probes/lttng-tracepoint-event.h>
-#include <l
inux/
version.h>
+#include <l
ttng-kernel-
version.h>
#undef TRACE_SYSTEM
#define TRACE_SYSTEM x86_irq_vectors
#undef TRACE_SYSTEM
#define TRACE_SYSTEM x86_irq_vectors
diff --git
a/instrumentation/events/lttng-module/arch/x86/kvm/mmutrace.h
b/instrumentation/events/lttng-module/arch/x86/kvm/mmutrace.h
index cdf0609f7c33bc2ee75a6b7ce2a64737b6e88d8f..64304e338d0f39641ec10b760d9de457bc0eb6ce 100644
(file)
--- a/
instrumentation/events/lttng-module/arch/x86/kvm/mmutrace.h
+++ b/
instrumentation/events/lttng-module/arch/x86/kvm/mmutrace.h
@@
-3,18
+3,18
@@
#define LTTNG_TRACE_KVM_MMU_H
#include <probes/lttng-tracepoint-event.h>
#define LTTNG_TRACE_KVM_MMU_H
#include <probes/lttng-tracepoint-event.h>
-#include <l
inux/
version.h>
+#include <l
ttng-kernel-
version.h>
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(4,2,0))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(4,2,0))
#include <linux/trace_events.h>
#include <linux/trace_events.h>
-#else /* if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(4,2,0)) */
+#else /* if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(4,2,0)) */
#include <linux/ftrace_event.h>
#include <linux/ftrace_event.h>
-#endif /* #else #if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(4,2,0)) */
+#endif /* #else #if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(4,2,0)) */
#undef TRACE_SYSTEM
#define TRACE_SYSTEM kvm_mmu
#undef TRACE_SYSTEM
#define TRACE_SYSTEM kvm_mmu
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(5,1,0) || \
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(5,1,0) || \
LTTNG_RHEL_KERNEL_RANGE(4,18,0,147,0,0, 4,19,0,0,0,0))
#define LTTNG_KVM_MMU_PAGE_FIELDS \
LTTNG_RHEL_KERNEL_RANGE(4,18,0,147,0,0, 4,19,0,0,0,0))
#define LTTNG_KVM_MMU_PAGE_FIELDS \
@@
-23,7
+23,7
@@
ctf_integer(__u32, root_count, (sp)->root_count) \
ctf_integer(bool, unsync, (sp)->unsync)
ctf_integer(__u32, root_count, (sp)->root_count) \
ctf_integer(bool, unsync, (sp)->unsync)
-#elif (L
INUX_VERSION_CODE >=
KERNEL_VERSION(3,11,0))
+#elif (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(3,11,0))
#define LTTNG_KVM_MMU_PAGE_FIELDS \
ctf_integer(unsigned long, mmu_valid_gen, (sp)->mmu_valid_gen) \
#define LTTNG_KVM_MMU_PAGE_FIELDS \
ctf_integer(unsigned long, mmu_valid_gen, (sp)->mmu_valid_gen) \
@@
-32,7
+32,7
@@
ctf_integer(__u32, root_count, (sp)->root_count) \
ctf_integer(bool, unsync, (sp)->unsync)
ctf_integer(__u32, root_count, (sp)->root_count) \
ctf_integer(bool, unsync, (sp)->unsync)
-#else /* #if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(3,11,0)) */
+#else /* #if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(3,11,0)) */
#define LTTNG_KVM_MMU_PAGE_FIELDS \
ctf_integer(__u64, gfn, (sp)->gfn) \
#define LTTNG_KVM_MMU_PAGE_FIELDS \
ctf_integer(__u64, gfn, (sp)->gfn) \
@@
-40,9
+40,9
@@
ctf_integer(__u32, root_count, (sp)->root_count) \
ctf_integer(bool, unsync, (sp)->unsync)
ctf_integer(__u32, root_count, (sp)->root_count) \
ctf_integer(bool, unsync, (sp)->unsync)
-#endif /* #else #if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(3,11,0)) */
+#endif /* #else #if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(3,11,0)) */
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(3,6,0))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(3,6,0))
/*
* A pagetable walk has started
*/
/*
* A pagetable walk has started
*/
@@
-56,7
+56,7
@@
LTTNG_TRACEPOINT_EVENT(
ctf_integer(__u32, pferr, pferr)
)
)
ctf_integer(__u32, pferr, pferr)
)
)
-#else /* #if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(3,6,0)) */
+#else /* #if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(3,6,0)) */
/*
* A pagetable walk has started
*/
/*
* A pagetable walk has started
*/
@@
-72,7
+72,7
@@
LTTNG_TRACEPOINT_EVENT(
| (!!fetch_fault << 4))
)
)
| (!!fetch_fault << 4))
)
)
-#endif /* #else #if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(3,6,0)) */
+#endif /* #else #if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(3,6,0)) */
/* We just walked a paging element */
LTTNG_TRACEPOINT_EVENT(
/* We just walked a paging element */
LTTNG_TRACEPOINT_EVENT(
@@
-163,7
+163,7
@@
LTTNG_TRACEPOINT_EVENT_INSTANCE(kvm_mmu_page_class, kvm_mmu_prepare_zap_page,
TP_ARGS(sp)
)
TP_ARGS(sp)
)
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(5,10,0))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(5,10,0))
LTTNG_TRACEPOINT_EVENT_MAP(
mark_mmio_spte,
LTTNG_TRACEPOINT_EVENT_MAP(
mark_mmio_spte,
@@
-181,7
+181,7
@@
LTTNG_TRACEPOINT_EVENT_MAP(
)
)
)
)
-#elif (L
INUX_VERSION_CODE >=
KERNEL_VERSION(3,11,0))
+#elif (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(3,11,0))
LTTNG_TRACEPOINT_EVENT_MAP(
mark_mmio_spte,
LTTNG_TRACEPOINT_EVENT_MAP(
mark_mmio_spte,
@@
-199,7
+199,7
@@
LTTNG_TRACEPOINT_EVENT_MAP(
)
)
)
)
-#else /* #if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(3,11,0)) */
+#else /* #if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(3,11,0)) */
LTTNG_TRACEPOINT_EVENT_MAP(
mark_mmio_spte,
LTTNG_TRACEPOINT_EVENT_MAP(
mark_mmio_spte,
@@
-216,7
+216,7
@@
LTTNG_TRACEPOINT_EVENT_MAP(
)
)
)
)
-#endif /* #else #if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(3,11,0)) */
+#endif /* #else #if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(3,11,0)) */
LTTNG_TRACEPOINT_EVENT_MAP(
handle_mmio_page_fault,
LTTNG_TRACEPOINT_EVENT_MAP(
handle_mmio_page_fault,
@@
-233,7
+233,7
@@
LTTNG_TRACEPOINT_EVENT_MAP(
)
)
)
)
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(5,10,0))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(5,10,0))
LTTNG_TRACEPOINT_EVENT_MAP(
fast_page_fault,
LTTNG_TRACEPOINT_EVENT_MAP(
fast_page_fault,
@@
-253,7
+253,7
@@
LTTNG_TRACEPOINT_EVENT_MAP(
ctf_integer(int, ret, ret)
)
)
ctf_integer(int, ret, ret)
)
)
-#elif (L
INUX_VERSION_CODE >=
KERNEL_VERSION(5,6,0) || \
+#elif (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(5,6,0) || \
LTTNG_KERNEL_RANGE(4,19,103, 4,20,0) || \
LTTNG_KERNEL_RANGE(5,4,19, 5,5,0) || \
LTTNG_KERNEL_RANGE(5,5,3, 5,6,0) || \
LTTNG_KERNEL_RANGE(4,19,103, 4,20,0) || \
LTTNG_KERNEL_RANGE(5,4,19, 5,5,0) || \
LTTNG_KERNEL_RANGE(5,5,3, 5,6,0) || \
diff --git
a/instrumentation/events/lttng-module/arch/x86/kvm/trace.h
b/instrumentation/events/lttng-module/arch/x86/kvm/trace.h
index 0917b51f5122014f8157e0ca2fccf9a83de3a3f3..4f131aa77b0160aeec4557447032100bd47985eb 100644
(file)
--- a/
instrumentation/events/lttng-module/arch/x86/kvm/trace.h
+++ b/
instrumentation/events/lttng-module/arch/x86/kvm/trace.h
@@
-5,10
+5,10
@@
#include <probes/lttng-tracepoint-event.h>
#include <asm/vmx.h>
#include <asm/svm.h>
#include <probes/lttng-tracepoint-event.h>
#include <asm/vmx.h>
#include <asm/svm.h>
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(3,8,0))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(3,8,0))
#include <asm/clocksource.h>
#endif
#include <asm/clocksource.h>
#endif
-#include <l
inux/
version.h>
+#include <l
ttng-kernel-
version.h>
#include <../arch/x86/kvm/lapic.h>
#include <../arch/x86/kvm/kvm_cache_regs.h>
#include <../arch/x86/kvm/lapic.h>
#include <../arch/x86/kvm/kvm_cache_regs.h>
@@
-115,7
+115,7
@@
LTTNG_TRACEPOINT_EVENT_MAP(kvm_apic, kvm_x86_apic,
/*
* Tracepoint for kvm guest exit:
*/
/*
* Tracepoint for kvm guest exit:
*/
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(5,10,0))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(5,10,0))
LTTNG_TRACEPOINT_EVENT_CODE_MAP(kvm_exit, kvm_x86_exit,
TP_PROTO(unsigned int exit_reason, struct kvm_vcpu *vcpu, u32 isa),
TP_ARGS(exit_reason, vcpu, isa),
LTTNG_TRACEPOINT_EVENT_CODE_MAP(kvm_exit, kvm_x86_exit,
TP_PROTO(unsigned int exit_reason, struct kvm_vcpu *vcpu, u32 isa),
TP_ARGS(exit_reason, vcpu, isa),
@@
-145,7
+145,7
@@
LTTNG_TRACEPOINT_EVENT_CODE_MAP(kvm_exit, kvm_x86_exit,
TP_code_post()
)
TP_code_post()
)
-#elif (L
INUX_VERSION_CODE >=
KERNEL_VERSION(5,7,0))
+#elif (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(5,7,0))
LTTNG_TRACEPOINT_EVENT_CODE_MAP(kvm_exit, kvm_x86_exit,
TP_PROTO(unsigned int exit_reason, struct kvm_vcpu *vcpu, u32 isa),
TP_ARGS(exit_reason, vcpu, isa),
LTTNG_TRACEPOINT_EVENT_CODE_MAP(kvm_exit, kvm_x86_exit,
TP_PROTO(unsigned int exit_reason, struct kvm_vcpu *vcpu, u32 isa),
TP_ARGS(exit_reason, vcpu, isa),
@@
-480,21
+480,21
@@
LTTNG_TRACEPOINT_EVENT_MAP(kvm_emulate_insn, kvm_x86_emulate_insn,
TP_ARGS(vcpu, failed),
TP_FIELDS(
TP_ARGS(vcpu, failed),
TP_FIELDS(
-#if (L
INUX_VERSION_CODE <
KERNEL_VERSION(3,1,0))
+#if (L
TTNG_LINUX_VERSION_CODE < LTTNG_
KERNEL_VERSION(3,1,0))
ctf_integer(__u64, rip, vcpu->arch.emulate_ctxt.decode.fetch.start)
ctf_integer(__u32, csbase, kvm_x86_ops->get_segment_base(vcpu, VCPU_SREG_CS))
ctf_integer(__u8, len, vcpu->arch.emulate_ctxt.decode.eip
- vcpu->arch.emulate_ctxt.decode.fetch.start)
ctf_array(__u8, insn, vcpu->arch.emulate_ctxt.decode.fetch.data, 15)
ctf_integer(__u8, flags, kei_decode_mode(vcpu->arch.emulate_ctxt.mode))
ctf_integer(__u64, rip, vcpu->arch.emulate_ctxt.decode.fetch.start)
ctf_integer(__u32, csbase, kvm_x86_ops->get_segment_base(vcpu, VCPU_SREG_CS))
ctf_integer(__u8, len, vcpu->arch.emulate_ctxt.decode.eip
- vcpu->arch.emulate_ctxt.decode.fetch.start)
ctf_array(__u8, insn, vcpu->arch.emulate_ctxt.decode.fetch.data, 15)
ctf_integer(__u8, flags, kei_decode_mode(vcpu->arch.emulate_ctxt.mode))
-#elif (L
INUX_VERSION_CODE <
KERNEL_VERSION(3,17,0))
+#elif (L
TTNG_LINUX_VERSION_CODE < LTTNG_
KERNEL_VERSION(3,17,0))
ctf_integer(__u64, rip, vcpu->arch.emulate_ctxt.fetch.start)
ctf_integer(__u32, csbase, kvm_x86_ops->get_segment_base(vcpu, VCPU_SREG_CS))
ctf_integer(__u8, len, vcpu->arch.emulate_ctxt._eip
- vcpu->arch.emulate_ctxt.fetch.start)
ctf_array(__u8, insn, vcpu->arch.emulate_ctxt.fetch.data, 15)
ctf_integer(__u8, flags, kei_decode_mode(vcpu->arch.emulate_ctxt.mode))
ctf_integer(__u64, rip, vcpu->arch.emulate_ctxt.fetch.start)
ctf_integer(__u32, csbase, kvm_x86_ops->get_segment_base(vcpu, VCPU_SREG_CS))
ctf_integer(__u8, len, vcpu->arch.emulate_ctxt._eip
- vcpu->arch.emulate_ctxt.fetch.start)
ctf_array(__u8, insn, vcpu->arch.emulate_ctxt.fetch.data, 15)
ctf_integer(__u8, flags, kei_decode_mode(vcpu->arch.emulate_ctxt.mode))
-#elif (L
INUX_VERSION_CODE <
KERNEL_VERSION(5,7,0))
+#elif (L
TTNG_LINUX_VERSION_CODE < LTTNG_
KERNEL_VERSION(5,7,0))
ctf_integer(__u64, rip, vcpu->arch.emulate_ctxt._eip -
(vcpu->arch.emulate_ctxt.fetch.ptr -
vcpu->arch.emulate_ctxt.fetch.data))
ctf_integer(__u64, rip, vcpu->arch.emulate_ctxt._eip -
(vcpu->arch.emulate_ctxt.fetch.ptr -
vcpu->arch.emulate_ctxt.fetch.data))
@@
-533,7
+533,7
@@
LTTNG_TRACEPOINT_EVENT_MAP(
)
)
)
)
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(3,11,0))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(3,11,0))
LTTNG_TRACEPOINT_EVENT_MAP(kvm_write_tsc_offset, kvm_x86_write_tsc_offset,
TP_PROTO(unsigned int vcpu_id, __u64 previous_tsc_offset,
__u64 next_tsc_offset),
LTTNG_TRACEPOINT_EVENT_MAP(kvm_write_tsc_offset, kvm_x86_write_tsc_offset,
TP_PROTO(unsigned int vcpu_id, __u64 previous_tsc_offset,
__u64 next_tsc_offset),
@@
-547,7
+547,7
@@
LTTNG_TRACEPOINT_EVENT_MAP(kvm_write_tsc_offset, kvm_x86_write_tsc_offset,
)
#endif
)
#endif
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(3,8,0))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(3,8,0))
#ifdef CONFIG_X86_64
LTTNG_TRACEPOINT_EVENT_MAP(kvm_update_master_clock, kvm_x86_update_master_clock,
#ifdef CONFIG_X86_64
LTTNG_TRACEPOINT_EVENT_MAP(kvm_update_master_clock, kvm_x86_update_master_clock,
@@
-578,7
+578,7
@@
LTTNG_TRACEPOINT_EVENT_MAP(kvm_track_tsc, kvm_x86_track_tsc,
)
#endif /* CONFIG_X86_64 */
)
#endif /* CONFIG_X86_64 */
-#endif /* L
INUX_VERSION_CODE >=
KERNEL_VERSION(3,8,0) */
+#endif /* L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(3,8,0) */
#endif /* LTTNG_TRACE_KVM_H */
#endif /* LTTNG_TRACE_KVM_H */
diff --git
a/instrumentation/events/lttng-module/asoc.h
b/instrumentation/events/lttng-module/asoc.h
index 0069e2ce8170d3c5e397ff6ec28e8bb52157c8c2..b08eedbb89c74dcb55e62810976839d29b29b5c1 100644
(file)
--- a/
instrumentation/events/lttng-module/asoc.h
+++ b/
instrumentation/events/lttng-module/asoc.h
@@
-7,28
+7,28
@@
#include <probes/lttng-tracepoint-event.h>
#include <linux/ktime.h>
#include <probes/lttng-tracepoint-event.h>
#include <linux/ktime.h>
-#include <l
inux/
version.h>
+#include <l
ttng-kernel-
version.h>
#define DAPM_DIRECT "(direct)"
#ifndef _TRACE_ASOC_DEF
#define _TRACE_ASOC_DEF
struct snd_soc_jack;
#define DAPM_DIRECT "(direct)"
#ifndef _TRACE_ASOC_DEF
#define _TRACE_ASOC_DEF
struct snd_soc_jack;
-#if (L
INUX_VERSION_CODE <
KERNEL_VERSION(3,19,0))
+#if (L
TTNG_LINUX_VERSION_CODE < LTTNG_
KERNEL_VERSION(3,19,0))
struct snd_soc_codec;
#endif
struct snd_soc_codec;
#endif
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(3,1,0) && \
- L
INUX_VERSION_CODE <
KERNEL_VERSION(3,16,0))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(3,1,0) && \
+ L
TTNG_LINUX_VERSION_CODE < LTTNG_
KERNEL_VERSION(3,16,0))
struct snd_soc_platform;
#endif
struct snd_soc_card;
struct snd_soc_dapm_widget;
struct snd_soc_platform;
#endif
struct snd_soc_card;
struct snd_soc_dapm_widget;
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(3,5,0))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(3,5,0))
struct snd_soc_dapm_path;
#endif
#endif
struct snd_soc_dapm_path;
#endif
#endif
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(3,16,0) \
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(3,16,0) \
|| LTTNG_RHEL_KERNEL_RANGE(3,10,0,514,0,0, 3,11,0,0,0,0))
#define CODEC_NAME_FIELD component.name
#define CODEC_ID_FIELD component.id
|| LTTNG_RHEL_KERNEL_RANGE(3,10,0,514,0,0, 3,11,0,0,0,0))
#define CODEC_NAME_FIELD component.name
#define CODEC_ID_FIELD component.id
@@
-37,7
+37,7
@@
struct snd_soc_dapm_path;
#define CODEC_ID_FIELD id
#endif
#define CODEC_ID_FIELD id
#endif
-#if (L
INUX_VERSION_CODE <
KERNEL_VERSION(3,16,0))
+#if (L
TTNG_LINUX_VERSION_CODE < LTTNG_
KERNEL_VERSION(3,16,0))
/*
* Log register events
*/
/*
* Log register events
*/
@@
-79,8
+79,8
@@
LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP(asoc_snd_soc_reg, snd_soc_reg_read,
)
#endif
)
#endif
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(3,1,0) && \
- L
INUX_VERSION_CODE <
KERNEL_VERSION(3,16,0))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(3,1,0) && \
+ L
TTNG_LINUX_VERSION_CODE < LTTNG_
KERNEL_VERSION(3,16,0))
LTTNG_TRACEPOINT_EVENT_CLASS(asoc_snd_soc_preg,
TP_PROTO(struct snd_soc_platform *platform, unsigned int reg,
LTTNG_TRACEPOINT_EVENT_CLASS(asoc_snd_soc_preg,
TP_PROTO(struct snd_soc_platform *platform, unsigned int reg,
@@
-224,7
+224,7
@@
LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP(asoc_snd_soc_dapm_widget, snd_soc_dapm_widge
)
)
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(3,2,0))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(3,2,0))
LTTNG_TRACEPOINT_EVENT_MAP(snd_soc_dapm_walk_done,
asoc_snd_soc_dapm_walk_done,
LTTNG_TRACEPOINT_EVENT_MAP(snd_soc_dapm_walk_done,
asoc_snd_soc_dapm_walk_done,
@@
-242,7
+242,7
@@
LTTNG_TRACEPOINT_EVENT_MAP(snd_soc_dapm_walk_done,
)
#endif
)
#endif
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(4,3,0))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(4,3,0))
LTTNG_TRACEPOINT_EVENT_MAP(snd_soc_dapm_path,
asoc_snd_soc_dapm_path,
LTTNG_TRACEPOINT_EVENT_MAP(snd_soc_dapm_path,
asoc_snd_soc_dapm_path,
@@
-262,7
+262,7
@@
LTTNG_TRACEPOINT_EVENT_MAP(snd_soc_dapm_path,
ctf_integer(int, path_dir, dir)
)
)
ctf_integer(int, path_dir, dir)
)
)
-#elif (L
INUX_VERSION_CODE >=
KERNEL_VERSION(3,5,0))
+#elif (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(3,5,0))
LTTNG_TRACEPOINT_EVENT_MAP(snd_soc_dapm_output_path,
asoc_snd_soc_dapm_output_path,
LTTNG_TRACEPOINT_EVENT_MAP(snd_soc_dapm_output_path,
asoc_snd_soc_dapm_output_path,
@@
-300,7
+300,7
@@
LTTNG_TRACEPOINT_EVENT_MAP(snd_soc_dapm_input_path,
)
#endif
)
#endif
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(3,5,0))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(3,5,0))
LTTNG_TRACEPOINT_EVENT_MAP(snd_soc_dapm_connected,
asoc_snd_soc_dapm_connected,
LTTNG_TRACEPOINT_EVENT_MAP(snd_soc_dapm_connected,
asoc_snd_soc_dapm_connected,
@@
-329,7
+329,7
@@
LTTNG_TRACEPOINT_EVENT_MAP(snd_soc_jack_irq,
)
)
)
)
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(3,5,0))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(3,5,0))
LTTNG_TRACEPOINT_EVENT_MAP(snd_soc_jack_report,
asoc_snd_soc_jack_report,
LTTNG_TRACEPOINT_EVENT_MAP(snd_soc_jack_report,
asoc_snd_soc_jack_report,
@@
-389,7
+389,7
@@
LTTNG_TRACEPOINT_EVENT_MAP(snd_soc_jack_notify,
)
#endif
)
#endif
-#if (L
INUX_VERSION_CODE <
KERNEL_VERSION(3,19,0))
+#if (L
TTNG_LINUX_VERSION_CODE < LTTNG_
KERNEL_VERSION(3,19,0))
LTTNG_TRACEPOINT_EVENT_MAP(snd_soc_cache_sync,
asoc_snd_soc_cache_sync,
LTTNG_TRACEPOINT_EVENT_MAP(snd_soc_cache_sync,
asoc_snd_soc_cache_sync,
diff --git
a/instrumentation/events/lttng-module/block.h
b/instrumentation/events/lttng-module/block.h
index f22d84275953e3d658d91148b4c03cf8fb206943..4212b048974e5bfd4aea5ebf2ff80581f6b9e3d2 100644
(file)
--- a/
instrumentation/events/lttng-module/block.h
+++ b/
instrumentation/events/lttng-module/block.h
@@
-9,11
+9,11
@@
#include <linux/blktrace_api.h>
#include <linux/blkdev.h>
#include <linux/trace_seq.h>
#include <linux/blktrace_api.h>
#include <linux/blkdev.h>
#include <linux/trace_seq.h>
-#include <l
inux/
version.h>
+#include <l
ttng-kernel-
version.h>
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(4,11,0))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(4,11,0))
#include <scsi/scsi_request.h>
#include <scsi/scsi_request.h>
-#endif /* (L
INUX_VERSION_CODE >=
KERNEL_VERSION(4,11,0)) */
+#endif /* (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(4,11,0)) */
#ifndef _TRACE_BLOCK_DEF_
#define _TRACE_BLOCK_DEF_
#ifndef _TRACE_BLOCK_DEF_
#define _TRACE_BLOCK_DEF_
@@
-50,7
+50,7
@@
LTTNG_TRACEPOINT_ENUM(block_rq_type,
)
)
)
)
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(4,8,0) || \
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(4,8,0) || \
LTTNG_SLE_KERNEL_RANGE(4,4,73,5,0,0, 4,4,73,6,0,0) || \
LTTNG_SLE_KERNEL_RANGE(4,4,82,6,0,0, 4,4,82,7,0,0) || \
LTTNG_SLE_KERNEL_RANGE(4,4,92,6,0,0, 4,4,92,7,0,0) || \
LTTNG_SLE_KERNEL_RANGE(4,4,73,5,0,0, 4,4,73,6,0,0) || \
LTTNG_SLE_KERNEL_RANGE(4,4,82,6,0,0, 4,4,82,7,0,0) || \
LTTNG_SLE_KERNEL_RANGE(4,4,92,6,0,0, 4,4,92,7,0,0) || \
@@
-78,7
+78,7
@@
LTTNG_TRACEPOINT_ENUM(block_rq_type,
| ((rw) & REQ_PREFLUSH ? RWBS_FLAG_PREFLUSH : 0) \
| ((rw) & REQ_FUA ? RWBS_FLAG_FUA : 0))
| ((rw) & REQ_PREFLUSH ? RWBS_FLAG_PREFLUSH : 0) \
| ((rw) & REQ_FUA ? RWBS_FLAG_FUA : 0))
-#elif (L
INUX_VERSION_CODE >=
KERNEL_VERSION(3,1,0))
+#elif (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(3,1,0))
#define lttng_req_op(rq)
#define lttng_req_rw(rq) ((rq)->cmd_flags)
#define lttng_req_op(rq)
#define lttng_req_rw(rq) ((rq)->cmd_flags)
@@
-116,7
+116,7
@@
LTTNG_TRACEPOINT_ENUM(block_rq_type,
#endif
#endif
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(3,9,0))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(3,9,0))
LTTNG_TRACEPOINT_EVENT_CLASS(block_buffer,
TP_PROTO(struct buffer_head *bh),
LTTNG_TRACEPOINT_EVENT_CLASS(block_buffer,
TP_PROTO(struct buffer_head *bh),
@@
-157,9
+157,9
@@
LTTNG_TRACEPOINT_EVENT_INSTANCE(block_buffer, block_dirty_buffer,
)
#endif
)
#endif
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(4,12,0))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(4,12,0))
/* block_rq_with_error event class removed in kernel 4.12 */
/* block_rq_with_error event class removed in kernel 4.12 */
-#elif (L
INUX_VERSION_CODE >=
KERNEL_VERSION(4,11,0))
+#elif (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(4,11,0))
LTTNG_TRACEPOINT_EVENT_CLASS_CODE(block_rq_with_error,
TP_PROTO(struct request_queue *q, struct request *rq),
LTTNG_TRACEPOINT_EVENT_CLASS_CODE(block_rq_with_error,
TP_PROTO(struct request_queue *q, struct request *rq),
@@
-202,7
+202,7
@@
LTTNG_TRACEPOINT_EVENT_CLASS_CODE(block_rq_with_error,
TP_code_post()
)
TP_code_post()
)
-#else /* #if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(4,11,0)) */
+#else /* #if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(4,11,0)) */
LTTNG_TRACEPOINT_EVENT_CLASS_CODE(block_rq_with_error,
TP_PROTO(struct request_queue *q, struct request *rq),
LTTNG_TRACEPOINT_EVENT_CLASS_CODE(block_rq_with_error,
TP_PROTO(struct request_queue *q, struct request *rq),
@@
-245,9
+245,9
@@
LTTNG_TRACEPOINT_EVENT_CLASS_CODE(block_rq_with_error,
TP_code_post()
)
TP_code_post()
)
-#endif /* #else #if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(4,11,0)) */
+#endif /* #else #if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(4,11,0)) */
-#if (L
INUX_VERSION_CODE <
KERNEL_VERSION(4,12,0))
+#if (L
TTNG_LINUX_VERSION_CODE < LTTNG_
KERNEL_VERSION(4,12,0))
/**
* block_rq_abort - abort block operation request
* @q: queue containing the block operation request
/**
* block_rq_abort - abort block operation request
* @q: queue containing the block operation request
@@
-266,7
+266,7
@@
LTTNG_TRACEPOINT_EVENT_INSTANCE(block_rq_with_error, block_rq_abort,
)
#endif
)
#endif
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(5,11,0))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(5,11,0))
/**
* block_rq_requeue - place block IO request back on a queue
* @rq: block IO operation request
/**
* block_rq_requeue - place block IO request back on a queue
* @rq: block IO operation request
@@
-290,7
+290,7
@@
LTTNG_TRACEPOINT_EVENT(block_rq_requeue,
lttng_req_op(rq), lttng_req_rw(rq), blk_rq_bytes(rq))
)
)
lttng_req_op(rq), lttng_req_rw(rq), blk_rq_bytes(rq))
)
)
-#elif (L
INUX_VERSION_CODE >=
KERNEL_VERSION(4,12,0))
+#elif (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(4,12,0))
/**
* block_rq_requeue - place block IO request back on a queue
* @q: queue holding operation
/**
* block_rq_requeue - place block IO request back on a queue
* @q: queue holding operation
@@
-336,7
+336,7
@@
LTTNG_TRACEPOINT_EVENT_INSTANCE(block_rq_with_error, block_rq_requeue,
* do for the request. If @rq->bio is non-NULL then there is
* additional work required to complete the request.
*/
* do for the request. If @rq->bio is non-NULL then there is
* additional work required to complete the request.
*/
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(4,12,0))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(4,12,0))
LTTNG_TRACEPOINT_EVENT(block_rq_complete,
TP_PROTO(struct request *rq, int error, unsigned int nr_bytes),
LTTNG_TRACEPOINT_EVENT(block_rq_complete,
TP_PROTO(struct request *rq, int error, unsigned int nr_bytes),
@@
-353,7
+353,7
@@
LTTNG_TRACEPOINT_EVENT(block_rq_complete,
lttng_req_op(rq), lttng_req_rw(rq), nr_bytes)
)
)
lttng_req_op(rq), lttng_req_rw(rq), nr_bytes)
)
)
-#elif (L
INUX_VERSION_CODE >=
KERNEL_VERSION(4,11,0))
+#elif (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(4,11,0))
LTTNG_TRACEPOINT_EVENT_CODE(block_rq_complete,
TP_PROTO(struct request_queue *q, struct request *rq,
LTTNG_TRACEPOINT_EVENT_CODE(block_rq_complete,
TP_PROTO(struct request_queue *q, struct request *rq,
@@
-391,7
+391,7
@@
LTTNG_TRACEPOINT_EVENT_CODE(block_rq_complete,
TP_code_post()
)
TP_code_post()
)
-#elif (L
INUX_VERSION_CODE >= KERNEL_VERSION(3,14,5)
\
+#elif (L
TTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(3,14,5)
\
|| LTTNG_KERNEL_RANGE(3,12,21, 3,13,0) \
|| LTTNG_KERNEL_RANGE(3,10,41, 3,11,0) \
|| LTTNG_KERNEL_RANGE(3,4,91, 3,5,0) \
|| LTTNG_KERNEL_RANGE(3,12,21, 3,13,0) \
|| LTTNG_KERNEL_RANGE(3,10,41, 3,11,0) \
|| LTTNG_KERNEL_RANGE(3,4,91, 3,5,0) \
@@
-436,7
+436,7
@@
LTTNG_TRACEPOINT_EVENT_CODE(block_rq_complete,
TP_code_post()
)
TP_code_post()
)
-#else /* #if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(3,15,0)) */
+#else /* #if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(3,15,0)) */
/**
* block_rq_complete - block IO operation completed by device driver
/**
* block_rq_complete - block IO operation completed by device driver
@@
-456,9
+456,9
@@
LTTNG_TRACEPOINT_EVENT_INSTANCE(block_rq_with_error, block_rq_complete,
TP_ARGS(q, rq)
)
TP_ARGS(q, rq)
)
-#endif /* #else #if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(3,15,0)) */
+#endif /* #else #if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(3,15,0)) */
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(5,11,0))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(5,11,0))
LTTNG_TRACEPOINT_EVENT_CLASS(block_rq,
TP_PROTO(struct request *rq),
LTTNG_TRACEPOINT_EVENT_CLASS(block_rq,
TP_PROTO(struct request *rq),
@@
-477,7
+477,7
@@
LTTNG_TRACEPOINT_EVENT_CLASS(block_rq,
ctf_array_text(char, comm, current->comm, TASK_COMM_LEN)
)
)
ctf_array_text(char, comm, current->comm, TASK_COMM_LEN)
)
)
-#elif (L
INUX_VERSION_CODE >=
KERNEL_VERSION(4,12,0))
+#elif (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(4,12,0))
LTTNG_TRACEPOINT_EVENT_CLASS(block_rq,
TP_PROTO(struct request_queue *q, struct request *rq),
LTTNG_TRACEPOINT_EVENT_CLASS(block_rq,
TP_PROTO(struct request_queue *q, struct request *rq),
@@
-496,7
+496,7
@@
LTTNG_TRACEPOINT_EVENT_CLASS(block_rq,
ctf_array_text(char, comm, current->comm, TASK_COMM_LEN)
)
)
ctf_array_text(char, comm, current->comm, TASK_COMM_LEN)
)
)
-#elif (L
INUX_VERSION_CODE >=
KERNEL_VERSION(4,11,0))
+#elif (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(4,11,0))
LTTNG_TRACEPOINT_EVENT_CLASS_CODE(block_rq,
TP_PROTO(struct request_queue *q, struct request *rq),
LTTNG_TRACEPOINT_EVENT_CLASS_CODE(block_rq,
TP_PROTO(struct request_queue *q, struct request *rq),
@@
-544,7
+544,7
@@
LTTNG_TRACEPOINT_EVENT_CLASS_CODE(block_rq,
TP_code_post()
)
TP_code_post()
)
-#else /* #if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(4,11,0)) */
+#else /* #if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(4,11,0)) */
LTTNG_TRACEPOINT_EVENT_CLASS_CODE(block_rq,
TP_PROTO(struct request_queue *q, struct request *rq),
LTTNG_TRACEPOINT_EVENT_CLASS_CODE(block_rq,
TP_PROTO(struct request_queue *q, struct request *rq),
@@
-591,9
+591,9
@@
LTTNG_TRACEPOINT_EVENT_CLASS_CODE(block_rq,
TP_code_post()
)
TP_code_post()
)
-#endif /* #else #if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(4,11,0)) */
+#endif /* #else #if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(4,11,0)) */
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(5,11,0))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(5,11,0))
/**
* block_rq_insert - insert block operation request into queue
* @rq: block IO operation request
/**
* block_rq_insert - insert block operation request into queue
* @rq: block IO operation request
@@
-628,7
+628,7
@@
LTTNG_TRACEPOINT_EVENT_INSTANCE(block_rq, block_rq_insert,
)
#endif
)
#endif
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(5,11,0))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(5,11,0))
/**
* block_rq_issue - issue pending block IO request operation to device driver
* @rq: block IO operation operation request
/**
* block_rq_issue - issue pending block IO request operation to device driver
* @rq: block IO operation operation request
@@
-659,7
+659,7
@@
LTTNG_TRACEPOINT_EVENT_INSTANCE(block_rq, block_rq_issue,
)
#endif
)
#endif
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(5,11,0))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(5,11,0))
/**
* block_rq_merge - merge request with another one in the elevator
* @rq: block IO operation operation request
/**
* block_rq_merge - merge request with another one in the elevator
* @rq: block IO operation operation request
@@
-673,7
+673,7
@@
LTTNG_TRACEPOINT_EVENT_INSTANCE(block_rq, block_rq_merge,
TP_ARGS(rq)
)
TP_ARGS(rq)
)
-#elif (L
INUX_VERSION_CODE >=
KERNEL_VERSION(5,9,0))
+#elif (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(5,9,0))
/**
* block_rq_merge - merge request with another one in the elevator
* @q: queue holding operation
/**
* block_rq_merge - merge request with another one in the elevator
* @q: queue holding operation
@@
-690,7
+690,7
@@
LTTNG_TRACEPOINT_EVENT_INSTANCE(block_rq, block_rq_merge,
)
#endif
)
#endif
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(5,8,0))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(5,8,0))
/**
* block_bio_complete - completed all work on the block operation
* @q: queue holding the block operation
/**
* block_bio_complete - completed all work on the block operation
* @q: queue holding the block operation
@@
-716,7
+716,7
@@
LTTNG_TRACEPOINT_EVENT(block_bio_complete,
bio->bi_iter.bi_size)
)
)
bio->bi_iter.bi_size)
)
)
-#elif (L
INUX_VERSION_CODE >=
KERNEL_VERSION(4,14,0))
+#elif (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(4,14,0))
/**
* block_bio_complete - completed all work on the block operation
* @q: queue holding the block operation
/**
* block_bio_complete - completed all work on the block operation
* @q: queue holding the block operation
@@
-742,7
+742,7
@@
LTTNG_TRACEPOINT_EVENT(block_bio_complete,
bio->bi_iter.bi_size)
)
)
bio->bi_iter.bi_size)
)
)
-#elif (L
INUX_VERSION_CODE >=
KERNEL_VERSION(3,14,0))
+#elif (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(3,14,0))
/**
* block_bio_complete - completed all work on the block operation
* @q: queue holding the block operation
/**
* block_bio_complete - completed all work on the block operation
* @q: queue holding the block operation
@@
-795,7
+795,7
@@
LTTNG_TRACEPOINT_EVENT(block_bio_complete,
)
#endif
)
#endif
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(5,11,0))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(5,11,0))
LTTNG_TRACEPOINT_EVENT_CLASS(block_bio,
TP_PROTO(struct bio *bio),
LTTNG_TRACEPOINT_EVENT_CLASS(block_bio,
TP_PROTO(struct bio *bio),
@@
-813,7
+813,7
@@
LTTNG_TRACEPOINT_EVENT_CLASS(block_bio,
ctf_array_text(char, comm, current->comm, TASK_COMM_LEN)
)
)
ctf_array_text(char, comm, current->comm, TASK_COMM_LEN)
)
)
-#elif (L
INUX_VERSION_CODE >=
KERNEL_VERSION(4,14,0))
+#elif (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(4,14,0))
LTTNG_TRACEPOINT_EVENT_CLASS(block_bio_merge,
TP_PROTO(struct request_queue *q, struct request *rq, struct bio *bio),
LTTNG_TRACEPOINT_EVENT_CLASS(block_bio_merge,
TP_PROTO(struct request_queue *q, struct request *rq, struct bio *bio),
@@
-831,7
+831,7
@@
LTTNG_TRACEPOINT_EVENT_CLASS(block_bio_merge,
ctf_array_text(char, comm, current->comm, TASK_COMM_LEN)
)
)
ctf_array_text(char, comm, current->comm, TASK_COMM_LEN)
)
)
-#elif (L
INUX_VERSION_CODE >=
KERNEL_VERSION(3,14,0))
+#elif (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(3,14,0))
LTTNG_TRACEPOINT_EVENT_CLASS(block_bio_merge,
TP_PROTO(struct request_queue *q, struct request *rq, struct bio *bio),
LTTNG_TRACEPOINT_EVENT_CLASS(block_bio_merge,
TP_PROTO(struct request_queue *q, struct request *rq, struct bio *bio),
@@
-849,7
+849,7
@@
LTTNG_TRACEPOINT_EVENT_CLASS(block_bio_merge,
ctf_array_text(char, comm, current->comm, TASK_COMM_LEN)
)
)
ctf_array_text(char, comm, current->comm, TASK_COMM_LEN)
)
)
-#elif (L
INUX_VERSION_CODE >=
KERNEL_VERSION(3,9,0))
+#elif (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(3,9,0))
LTTNG_TRACEPOINT_EVENT_CLASS(block_bio_merge,
TP_PROTO(struct request_queue *q, struct request *rq, struct bio *bio),
LTTNG_TRACEPOINT_EVENT_CLASS(block_bio_merge,
TP_PROTO(struct request_queue *q, struct request *rq, struct bio *bio),
@@
-870,7
+870,7
@@
LTTNG_TRACEPOINT_EVENT_CLASS(block_bio_merge,
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(5,11,0))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(5,11,0))
/**
* block_bio_bounce - used bounce buffer when processing block operation
* @bio: block operation
/**
* block_bio_bounce - used bounce buffer when processing block operation
* @bio: block operation
@@
-887,7
+887,7
@@
LTTNG_TRACEPOINT_EVENT_INSTANCE(block_bio, block_bio_bounce,
TP_ARGS(bio)
)
TP_ARGS(bio)
)
-#elif (L
INUX_VERSION_CODE >=
KERNEL_VERSION(4,14,0))
+#elif (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(4,14,0))
/**
* block_bio_bounce - used bounce buffer when processing block operation
* @q: queue holding the block operation
/**
* block_bio_bounce - used bounce buffer when processing block operation
* @q: queue holding the block operation
@@
-916,7
+916,7
@@
LTTNG_TRACEPOINT_EVENT(block_bio_bounce,
ctf_array_text(char, comm, current->comm, TASK_COMM_LEN)
)
)
ctf_array_text(char, comm, current->comm, TASK_COMM_LEN)
)
)
-#elif (L
INUX_VERSION_CODE >=
KERNEL_VERSION(3,14,0))
+#elif (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(3,14,0))
LTTNG_TRACEPOINT_EVENT(block_bio_bounce,
TP_PROTO(struct request_queue *q, struct bio *bio),
LTTNG_TRACEPOINT_EVENT(block_bio_bounce,
TP_PROTO(struct request_queue *q, struct bio *bio),
@@
-955,7
+955,7
@@
LTTNG_TRACEPOINT_EVENT(block_bio_bounce,
#endif
#endif
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(5,11,0))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(5,11,0))
/**
* block_bio_backmerge - merging block operation to the end of an existing operation
* @bio: new block operation to merge
/**
* block_bio_backmerge - merging block operation to the end of an existing operation
* @bio: new block operation to merge
@@
-994,7
+994,7
@@
LTTNG_TRACEPOINT_EVENT_INSTANCE(block_bio, block_bio_queue,
TP_ARGS(bio)
)
TP_ARGS(bio)
)
-#elif (L
INUX_VERSION_CODE >=
KERNEL_VERSION(3,9,0))
+#elif (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(3,9,0))
/**
* block_bio_backmerge - merging block operation to the end of an existing operation
* @q: queue holding operation
/**
* block_bio_backmerge - merging block operation to the end of an existing operation
* @q: queue holding operation
@@
-1041,28
+1041,28
@@
LTTNG_TRACEPOINT_EVENT(block_bio_queue,
TP_ARGS(q, bio),
TP_FIELDS(
TP_ARGS(q, bio),
TP_FIELDS(
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(4,14,0))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(4,14,0))
ctf_integer(dev_t, dev, bio_dev(bio))
#else
ctf_integer(dev_t, dev, bio->bi_bdev->bd_dev)
#endif
ctf_integer(dev_t, dev, bio_dev(bio))
#else
ctf_integer(dev_t, dev, bio->bi_bdev->bd_dev)
#endif
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(3,14,0))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(3,14,0))
ctf_integer(sector_t, sector, bio->bi_iter.bi_sector)
ctf_integer(unsigned int, nr_sector, bio_sectors(bio))
blk_rwbs_ctf_integer(unsigned int, rwbs,
lttng_bio_op(bio), lttng_bio_rw(bio),
bio->bi_iter.bi_size)
ctf_integer(sector_t, sector, bio->bi_iter.bi_sector)
ctf_integer(unsigned int, nr_sector, bio_sectors(bio))
blk_rwbs_ctf_integer(unsigned int, rwbs,
lttng_bio_op(bio), lttng_bio_rw(bio),
bio->bi_iter.bi_size)
-#else /* #if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(3,14,0)) */
+#else /* #if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(3,14,0)) */
ctf_integer(sector_t, sector, bio->bi_sector)
ctf_integer(unsigned int, nr_sector, bio->bi_size >> 9)
blk_rwbs_ctf_integer(unsigned int, rwbs,
lttng_bio_op(bio), lttng_bio_rw(bio), bio->bi_size)
ctf_integer(sector_t, sector, bio->bi_sector)
ctf_integer(unsigned int, nr_sector, bio->bi_size >> 9)
blk_rwbs_ctf_integer(unsigned int, rwbs,
lttng_bio_op(bio), lttng_bio_rw(bio), bio->bi_size)
-#endif /* #else #if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(3,14,0)) */
+#endif /* #else #if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(3,14,0)) */
ctf_integer(pid_t, tid, current->pid)
ctf_array_text(char, comm, current->comm, TASK_COMM_LEN)
)
)
ctf_integer(pid_t, tid, current->pid)
ctf_array_text(char, comm, current->comm, TASK_COMM_LEN)
)
)
-#else /* if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(3,9,0)) */
+#else /* if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(3,9,0)) */
LTTNG_TRACEPOINT_EVENT_CLASS(block_bio,
TP_PROTO(struct request_queue *q, struct bio *bio),
LTTNG_TRACEPOINT_EVENT_CLASS(block_bio,
TP_PROTO(struct request_queue *q, struct bio *bio),
@@
-1123,9
+1123,9
@@
LTTNG_TRACEPOINT_EVENT_INSTANCE(block_bio, block_bio_queue,
TP_ARGS(q, bio)
)
TP_ARGS(q, bio)
)
-#endif /* #else #if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(3,9,0)) */
+#endif /* #else #if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(3,9,0)) */
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(5,11,0))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(5,11,0))
/**
* block_getrq - get a free request entry in queue for block IO operations
* @bio: pending block IO operation (can be %NULL)
/**
* block_getrq - get a free request entry in queue for block IO operations
* @bio: pending block IO operation (can be %NULL)
@@
-1146,12
+1146,12
@@
LTTNG_TRACEPOINT_EVENT_CLASS(block_get_rq,
TP_ARGS(q, bio, rw),
TP_FIELDS(
TP_ARGS(q, bio, rw),
TP_FIELDS(
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(4,14,0))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(4,14,0))
ctf_integer(dev_t, dev, bio ? bio_dev(bio) : 0)
#else
ctf_integer(dev_t, dev, bio ? bio->bi_bdev->bd_dev : 0)
#endif
ctf_integer(dev_t, dev, bio ? bio_dev(bio) : 0)
#else
ctf_integer(dev_t, dev, bio ? bio->bi_bdev->bd_dev : 0)
#endif
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(3,14,0))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(3,14,0))
ctf_integer(sector_t, sector, bio ? bio->bi_iter.bi_sector : 0)
ctf_integer(unsigned int, nr_sector,
bio ? bio_sectors(bio) : 0)
ctf_integer(sector_t, sector, bio ? bio->bi_iter.bi_sector : 0)
ctf_integer(unsigned int, nr_sector,
bio ? bio_sectors(bio) : 0)
@@
-1159,7
+1159,7
@@
LTTNG_TRACEPOINT_EVENT_CLASS(block_get_rq,
bio ? lttng_bio_op(bio) : 0,
bio ? lttng_bio_rw(bio) : 0,
bio ? bio->bi_iter.bi_size : 0)
bio ? lttng_bio_op(bio) : 0,
bio ? lttng_bio_rw(bio) : 0,
bio ? bio->bi_iter.bi_size : 0)
-#else /* #if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(3,14,0)) */
+#else /* #if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(3,14,0)) */
ctf_integer(sector_t, sector, bio ? bio->bi_sector : 0)
ctf_integer(unsigned int, nr_sector,
bio ? bio->bi_size >> 9 : 0)
ctf_integer(sector_t, sector, bio ? bio->bi_sector : 0)
ctf_integer(unsigned int, nr_sector,
bio ? bio->bi_size >> 9 : 0)
@@
-1167,7
+1167,7
@@
LTTNG_TRACEPOINT_EVENT_CLASS(block_get_rq,
bio ? lttng_bio_op(bio) : 0,
bio ? lttng_bio_rw(bio) : 0,
bio ? bio->bi_size : 0)
bio ? lttng_bio_op(bio) : 0,
bio ? lttng_bio_rw(bio) : 0,
bio ? bio->bi_size : 0)
-#endif /* #else #if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(3,14,0)) */
+#endif /* #else #if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(3,14,0)) */
ctf_integer(pid_t, tid, current->pid)
ctf_array_text(char, comm, current->comm, TASK_COMM_LEN)
)
ctf_integer(pid_t, tid, current->pid)
ctf_array_text(char, comm, current->comm, TASK_COMM_LEN)
)
@@
-1257,7
+1257,7
@@
LTTNG_TRACEPOINT_EVENT_INSTANCE(block_unplug, block_unplug,
TP_ARGS(q, depth, explicit)
)
TP_ARGS(q, depth, explicit)
)
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(5,11,0))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(5,11,0))
/**
* block_split - split a single bio struct into two bio structs
* @bio: block operation being split
/**
* block_split - split a single bio struct into two bio structs
* @bio: block operation being split
@@
-1286,7
+1286,7
@@
LTTNG_TRACEPOINT_EVENT(block_split,
)
)
)
)
-#elif (L
INUX_VERSION_CODE >=
KERNEL_VERSION(4,14,0))
+#elif (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(4,14,0))
/**
* block_split - split a single bio struct into two bio structs
* @q: queue containing the bio
/**
* block_split - split a single bio struct into two bio structs
* @q: queue containing the bio
@@
-1316,7
+1316,7
@@
LTTNG_TRACEPOINT_EVENT(block_split,
ctf_array_text(char, comm, current->comm, TASK_COMM_LEN)
)
)
ctf_array_text(char, comm, current->comm, TASK_COMM_LEN)
)
)
-#elif (L
INUX_VERSION_CODE >=
KERNEL_VERSION(3,14,0))
+#elif (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(3,14,0))
LTTNG_TRACEPOINT_EVENT(block_split,
TP_PROTO(struct request_queue *q, struct bio *bio,
LTTNG_TRACEPOINT_EVENT(block_split,
TP_PROTO(struct request_queue *q, struct bio *bio,
@@
-1355,7
+1355,7
@@
LTTNG_TRACEPOINT_EVENT(block_split,
)
#endif
)
#endif
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(5,11,0))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(5,11,0))
/**
* block_bio_remap - map request for a logical device to the raw device
* @bio: revised operation
/**
* block_bio_remap - map request for a logical device to the raw device
* @bio: revised operation
@@
-1382,7
+1382,7
@@
LTTNG_TRACEPOINT_EVENT(block_bio_remap,
ctf_integer(sector_t, old_sector, from)
)
)
ctf_integer(sector_t, old_sector, from)
)
)
-#elif (L
INUX_VERSION_CODE >=
KERNEL_VERSION(4,14,0))
+#elif (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(4,14,0))
/**
* block_bio_remap - map request for a logical device to the raw device
* @q: queue holding the operation
/**
* block_bio_remap - map request for a logical device to the raw device
* @q: queue holding the operation
@@
-1411,7
+1411,7
@@
LTTNG_TRACEPOINT_EVENT(block_bio_remap,
ctf_integer(sector_t, old_sector, from)
)
)
ctf_integer(sector_t, old_sector, from)
)
)
-#elif (L
INUX_VERSION_CODE >=
KERNEL_VERSION(3,14,0))
+#elif (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(3,14,0))
LTTNG_TRACEPOINT_EVENT(block_bio_remap,
TP_PROTO(struct request_queue *q, struct bio *bio, dev_t dev,
LTTNG_TRACEPOINT_EVENT(block_bio_remap,
TP_PROTO(struct request_queue *q, struct bio *bio, dev_t dev,
@@
-1450,7
+1450,7
@@
LTTNG_TRACEPOINT_EVENT(block_bio_remap,
)
#endif
)
#endif
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(5,11,0))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(5,11,0))
/**
* block_rq_remap - map request for a block operation request
* @rq: block IO operation request
/**
* block_rq_remap - map request for a block operation request
* @rq: block IO operation request
diff --git
a/instrumentation/events/lttng-module/btrfs.h
b/instrumentation/events/lttng-module/btrfs.h
index efe7af963b53356fc536c3567148dc214bdf28db..4cc8b909f0a16baeb7a0f0b23874746e0100783c 100644
(file)
--- a/
instrumentation/events/lttng-module/btrfs.h
+++ b/
instrumentation/events/lttng-module/btrfs.h
@@
-7,7
+7,7
@@
#include <probes/lttng-tracepoint-event.h>
#include <linux/writeback.h>
#include <probes/lttng-tracepoint-event.h>
#include <linux/writeback.h>
-#include <l
inux/
version.h>
+#include <l
ttng-kernel-
version.h>
#ifndef _TRACE_BTRFS_DEF_
#define _TRACE_BTRFS_DEF_
#ifndef _TRACE_BTRFS_DEF_
#define _TRACE_BTRFS_DEF_
@@
-20,30
+20,30
@@
struct btrfs_delayed_ref_node;
struct btrfs_delayed_tree_ref;
struct btrfs_delayed_data_ref;
struct btrfs_delayed_ref_head;
struct btrfs_delayed_tree_ref;
struct btrfs_delayed_data_ref;
struct btrfs_delayed_ref_head;
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(5,5,0))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(5,5,0))
struct btrfs_block_group;
struct btrfs_block_group;
-#elif (L
INUX_VERSION_CODE >=
KERNEL_VERSION(3,3,0))
+#elif (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(3,3,0))
struct btrfs_block_group_cache;
#endif
struct btrfs_block_group_cache;
#endif
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(3,3,0))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(3,3,0))
struct btrfs_free_cluster;
#endif
struct map_lookup;
struct extent_buffer;
struct btrfs_free_cluster;
#endif
struct map_lookup;
struct extent_buffer;
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(3,4,0))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(3,4,0))
struct extent_state;
#endif
#endif
#define BTRFS_UUID_SIZE 16
struct extent_state;
#endif
#endif
#define BTRFS_UUID_SIZE 16
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(5,0,0))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(5,0,0))
#define lttng_fs_info_fsid fs_info->fs_devices->fsid
#else
#define lttng_fs_info_fsid fs_info->fsid
#endif
#define lttng_fs_info_fsid fs_info->fs_devices->fsid
#else
#define lttng_fs_info_fsid fs_info->fsid
#endif
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(4,14,0) || \
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(4,14,0) || \
LTTNG_SLE_KERNEL_RANGE(4,4,73,5,0,0, 4,4,73,6,0,0) || \
LTTNG_SLE_KERNEL_RANGE(4,4,82,6,0,0, 4,4,82,7,0,0) || \
LTTNG_SLE_KERNEL_RANGE(4,4,92,6,0,0, 4,4,92,7,0,0) || \
LTTNG_SLE_KERNEL_RANGE(4,4,73,5,0,0, 4,4,73,6,0,0) || \
LTTNG_SLE_KERNEL_RANGE(4,4,82,6,0,0, 4,4,82,7,0,0) || \
LTTNG_SLE_KERNEL_RANGE(4,4,92,6,0,0, 4,4,92,7,0,0) || \
@@
-151,7
+151,7
@@
LTTNG_TRACEPOINT_EVENT_INSTANCE(btrfs__inode, btrfs_inode_evict,
)
#endif
)
#endif
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(4,14,0))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(4,14,0))
LTTNG_TRACEPOINT_EVENT(btrfs_get_extent,
LTTNG_TRACEPOINT_EVENT(btrfs_get_extent,
@@
-174,7
+174,7
@@
LTTNG_TRACEPOINT_EVENT(btrfs_get_extent,
)
)
)
)
-#elif (L
INUX_VERSION_CODE >=
KERNEL_VERSION(4,12,0))
+#elif (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(4,12,0))
LTTNG_TRACEPOINT_EVENT(btrfs_get_extent,
LTTNG_TRACEPOINT_EVENT(btrfs_get_extent,
@@
-197,7
+197,7
@@
LTTNG_TRACEPOINT_EVENT(btrfs_get_extent,
)
)
)
)
-#elif (L
INUX_VERSION_CODE >=
KERNEL_VERSION(4,11,0))
+#elif (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(4,11,0))
LTTNG_TRACEPOINT_EVENT(btrfs_get_extent,
LTTNG_TRACEPOINT_EVENT(btrfs_get_extent,
@@
-220,7
+220,7
@@
LTTNG_TRACEPOINT_EVENT(btrfs_get_extent,
)
)
)
)
-#elif (L
INUX_VERSION_CODE >=
KERNEL_VERSION(4,10,0))
+#elif (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(4,10,0))
LTTNG_TRACEPOINT_EVENT(btrfs_get_extent,
LTTNG_TRACEPOINT_EVENT(btrfs_get_extent,
@@
-267,7
+267,7
@@
LTTNG_TRACEPOINT_EVENT(btrfs_get_extent,
)
)
)
)
-#else /* #if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(4,10,0)) */
+#else /* #if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(4,10,0)) */
LTTNG_TRACEPOINT_EVENT(btrfs_get_extent,
LTTNG_TRACEPOINT_EVENT(btrfs_get_extent,
@@
-288,9
+288,9
@@
LTTNG_TRACEPOINT_EVENT(btrfs_get_extent,
)
)
)
)
-#endif /* #else #if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(4,10,0)) */
+#endif /* #else #if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(4,10,0)) */
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(5,5,0))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(5,5,0))
LTTNG_TRACEPOINT_EVENT(btrfs_handle_em_exist,
TP_PROTO(const struct btrfs_fs_info *fs_info,
LTTNG_TRACEPOINT_EVENT(btrfs_handle_em_exist,
TP_PROTO(const struct btrfs_fs_info *fs_info,
@@
-309,7
+309,7
@@
LTTNG_TRACEPOINT_EVENT(btrfs_handle_em_exist,
ctf_integer(u64, len, len)
)
)
ctf_integer(u64, len, len)
)
)
-#elif (L
INUX_VERSION_CODE >=
KERNEL_VERSION(4,18,0))
+#elif (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(4,18,0))
LTTNG_TRACEPOINT_EVENT(btrfs_handle_em_exist,
TP_PROTO(struct btrfs_fs_info *fs_info,
LTTNG_TRACEPOINT_EVENT(btrfs_handle_em_exist,
TP_PROTO(struct btrfs_fs_info *fs_info,
@@
-328,7
+328,7
@@
LTTNG_TRACEPOINT_EVENT(btrfs_handle_em_exist,
ctf_integer(u64, len, len)
)
)
ctf_integer(u64, len, len)
)
)
-#elif (L
INUX_VERSION_CODE >=
KERNEL_VERSION(4,17,0))
+#elif (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(4,17,0))
LTTNG_TRACEPOINT_EVENT(btrfs_handle_em_exist,
TP_PROTO(const struct extent_map *existing, const struct extent_map *map, u64 start, u64 len),
LTTNG_TRACEPOINT_EVENT(btrfs_handle_em_exist,
TP_PROTO(const struct extent_map *existing, const struct extent_map *map, u64 start, u64 len),
@@
-346,7
+346,7
@@
LTTNG_TRACEPOINT_EVENT(btrfs_handle_em_exist,
)
#endif
)
#endif
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(5,10,0))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(5,10,0))
LTTNG_TRACEPOINT_EVENT_CLASS(btrfs__ordered_extent,
TP_PROTO(const struct btrfs_inode *inode,
LTTNG_TRACEPOINT_EVENT_CLASS(btrfs__ordered_extent,
TP_PROTO(const struct btrfs_inode *inode,
@@
-368,7
+368,7
@@
LTTNG_TRACEPOINT_EVENT_CLASS(btrfs__ordered_extent,
ctf_integer(u64, root_objectid, inode->root->root_key.objectid)
)
)
ctf_integer(u64, root_objectid, inode->root->root_key.objectid)
)
)
-#elif (L
INUX_VERSION_CODE >=
KERNEL_VERSION(5,6,0))
+#elif (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(5,6,0))
LTTNG_TRACEPOINT_EVENT_CLASS(btrfs__ordered_extent,
TP_PROTO(const struct inode *inode,
LTTNG_TRACEPOINT_EVENT_CLASS(btrfs__ordered_extent,
TP_PROTO(const struct inode *inode,
@@
-390,7
+390,7
@@
LTTNG_TRACEPOINT_EVENT_CLASS(btrfs__ordered_extent,
BTRFS_I(inode)->root->root_key.objectid)
)
)
BTRFS_I(inode)->root->root_key.objectid)
)
)
-#elif (L
INUX_VERSION_CODE >=
KERNEL_VERSION(4,14,0))
+#elif (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(4,14,0))
LTTNG_TRACEPOINT_EVENT_CLASS(btrfs__ordered_extent,
TP_PROTO(const struct inode *inode,
LTTNG_TRACEPOINT_EVENT_CLASS(btrfs__ordered_extent,
TP_PROTO(const struct inode *inode,
@@
-412,7
+412,7
@@
LTTNG_TRACEPOINT_EVENT_CLASS(btrfs__ordered_extent,
BTRFS_I(inode)->root->root_key.objectid)
)
)
BTRFS_I(inode)->root->root_key.objectid)
)
)
-#elif (L
INUX_VERSION_CODE >=
KERNEL_VERSION(4,12,0))
+#elif (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(4,12,0))
LTTNG_TRACEPOINT_EVENT_CLASS(btrfs__ordered_extent,
TP_PROTO(struct inode *inode, struct btrfs_ordered_extent *ordered),
LTTNG_TRACEPOINT_EVENT_CLASS(btrfs__ordered_extent,
TP_PROTO(struct inode *inode, struct btrfs_ordered_extent *ordered),
@@
-480,7
+480,7
@@
LTTNG_TRACEPOINT_EVENT_CLASS(btrfs__ordered_extent,
)
#endif
)
#endif
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(5,10,0))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(5,10,0))
LTTNG_TRACEPOINT_EVENT_INSTANCE(btrfs__ordered_extent, btrfs_ordered_extent_add,
TP_PROTO(const struct btrfs_inode *inode,
LTTNG_TRACEPOINT_EVENT_INSTANCE(btrfs__ordered_extent, btrfs_ordered_extent_add,
TP_PROTO(const struct btrfs_inode *inode,
@@
-512,7
+512,7
@@
LTTNG_TRACEPOINT_EVENT_INSTANCE(btrfs__ordered_extent, btrfs_ordered_extent_put,
TP_ARGS(inode, ordered)
)
TP_ARGS(inode, ordered)
)
-#elif (L
INUX_VERSION_CODE >=
KERNEL_VERSION(4,14,0) || \
+#elif (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(4,14,0) || \
LTTNG_SLE_KERNEL_RANGE(4,4,73,5,0,0, 4,4,73,6,0,0) || \
LTTNG_SLE_KERNEL_RANGE(4,4,82,6,0,0, 4,4,82,7,0,0) || \
LTTNG_SLE_KERNEL_RANGE(4,4,92,6,0,0, 4,4,92,7,0,0) || \
LTTNG_SLE_KERNEL_RANGE(4,4,73,5,0,0, 4,4,73,6,0,0) || \
LTTNG_SLE_KERNEL_RANGE(4,4,82,6,0,0, 4,4,82,7,0,0) || \
LTTNG_SLE_KERNEL_RANGE(4,4,92,6,0,0, 4,4,92,7,0,0) || \
@@
-578,7
+578,7
@@
LTTNG_TRACEPOINT_EVENT_INSTANCE(btrfs__ordered_extent, btrfs_ordered_extent_put,
)
#endif
)
#endif
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(4,14,0) || \
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(4,14,0) || \
LTTNG_SLE_KERNEL_RANGE(4,4,73,5,0,0, 4,4,73,6,0,0) || \
LTTNG_SLE_KERNEL_RANGE(4,4,82,6,0,0, 4,4,82,7,0,0) || \
LTTNG_SLE_KERNEL_RANGE(4,4,92,6,0,0, 4,4,92,7,0,0) || \
LTTNG_SLE_KERNEL_RANGE(4,4,73,5,0,0, 4,4,73,6,0,0) || \
LTTNG_SLE_KERNEL_RANGE(4,4,82,6,0,0, 4,4,82,7,0,0) || \
LTTNG_SLE_KERNEL_RANGE(4,4,92,6,0,0, 4,4,92,7,0,0) || \
@@
-665,7
+665,7
@@
LTTNG_TRACEPOINT_EVENT_CLASS(btrfs__writepage,
ctf_integer(long, pages_skipped, wbc->pages_skipped)
ctf_integer(loff_t, range_start, wbc->range_start)
ctf_integer(loff_t, range_end, wbc->range_end)
ctf_integer(long, pages_skipped, wbc->pages_skipped)
ctf_integer(loff_t, range_start, wbc->range_start)
ctf_integer(loff_t, range_end, wbc->range_end)
-#if (L
INUX_VERSION_CODE <
KERNEL_VERSION(3,1,0))
+#if (L
TTNG_LINUX_VERSION_CODE < LTTNG_
KERNEL_VERSION(3,1,0))
ctf_integer(char, nonblocking, wbc->nonblocking)
#endif
ctf_integer(char, for_kupdate, wbc->for_kupdate)
ctf_integer(char, nonblocking, wbc->nonblocking)
#endif
ctf_integer(char, for_kupdate, wbc->for_kupdate)
@@
-723,7
+723,7
@@
LTTNG_TRACEPOINT_EVENT(btrfs_sync_file,
)
#endif
)
#endif
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(4,14,0) || \
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(4,14,0) || \
LTTNG_SLE_KERNEL_RANGE(4,4,73,5,0,0, 4,4,73,6,0,0) || \
LTTNG_SLE_KERNEL_RANGE(4,4,82,6,0,0, 4,4,82,7,0,0) || \
LTTNG_SLE_KERNEL_RANGE(4,4,92,6,0,0, 4,4,92,7,0,0) || \
LTTNG_SLE_KERNEL_RANGE(4,4,73,5,0,0, 4,4,73,6,0,0) || \
LTTNG_SLE_KERNEL_RANGE(4,4,82,6,0,0, 4,4,82,7,0,0) || \
LTTNG_SLE_KERNEL_RANGE(4,4,92,6,0,0, 4,4,92,7,0,0) || \
@@
-741,7
+741,7
@@
LTTNG_TRACEPOINT_EVENT(btrfs_sync_fs,
ctf_integer(int, wait, wait)
)
)
ctf_integer(int, wait, wait)
)
)
-#elif (L
INUX_VERSION_CODE >=
KERNEL_VERSION(4,8,0))
+#elif (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(4,8,0))
LTTNG_TRACEPOINT_EVENT(btrfs_sync_fs,
TP_PROTO(struct btrfs_fs_info *fs_info, int wait),
LTTNG_TRACEPOINT_EVENT(btrfs_sync_fs,
TP_PROTO(struct btrfs_fs_info *fs_info, int wait),
@@
-765,7
+765,7
@@
LTTNG_TRACEPOINT_EVENT(btrfs_sync_fs,
)
#endif
)
#endif
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(5,5,0))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(5,5,0))
LTTNG_TRACEPOINT_EVENT(btrfs_add_block_group,
TP_PROTO(const struct btrfs_fs_info *fs_info,
LTTNG_TRACEPOINT_EVENT(btrfs_add_block_group,
TP_PROTO(const struct btrfs_fs_info *fs_info,
@@
-783,7
+783,7
@@
LTTNG_TRACEPOINT_EVENT(btrfs_add_block_group,
ctf_integer(int, create, create)
)
)
ctf_integer(int, create, create)
)
)
-#elif (L
INUX_VERSION_CODE >=
KERNEL_VERSION(4,14,0) || \
+#elif (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(4,14,0) || \
LTTNG_SLE_KERNEL_RANGE(4,4,73,5,0,0, 4,4,73,6,0,0) || \
LTTNG_SLE_KERNEL_RANGE(4,4,82,6,0,0, 4,4,82,7,0,0) || \
LTTNG_SLE_KERNEL_RANGE(4,4,92,6,0,0, 4,4,92,7,0,0) || \
LTTNG_SLE_KERNEL_RANGE(4,4,73,5,0,0, 4,4,73,6,0,0) || \
LTTNG_SLE_KERNEL_RANGE(4,4,82,6,0,0, 4,4,82,7,0,0) || \
LTTNG_SLE_KERNEL_RANGE(4,4,92,6,0,0, 4,4,92,7,0,0) || \
@@
-825,7
+825,7
@@
LTTNG_TRACEPOINT_EVENT(btrfs_add_block_group,
)
#endif
)
#endif
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(4,14,0) || \
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(4,14,0) || \
LTTNG_SLE_KERNEL_RANGE(4,4,73,5,0,0, 4,4,73,6,0,0) || \
LTTNG_SLE_KERNEL_RANGE(4,4,82,6,0,0, 4,4,82,7,0,0) || \
LTTNG_SLE_KERNEL_RANGE(4,4,92,6,0,0, 4,4,92,7,0,0) || \
LTTNG_SLE_KERNEL_RANGE(4,4,73,5,0,0, 4,4,73,6,0,0) || \
LTTNG_SLE_KERNEL_RANGE(4,4,82,6,0,0, 4,4,82,7,0,0) || \
LTTNG_SLE_KERNEL_RANGE(4,4,92,6,0,0, 4,4,92,7,0,0) || \
@@
-882,7
+882,7
@@
LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP(btrfs_delayed_tree_ref,
TP_ARGS(fs_info, ref, full_ref, action)
)
TP_ARGS(fs_info, ref, full_ref, action)
)
-#elif (L
INUX_VERSION_CODE >=
KERNEL_VERSION(4,8,0))
+#elif (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(4,8,0))
LTTNG_TRACEPOINT_EVENT_CLASS(btrfs_delayed_tree_ref,
TP_PROTO(struct btrfs_fs_info *fs_info,
LTTNG_TRACEPOINT_EVENT_CLASS(btrfs_delayed_tree_ref,
TP_PROTO(struct btrfs_fs_info *fs_info,
@@
-978,7
+978,7
@@
LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP(btrfs_delayed_tree_ref,
TP_ARGS(ref, full_ref, action)
)
TP_ARGS(ref, full_ref, action)
)
-#elif (L
INUX_VERSION_CODE >=
KERNEL_VERSION(3,12,0))
+#elif (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(3,12,0))
LTTNG_TRACEPOINT_EVENT_CLASS(btrfs_delayed_tree_ref,
TP_PROTO(struct btrfs_delayed_ref_node *ref,
LTTNG_TRACEPOINT_EVENT_CLASS(btrfs_delayed_tree_ref,
TP_PROTO(struct btrfs_delayed_ref_node *ref,
@@
-1024,7
+1024,7
@@
LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP(btrfs_delayed_tree_ref,
TP_ARGS(ref, full_ref, action)
)
TP_ARGS(ref, full_ref, action)
)
-#elif (L
INUX_VERSION_CODE >=
KERNEL_VERSION(3,7,0))
+#elif (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(3,7,0))
LTTNG_TRACEPOINT_EVENT(btrfs_delayed_tree_ref,
TP_PROTO(struct btrfs_delayed_ref_node *ref,
LTTNG_TRACEPOINT_EVENT(btrfs_delayed_tree_ref,
TP_PROTO(struct btrfs_delayed_ref_node *ref,
@@
-1065,7
+1065,7
@@
LTTNG_TRACEPOINT_EVENT(btrfs_delayed_tree_ref,
)
#endif
)
#endif
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(4,14,0) || \
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(4,14,0) || \
LTTNG_SLE_KERNEL_RANGE(4,4,73,5,0,0, 4,4,73,6,0,0) || \
LTTNG_SLE_KERNEL_RANGE(4,4,82,6,0,0, 4,4,82,7,0,0) || \
LTTNG_SLE_KERNEL_RANGE(4,4,92,6,0,0, 4,4,92,7,0,0) || \
LTTNG_SLE_KERNEL_RANGE(4,4,73,5,0,0, 4,4,73,6,0,0) || \
LTTNG_SLE_KERNEL_RANGE(4,4,82,6,0,0, 4,4,82,7,0,0) || \
LTTNG_SLE_KERNEL_RANGE(4,4,92,6,0,0, 4,4,92,7,0,0) || \
@@
-1123,7
+1123,7
@@
LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP(btrfs_delayed_data_ref,
TP_ARGS(fs_info, ref, full_ref, action)
)
TP_ARGS(fs_info, ref, full_ref, action)
)
-#elif (L
INUX_VERSION_CODE >=
KERNEL_VERSION(4,8,0))
+#elif (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(4,8,0))
LTTNG_TRACEPOINT_EVENT_CLASS(btrfs_delayed_data_ref,
TP_PROTO(struct btrfs_fs_info *fs_info,
LTTNG_TRACEPOINT_EVENT_CLASS(btrfs_delayed_data_ref,
TP_PROTO(struct btrfs_fs_info *fs_info,
@@
-1221,7
+1221,7
@@
LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP(btrfs_delayed_data_ref,
TP_ARGS(fs_info, ref, full_ref, action)
)
TP_ARGS(fs_info, ref, full_ref, action)
)
-#elif (L
INUX_VERSION_CODE >=
KERNEL_VERSION(3,12,0))
+#elif (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(3,12,0))
LTTNG_TRACEPOINT_EVENT_CLASS(btrfs_delayed_data_ref,
TP_PROTO(struct btrfs_delayed_ref_node *ref,
LTTNG_TRACEPOINT_EVENT_CLASS(btrfs_delayed_data_ref,
TP_PROTO(struct btrfs_delayed_ref_node *ref,
@@
-1268,7
+1268,7
@@
LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP(btrfs_delayed_data_ref,
TP_ARGS(fs_info, ref, full_ref, action)
)
TP_ARGS(fs_info, ref, full_ref, action)
)
-#elif (L
INUX_VERSION_CODE >=
KERNEL_VERSION(3,7,0))
+#elif (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(3,7,0))
LTTNG_TRACEPOINT_EVENT(btrfs_delayed_data_ref,
TP_PROTO(struct btrfs_delayed_ref_node *ref,
LTTNG_TRACEPOINT_EVENT(btrfs_delayed_data_ref,
TP_PROTO(struct btrfs_delayed_ref_node *ref,
@@
-1311,7
+1311,7
@@
LTTNG_TRACEPOINT_EVENT(btrfs_delayed_data_ref,
)
#endif
)
#endif
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(4,15,0))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(4,15,0))
LTTNG_TRACEPOINT_EVENT_CLASS(btrfs_delayed_ref_head,
TP_PROTO(const struct btrfs_fs_info *fs_info,
LTTNG_TRACEPOINT_EVENT_CLASS(btrfs_delayed_ref_head,
TP_PROTO(const struct btrfs_fs_info *fs_info,
@@
-1354,7
+1354,7
@@
LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP(btrfs_delayed_ref_head,
TP_ARGS(fs_info, head_ref, action)
)
TP_ARGS(fs_info, head_ref, action)
)
-#elif (L
INUX_VERSION_CODE >=
KERNEL_VERSION(4,14,0) || \
+#elif (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(4,14,0) || \
LTTNG_SLE_KERNEL_RANGE(4,4,73,5,0,0, 4,4,73,6,0,0) || \
LTTNG_SLE_KERNEL_RANGE(4,4,82,6,0,0, 4,4,82,7,0,0) || \
LTTNG_SLE_KERNEL_RANGE(4,4,92,6,0,0, 4,4,92,7,0,0) || \
LTTNG_SLE_KERNEL_RANGE(4,4,73,5,0,0, 4,4,73,6,0,0) || \
LTTNG_SLE_KERNEL_RANGE(4,4,82,6,0,0, 4,4,82,7,0,0) || \
LTTNG_SLE_KERNEL_RANGE(4,4,92,6,0,0, 4,4,92,7,0,0) || \
@@
-1408,7
+1408,7
@@
LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP(btrfs_delayed_ref_head,
TP_ARGS(fs_info, ref, head_ref, action)
)
TP_ARGS(fs_info, ref, head_ref, action)
)
-#elif (L
INUX_VERSION_CODE >=
KERNEL_VERSION(4,8,0))
+#elif (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(4,8,0))
LTTNG_TRACEPOINT_EVENT_CLASS(btrfs_delayed_ref_head,
TP_PROTO(struct btrfs_fs_info *fs_info,
LTTNG_TRACEPOINT_EVENT_CLASS(btrfs_delayed_ref_head,
TP_PROTO(struct btrfs_fs_info *fs_info,
@@
-1497,7
+1497,7
@@
LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP(btrfs_delayed_ref_head,
TP_ARGS(ref, head_ref, action)
)
TP_ARGS(ref, head_ref, action)
)
-#elif (L
INUX_VERSION_CODE >=
KERNEL_VERSION(3,12,0))
+#elif (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(3,12,0))
LTTNG_TRACEPOINT_EVENT_CLASS(btrfs_delayed_ref_head,
TP_PROTO(struct btrfs_delayed_ref_node *ref,
LTTNG_TRACEPOINT_EVENT_CLASS(btrfs_delayed_ref_head,
TP_PROTO(struct btrfs_delayed_ref_node *ref,
@@
-1558,7
+1558,7
@@
LTTNG_TRACEPOINT_EVENT(btrfs_delayed_ref_head,
)
#endif
)
#endif
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(4,14,0))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(4,14,0))
LTTNG_TRACEPOINT_EVENT_CLASS(btrfs__chunk,
LTTNG_TRACEPOINT_EVENT_CLASS(btrfs__chunk,
@@
-1593,7
+1593,7
@@
LTTNG_TRACEPOINT_EVENT_INSTANCE(btrfs__chunk, btrfs_chunk_free,
TP_ARGS(fs_info, map, offset, size)
)
TP_ARGS(fs_info, map, offset, size)
)
-#elif (L
INUX_VERSION_CODE >=
KERNEL_VERSION(4,10,0))
+#elif (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(4,10,0))
LTTNG_TRACEPOINT_EVENT_CLASS(btrfs__chunk,
LTTNG_TRACEPOINT_EVENT_CLASS(btrfs__chunk,
@@
-1666,7
+1666,7
@@
LTTNG_TRACEPOINT_EVENT_INSTANCE(btrfs__chunk, btrfs_chunk_free,
TP_ARGS(root, map, offset, size)
)
TP_ARGS(root, map, offset, size)
)
-#else /* #if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(4,10,0)) */
+#else /* #if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(4,10,0)) */
LTTNG_TRACEPOINT_EVENT_CLASS(btrfs__chunk,
LTTNG_TRACEPOINT_EVENT_CLASS(btrfs__chunk,
@@
-1701,9
+1701,9
@@
LTTNG_TRACEPOINT_EVENT_INSTANCE(btrfs__chunk, btrfs_chunk_free,
TP_ARGS(root, map, offset, size)
)
TP_ARGS(root, map, offset, size)
)
-#endif /* #else #if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(4,10,0)) */
+#endif /* #else #if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(4,10,0)) */
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(4,14,0) || \
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(4,14,0) || \
LTTNG_SLE_KERNEL_RANGE(4,4,73,5,0,0, 4,4,73,6,0,0) || \
LTTNG_SLE_KERNEL_RANGE(4,4,82,6,0,0, 4,4,82,7,0,0) || \
LTTNG_SLE_KERNEL_RANGE(4,4,92,6,0,0, 4,4,92,7,0,0) || \
LTTNG_SLE_KERNEL_RANGE(4,4,73,5,0,0, 4,4,73,6,0,0) || \
LTTNG_SLE_KERNEL_RANGE(4,4,82,6,0,0, 4,4,82,7,0,0) || \
LTTNG_SLE_KERNEL_RANGE(4,4,92,6,0,0, 4,4,92,7,0,0) || \
@@
-1743,7
+1743,7
@@
LTTNG_TRACEPOINT_EVENT(btrfs_cow_block,
)
#endif
)
#endif
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(5,5,0))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(5,5,0))
LTTNG_TRACEPOINT_EVENT(btrfs_space_reservation,
TP_PROTO(const struct btrfs_fs_info *fs_info, const char *type, u64 val,
LTTNG_TRACEPOINT_EVENT(btrfs_space_reservation,
TP_PROTO(const struct btrfs_fs_info *fs_info, const char *type, u64 val,
@@
-1759,7
+1759,7
@@
LTTNG_TRACEPOINT_EVENT(btrfs_space_reservation,
ctf_integer(int, reserve, reserve)
)
)
ctf_integer(int, reserve, reserve)
)
)
-#elif (L
INUX_VERSION_CODE >=
KERNEL_VERSION(4,14,0) || \
+#elif (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(4,14,0) || \
LTTNG_SLE_KERNEL_RANGE(4,4,73,5,0,0, 4,4,73,6,0,0) || \
LTTNG_SLE_KERNEL_RANGE(4,4,82,6,0,0, 4,4,82,7,0,0) || \
LTTNG_SLE_KERNEL_RANGE(4,4,92,6,0,0, 4,4,92,7,0,0) || \
LTTNG_SLE_KERNEL_RANGE(4,4,73,5,0,0, 4,4,73,6,0,0) || \
LTTNG_SLE_KERNEL_RANGE(4,4,82,6,0,0, 4,4,82,7,0,0) || \
LTTNG_SLE_KERNEL_RANGE(4,4,92,6,0,0, 4,4,92,7,0,0) || \
@@
-1779,7
+1779,7
@@
LTTNG_TRACEPOINT_EVENT(btrfs_space_reservation,
ctf_integer(int, reserve, reserve)
)
)
ctf_integer(int, reserve, reserve)
)
)
-#elif (L
INUX_VERSION_CODE >=
KERNEL_VERSION(3,3,0))
+#elif (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(3,3,0))
LTTNG_TRACEPOINT_EVENT(btrfs_space_reservation,
TP_PROTO(struct btrfs_fs_info *fs_info, char *type, u64 val,
LTTNG_TRACEPOINT_EVENT(btrfs_space_reservation,
TP_PROTO(struct btrfs_fs_info *fs_info, char *type, u64 val,
@@
-1797,7
+1797,7
@@
LTTNG_TRACEPOINT_EVENT(btrfs_space_reservation,
)
#endif
)
#endif
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(4,14,0))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(4,14,0))
LTTNG_TRACEPOINT_EVENT_CLASS(btrfs__reserved_extent,
LTTNG_TRACEPOINT_EVENT_CLASS(btrfs__reserved_extent,
@@
-1825,7
+1825,7
@@
LTTNG_TRACEPOINT_EVENT_INSTANCE(btrfs__reserved_extent, btrfs_reserved_extent_f
TP_ARGS(fs_info, start, len)
)
TP_ARGS(fs_info, start, len)
)
-#elif (L
INUX_VERSION_CODE >=
KERNEL_VERSION(4,10,0))
+#elif (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(4,10,0))
LTTNG_TRACEPOINT_EVENT_CLASS(btrfs__reserved_extent,
LTTNG_TRACEPOINT_EVENT_CLASS(btrfs__reserved_extent,
@@
-1885,7
+1885,7
@@
LTTNG_TRACEPOINT_EVENT_INSTANCE(btrfs__reserved_extent, btrfs_reserved_extent_f
TP_ARGS(root, start, len)
)
TP_ARGS(root, start, len)
)
-#else /* #if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(4,10,0)) */
+#else /* #if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(4,10,0)) */
LTTNG_TRACEPOINT_EVENT_CLASS(btrfs__reserved_extent,
LTTNG_TRACEPOINT_EVENT_CLASS(btrfs__reserved_extent,
@@
-1914,9
+1914,9
@@
LTTNG_TRACEPOINT_EVENT_INSTANCE(btrfs__reserved_extent, btrfs_reserved_extent_f
TP_ARGS(root, start, len)
)
TP_ARGS(root, start, len)
)
-#endif /* #else #if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(4,10,0)) */
+#endif /* #else #if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(4,10,0)) */
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(5,10,0) || \
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(5,10,0) || \
LTTNG_KERNEL_RANGE(5,9,5, 5,10,0) || \
LTTNG_KERNEL_RANGE(5,4,78, 5,5,0))
LTTNG_TRACEPOINT_EVENT_MAP(find_free_extent,
LTTNG_KERNEL_RANGE(5,9,5, 5,10,0) || \
LTTNG_KERNEL_RANGE(5,4,78, 5,5,0))
LTTNG_TRACEPOINT_EVENT_MAP(find_free_extent,
@@
-1937,7
+1937,7
@@
LTTNG_TRACEPOINT_EVENT_MAP(find_free_extent,
)
)
)
)
-#elif (L
INUX_VERSION_CODE >=
KERNEL_VERSION(5,5,0))
+#elif (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(5,5,0))
LTTNG_TRACEPOINT_EVENT_MAP(find_free_extent,
LTTNG_TRACEPOINT_EVENT_MAP(find_free_extent,
@@
-1956,7
+1956,7
@@
LTTNG_TRACEPOINT_EVENT_MAP(find_free_extent,
)
)
)
)
-#elif (L
INUX_VERSION_CODE >=
KERNEL_VERSION(4,18,0))
+#elif (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(4,18,0))
LTTNG_TRACEPOINT_EVENT_MAP(find_free_extent,
LTTNG_TRACEPOINT_EVENT_MAP(find_free_extent,
@@
-1975,7
+1975,7
@@
LTTNG_TRACEPOINT_EVENT_MAP(find_free_extent,
)
)
)
)
-#elif (L
INUX_VERSION_CODE >=
KERNEL_VERSION(4,14,0))
+#elif (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(4,14,0))
LTTNG_TRACEPOINT_EVENT_MAP(find_free_extent,
LTTNG_TRACEPOINT_EVENT_MAP(find_free_extent,
@@
-1994,7
+1994,7
@@
LTTNG_TRACEPOINT_EVENT_MAP(find_free_extent,
)
)
)
)
-#elif (L
INUX_VERSION_CODE >=
KERNEL_VERSION(4,10,0))
+#elif (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(4,10,0))
LTTNG_TRACEPOINT_EVENT_MAP(find_free_extent,
LTTNG_TRACEPOINT_EVENT_MAP(find_free_extent,
@@
-2034,7
+2034,7
@@
LTTNG_TRACEPOINT_EVENT_MAP(find_free_extent,
ctf_integer(u64, data, data)
)
)
ctf_integer(u64, data, data)
)
)
-#elif (L
INUX_VERSION_CODE >=
KERNEL_VERSION(3,3,0))
+#elif (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(3,3,0))
LTTNG_TRACEPOINT_EVENT_MAP(find_free_extent,
LTTNG_TRACEPOINT_EVENT_MAP(find_free_extent,
@@
-2054,7
+2054,7
@@
LTTNG_TRACEPOINT_EVENT_MAP(find_free_extent,
)
#endif
)
#endif
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(5,5,0))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(5,5,0))
LTTNG_TRACEPOINT_EVENT_CLASS(btrfs__reserve_extent,
TP_PROTO(const struct btrfs_block_group *block_group, u64 start,
LTTNG_TRACEPOINT_EVENT_CLASS(btrfs__reserve_extent,
TP_PROTO(const struct btrfs_block_group *block_group, u64 start,
@@
-2087,7
+2087,7
@@
LTTNG_TRACEPOINT_EVENT_INSTANCE(btrfs__reserve_extent, btrfs_reserve_extent_clus
TP_ARGS(block_group, start, len)
)
TP_ARGS(block_group, start, len)
)
-#elif (L
INUX_VERSION_CODE >=
KERNEL_VERSION(4,18,0))
+#elif (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(4,18,0))
LTTNG_TRACEPOINT_EVENT_CLASS(btrfs__reserve_extent,
LTTNG_TRACEPOINT_EVENT_CLASS(btrfs__reserve_extent,
@@
-2121,7
+2121,7
@@
LTTNG_TRACEPOINT_EVENT_INSTANCE(btrfs__reserve_extent, btrfs_reserve_extent_clus
TP_ARGS(block_group, start, len)
)
TP_ARGS(block_group, start, len)
)
-#elif (L
INUX_VERSION_CODE >=
KERNEL_VERSION(4,14,0))
+#elif (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(4,14,0))
LTTNG_TRACEPOINT_EVENT_CLASS(btrfs__reserve_extent,
LTTNG_TRACEPOINT_EVENT_CLASS(btrfs__reserve_extent,
@@
-2158,7
+2158,7
@@
LTTNG_TRACEPOINT_EVENT_INSTANCE(btrfs__reserve_extent, btrfs_reserve_extent_clus
TP_ARGS(fs_info, block_group, start, len)
)
TP_ARGS(fs_info, block_group, start, len)
)
-#elif (L
INUX_VERSION_CODE >=
KERNEL_VERSION(4,10,0))
+#elif (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(4,10,0))
LTTNG_TRACEPOINT_EVENT_CLASS(btrfs__reserve_extent,
LTTNG_TRACEPOINT_EVENT_CLASS(btrfs__reserve_extent,
@@
-2233,7
+2233,7
@@
LTTNG_TRACEPOINT_EVENT_INSTANCE(btrfs__reserve_extent, btrfs_reserve_extent_clus
TP_ARGS(root, block_group, start, len)
)
TP_ARGS(root, block_group, start, len)
)
-#elif (L
INUX_VERSION_CODE >=
KERNEL_VERSION(3,3,0))
+#elif (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(3,3,0))
LTTNG_TRACEPOINT_EVENT_CLASS(btrfs__reserve_extent,
LTTNG_TRACEPOINT_EVENT_CLASS(btrfs__reserve_extent,
@@
-2270,9
+2270,9
@@
LTTNG_TRACEPOINT_EVENT_INSTANCE(btrfs__reserve_extent, btrfs_reserve_extent_clus
TP_ARGS(root, block_group, start, len)
)
TP_ARGS(root, block_group, start, len)
)
-#endif /* #else #if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(4,10,0)) */
+#endif /* #else #if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(4,10,0)) */
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(5,5,0))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(5,5,0))
LTTNG_TRACEPOINT_EVENT(btrfs_find_cluster,
TP_PROTO(const struct btrfs_block_group *block_group, u64 start,
LTTNG_TRACEPOINT_EVENT(btrfs_find_cluster,
TP_PROTO(const struct btrfs_block_group *block_group, u64 start,
@@
-2317,7
+2317,7
@@
LTTNG_TRACEPOINT_EVENT(btrfs_setup_cluster,
ctf_integer(int, bitmap, bitmap)
)
)
ctf_integer(int, bitmap, bitmap)
)
)
-#elif (L
INUX_VERSION_CODE >=
KERNEL_VERSION(4,14,0) || \
+#elif (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(4,14,0) || \
LTTNG_SLE_KERNEL_RANGE(4,4,73,5,0,0, 4,4,73,6,0,0) || \
LTTNG_SLE_KERNEL_RANGE(4,4,82,6,0,0, 4,4,82,7,0,0) || \
LTTNG_SLE_KERNEL_RANGE(4,4,92,6,0,0, 4,4,92,7,0,0) || \
LTTNG_SLE_KERNEL_RANGE(4,4,73,5,0,0, 4,4,73,6,0,0) || \
LTTNG_SLE_KERNEL_RANGE(4,4,82,6,0,0, 4,4,82,7,0,0) || \
LTTNG_SLE_KERNEL_RANGE(4,4,92,6,0,0, 4,4,92,7,0,0) || \
@@
-2366,7
+2366,7
@@
LTTNG_TRACEPOINT_EVENT(btrfs_setup_cluster,
ctf_integer(int, bitmap, bitmap)
)
)
ctf_integer(int, bitmap, bitmap)
)
)
-#elif (L
INUX_VERSION_CODE >=
KERNEL_VERSION(3,3,0))
+#elif (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(3,3,0))
LTTNG_TRACEPOINT_EVENT(btrfs_find_cluster,
TP_PROTO(struct btrfs_block_group_cache *block_group, u64 start,
LTTNG_TRACEPOINT_EVENT(btrfs_find_cluster,
TP_PROTO(struct btrfs_block_group_cache *block_group, u64 start,
@@
-2413,7
+2413,7
@@
LTTNG_TRACEPOINT_EVENT(btrfs_setup_cluster,
)
#endif
)
#endif
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(4,14,0) || \
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(4,14,0) || \
LTTNG_SLE_KERNEL_RANGE(4,4,73,5,0,0, 4,4,73,6,0,0) || \
LTTNG_SLE_KERNEL_RANGE(4,4,82,6,0,0, 4,4,82,7,0,0) || \
LTTNG_SLE_KERNEL_RANGE(4,4,92,6,0,0, 4,4,92,7,0,0) || \
LTTNG_SLE_KERNEL_RANGE(4,4,73,5,0,0, 4,4,73,6,0,0) || \
LTTNG_SLE_KERNEL_RANGE(4,4,82,6,0,0, 4,4,82,7,0,0) || \
LTTNG_SLE_KERNEL_RANGE(4,4,92,6,0,0, 4,4,92,7,0,0) || \
@@
-2446,7
+2446,7
@@
LTTNG_TRACEPOINT_EVENT_MAP(free_extent_state,
ctf_integer(unsigned long, ip, IP)
)
)
ctf_integer(unsigned long, ip, IP)
)
)
-#elif (L
INUX_VERSION_CODE >=
KERNEL_VERSION(3,4,0))
+#elif (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(3,4,0))
LTTNG_TRACEPOINT_EVENT_MAP(alloc_extent_state,
btrfs_alloc_extent_state,
LTTNG_TRACEPOINT_EVENT_MAP(alloc_extent_state,
btrfs_alloc_extent_state,
diff --git
a/instrumentation/events/lttng-module/compaction.h
b/instrumentation/events/lttng-module/compaction.h
index c6db6d0585d2ffb876da4f38741448c57a2e4bfe..52d37c0447bf7527a148de7cab7558cdb5097cac 100644
(file)
--- a/
instrumentation/events/lttng-module/compaction.h
+++ b/
instrumentation/events/lttng-module/compaction.h
@@
-7,9
+7,9
@@
#include <probes/lttng-tracepoint-event.h>
#include <linux/types.h>
#include <probes/lttng-tracepoint-event.h>
#include <linux/types.h>
-#include <l
inux/
version.h>
+#include <l
ttng-kernel-
version.h>
-#if L
INUX_VERSION_CODE >=
KERNEL_VERSION(4,0,0)
+#if L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(4,0,0)
LTTNG_TRACEPOINT_EVENT_CLASS(compaction_isolate_template,
LTTNG_TRACEPOINT_EVENT_CLASS(compaction_isolate_template,
@@
-56,7
+56,7
@@
LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP(compaction_isolate_template,
TP_ARGS(start_pfn, end_pfn, nr_scanned, nr_taken)
)
TP_ARGS(start_pfn, end_pfn, nr_scanned, nr_taken)
)
-#else /* #if L
INUX_VERSION_CODE >=
KERNEL_VERSION(4,0,0) */
+#else /* #if L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(4,0,0) */
LTTNG_TRACEPOINT_EVENT_CLASS(compaction_isolate_template,
LTTNG_TRACEPOINT_EVENT_CLASS(compaction_isolate_template,
@@
-95,11
+95,11
@@
LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP(compaction_isolate_template,
TP_ARGS(nr_scanned, nr_taken)
)
TP_ARGS(nr_scanned, nr_taken)
)
-#endif /* #else #if L
INUX_VERSION_CODE >=
KERNEL_VERSION(4,0,0) */
+#endif /* #else #if L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(4,0,0) */
#if LTTNG_KERNEL_RANGE(3,12,30, 3,13,0) || \
LTTNG_KERNEL_RANGE(3,14,25, 3,15,0) || \
#if LTTNG_KERNEL_RANGE(3,12,30, 3,13,0) || \
LTTNG_KERNEL_RANGE(3,14,25, 3,15,0) || \
- (L
INUX_VERSION_CODE >=
KERNEL_VERSION(3,16,0))
+ (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(3,16,0))
LTTNG_TRACEPOINT_EVENT_CODE_MAP(mm_compaction_migratepages,
compaction_migratepages,
LTTNG_TRACEPOINT_EVENT_CODE_MAP(mm_compaction_migratepages,
compaction_migratepages,
@@
-135,7
+135,7
@@
LTTNG_TRACEPOINT_EVENT_CODE_MAP(mm_compaction_migratepages,
TP_code_post()
)
TP_code_post()
)
-#else /* #if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(3,16,0)) */
+#else /* #if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(3,16,0)) */
LTTNG_TRACEPOINT_EVENT_MAP(mm_compaction_migratepages,
compaction_migratepages,
LTTNG_TRACEPOINT_EVENT_MAP(mm_compaction_migratepages,
compaction_migratepages,
@@
-150,7
+150,7
@@
LTTNG_TRACEPOINT_EVENT_MAP(mm_compaction_migratepages,
ctf_integer(unsigned long, nr_failed, nr_failed)
)
)
ctf_integer(unsigned long, nr_failed, nr_failed)
)
)
-#endif /* #else #if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(3,16,0)) */
+#endif /* #else #if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(3,16,0)) */
#endif /* LTTNG_TRACE_COMPACTION_H */
#endif /* LTTNG_TRACE_COMPACTION_H */
diff --git
a/instrumentation/events/lttng-module/ext3.h
b/instrumentation/events/lttng-module/ext3.h
index 8c0115ac2869826a761c2f04196aaad0d9421326..7af0ab66c822484fd647df03efe189167f2eaa33 100644
(file)
--- a/
instrumentation/events/lttng-module/ext3.h
+++ b/
instrumentation/events/lttng-module/ext3.h
@@
-6,7
+6,7
@@
#define LTTNG_TRACE_EXT3_H
#include <probes/lttng-tracepoint-event.h>
#define LTTNG_TRACE_EXT3_H
#include <probes/lttng-tracepoint-event.h>
-#include <l
inux/
version.h>
+#include <l
ttng-kernel-
version.h>
LTTNG_TRACEPOINT_EVENT(ext3_free_inode,
TP_PROTO(struct inode *inode),
LTTNG_TRACEPOINT_EVENT(ext3_free_inode,
TP_PROTO(struct inode *inode),
@@
-17,7
+17,7
@@
LTTNG_TRACEPOINT_EVENT(ext3_free_inode,
ctf_integer(dev_t, dev, inode->i_sb->s_dev)
ctf_integer(ino_t, ino, inode->i_ino)
ctf_integer(umode_t, mode, inode->i_mode)
ctf_integer(dev_t, dev, inode->i_sb->s_dev)
ctf_integer(ino_t, ino, inode->i_ino)
ctf_integer(umode_t, mode, inode->i_mode)
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(3,5,0))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(3,5,0))
ctf_integer(uid_t, uid, i_uid_read(inode))
ctf_integer(gid_t, gid, i_gid_read(inode))
#else
ctf_integer(uid_t, uid, i_uid_read(inode))
ctf_integer(gid_t, gid, i_gid_read(inode))
#else
@@
-190,7
+190,7
@@
LTTNG_TRACEPOINT_EVENT_INSTANCE(ext3__page_op, ext3_releasepage,
TP_ARGS(page)
)
TP_ARGS(page)
)
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(3,11,0))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(3,11,0))
LTTNG_TRACEPOINT_EVENT(ext3_invalidatepage,
TP_PROTO(struct page *page, unsigned int offset, unsigned int length),
LTTNG_TRACEPOINT_EVENT(ext3_invalidatepage,
TP_PROTO(struct page *page, unsigned int offset, unsigned int length),
diff --git
a/instrumentation/events/lttng-module/ext4.h
b/instrumentation/events/lttng-module/ext4.h
index 6e74abadd1eb2684c4d01b30f2bd1c8f23ea20eb..cf75ce9b3a311bac7dbb161846a71da2e6d178d0 100644
(file)
--- a/
instrumentation/events/lttng-module/ext4.h
+++ b/
instrumentation/events/lttng-module/ext4.h
@@
-7,7
+7,7
@@
#include <probes/lttng-tracepoint-event.h>
#include <linux/writeback.h>
#include <probes/lttng-tracepoint-event.h>
#include <linux/writeback.h>
-#include <l
inux/
version.h>
+#include <l
ttng-kernel-
version.h>
#ifndef _TRACE_EXT4_DEF_
#define _TRACE_EXT4_DEF_
#ifndef _TRACE_EXT4_DEF_
#define _TRACE_EXT4_DEF_
@@
-17,13
+17,13
@@
struct ext4_prealloc_space;
struct ext4_inode_info;
struct mpage_da_data;
struct ext4_map_blocks;
struct ext4_inode_info;
struct mpage_da_data;
struct ext4_map_blocks;
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(3,2,0))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(3,2,0))
struct ext4_extent;
#endif
#endif
#define EXT4_I(inode) (container_of(inode, struct ext4_inode_info, vfs_inode))
struct ext4_extent;
#endif
#endif
#define EXT4_I(inode) (container_of(inode, struct ext4_inode_info, vfs_inode))
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(3,1,0))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(3,1,0))
#define TP_MODE_T __u16
#else
#define TP_MODE_T umode_t
#define TP_MODE_T __u16
#else
#define TP_MODE_T umode_t
@@
-37,7
+37,7
@@
LTTNG_TRACEPOINT_EVENT(ext4_free_inode,
TP_FIELDS(
ctf_integer(dev_t, dev, inode->i_sb->s_dev)
ctf_integer(ino_t, ino, inode->i_ino)
TP_FIELDS(
ctf_integer(dev_t, dev, inode->i_sb->s_dev)
ctf_integer(ino_t, ino, inode->i_ino)
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(3,5,0))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(3,5,0))
ctf_integer(uid_t, uid, i_uid_read(inode))
ctf_integer(gid_t, gid, i_gid_read(inode))
#else
ctf_integer(uid_t, uid, i_uid_read(inode))
ctf_integer(gid_t, gid, i_gid_read(inode))
#else
@@
-220,7
+220,7
@@
LTTNG_TRACEPOINT_EVENT(ext4_da_writepages,
)
)
)
)
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(3,11,0))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(3,11,0))
LTTNG_TRACEPOINT_EVENT(ext4_da_write_pages,
TP_PROTO(struct inode *inode, pgoff_t first_page,
LTTNG_TRACEPOINT_EVENT(ext4_da_write_pages,
TP_PROTO(struct inode *inode, pgoff_t first_page,
@@
-259,7
+259,7
@@
LTTNG_TRACEPOINT_EVENT(ext4_da_write_pages,
#endif
#endif
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(3,11,0))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(3,11,0))
LTTNG_TRACEPOINT_EVENT(ext4_da_write_pages_extent,
TP_PROTO(struct inode *inode, struct ext4_map_blocks *map),
LTTNG_TRACEPOINT_EVENT(ext4_da_write_pages_extent,
TP_PROTO(struct inode *inode, struct ext4_map_blocks *map),
@@
-327,7
+327,7
@@
LTTNG_TRACEPOINT_EVENT_INSTANCE(ext4__page_op, ext4_releasepage,
TP_ARGS(page)
)
TP_ARGS(page)
)
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(3,11,0))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(3,11,0))
LTTNG_TRACEPOINT_EVENT_CLASS(ext4_invalidatepage_op,
TP_PROTO(struct page *page, unsigned int offset, unsigned int length),
LTTNG_TRACEPOINT_EVENT_CLASS(ext4_invalidatepage_op,
TP_PROTO(struct page *page, unsigned int offset, unsigned int length),
@@
-432,7
+432,7
@@
LTTNG_TRACEPOINT_EVENT(ext4_mb_release_inode_pa,
)
)
)
)
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(3,3,0))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(3,3,0))
LTTNG_TRACEPOINT_EVENT(ext4_mb_release_group_pa,
TP_PROTO(struct super_block *sb, struct ext4_prealloc_space *pa),
LTTNG_TRACEPOINT_EVENT(ext4_mb_release_group_pa,
TP_PROTO(struct super_block *sb, struct ext4_prealloc_space *pa),
@@
-460,7
+460,7
@@
LTTNG_TRACEPOINT_EVENT(ext4_mb_release_group_pa,
)
#endif
)
#endif
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(5,9,0) || \
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(5,9,0) || \
LTTNG_KERNEL_RANGE(5,8,6, 5,9,0))
LTTNG_TRACEPOINT_EVENT(ext4_discard_preallocations,
TP_PROTO(struct inode *inode, unsigned int len, unsigned int needed),
LTTNG_KERNEL_RANGE(5,8,6, 5,9,0))
LTTNG_TRACEPOINT_EVENT(ext4_discard_preallocations,
TP_PROTO(struct inode *inode, unsigned int len, unsigned int needed),
@@
-590,7
+590,7
@@
LTTNG_TRACEPOINT_EVENT(ext4_sync_fs,
)
)
)
)
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(4,13,0))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(4,13,0))
LTTNG_TRACEPOINT_EVENT(ext4_alloc_da_blocks,
TP_PROTO(struct inode *inode),
LTTNG_TRACEPOINT_EVENT(ext4_alloc_da_blocks,
TP_PROTO(struct inode *inode),
@@
-719,7
+719,7
@@
LTTNG_TRACEPOINT_EVENT(ext4_forget,
)
)
)
)
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(4,13,0))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(4,13,0))
LTTNG_TRACEPOINT_EVENT(ext4_da_update_reserve_space,
TP_PROTO(struct inode *inode, int used_blocks, int quota_claim),
LTTNG_TRACEPOINT_EVENT(ext4_da_update_reserve_space,
TP_PROTO(struct inode *inode, int used_blocks, int quota_claim),
@@
-736,7
+736,7
@@
LTTNG_TRACEPOINT_EVENT(ext4_da_update_reserve_space,
ctf_integer(TP_MODE_T, mode, inode->i_mode)
)
)
ctf_integer(TP_MODE_T, mode, inode->i_mode)
)
)
-#elif (L
INUX_VERSION_CODE >=
KERNEL_VERSION(3,2,0))
+#elif (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(3,2,0))
LTTNG_TRACEPOINT_EVENT(ext4_da_update_reserve_space,
TP_PROTO(struct inode *inode, int used_blocks, int quota_claim),
LTTNG_TRACEPOINT_EVENT(ext4_da_update_reserve_space,
TP_PROTO(struct inode *inode, int used_blocks, int quota_claim),
@@
-779,7
+779,7
@@
LTTNG_TRACEPOINT_EVENT(ext4_da_update_reserve_space,
)
#endif
)
#endif
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(4,13,0))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(4,13,0))
LTTNG_TRACEPOINT_EVENT(ext4_da_reserve_space,
TP_PROTO(struct inode *inode),
LTTNG_TRACEPOINT_EVENT(ext4_da_reserve_space,
TP_PROTO(struct inode *inode),
@@
-794,7
+794,7
@@
LTTNG_TRACEPOINT_EVENT(ext4_da_reserve_space,
ctf_integer(TP_MODE_T, mode, inode->i_mode)
)
)
ctf_integer(TP_MODE_T, mode, inode->i_mode)
)
)
-#elif (L
INUX_VERSION_CODE >=
KERNEL_VERSION(4,2,0))
+#elif (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(4,2,0))
LTTNG_TRACEPOINT_EVENT(ext4_da_reserve_space,
TP_PROTO(struct inode *inode),
LTTNG_TRACEPOINT_EVENT(ext4_da_reserve_space,
TP_PROTO(struct inode *inode),
@@
-831,7
+831,7
@@
LTTNG_TRACEPOINT_EVENT(ext4_da_reserve_space,
)
#endif
)
#endif
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(4,13,0))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(4,13,0))
LTTNG_TRACEPOINT_EVENT(ext4_da_release_space,
TP_PROTO(struct inode *inode, int freed_blocks),
LTTNG_TRACEPOINT_EVENT(ext4_da_release_space,
TP_PROTO(struct inode *inode, int freed_blocks),
@@
-894,7
+894,7
@@
LTTNG_TRACEPOINT_EVENT_INSTANCE(ext4__bitmap_load, ext4_mb_buddy_bitmap_load,
TP_ARGS(sb, group)
)
TP_ARGS(sb, group)
)
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(5,9,0))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(5,9,0))
LTTNG_TRACEPOINT_EVENT(ext4_read_block_bitmap_load,
TP_PROTO(struct super_block *sb, unsigned long group, bool prefetch),
LTTNG_TRACEPOINT_EVENT(ext4_read_block_bitmap_load,
TP_PROTO(struct super_block *sb, unsigned long group, bool prefetch),
@@
-967,7
+967,7
@@
LTTNG_TRACEPOINT_EVENT(ext4_fallocate_exit,
)
)
)
)
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(3,15,0))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(3,15,0))
LTTNG_TRACEPOINT_EVENT_CLASS(ext4__fallocate_mode,
TP_PROTO(struct inode *inode, loff_t offset, loff_t len, int mode),
LTTNG_TRACEPOINT_EVENT_CLASS(ext4__fallocate_mode,
TP_PROTO(struct inode *inode, loff_t offset, loff_t len, int mode),
@@
-1004,7
+1004,7
@@
LTTNG_TRACEPOINT_EVENT_INSTANCE(ext4__fallocate_mode, ext4_zero_range,
TP_ARGS(inode, offset, len, mode)
)
TP_ARGS(inode, offset, len, mode)
)
-#else /* #if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(3,15,0)) */
+#else /* #if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(3,15,0)) */
LTTNG_TRACEPOINT_EVENT(ext4_fallocate_enter,
TP_PROTO(struct inode *inode, loff_t offset, loff_t len, int mode),
LTTNG_TRACEPOINT_EVENT(ext4_fallocate_enter,
TP_PROTO(struct inode *inode, loff_t offset, loff_t len, int mode),
@@
-1020,7
+1020,7
@@
LTTNG_TRACEPOINT_EVENT(ext4_fallocate_enter,
)
)
)
)
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(3,11,0))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(3,11,0))
LTTNG_TRACEPOINT_EVENT(ext4_punch_hole,
TP_PROTO(struct inode *inode, loff_t offset, loff_t len),
LTTNG_TRACEPOINT_EVENT(ext4_punch_hole,
TP_PROTO(struct inode *inode, loff_t offset, loff_t len),
@@
-1035,9
+1035,9
@@
LTTNG_TRACEPOINT_EVENT(ext4_punch_hole,
)
)
)
)
-#endif /* #if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(3,11,0)) */
+#endif /* #if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(3,11,0)) */
-#endif /* #else #if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(3,15,0)) */
+#endif /* #else #if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(3,15,0)) */
LTTNG_TRACEPOINT_EVENT(ext4_unlink_enter,
TP_PROTO(struct inode *parent, struct dentry *dentry),
LTTNG_TRACEPOINT_EVENT(ext4_unlink_enter,
TP_PROTO(struct inode *parent, struct dentry *dentry),
@@
-1090,7
+1090,7
@@
LTTNG_TRACEPOINT_EVENT_INSTANCE(ext4__truncate, ext4_truncate_exit,
TP_ARGS(inode)
)
TP_ARGS(inode)
)
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(3,2,0))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(3,2,0))
/* 'ux' is the uninitialized extent. */
LTTNG_TRACEPOINT_EVENT(ext4_ext_convert_to_initialized_enter,
TP_PROTO(struct inode *inode, struct ext4_map_blocks *map,
/* 'ux' is the uninitialized extent. */
LTTNG_TRACEPOINT_EVENT(ext4_ext_convert_to_initialized_enter,
TP_PROTO(struct inode *inode, struct ext4_map_blocks *map,
@@
-1163,7
+1163,7
@@
LTTNG_TRACEPOINT_EVENT_INSTANCE(ext4__map_blocks_enter, ext4_ind_map_blocks_ente
TP_ARGS(inode, lblk, len, flags)
)
TP_ARGS(inode, lblk, len, flags)
)
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(3,11,0))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(3,11,0))
LTTNG_TRACEPOINT_EVENT_CLASS(ext4__map_blocks_exit,
TP_PROTO(struct inode *inode, unsigned flags, struct ext4_map_blocks *map,
LTTNG_TRACEPOINT_EVENT_CLASS(ext4__map_blocks_exit,
TP_PROTO(struct inode *inode, unsigned flags, struct ext4_map_blocks *map,
@@
-1197,7
+1197,7
@@
LTTNG_TRACEPOINT_EVENT_INSTANCE(ext4__map_blocks_exit, ext4_ind_map_blocks_exit,
TP_ARGS(inode, flags, map, ret)
)
TP_ARGS(inode, flags, map, ret)
)
-#elif (L
INUX_VERSION_CODE >=
KERNEL_VERSION(3,8,0))
+#elif (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(3,8,0))
LTTNG_TRACEPOINT_EVENT_CLASS(ext4__map_blocks_exit,
TP_PROTO(struct inode *inode, struct ext4_map_blocks *map, int ret),
LTTNG_TRACEPOINT_EVENT_CLASS(ext4__map_blocks_exit,
TP_PROTO(struct inode *inode, struct ext4_map_blocks *map, int ret),
@@
-1227,7
+1227,7
@@
LTTNG_TRACEPOINT_EVENT_INSTANCE(ext4__map_blocks_exit, ext4_ind_map_blocks_exit,
TP_ARGS(inode, map, ret)
)
TP_ARGS(inode, map, ret)
)
-#else /* #if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(3,8,0)) */
+#else /* #if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(3,8,0)) */
LTTNG_TRACEPOINT_EVENT_CLASS(ext4__map_blocks_exit,
TP_PROTO(struct inode *inode, ext4_lblk_t lblk,
LTTNG_TRACEPOINT_EVENT_CLASS(ext4__map_blocks_exit,
TP_PROTO(struct inode *inode, ext4_lblk_t lblk,
@@
-1259,7
+1259,7
@@
LTTNG_TRACEPOINT_EVENT_INSTANCE(ext4__map_blocks_exit, ext4_ind_map_blocks_exit,
TP_ARGS(inode, lblk, pblk, len, ret)
)
TP_ARGS(inode, lblk, pblk, len, ret)
)
-#endif /* #else #if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(3,8,0)) */
+#endif /* #else #if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(3,8,0)) */
LTTNG_TRACEPOINT_EVENT(ext4_ext_load_extent,
TP_PROTO(struct inode *inode, ext4_lblk_t lblk, ext4_fsblk_t pblk),
LTTNG_TRACEPOINT_EVENT(ext4_ext_load_extent,
TP_PROTO(struct inode *inode, ext4_lblk_t lblk, ext4_fsblk_t pblk),
@@
-1274,7
+1274,7
@@
LTTNG_TRACEPOINT_EVENT(ext4_ext_load_extent,
)
)
)
)
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(5,10,0))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(5,10,0))
LTTNG_TRACEPOINT_EVENT(ext4_load_inode,
TP_PROTO(struct super_block *sb, unsigned long ino),
LTTNG_TRACEPOINT_EVENT(ext4_load_inode,
TP_PROTO(struct super_block *sb, unsigned long ino),
@@
-1298,7
+1298,7
@@
LTTNG_TRACEPOINT_EVENT(ext4_load_inode,
)
#endif
)
#endif
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(5,5,0))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(5,5,0))
LTTNG_TRACEPOINT_EVENT(ext4_journal_start,
TP_PROTO(struct super_block *sb, int blocks, int rsv_blocks,
LTTNG_TRACEPOINT_EVENT(ext4_journal_start,
TP_PROTO(struct super_block *sb, int blocks, int rsv_blocks,
@@
-1327,7
+1327,7
@@
LTTNG_TRACEPOINT_EVENT(ext4_journal_start_reserved,
)
)
)
)
-#elif (L
INUX_VERSION_CODE >=
KERNEL_VERSION(3,11,0))
+#elif (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(3,11,0))
LTTNG_TRACEPOINT_EVENT(ext4_journal_start,
TP_PROTO(struct super_block *sb, int blocks, int rsv_blocks,
LTTNG_TRACEPOINT_EVENT(ext4_journal_start,
TP_PROTO(struct super_block *sb, int blocks, int rsv_blocks,
@@
-1355,7
+1355,7
@@
LTTNG_TRACEPOINT_EVENT(ext4_journal_start_reserved,
)
)
)
)
-#elif (L
INUX_VERSION_CODE >=
KERNEL_VERSION(3,1,0))
+#elif (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(3,1,0))
LTTNG_TRACEPOINT_EVENT(ext4_journal_start,
TP_PROTO(struct super_block *sb, int nblocks, unsigned long IP),
LTTNG_TRACEPOINT_EVENT(ext4_journal_start,
TP_PROTO(struct super_block *sb, int nblocks, unsigned long IP),
@@
-1407,29
+1407,29
@@
LTTNG_TRACEPOINT_EVENT_INSTANCE(ext4__trim, ext4_trim_all_free,
)
#endif
)
#endif
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(3,2,0))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(3,2,0))
LTTNG_TRACEPOINT_EVENT(ext4_ext_handle_uninitialized_extents,
LTTNG_TRACEPOINT_EVENT(ext4_ext_handle_uninitialized_extents,
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(3,8,0))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(3,8,0))
TP_PROTO(struct inode *inode, struct ext4_map_blocks *map, int flags,
unsigned int allocated, ext4_fsblk_t newblock),
TP_ARGS(inode, map, flags, allocated, newblock),
TP_PROTO(struct inode *inode, struct ext4_map_blocks *map, int flags,
unsigned int allocated, ext4_fsblk_t newblock),
TP_ARGS(inode, map, flags, allocated, newblock),
-#else /* #if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(3,8,0)) */
+#else /* #if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(3,8,0)) */
TP_PROTO(struct inode *inode, struct ext4_map_blocks *map,
unsigned int allocated, ext4_fsblk_t newblock),
TP_ARGS(inode, map, allocated, newblock),
TP_PROTO(struct inode *inode, struct ext4_map_blocks *map,
unsigned int allocated, ext4_fsblk_t newblock),
TP_ARGS(inode, map, allocated, newblock),
-#endif /* #else #if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(3,8,0)) */
+#endif /* #else #if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(3,8,0)) */
TP_FIELDS(
ctf_integer(dev_t, dev, inode->i_sb->s_dev)
ctf_integer(ino_t, ino, inode->i_ino)
TP_FIELDS(
ctf_integer(dev_t, dev, inode->i_sb->s_dev)
ctf_integer(ino_t, ino, inode->i_ino)
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(3,8,0))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(3,8,0))
ctf_integer(int, flags, flags)
ctf_integer(int, flags, flags)
-#else /* #if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(3,8,0)) */
+#else /* #if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(3,8,0)) */
ctf_integer(int, flags, map->m_flags)
ctf_integer(int, flags, map->m_flags)
-#endif /* #else #if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(3,8,0)) */
+#endif /* #else #if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(3,8,0)) */
ctf_integer(ext4_lblk_t, lblk, map->m_lblk)
ctf_integer(ext4_fsblk_t, pblk, map->m_pblk)
ctf_integer(unsigned int, len, map->m_len)
ctf_integer(ext4_lblk_t, lblk, map->m_lblk)
ctf_integer(ext4_fsblk_t, pblk, map->m_pblk)
ctf_integer(unsigned int, len, map->m_len)
@@
-1526,7
+1526,7
@@
LTTNG_TRACEPOINT_EVENT(ext4_ext_show_extent,
)
)
)
)
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(4,20,0) || \
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(4,20,0) || \
LTTNG_RHEL_KERNEL_RANGE(4,18,0,147,0,0, 4,19,0,0,0,0))
LTTNG_TRACEPOINT_EVENT(ext4_remove_blocks,
LTTNG_RHEL_KERNEL_RANGE(4,18,0,147,0,0, 4,19,0,0,0,0))
LTTNG_TRACEPOINT_EVENT(ext4_remove_blocks,
@@
-1550,7
+1550,7
@@
LTTNG_TRACEPOINT_EVENT(ext4_remove_blocks,
)
)
)
)
-#elif (L
INUX_VERSION_CODE >=
KERNEL_VERSION(3,11,0))
+#elif (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(3,11,0))
LTTNG_TRACEPOINT_EVENT(ext4_remove_blocks,
TP_PROTO(struct inode *inode, struct ext4_extent *ex,
LTTNG_TRACEPOINT_EVENT(ext4_remove_blocks,
TP_PROTO(struct inode *inode, struct ext4_extent *ex,
@@
-1594,7
+1594,7
@@
LTTNG_TRACEPOINT_EVENT(ext4_remove_blocks,
#endif
#endif
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(4,20,0) || \
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(4,20,0) || \
LTTNG_RHEL_KERNEL_RANGE(4,18,0,147,0,0, 4,19,0,0,0,0))
LTTNG_TRACEPOINT_EVENT(ext4_ext_rm_leaf,
LTTNG_RHEL_KERNEL_RANGE(4,18,0,147,0,0, 4,19,0,0,0,0))
LTTNG_TRACEPOINT_EVENT(ext4_ext_rm_leaf,
@@
-1617,7
+1617,7
@@
LTTNG_TRACEPOINT_EVENT(ext4_ext_rm_leaf,
)
)
)
)
-#elif (L
INUX_VERSION_CODE >=
KERNEL_VERSION(3,11,0))
+#elif (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(3,11,0))
LTTNG_TRACEPOINT_EVENT(ext4_ext_rm_leaf,
TP_PROTO(struct inode *inode, ext4_lblk_t start,
LTTNG_TRACEPOINT_EVENT(ext4_ext_rm_leaf,
TP_PROTO(struct inode *inode, ext4_lblk_t start,
@@
-1670,7
+1670,7
@@
LTTNG_TRACEPOINT_EVENT(ext4_ext_rm_idx,
)
)
)
)
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(3,11,0))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(3,11,0))
LTTNG_TRACEPOINT_EVENT(ext4_ext_remove_space,
TP_PROTO(struct inode *inode, ext4_lblk_t start,
LTTNG_TRACEPOINT_EVENT(ext4_ext_remove_space,
TP_PROTO(struct inode *inode, ext4_lblk_t start,
@@
-1704,7
+1704,7
@@
LTTNG_TRACEPOINT_EVENT(ext4_ext_remove_space,
#endif
#endif
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(4,20,0) || \
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(4,20,0) || \
LTTNG_RHEL_KERNEL_RANGE(4,18,0,147,0,0, 4,19,0,0,0,0))
LTTNG_TRACEPOINT_EVENT(ext4_ext_remove_space_done,
LTTNG_RHEL_KERNEL_RANGE(4,18,0,147,0,0, 4,19,0,0,0,0))
LTTNG_TRACEPOINT_EVENT(ext4_ext_remove_space_done,
@@
-1726,7
+1726,7
@@
LTTNG_TRACEPOINT_EVENT(ext4_ext_remove_space_done,
)
)
)
)
-#elif (L
INUX_VERSION_CODE >=
KERNEL_VERSION(3,11,0))
+#elif (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(3,11,0))
LTTNG_TRACEPOINT_EVENT(ext4_ext_remove_space_done,
TP_PROTO(struct inode *inode, ext4_lblk_t start, ext4_lblk_t end,
LTTNG_TRACEPOINT_EVENT(ext4_ext_remove_space_done,
TP_PROTO(struct inode *inode, ext4_lblk_t start, ext4_lblk_t end,
@@
-1767,7
+1767,7
@@
LTTNG_TRACEPOINT_EVENT(ext4_ext_remove_space_done,
#endif
#endif
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(3,12,0))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(3,12,0))
LTTNG_TRACEPOINT_EVENT_CLASS(ext4__es_extent,
TP_PROTO(struct inode *inode, struct extent_status *es),
LTTNG_TRACEPOINT_EVENT_CLASS(ext4__es_extent,
TP_PROTO(struct inode *inode, struct extent_status *es),
@@
-1796,7
+1796,7
@@
LTTNG_TRACEPOINT_EVENT_INSTANCE(ext4__es_extent, ext4_es_cache_extent,
TP_ARGS(inode, es)
)
TP_ARGS(inode, es)
)
-#elif (L
INUX_VERSION_CODE >=
KERNEL_VERSION(3,11,0))
+#elif (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(3,11,0))
LTTNG_TRACEPOINT_EVENT(ext4_es_insert_extent,
TP_PROTO(struct inode *inode, struct extent_status *es),
LTTNG_TRACEPOINT_EVENT(ext4_es_insert_extent,
TP_PROTO(struct inode *inode, struct extent_status *es),
@@
-1908,7
+1908,7
@@
LTTNG_TRACEPOINT_EVENT(ext4_es_shrink_exit,
#endif
#endif
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(5,10,0))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(5,10,0))
LTTNG_TRACEPOINT_EVENT(ext4_fc_replay_scan,
TP_PROTO(struct super_block *sb, int error, int off),
LTTNG_TRACEPOINT_EVENT(ext4_fc_replay_scan,
TP_PROTO(struct super_block *sb, int error, int off),
diff --git
a/instrumentation/events/lttng-module/jbd.h
b/instrumentation/events/lttng-module/jbd.h
index acc8a48d3c619e4357ce2f22844bac807fdb5195..0f45c82fd42ca184ecb0c35fe8280774a4e85ea6 100644
(file)
--- a/
instrumentation/events/lttng-module/jbd.h
+++ b/
instrumentation/events/lttng-module/jbd.h
@@
-7,7
+7,7
@@
#include <probes/lttng-tracepoint-event.h>
#include <linux/jbd.h>
#include <probes/lttng-tracepoint-event.h>
#include <linux/jbd.h>
-#include <l
inux/
version.h>
+#include <l
ttng-kernel-
version.h>
LTTNG_TRACEPOINT_EVENT(jbd_checkpoint,
LTTNG_TRACEPOINT_EVENT(jbd_checkpoint,
@@
-29,7
+29,7
@@
LTTNG_TRACEPOINT_EVENT_CLASS(jbd_commit,
TP_FIELDS(
ctf_integer(dev_t, dev, journal->j_fs_dev->bd_dev)
TP_FIELDS(
ctf_integer(dev_t, dev, journal->j_fs_dev->bd_dev)
-#if (L
INUX_VERSION_CODE <
KERNEL_VERSION(3,5,0))
+#if (L
TTNG_LINUX_VERSION_CODE < LTTNG_
KERNEL_VERSION(3,5,0))
ctf_integer(char, sync_commit, commit_transaction->t_synchronous_commit)
#endif
ctf_integer(int, transaction, commit_transaction->t_tid)
ctf_integer(char, sync_commit, commit_transaction->t_synchronous_commit)
#endif
ctf_integer(int, transaction, commit_transaction->t_tid)
@@
-72,7
+72,7
@@
LTTNG_TRACEPOINT_EVENT(jbd_drop_transaction,
TP_FIELDS(
ctf_integer(dev_t, dev, journal->j_fs_dev->bd_dev)
TP_FIELDS(
ctf_integer(dev_t, dev, journal->j_fs_dev->bd_dev)
-#if (L
INUX_VERSION_CODE <
KERNEL_VERSION(3,5,0))
+#if (L
TTNG_LINUX_VERSION_CODE < LTTNG_
KERNEL_VERSION(3,5,0))
ctf_integer(char, sync_commit, commit_transaction->t_synchronous_commit)
#endif
ctf_integer(int, transaction, commit_transaction->t_tid)
ctf_integer(char, sync_commit, commit_transaction->t_synchronous_commit)
#endif
ctf_integer(int, transaction, commit_transaction->t_tid)
@@
-86,7
+86,7
@@
LTTNG_TRACEPOINT_EVENT(jbd_end_commit,
TP_FIELDS(
ctf_integer(dev_t, dev, journal->j_fs_dev->bd_dev)
TP_FIELDS(
ctf_integer(dev_t, dev, journal->j_fs_dev->bd_dev)
-#if (L
INUX_VERSION_CODE <
KERNEL_VERSION(3,5,0))
+#if (L
TTNG_LINUX_VERSION_CODE < LTTNG_
KERNEL_VERSION(3,5,0))
ctf_integer(char, sync_commit, commit_transaction->t_synchronous_commit)
#endif
ctf_integer(int, transaction, commit_transaction->t_tid)
ctf_integer(char, sync_commit, commit_transaction->t_synchronous_commit)
#endif
ctf_integer(int, transaction, commit_transaction->t_tid)
@@
-101,7
+101,7
@@
LTTNG_TRACEPOINT_EVENT(jbd_do_submit_data,
TP_FIELDS(
ctf_integer(dev_t, dev, journal->j_fs_dev->bd_dev)
TP_FIELDS(
ctf_integer(dev_t, dev, journal->j_fs_dev->bd_dev)
-#if (L
INUX_VERSION_CODE <
KERNEL_VERSION(3,5,0))
+#if (L
TTNG_LINUX_VERSION_CODE < LTTNG_
KERNEL_VERSION(3,5,0))
ctf_integer(char, sync_commit, commit_transaction->t_synchronous_commit)
#endif
ctf_integer(int, transaction, commit_transaction->t_tid)
ctf_integer(char, sync_commit, commit_transaction->t_synchronous_commit)
#endif
ctf_integer(int, transaction, commit_transaction->t_tid)
@@
-124,7
+124,7
@@
LTTNG_TRACEPOINT_EVENT(jbd_cleanup_journal_tail,
)
)
)
)
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(3,5,0))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(3,5,0))
LTTNG_TRACEPOINT_EVENT_MAP(journal_write_superblock,
jbd_journal_write_superblock,
LTTNG_TRACEPOINT_EVENT_MAP(journal_write_superblock,
jbd_journal_write_superblock,
diff --git
a/instrumentation/events/lttng-module/jbd2.h
b/instrumentation/events/lttng-module/jbd2.h
index a760da249698868762a7a5be18405a636699ad82..46563a943ebe80448ab60ff6912378d09ff0fa78 100644
(file)
--- a/
instrumentation/events/lttng-module/jbd2.h
+++ b/
instrumentation/events/lttng-module/jbd2.h
@@
-7,7
+7,7
@@
#include <probes/lttng-tracepoint-event.h>
#include <linux/jbd2.h>
#include <probes/lttng-tracepoint-event.h>
#include <linux/jbd2.h>
-#include <l
inux/
version.h>
+#include <l
ttng-kernel-
version.h>
#ifndef _TRACE_JBD2_DEF
#define _TRACE_JBD2_DEF
#ifndef _TRACE_JBD2_DEF
#define _TRACE_JBD2_DEF
@@
-68,7
+68,7
@@
LTTNG_TRACEPOINT_EVENT_INSTANCE(jbd2_commit, jbd2_commit_logging,
TP_ARGS(journal, commit_transaction)
)
TP_ARGS(journal, commit_transaction)
)
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(3,4,0))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(3,4,0))
LTTNG_TRACEPOINT_EVENT_INSTANCE(jbd2_commit, jbd2_drop_transaction,
TP_PROTO(journal_t *journal, transaction_t *commit_transaction),
LTTNG_TRACEPOINT_EVENT_INSTANCE(jbd2_commit, jbd2_drop_transaction,
TP_PROTO(journal_t *journal, transaction_t *commit_transaction),
@@
-137,7
+137,7
@@
LTTNG_TRACEPOINT_EVENT(jbd2_checkpoint_stats,
)
)
)
)
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(3,4,0))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(3,4,0))
LTTNG_TRACEPOINT_EVENT(jbd2_update_log_tail,
#else
LTTNG_TRACEPOINT_EVENT(jbd2_cleanup_journal_tail,
LTTNG_TRACEPOINT_EVENT(jbd2_update_log_tail,
#else
LTTNG_TRACEPOINT_EVENT(jbd2_cleanup_journal_tail,
@@
-157,7
+157,7
@@
LTTNG_TRACEPOINT_EVENT(jbd2_cleanup_journal_tail,
)
)
)
)
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(3,4,0))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(3,4,0))
LTTNG_TRACEPOINT_EVENT(jbd2_write_superblock,
TP_PROTO(journal_t *journal, int write_op),
LTTNG_TRACEPOINT_EVENT(jbd2_write_superblock,
TP_PROTO(journal_t *journal, int write_op),
diff --git
a/instrumentation/events/lttng-module/kmem.h
b/instrumentation/events/lttng-module/kmem.h
index 2313ae812a80b6f3e16b5b819e734e160c5f9d92..b134620a92ed13a3e98bb5f66333ef8a155ee77c 100644
(file)
--- a/
instrumentation/events/lttng-module/kmem.h
+++ b/
instrumentation/events/lttng-module/kmem.h
@@
-7,7
+7,7
@@
#include <probes/lttng-tracepoint-event.h>
#include <linux/types.h>
#include <probes/lttng-tracepoint-event.h>
#include <linux/types.h>
-#include <l
inux/
version.h>
+#include <l
ttng-kernel-
version.h>
LTTNG_TRACEPOINT_EVENT_CLASS(kmem_alloc,
LTTNG_TRACEPOINT_EVENT_CLASS(kmem_alloc,
@@
-115,7
+115,7
@@
LTTNG_TRACEPOINT_EVENT_INSTANCE(kmem_free, kmem_cache_free,
TP_ARGS(call_site, ptr)
)
TP_ARGS(call_site, ptr)
)
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(3,3,0))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(3,3,0))
LTTNG_TRACEPOINT_EVENT_MAP(mm_page_free, kmem_mm_page_free,
#else
LTTNG_TRACEPOINT_EVENT_MAP(mm_page_free_direct, kmem_mm_page_free_direct,
LTTNG_TRACEPOINT_EVENT_MAP(mm_page_free, kmem_mm_page_free,
#else
LTTNG_TRACEPOINT_EVENT_MAP(mm_page_free_direct, kmem_mm_page_free_direct,
@@
-132,7
+132,7
@@
LTTNG_TRACEPOINT_EVENT_MAP(mm_page_free_direct, kmem_mm_page_free_direct,
)
)
)
)
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(4,15,0))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(4,15,0))
LTTNG_TRACEPOINT_EVENT_MAP(mm_page_free_batched, kmem_mm_page_free_batched,
TP_PROTO(struct page *page),
LTTNG_TRACEPOINT_EVENT_MAP(mm_page_free_batched, kmem_mm_page_free_batched,
TP_PROTO(struct page *page),
@@
-144,7
+144,7
@@
LTTNG_TRACEPOINT_EVENT_MAP(mm_page_free_batched, kmem_mm_page_free_batched,
ctf_integer(unsigned long, pfn, page_to_pfn(page))
)
)
ctf_integer(unsigned long, pfn, page_to_pfn(page))
)
)
-#elif (L
INUX_VERSION_CODE >=
KERNEL_VERSION(3,3,0))
+#elif (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(3,3,0))
LTTNG_TRACEPOINT_EVENT_MAP(mm_page_free_batched, kmem_mm_page_free_batched,
TP_PROTO(struct page *page, int cold),
LTTNG_TRACEPOINT_EVENT_MAP(mm_page_free_batched, kmem_mm_page_free_batched,
TP_PROTO(struct page *page, int cold),
@@
-222,7
+222,7
@@
LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP(kmem_mm_page, mm_page_pcpu_drain,
TP_ARGS(page, order, migratetype)
)
TP_ARGS(page, order, migratetype)
)
-#if (L
INUX_VERSION_CODE >= KERNEL_VERSION(3,19,2)
\
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(3,19,2)
\
|| LTTNG_KERNEL_RANGE(3,14,36, 3,15,0) \
|| LTTNG_KERNEL_RANGE(3,16,35, 3,17,0) \
|| LTTNG_KERNEL_RANGE(3,18,10, 3,19,0) \
|| LTTNG_KERNEL_RANGE(3,14,36, 3,15,0) \
|| LTTNG_KERNEL_RANGE(3,16,35, 3,17,0) \
|| LTTNG_KERNEL_RANGE(3,18,10, 3,19,0) \
@@
-254,7
+254,7
@@
LTTNG_TRACEPOINT_EVENT_MAP(mm_page_alloc_extfrag,
)
)
)
)
-#elif (L
INUX_VERSION_CODE >=
KERNEL_VERSION(3,12,30))
+#elif (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(3,12,30))
LTTNG_TRACEPOINT_EVENT_MAP(mm_page_alloc_extfrag,
LTTNG_TRACEPOINT_EVENT_MAP(mm_page_alloc_extfrag,
@@
-279,7
+279,7
@@
LTTNG_TRACEPOINT_EVENT_MAP(mm_page_alloc_extfrag,
)
)
)
)
-#elif (L
INUX_VERSION_CODE >=
KERNEL_VERSION(3,12,0))
+#elif (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(3,12,0))
LTTNG_TRACEPOINT_EVENT_MAP(mm_page_alloc_extfrag,
LTTNG_TRACEPOINT_EVENT_MAP(mm_page_alloc_extfrag,
@@
-306,7
+306,7
@@
LTTNG_TRACEPOINT_EVENT_MAP(mm_page_alloc_extfrag,
)
)
)
)
-#else /* #if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(3,12,0)) */
+#else /* #if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(3,12,0)) */
LTTNG_TRACEPOINT_EVENT_MAP(mm_page_alloc_extfrag,
LTTNG_TRACEPOINT_EVENT_MAP(mm_page_alloc_extfrag,
@@
-330,7
+330,7
@@
LTTNG_TRACEPOINT_EVENT_MAP(mm_page_alloc_extfrag,
)
)
)
)
-#endif /* #else #if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(3,12,0)) */
+#endif /* #else #if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(3,12,0)) */
#endif /* LTTNG_TRACE_KMEM_H */
#endif /* LTTNG_TRACE_KMEM_H */
diff --git
a/instrumentation/events/lttng-module/kvm.h
b/instrumentation/events/lttng-module/kvm.h
index 4868d894c22849d5a1d743cb6453edd35b936be1..814fb6139f24d9de58c916c09e7802eb4c96e68b 100644
(file)
--- a/
instrumentation/events/lttng-module/kvm.h
+++ b/
instrumentation/events/lttng-module/kvm.h
@@
-3,7
+3,7
@@
#define LTTNG_TRACE_KVM_MAIN_H
#include <probes/lttng-tracepoint-event.h>
#define LTTNG_TRACE_KVM_MAIN_H
#include <probes/lttng-tracepoint-event.h>
-#include <l
inux/
version.h>
+#include <l
ttng-kernel-
version.h>
#undef TRACE_SYSTEM
#define TRACE_SYSTEM kvm
#undef TRACE_SYSTEM
#define TRACE_SYSTEM kvm
@@
-18,7
+18,7
@@
LTTNG_TRACEPOINT_EVENT(kvm_userspace_exit,
)
)
)
)
-#if (L
INUX_VERSION_CODE <
KERNEL_VERSION(3,6,0))
+#if (L
TTNG_LINUX_VERSION_CODE < LTTNG_
KERNEL_VERSION(3,6,0))
#if defined(__KVM_HAVE_IOAPIC)
#undef __KVM_HAVE_IRQ_LINE
#define __KVM_HAVE_IRQ_LINE
#if defined(__KVM_HAVE_IOAPIC)
#undef __KVM_HAVE_IRQ_LINE
#define __KVM_HAVE_IRQ_LINE
@@
-98,7
+98,7
@@
LTTNG_TRACEPOINT_EVENT(kvm_mmio,
)
)
)
)
-#elif (L
INUX_VERSION_CODE >=
KERNEL_VERSION(4,15,0) \
+#elif (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(4,15,0) \
|| LTTNG_KERNEL_RANGE(4,14,14, 4,15,0) \
|| LTTNG_DEBIAN_KERNEL_RANGE(4,14,13,0,1,0, 4,15,0,0,0,0) \
|| LTTNG_KERNEL_RANGE(4,9,77, 4,10,0) \
|| LTTNG_KERNEL_RANGE(4,14,14, 4,15,0) \
|| LTTNG_DEBIAN_KERNEL_RANGE(4,14,13,0,1,0, 4,15,0,0,0,0) \
|| LTTNG_KERNEL_RANGE(4,9,77, 4,10,0) \
@@
-152,7
+152,7
@@
LTTNG_TRACEPOINT_EVENT(kvm_fpu,
)
)
)
)
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(3,18,0) \
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(3,18,0) \
|| LTTNG_RHEL_KERNEL_RANGE(3,10,0,327,0,0, 3,11,0,0,0,0))
LTTNG_TRACEPOINT_EVENT(kvm_age_page,
|| LTTNG_RHEL_KERNEL_RANGE(3,10,0,327,0,0, 3,11,0,0,0,0))
LTTNG_TRACEPOINT_EVENT(kvm_age_page,
@@
-236,7
+236,7
@@
LTTNG_TRACEPOINT_EVENT_INSTANCE(kvm_async_pf_nopresent_ready, kvm_async_pf_ready
TP_ARGS(token, gva)
)
TP_ARGS(token, gva)
)
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(3,13,0) \
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(3,13,0) \
|| LTTNG_RHEL_KERNEL_RANGE(3,10,0,229,0,0, 3,11,0,0,0,0))
LTTNG_TRACEPOINT_EVENT(
|| LTTNG_RHEL_KERNEL_RANGE(3,10,0,229,0,0, 3,11,0,0,0,0))
LTTNG_TRACEPOINT_EVENT(
@@
-250,7
+250,7
@@
LTTNG_TRACEPOINT_EVENT(
)
)
)
)
-#else /* #if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(3,13,0)) */
+#else /* #if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(3,13,0)) */
LTTNG_TRACEPOINT_EVENT(
kvm_async_pf_completed,
LTTNG_TRACEPOINT_EVENT(
kvm_async_pf_completed,
@@
-264,7
+264,7
@@
LTTNG_TRACEPOINT_EVENT(
)
)
)
)
-#endif /* #else #if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(3,13,0)) */
+#endif /* #else #if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(3,13,0)) */
#endif
#endif
diff --git
a/instrumentation/events/lttng-module/lttng-statedump.h
b/instrumentation/events/lttng-module/lttng-statedump.h
index 5ba7df20d49bd6b786bda24021ec97d9d3998018..ed43dfb3e051106765675eace7ac5a4430e4bafe 100644
(file)
--- a/
instrumentation/events/lttng-module/lttng-statedump.h
+++ b/
instrumentation/events/lttng-module/lttng-statedump.h
@@
-14,7
+14,7
@@
#include <linux/user_namespace.h>
#include <linux/utsname.h>
#include <linux/types.h>
#include <linux/user_namespace.h>
#include <linux/utsname.h>
#include <linux/types.h>
-#include <l
inux/
version.h>
+#include <l
ttng-kernel-
version.h>
#include <wrapper/namespace.h>
#include <wrapper/user_namespace.h>
#include <wrapper/namespace.h>
#include <wrapper/user_namespace.h>
@@
-65,7
+65,7
@@
LTTNG_TRACEPOINT_EVENT(lttng_statedump_process_state,
)
)
)
)
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(4,6,0))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(4,6,0))
LTTNG_TRACEPOINT_EVENT(lttng_statedump_process_cgroup_ns,
TP_PROTO(struct lttng_session *session,
struct task_struct *p,
LTTNG_TRACEPOINT_EVENT(lttng_statedump_process_cgroup_ns,
TP_PROTO(struct lttng_session *session,
struct task_struct *p,
@@
-85,7
+85,7
@@
LTTNG_TRACEPOINT_EVENT(lttng_statedump_process_ipc_ns,
TP_ARGS(session, p, ipc_ns),
TP_FIELDS(
ctf_integer(pid_t, tid, p->pid)
TP_ARGS(session, p, ipc_ns),
TP_FIELDS(
ctf_integer(pid_t, tid, p->pid)
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(3,8,0))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(3,8,0))
ctf_integer(unsigned int, ns_inum, ipc_ns ? ipc_ns->lttng_ns_inum : 0)
#endif
)
ctf_integer(unsigned int, ns_inum, ipc_ns ? ipc_ns->lttng_ns_inum : 0)
#endif
)
@@
-99,7
+99,7
@@
LTTNG_TRACEPOINT_EVENT(lttng_statedump_process_mnt_ns,
TP_ARGS(session, p, mnt_ns),
TP_FIELDS(
ctf_integer(pid_t, tid, p->pid)
TP_ARGS(session, p, mnt_ns),
TP_FIELDS(
ctf_integer(pid_t, tid, p->pid)
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(3,8,0))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(3,8,0))
ctf_integer(unsigned int, ns_inum, mnt_ns ? mnt_ns->lttng_ns_inum : 0)
#endif
)
ctf_integer(unsigned int, ns_inum, mnt_ns ? mnt_ns->lttng_ns_inum : 0)
#endif
)
@@
-113,7
+113,7
@@
LTTNG_TRACEPOINT_EVENT(lttng_statedump_process_net_ns,
TP_ARGS(session, p, net_ns),
TP_FIELDS(
ctf_integer(pid_t, tid, p->pid)
TP_ARGS(session, p, net_ns),
TP_FIELDS(
ctf_integer(pid_t, tid, p->pid)
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(3,8,0))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(3,8,0))
ctf_integer(unsigned int, ns_inum, net_ns ? net_ns->lttng_ns_inum : 0)
#endif
)
ctf_integer(unsigned int, ns_inum, net_ns ? net_ns->lttng_ns_inum : 0)
#endif
)
@@
-142,7
+142,7
@@
LTTNG_TRACEPOINT_EVENT(lttng_statedump_process_pid_ns,
ret;
}))
ctf_integer(int, ns_level, pid_ns ? pid_ns->level : 0)
ret;
}))
ctf_integer(int, ns_level, pid_ns ? pid_ns->level : 0)
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(3,8,0))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(3,8,0))
ctf_integer(unsigned int, ns_inum, pid_ns ? pid_ns->lttng_ns_inum : 0)
#endif
)
ctf_integer(unsigned int, ns_inum, pid_ns ? pid_ns->lttng_ns_inum : 0)
#endif
)
@@
-157,10
+157,10
@@
LTTNG_TRACEPOINT_EVENT(lttng_statedump_process_user_ns,
ctf_integer(pid_t, tid, p->pid)
ctf_integer(uid_t, vuid, user_ns ? lttng_task_vuid(p, user_ns) : 0)
ctf_integer(gid_t, vgid, user_ns ? lttng_task_vgid(p, user_ns) : 0)
ctf_integer(pid_t, tid, p->pid)
ctf_integer(uid_t, vuid, user_ns ? lttng_task_vuid(p, user_ns) : 0)
ctf_integer(gid_t, vgid, user_ns ? lttng_task_vgid(p, user_ns) : 0)
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(3,11,0))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(3,11,0))
ctf_integer(int, ns_level, user_ns ? user_ns->level : 0)
#endif
ctf_integer(int, ns_level, user_ns ? user_ns->level : 0)
#endif
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(3,8,0))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(3,8,0))
ctf_integer(unsigned int, ns_inum, user_ns ? user_ns->lttng_ns_inum : 0)
#endif
)
ctf_integer(unsigned int, ns_inum, user_ns ? user_ns->lttng_ns_inum : 0)
#endif
)
@@
-173,7
+173,7
@@
LTTNG_TRACEPOINT_EVENT(lttng_statedump_process_uts_ns,
TP_ARGS(session, p, uts_ns),
TP_FIELDS(
ctf_integer(pid_t, tid, p->pid)
TP_ARGS(session, p, uts_ns),
TP_FIELDS(
ctf_integer(pid_t, tid, p->pid)
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(3,8,0))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(3,8,0))
ctf_integer(unsigned int, ns_inum, uts_ns ? uts_ns->lttng_ns_inum : 0)
#endif
)
ctf_integer(unsigned int, ns_inum, uts_ns ? uts_ns->lttng_ns_inum : 0)
#endif
)
diff --git
a/instrumentation/events/lttng-module/lttng-test.h
b/instrumentation/events/lttng-module/lttng-test.h
index 9f0cffbf0c1b308e375b8e19eb036ca207ebe1e5..df32b65b27c845aeae8e5c9405e6764e3bbccdaf 100644
(file)
--- a/
instrumentation/events/lttng-module/lttng-test.h
+++ b/
instrumentation/events/lttng-module/lttng-test.h
@@
-7,7
+7,7
@@
#include <probes/lttng-tracepoint-event.h>
#include <linux/types.h>
#include <probes/lttng-tracepoint-event.h>
#include <linux/types.h>
-#include <l
inux/
version.h>
+#include <l
ttng-kernel-
version.h>
LTTNG_TRACEPOINT_ENUM(
lttng_test_filter_event_enum,
LTTNG_TRACEPOINT_ENUM(
lttng_test_filter_event_enum,
diff --git
a/instrumentation/events/lttng-module/mm_vmscan.h
b/instrumentation/events/lttng-module/mm_vmscan.h
index 9f8a27829bec0e826eb7055ce51dd8bb2999fe35..dd845590f97322b8a374df308e508cac8cd00171 100644
(file)
--- a/
instrumentation/events/lttng-module/mm_vmscan.h
+++ b/
instrumentation/events/lttng-module/mm_vmscan.h
@@
-9,7
+9,7
@@
#include <linux/types.h>
#include <linux/mm.h>
#include <linux/memcontrol.h>
#include <linux/types.h>
#include <linux/mm.h>
#include <linux/memcontrol.h>
-#include <l
inux/
version.h>
+#include <l
ttng-kernel-
version.h>
#ifndef _TRACE_VMSCAN_DEF
#define _TRACE_VMSCAN_DEF
#ifndef _TRACE_VMSCAN_DEF
#define _TRACE_VMSCAN_DEF
@@
-19,14
+19,14
@@
#define RECLAIM_WB_SYNC 0x0004u /* Unused, all reclaim async */
#define RECLAIM_WB_ASYNC 0x0008u
#define RECLAIM_WB_SYNC 0x0004u /* Unused, all reclaim async */
#define RECLAIM_WB_ASYNC 0x0008u
-#if ((L
INUX_VERSION_CODE <=
KERNEL_VERSION(3,0,38)) || \
+#if ((L
TTNG_LINUX_VERSION_CODE <= LTTNG_
KERNEL_VERSION(3,0,38)) || \
LTTNG_KERNEL_RANGE(3,1,0, 3,2,0))
typedef int isolate_mode_t;
#endif
#endif
LTTNG_KERNEL_RANGE(3,1,0, 3,2,0))
typedef int isolate_mode_t;
#endif
#endif
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(5,2,0))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(5,2,0))
#include <linux/mm_inline.h>
#include <linux/mm_inline.h>
@@
-35,7
+35,7
@@
typedef int isolate_mode_t;
(RECLAIM_WB_ASYNC) \
)
(RECLAIM_WB_ASYNC) \
)
-#elif (L
INUX_VERSION_CODE >=
KERNEL_VERSION(4,5,0))
+#elif (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(4,5,0))
#include <linux/mm_inline.h>
#include <linux/mm_inline.h>
@@
-63,7
+63,7
@@
LTTNG_TRACEPOINT_EVENT(mm_vmscan_kswapd_sleep,
)
)
)
)
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(4,8,0))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(4,8,0))
LTTNG_TRACEPOINT_EVENT(mm_vmscan_kswapd_wake,
LTTNG_TRACEPOINT_EVENT(mm_vmscan_kswapd_wake,
@@
-94,7
+94,7
@@
LTTNG_TRACEPOINT_EVENT(mm_vmscan_kswapd_wake,
#endif
#endif
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(4,17,0))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(4,17,0))
LTTNG_TRACEPOINT_EVENT(mm_vmscan_wakeup_kswapd,
TP_PROTO(int nid, int zid, int order, gfp_t gfp_flags),
LTTNG_TRACEPOINT_EVENT(mm_vmscan_wakeup_kswapd,
TP_PROTO(int nid, int zid, int order, gfp_t gfp_flags),
@@
-123,7
+123,7
@@
LTTNG_TRACEPOINT_EVENT(mm_vmscan_wakeup_kswapd,
)
#endif
)
#endif
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(5,2,0))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(5,2,0))
LTTNG_TRACEPOINT_EVENT_CLASS(mm_vmscan_direct_reclaim_begin_template,
LTTNG_TRACEPOINT_EVENT_CLASS(mm_vmscan_direct_reclaim_begin_template,
@@
-158,7
+158,7
@@
LTTNG_TRACEPOINT_EVENT_INSTANCE(mm_vmscan_direct_reclaim_begin_template, mm_vmsc
TP_ARGS(order, gfp_flags)
)
TP_ARGS(order, gfp_flags)
)
-#elif (L
INUX_VERSION_CODE >=
KERNEL_VERSION(4,8,0))
+#elif (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(4,8,0))
LTTNG_TRACEPOINT_EVENT_CLASS(mm_vmscan_direct_reclaim_begin_template,
LTTNG_TRACEPOINT_EVENT_CLASS(mm_vmscan_direct_reclaim_begin_template,
@@
-265,7
+265,7
@@
LTTNG_TRACEPOINT_EVENT_INSTANCE(mm_vmscan_direct_reclaim_end_template, mm_vmscan
TP_ARGS(nr_reclaimed)
)
TP_ARGS(nr_reclaimed)
)
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(4,16,0))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(4,16,0))
LTTNG_TRACEPOINT_EVENT_MAP(mm_shrink_slab_start,
mm_vmscan_shrink_slab_start,
LTTNG_TRACEPOINT_EVENT_MAP(mm_shrink_slab_start,
mm_vmscan_shrink_slab_start,
@@
-290,7
+290,7
@@
LTTNG_TRACEPOINT_EVENT_MAP(mm_shrink_slab_start,
ctf_integer(int, priority, priority)
)
)
ctf_integer(int, priority, priority)
)
)
-#elif (L
INUX_VERSION_CODE >=
KERNEL_VERSION(3,1,0))
+#elif (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(3,1,0))
LTTNG_TRACEPOINT_EVENT_MAP(mm_shrink_slab_start,
mm_vmscan_shrink_slab_start,
LTTNG_TRACEPOINT_EVENT_MAP(mm_shrink_slab_start,
mm_vmscan_shrink_slab_start,
@@
-305,11
+305,11
@@
LTTNG_TRACEPOINT_EVENT_MAP(mm_shrink_slab_start,
TP_FIELDS(
ctf_integer_hex(struct shrinker *, shr, shr)
TP_FIELDS(
ctf_integer_hex(struct shrinker *, shr, shr)
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(3,12,0))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(3,12,0))
ctf_integer_hex(void *, shrink, shr->scan_objects)
ctf_integer_hex(void *, shrink, shr->scan_objects)
-#else /* #if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(3,12,0)) */
+#else /* #if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(3,12,0)) */
ctf_integer_hex(void *, shrink, shr->shrink)
ctf_integer_hex(void *, shrink, shr->shrink)
-#endif /* #else #if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(3,12,0)) */
+#endif /* #else #if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(3,12,0)) */
ctf_integer(long, nr_objects_to_shrink, nr_objects_to_shrink)
ctf_integer(gfp_t, gfp_flags, sc->gfp_mask)
ctf_integer(unsigned long, pgs_scanned, pgs_scanned)
ctf_integer(long, nr_objects_to_shrink, nr_objects_to_shrink)
ctf_integer(gfp_t, gfp_flags, sc->gfp_mask)
ctf_integer(unsigned long, pgs_scanned, pgs_scanned)
@@
-321,7
+321,7
@@
LTTNG_TRACEPOINT_EVENT_MAP(mm_shrink_slab_start,
)
#endif
)
#endif
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(3,16,0))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(3,16,0))
LTTNG_TRACEPOINT_EVENT_MAP(mm_shrink_slab_end,
mm_vmscan_shrink_slab_end,
LTTNG_TRACEPOINT_EVENT_MAP(mm_shrink_slab_end,
mm_vmscan_shrink_slab_end,
@@
-342,7
+342,7
@@
LTTNG_TRACEPOINT_EVENT_MAP(mm_shrink_slab_end,
ctf_integer(long, total_scan, total_scan)
)
)
ctf_integer(long, total_scan, total_scan)
)
)
-#elif (L
INUX_VERSION_CODE >=
KERNEL_VERSION(3,1,0))
+#elif (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(3,1,0))
LTTNG_TRACEPOINT_EVENT_MAP(mm_shrink_slab_end,
mm_vmscan_shrink_slab_end,
LTTNG_TRACEPOINT_EVENT_MAP(mm_shrink_slab_end,
mm_vmscan_shrink_slab_end,
@@
-354,11
+354,11
@@
LTTNG_TRACEPOINT_EVENT_MAP(mm_shrink_slab_end,
TP_FIELDS(
ctf_integer_hex(struct shrinker *, shr, shr)
TP_FIELDS(
ctf_integer_hex(struct shrinker *, shr, shr)
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(3,12,0))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(3,12,0))
ctf_integer_hex(void *, shrink, shr->scan_objects)
ctf_integer_hex(void *, shrink, shr->scan_objects)
-#else /* #if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(3,12,0)) */
+#else /* #if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(3,12,0)) */
ctf_integer_hex(void *, shrink, shr->shrink)
ctf_integer_hex(void *, shrink, shr->shrink)
-#endif /* #else #if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(3,12,0)) */
+#endif /* #else #if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(3,12,0)) */
ctf_integer(long, unused_scan, unused_scan_cnt)
ctf_integer(long, new_scan, new_scan_cnt)
ctf_integer(int, retval, shrinker_retval)
ctf_integer(long, unused_scan, unused_scan_cnt)
ctf_integer(long, new_scan, new_scan_cnt)
ctf_integer(int, retval, shrinker_retval)
@@
-367,7
+367,7
@@
LTTNG_TRACEPOINT_EVENT_MAP(mm_shrink_slab_end,
)
#endif
)
#endif
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(4,11,0))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(4,11,0))
LTTNG_TRACEPOINT_EVENT(mm_vmscan_lru_isolate,
TP_PROTO(int classzone_idx,
LTTNG_TRACEPOINT_EVENT(mm_vmscan_lru_isolate,
TP_PROTO(int classzone_idx,
@@
-395,7
+395,7
@@
LTTNG_TRACEPOINT_EVENT(mm_vmscan_lru_isolate,
ctf_integer(int, lru, lru)
)
)
ctf_integer(int, lru, lru)
)
)
-#elif (L
INUX_VERSION_CODE >=
KERNEL_VERSION(4,8,0))
+#elif (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(4,8,0))
LTTNG_TRACEPOINT_EVENT_CLASS(mm_vmscan_lru_isolate_template,
TP_PROTO(int classzone_idx,
LTTNG_TRACEPOINT_EVENT_CLASS(mm_vmscan_lru_isolate_template,
TP_PROTO(int classzone_idx,
@@
-462,12
+462,12
@@
LTTNG_TRACEPOINT_EVENT_CLASS(mm_vmscan_lru_isolate_template,
unsigned long nr_requested,
unsigned long nr_scanned,
unsigned long nr_taken,
unsigned long nr_requested,
unsigned long nr_scanned,
unsigned long nr_taken,
-#if (L
INUX_VERSION_CODE <
KERNEL_VERSION(3,5,0))
+#if (L
TTNG_LINUX_VERSION_CODE < LTTNG_
KERNEL_VERSION(3,5,0))
unsigned long nr_lumpy_taken,
unsigned long nr_lumpy_dirty,
unsigned long nr_lumpy_failed,
#endif
unsigned long nr_lumpy_taken,
unsigned long nr_lumpy_dirty,
unsigned long nr_lumpy_failed,
#endif
-#if (L
INUX_VERSION_CODE <
KERNEL_VERSION(3,3,0))
+#if (L
TTNG_LINUX_VERSION_CODE < LTTNG_
KERNEL_VERSION(3,3,0))
isolate_mode_t isolate_mode
#else
isolate_mode_t isolate_mode,
isolate_mode_t isolate_mode
#else
isolate_mode_t isolate_mode,
@@
-476,10
+476,10
@@
LTTNG_TRACEPOINT_EVENT_CLASS(mm_vmscan_lru_isolate_template,
),
TP_ARGS(order, nr_requested, nr_scanned, nr_taken,
),
TP_ARGS(order, nr_requested, nr_scanned, nr_taken,
-#if (L
INUX_VERSION_CODE <
KERNEL_VERSION(3,5,0))
+#if (L
TTNG_LINUX_VERSION_CODE < LTTNG_
KERNEL_VERSION(3,5,0))
nr_lumpy_taken, nr_lumpy_dirty, nr_lumpy_failed,
#endif
nr_lumpy_taken, nr_lumpy_dirty, nr_lumpy_failed,
#endif
-#if (L
INUX_VERSION_CODE <
KERNEL_VERSION(3,3,0))
+#if (L
TTNG_LINUX_VERSION_CODE < LTTNG_
KERNEL_VERSION(3,3,0))
isolate_mode
#else
isolate_mode, file
isolate_mode
#else
isolate_mode, file
@@
-492,13
+492,13
@@
LTTNG_TRACEPOINT_EVENT_CLASS(mm_vmscan_lru_isolate_template,
ctf_integer(unsigned long, nr_requested, nr_requested)
ctf_integer(unsigned long, nr_scanned, nr_scanned)
ctf_integer(unsigned long, nr_taken, nr_taken)
ctf_integer(unsigned long, nr_requested, nr_requested)
ctf_integer(unsigned long, nr_scanned, nr_scanned)
ctf_integer(unsigned long, nr_taken, nr_taken)
-#if (L
INUX_VERSION_CODE <
KERNEL_VERSION(3,5,0))
+#if (L
TTNG_LINUX_VERSION_CODE < LTTNG_
KERNEL_VERSION(3,5,0))
ctf_integer(unsigned long, nr_lumpy_taken, nr_lumpy_taken)
ctf_integer(unsigned long, nr_lumpy_dirty, nr_lumpy_dirty)
ctf_integer(unsigned long, nr_lumpy_failed, nr_lumpy_failed)
#endif
ctf_integer(isolate_mode_t, isolate_mode, isolate_mode)
ctf_integer(unsigned long, nr_lumpy_taken, nr_lumpy_taken)
ctf_integer(unsigned long, nr_lumpy_dirty, nr_lumpy_dirty)
ctf_integer(unsigned long, nr_lumpy_failed, nr_lumpy_failed)
#endif
ctf_integer(isolate_mode_t, isolate_mode, isolate_mode)
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(3,3,0))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(3,3,0))
ctf_integer(int, file, file)
#endif
)
ctf_integer(int, file, file)
#endif
)
@@
-510,12
+510,12
@@
LTTNG_TRACEPOINT_EVENT_INSTANCE(mm_vmscan_lru_isolate_template, mm_vmscan_lru_is
unsigned long nr_requested,
unsigned long nr_scanned,
unsigned long nr_taken,
unsigned long nr_requested,
unsigned long nr_scanned,
unsigned long nr_taken,
-#if (L
INUX_VERSION_CODE <
KERNEL_VERSION(3,5,0))
+#if (L
TTNG_LINUX_VERSION_CODE < LTTNG_
KERNEL_VERSION(3,5,0))
unsigned long nr_lumpy_taken,
unsigned long nr_lumpy_dirty,
unsigned long nr_lumpy_failed,
#endif
unsigned long nr_lumpy_taken,
unsigned long nr_lumpy_dirty,
unsigned long nr_lumpy_failed,
#endif
-#if (L
INUX_VERSION_CODE <
KERNEL_VERSION(3,3,0))
+#if (L
TTNG_LINUX_VERSION_CODE < LTTNG_
KERNEL_VERSION(3,3,0))
isolate_mode_t isolate_mode
#else
isolate_mode_t isolate_mode,
isolate_mode_t isolate_mode
#else
isolate_mode_t isolate_mode,
@@
-524,10
+524,10
@@
LTTNG_TRACEPOINT_EVENT_INSTANCE(mm_vmscan_lru_isolate_template, mm_vmscan_lru_is
),
TP_ARGS(order, nr_requested, nr_scanned, nr_taken,
),
TP_ARGS(order, nr_requested, nr_scanned, nr_taken,
-#if (L
INUX_VERSION_CODE <
KERNEL_VERSION(3,5,0))
+#if (L
TTNG_LINUX_VERSION_CODE < LTTNG_
KERNEL_VERSION(3,5,0))
nr_lumpy_taken, nr_lumpy_dirty, nr_lumpy_failed,
#endif
nr_lumpy_taken, nr_lumpy_dirty, nr_lumpy_failed,
#endif
-#if (L
INUX_VERSION_CODE <
KERNEL_VERSION(3,3,0))
+#if (L
TTNG_LINUX_VERSION_CODE < LTTNG_
KERNEL_VERSION(3,3,0))
isolate_mode
#else
isolate_mode, file
isolate_mode
#else
isolate_mode, file
@@
-542,12
+542,12
@@
LTTNG_TRACEPOINT_EVENT_INSTANCE(mm_vmscan_lru_isolate_template, mm_vmscan_memcg_
unsigned long nr_requested,
unsigned long nr_scanned,
unsigned long nr_taken,
unsigned long nr_requested,
unsigned long nr_scanned,
unsigned long nr_taken,
-#if (L
INUX_VERSION_CODE <
KERNEL_VERSION(3,5,0))
+#if (L
TTNG_LINUX_VERSION_CODE < LTTNG_
KERNEL_VERSION(3,5,0))
unsigned long nr_lumpy_taken,
unsigned long nr_lumpy_dirty,
unsigned long nr_lumpy_failed,
#endif
unsigned long nr_lumpy_taken,
unsigned long nr_lumpy_dirty,
unsigned long nr_lumpy_failed,
#endif
-#if (L
INUX_VERSION_CODE <
KERNEL_VERSION(3,3,0))
+#if (L
TTNG_LINUX_VERSION_CODE < LTTNG_
KERNEL_VERSION(3,3,0))
isolate_mode_t isolate_mode
#else
isolate_mode_t isolate_mode,
isolate_mode_t isolate_mode
#else
isolate_mode_t isolate_mode,
@@
-556,10
+556,10
@@
LTTNG_TRACEPOINT_EVENT_INSTANCE(mm_vmscan_lru_isolate_template, mm_vmscan_memcg_
),
TP_ARGS(order, nr_requested, nr_scanned, nr_taken,
),
TP_ARGS(order, nr_requested, nr_scanned, nr_taken,
-#if (L
INUX_VERSION_CODE <
KERNEL_VERSION(3,5,0))
+#if (L
TTNG_LINUX_VERSION_CODE < LTTNG_
KERNEL_VERSION(3,5,0))
nr_lumpy_taken, nr_lumpy_dirty, nr_lumpy_failed,
#endif
nr_lumpy_taken, nr_lumpy_dirty, nr_lumpy_failed,
#endif
-#if (L
INUX_VERSION_CODE <
KERNEL_VERSION(3,3,0))
+#if (L
TTNG_LINUX_VERSION_CODE < LTTNG_
KERNEL_VERSION(3,3,0))
isolate_mode
#else
isolate_mode, file
isolate_mode
#else
isolate_mode, file
@@
-568,7
+568,7
@@
LTTNG_TRACEPOINT_EVENT_INSTANCE(mm_vmscan_lru_isolate_template, mm_vmscan_memcg_
)
#endif
)
#endif
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(5,7,0))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(5,7,0))
LTTNG_TRACEPOINT_EVENT(mm_vmscan_writepage,
TP_PROTO(struct page *page),
LTTNG_TRACEPOINT_EVENT(mm_vmscan_writepage,
TP_PROTO(struct page *page),
@@
-581,7
+581,7
@@
LTTNG_TRACEPOINT_EVENT(mm_vmscan_writepage,
page_is_file_lru(page)))
)
)
page_is_file_lru(page)))
)
)
-#elif (L
INUX_VERSION_CODE >=
KERNEL_VERSION(5,2,0))
+#elif (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(5,2,0))
LTTNG_TRACEPOINT_EVENT(mm_vmscan_writepage,
TP_PROTO(struct page *page),
LTTNG_TRACEPOINT_EVENT(mm_vmscan_writepage,
TP_PROTO(struct page *page),
@@
-594,7
+594,7
@@
LTTNG_TRACEPOINT_EVENT(mm_vmscan_writepage,
page_is_file_cache(page)))
)
)
page_is_file_cache(page)))
)
)
-#elif (L
INUX_VERSION_CODE >=
KERNEL_VERSION(4,5,0))
+#elif (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(4,5,0))
LTTNG_TRACEPOINT_EVENT(mm_vmscan_writepage,
TP_PROTO(struct page *page),
LTTNG_TRACEPOINT_EVENT(mm_vmscan_writepage,
TP_PROTO(struct page *page),
@@
-621,7
+621,7
@@
LTTNG_TRACEPOINT_EVENT(mm_vmscan_writepage,
)
#endif
)
#endif
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(5,2,0))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(5,2,0))
LTTNG_TRACEPOINT_EVENT(mm_vmscan_lru_shrink_inactive,
TP_PROTO(int nid,
LTTNG_TRACEPOINT_EVENT(mm_vmscan_lru_shrink_inactive,
TP_PROTO(int nid,
@@
-646,7
+646,7
@@
LTTNG_TRACEPOINT_EVENT(mm_vmscan_lru_shrink_inactive,
ctf_integer(int, reclaim_flags, trace_reclaim_flags(file))
)
)
ctf_integer(int, reclaim_flags, trace_reclaim_flags(file))
)
)
-#elif (L
INUX_VERSION_CODE >=
KERNEL_VERSION(4,17,0))
+#elif (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(4,17,0))
LTTNG_TRACEPOINT_EVENT(mm_vmscan_lru_shrink_inactive,
TP_PROTO(int nid,
LTTNG_TRACEPOINT_EVENT(mm_vmscan_lru_shrink_inactive,
TP_PROTO(int nid,
@@
-670,7
+670,7
@@
LTTNG_TRACEPOINT_EVENT(mm_vmscan_lru_shrink_inactive,
ctf_integer(int, reclaim_flags, trace_shrink_flags(file))
)
)
ctf_integer(int, reclaim_flags, trace_shrink_flags(file))
)
)
-#elif (L
INUX_VERSION_CODE >=
KERNEL_VERSION(4,11,0))
+#elif (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(4,11,0))
LTTNG_TRACEPOINT_EVENT(mm_vmscan_lru_shrink_inactive,
TP_PROTO(int nid,
LTTNG_TRACEPOINT_EVENT(mm_vmscan_lru_shrink_inactive,
TP_PROTO(int nid,
@@
-700,7
+700,7
@@
LTTNG_TRACEPOINT_EVENT(mm_vmscan_lru_shrink_inactive,
ctf_integer(int, reclaim_flags, trace_shrink_flags(file))
)
)
ctf_integer(int, reclaim_flags, trace_shrink_flags(file))
)
)
-#elif (L
INUX_VERSION_CODE >=
KERNEL_VERSION(4,8,0))
+#elif (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(4,8,0))
LTTNG_TRACEPOINT_EVENT(mm_vmscan_lru_shrink_inactive,
TP_PROTO(int nid,
LTTNG_TRACEPOINT_EVENT(mm_vmscan_lru_shrink_inactive,
TP_PROTO(int nid,
@@
-717,7
+717,7
@@
LTTNG_TRACEPOINT_EVENT(mm_vmscan_lru_shrink_inactive,
ctf_integer(int, reclaim_flags, trace_shrink_flags(file))
)
)
ctf_integer(int, reclaim_flags, trace_shrink_flags(file))
)
)
-#elif (L
INUX_VERSION_CODE >=
KERNEL_VERSION(4,5,0))
+#elif (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(4,5,0))
LTTNG_TRACEPOINT_EVENT(mm_vmscan_lru_shrink_inactive,
TP_PROTO(struct zone *zone,
LTTNG_TRACEPOINT_EVENT(mm_vmscan_lru_shrink_inactive,
TP_PROTO(struct zone *zone,
@@
-755,7
+755,7
@@
LTTNG_TRACEPOINT_EVENT(mm_vmscan_lru_shrink_inactive,
)
#endif
)
#endif
-#if (L
INUX_VERSION_CODE <
KERNEL_VERSION(3,5,0))
+#if (L
TTNG_LINUX_VERSION_CODE < LTTNG_
KERNEL_VERSION(3,5,0))
LTTNG_TRACEPOINT_EVENT_MAP(replace_swap_token,
mm_vmscan_replace_swap_token,
LTTNG_TRACEPOINT_EVENT_MAP(replace_swap_token,
mm_vmscan_replace_swap_token,
diff --git
a/instrumentation/events/lttng-module/module.h
b/instrumentation/events/lttng-module/module.h
index 89b1e7980d7d0a928d4753303d26eb6381328003..d4c8a39d23164069bab748aee469d6cb1b97dc80 100644
(file)
--- a/
instrumentation/events/lttng-module/module.h
+++ b/
instrumentation/events/lttng-module/module.h
@@
-16,7
+16,7
@@
#define LTTNG_TRACE_MODULE_H
#include <probes/lttng-tracepoint-event.h>
#define LTTNG_TRACE_MODULE_H
#include <probes/lttng-tracepoint-event.h>
-#include <l
inux/
version.h>
+#include <l
ttng-kernel-
version.h>
#ifdef CONFIG_MODULES
#ifdef CONFIG_MODULES
@@
-60,7
+60,7
@@
LTTNG_TRACEPOINT_EVENT_CLASS(module_refcnt,
TP_FIELDS(
ctf_integer(unsigned long, ip, ip)
TP_FIELDS(
ctf_integer(unsigned long, ip, ip)
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(3,19,0))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(3,19,0))
ctf_integer(int, refcnt, atomic_read(&mod->refcnt))
#else
ctf_integer(int, refcnt, __this_cpu_read(mod->refptr->incs) + __this_cpu_read(mod->refptr->decs))
ctf_integer(int, refcnt, atomic_read(&mod->refcnt))
#else
ctf_integer(int, refcnt, __this_cpu_read(mod->refptr->incs) + __this_cpu_read(mod->refptr->decs))
diff --git
a/instrumentation/events/lttng-module/napi.h
b/instrumentation/events/lttng-module/napi.h
index 57fd6ee279e3c524eae4797c85dcf48a986ca420..168163669403cd7840888a79d6c3f95ef5146655 100644
(file)
--- a/
instrumentation/events/lttng-module/napi.h
+++ b/
instrumentation/events/lttng-module/napi.h
@@
-11,7
+11,7
@@
#define NO_DEV "(no_device)"
#define NO_DEV "(no_device)"
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(4,8,0))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(4,8,0))
LTTNG_TRACEPOINT_EVENT(napi_poll,
LTTNG_TRACEPOINT_EVENT(napi_poll,
diff --git
a/instrumentation/events/lttng-module/net.h
b/instrumentation/events/lttng-module/net.h
index 7dd68957be97f793c31cd88f5616421c722bd80c..c66a6dba3fe9310bd6c929aac9224cc073b1b267 100644
(file)
--- a/
instrumentation/events/lttng-module/net.h
+++ b/
instrumentation/events/lttng-module/net.h
@@
-11,7
+11,7
@@
#include <linux/ip.h>
#include <linux/ipv6.h>
#include <linux/tcp.h>
#include <linux/ip.h>
#include <linux/ipv6.h>
#include <linux/tcp.h>
-#include <l
inux/
version.h>
+#include <l
ttng-kernel-
version.h>
#include <lttng-endian.h>
#include <net/sock.h>
#include <lttng-endian.h>
#include <net/sock.h>
@@
-554,7
+554,7
@@
LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP(net_dev_template,
TP_ARGS(skb)
)
TP_ARGS(skb)
)
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(3,14,0))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(3,14,0))
/* Trace events for the receive entry points */
LTTNG_TRACEPOINT_EVENT_CLASS(net_dev_receive_entry_template,
/* Trace events for the receive entry points */
LTTNG_TRACEPOINT_EVENT_CLASS(net_dev_receive_entry_template,
@@
-625,7
+625,7
@@
LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP(net_dev_receive_entry_template,
#endif /* kernel > 3.14 */
#endif /* kernel > 3.14 */
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(4,19,0))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(4,19,0))
LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP(net_dev_receive_entry_template,
LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP(net_dev_receive_entry_template,
@@
-640,7
+640,7
@@
LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP(net_dev_receive_entry_template,
#endif /* kernel > 4.19 */
#endif /* kernel > 4.19 */
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(5,0,0))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(5,0,0))
/* Trace events for the receive exit points */
LTTNG_TRACEPOINT_EVENT_CLASS(net_dev_receive_exit_template,
/* Trace events for the receive exit points */
LTTNG_TRACEPOINT_EVENT_CLASS(net_dev_receive_exit_template,
diff --git
a/instrumentation/events/lttng-module/power.h
b/instrumentation/events/lttng-module/power.h
index fee6f5f8bb4eb583956c7f0ce9fe72d681fadd7f..1172fd7365f7e1d99b93ea003126614a88d57de4 100644
(file)
--- a/
instrumentation/events/lttng-module/power.h
+++ b/
instrumentation/events/lttng-module/power.h
@@
-7,7
+7,7
@@
#include <probes/lttng-tracepoint-event.h>
#include <linux/ktime.h>
#include <probes/lttng-tracepoint-event.h>
#include <linux/ktime.h>
-#include <l
inux/
version.h>
+#include <l
ttng-kernel-
version.h>
LTTNG_TRACEPOINT_EVENT_CLASS(power_cpu,
LTTNG_TRACEPOINT_EVENT_CLASS(power_cpu,
@@
-59,7
+59,7
@@
LTTNG_TRACEPOINT_EVENT_MAP(machine_suspend,
)
)
)
)
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(3,5,0))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(3,5,0))
LTTNG_TRACEPOINT_EVENT_CLASS(power_wakeup_source,
TP_PROTO(const char *name, unsigned int state),
LTTNG_TRACEPOINT_EVENT_CLASS(power_wakeup_source,
TP_PROTO(const char *name, unsigned int state),
@@
-160,7
+160,7
@@
enum {
events get removed */
static inline void trace_power_start(u64 type, u64 state, u64 cpuid) {};
static inline void trace_power_end(u64 cpuid) {};
events get removed */
static inline void trace_power_start(u64 type, u64 state, u64 cpuid) {};
static inline void trace_power_end(u64 cpuid) {};
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(3,4,0))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(3,4,0))
static inline void trace_power_start_rcuidle(u64 type, u64 state, u64 cpuid) {};
static inline void trace_power_end_rcuidle(u64 cpuid) {};
#endif
static inline void trace_power_start_rcuidle(u64 type, u64 state, u64 cpuid) {};
static inline void trace_power_end_rcuidle(u64 cpuid) {};
#endif
diff --git
a/instrumentation/events/lttng-module/preemptirq.h
b/instrumentation/events/lttng-module/preemptirq.h
index 2fc81177cc3de8f7e941ba8ade021e132998c73e..db681e4d88869e77dcb6fa2773da325906db6c52 100644
(file)
--- a/
instrumentation/events/lttng-module/preemptirq.h
+++ b/
instrumentation/events/lttng-module/preemptirq.h
@@
-35,7
+35,7
@@
LTTNG_TRACEPOINT_EVENT_CLASS(preemptirq_template,
*/
#if defined(CONFIG_TRACE_IRQFLAGS)
#define LTTNG_TRACE_IRQ
*/
#if defined(CONFIG_TRACE_IRQFLAGS)
#define LTTNG_TRACE_IRQ
-#elif (L
INUX_VERSION_CODE <
KERNEL_VERSION(4,19,0) && \
+#elif (L
TTNG_LINUX_VERSION_CODE < LTTNG_
KERNEL_VERSION(4,19,0) && \
!defined(CONFIG_PROVE_LOCKING))
#define LTTNG_TRACE_IRQ
#endif
!defined(CONFIG_PROVE_LOCKING))
#define LTTNG_TRACE_IRQ
#endif
@@
-67,7
+67,7
@@
LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP(preemptirq_template, irq_enable,
*/
#if defined(CONFIG_TRACE_PREEMPT_TOGGLE)
#define LTTNG_TRACE_PREEMPT
*/
#if defined(CONFIG_TRACE_PREEMPT_TOGGLE)
#define LTTNG_TRACE_PREEMPT
-#elif (L
INUX_VERSION_CODE <
KERNEL_VERSION(4,19,0) && \
+#elif (L
TTNG_LINUX_VERSION_CODE < LTTNG_
KERNEL_VERSION(4,19,0) && \
defined(CONFIG_DEBUG_PREEMPT))
#define LTTNG_TRACE_PREEMPT
#endif
defined(CONFIG_DEBUG_PREEMPT))
#define LTTNG_TRACE_PREEMPT
#endif
diff --git
a/instrumentation/events/lttng-module/printk.h
b/instrumentation/events/lttng-module/printk.h
index 1d5ea365a01cf5e4637e1c080fded2027aa990d6..b01ac59b22dcaf8a32b9a65020041f8ec6b2b0cd 100644
(file)
--- a/
instrumentation/events/lttng-module/printk.h
+++ b/
instrumentation/events/lttng-module/printk.h
@@
-6,9
+6,9
@@
#define LTTNG_TRACE_PRINTK_H
#include <probes/lttng-tracepoint-event.h>
#define LTTNG_TRACE_PRINTK_H
#include <probes/lttng-tracepoint-event.h>
-#include <l
inux/
version.h>
+#include <l
ttng-kernel-
version.h>
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(3,10,0))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(3,10,0))
LTTNG_TRACEPOINT_EVENT_MAP(console,
LTTNG_TRACEPOINT_EVENT_MAP(console,
@@
-23,7
+23,7
@@
LTTNG_TRACEPOINT_EVENT_MAP(console,
)
)
)
)
-#elif (L
INUX_VERSION_CODE >=
KERNEL_VERSION(3,5,0))
+#elif (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(3,5,0))
LTTNG_TRACEPOINT_EVENT_MAP(console,
LTTNG_TRACEPOINT_EVENT_MAP(console,
@@
-40,7
+40,7
@@
LTTNG_TRACEPOINT_EVENT_MAP(console,
)
)
)
)
-#else /* (L
INUX_VERSION_CODE <
KERNEL_VERSION(3,5,0)) */
+#else /* (L
TTNG_LINUX_VERSION_CODE < LTTNG_
KERNEL_VERSION(3,5,0)) */
LTTNG_TRACEPOINT_EVENT_MAP(console,
LTTNG_TRACEPOINT_EVENT_MAP(console,
diff --git
a/instrumentation/events/lttng-module/random.h
b/instrumentation/events/lttng-module/random.h
index 80b227968e611e058840d8c191971fd9918ff0ea..12e2865bb2d1c5a74a777feb937d034d4b333a87 100644
(file)
--- a/
instrumentation/events/lttng-module/random.h
+++ b/
instrumentation/events/lttng-module/random.h
@@
-38,7
+38,7
@@
LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP(random__mix_pool_bytes, mix_pool_bytes_noloc
TP_ARGS(pool_name, bytes, IP)
)
TP_ARGS(pool_name, bytes, IP)
)
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(5,2,0))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(5,2,0))
LTTNG_TRACEPOINT_EVENT_MAP(credit_entropy_bits,
random_credit_entropy_bits,
LTTNG_TRACEPOINT_EVENT_MAP(credit_entropy_bits,
random_credit_entropy_bits,
diff --git
a/instrumentation/events/lttng-module/rcu.h
b/instrumentation/events/lttng-module/rcu.h
index 24bd51da82d6bae02c0984872f2f927ccc7e8633..d2dbedfa85322c625a6d379e4be6dd785a01d415 100644
(file)
--- a/
instrumentation/events/lttng-module/rcu.h
+++ b/
instrumentation/events/lttng-module/rcu.h
@@
-6,7
+6,7
@@
#define LTTNG_TRACE_RCU_H
#include <probes/lttng-tracepoint-event.h>
#define LTTNG_TRACE_RCU_H
#include <probes/lttng-tracepoint-event.h>
-#include <l
inux/
version.h>
+#include <l
ttng-kernel-
version.h>
/*
* Tracepoint for start/end markers used for utilization calculations.
/*
* Tracepoint for start/end markers used for utilization calculations.
@@
-21,11
+21,11
@@
*/
LTTNG_TRACEPOINT_EVENT(rcu_utilization,
*/
LTTNG_TRACEPOINT_EVENT(rcu_utilization,
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(3,12,0))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(3,12,0))
TP_PROTO(const char *s),
TP_PROTO(const char *s),
-#else /* #if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(3,12,0)) */
+#else /* #if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(3,12,0)) */
TP_PROTO(char *s),
TP_PROTO(char *s),
-#endif /* #else #if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(3,12,0)) */
+#endif /* #else #if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(3,12,0)) */
TP_ARGS(s),
TP_ARGS(s),
@@
-37,7
+37,7
@@
LTTNG_TRACEPOINT_EVENT(rcu_utilization,
#ifdef CONFIG_RCU_TRACE
#if defined(CONFIG_TREE_RCU) \
#ifdef CONFIG_RCU_TRACE
#if defined(CONFIG_TREE_RCU) \
- || (L
INUX_VERSION_CODE >=
KERNEL_VERSION(3,19,0) \
+ || (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(3,19,0) \
&& defined(CONFIG_PREEMPT_RCU)) \
|| defined(CONFIG_TREE_PREEMPT_RCU)
&& defined(CONFIG_PREEMPT_RCU)) \
|| defined(CONFIG_TREE_PREEMPT_RCU)
@@
-50,7
+50,7
@@
LTTNG_TRACEPOINT_EVENT(rcu_utilization,
* and "cpuofl", respectively), and a CPU being kicked for being too
* long in dyntick-idle mode ("kick").
*/
* and "cpuofl", respectively), and a CPU being kicked for being too
* long in dyntick-idle mode ("kick").
*/
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(4,19,0) || \
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(4,19,0) || \
LTTNG_RHEL_KERNEL_RANGE(4,18,0,80,0,0, 4,19,0,0,0,0))
LTTNG_TRACEPOINT_EVENT(rcu_grace_period,
LTTNG_RHEL_KERNEL_RANGE(4,18,0,80,0,0, 4,19,0,0,0,0))
LTTNG_TRACEPOINT_EVENT(rcu_grace_period,
@@
-64,7
+64,7
@@
LTTNG_TRACEPOINT_EVENT(rcu_grace_period,
ctf_string(gpevent, gpevent)
)
)
ctf_string(gpevent, gpevent)
)
)
-#elif (L
INUX_VERSION_CODE >=
KERNEL_VERSION(3,12,0))
+#elif (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(3,12,0))
LTTNG_TRACEPOINT_EVENT(rcu_grace_period,
TP_PROTO(const char *rcuname, unsigned long gpnum, const char *gpevent),
LTTNG_TRACEPOINT_EVENT(rcu_grace_period,
TP_PROTO(const char *rcuname, unsigned long gpnum, const char *gpevent),
@@
-99,7
+99,7
@@
LTTNG_TRACEPOINT_EVENT(rcu_grace_period,
* rcu_node structure, and the mask of CPUs that will be waited for.
* All but the type of RCU are extracted from the rcu_node structure.
*/
* rcu_node structure, and the mask of CPUs that will be waited for.
* All but the type of RCU are extracted from the rcu_node structure.
*/
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(4,19,0) || \
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(4,19,0) || \
LTTNG_RHEL_KERNEL_RANGE(4,18,0,80,0,0, 4,19,0,0,0,0))
LTTNG_TRACEPOINT_EVENT(rcu_grace_period_init,
LTTNG_RHEL_KERNEL_RANGE(4,18,0,80,0,0, 4,19,0,0,0,0))
LTTNG_TRACEPOINT_EVENT(rcu_grace_period_init,
@@
-117,7
+117,7
@@
LTTNG_TRACEPOINT_EVENT(rcu_grace_period_init,
ctf_integer(unsigned long, qsmask, qsmask)
)
)
ctf_integer(unsigned long, qsmask, qsmask)
)
)
-#elif (L
INUX_VERSION_CODE >=
KERNEL_VERSION(3,12,0))
+#elif (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(3,12,0))
LTTNG_TRACEPOINT_EVENT(rcu_grace_period_init,
TP_PROTO(const char *rcuname, unsigned long gpnum, u8 level,
LTTNG_TRACEPOINT_EVENT(rcu_grace_period_init,
TP_PROTO(const char *rcuname, unsigned long gpnum, u8 level,
@@
-159,7
+159,7
@@
LTTNG_TRACEPOINT_EVENT(rcu_grace_period_init,
* include SRCU), the grace-period number that the task is blocking
* (the current or the next), and the task's PID.
*/
* include SRCU), the grace-period number that the task is blocking
* (the current or the next), and the task's PID.
*/
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(4,19,0) || \
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(4,19,0) || \
LTTNG_RHEL_KERNEL_RANGE(4,18,0,80,0,0, 4,19,0,0,0,0))
LTTNG_TRACEPOINT_EVENT(rcu_preempt_task,
LTTNG_RHEL_KERNEL_RANGE(4,18,0,80,0,0, 4,19,0,0,0,0))
LTTNG_TRACEPOINT_EVENT(rcu_preempt_task,
@@
-173,7
+173,7
@@
LTTNG_TRACEPOINT_EVENT(rcu_preempt_task,
ctf_integer(int, pid, pid)
)
)
ctf_integer(int, pid, pid)
)
)
-#elif (L
INUX_VERSION_CODE >=
KERNEL_VERSION(3,12,0))
+#elif (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(3,12,0))
LTTNG_TRACEPOINT_EVENT(rcu_preempt_task,
TP_PROTO(const char *rcuname, int pid, unsigned long gpnum),
LTTNG_TRACEPOINT_EVENT(rcu_preempt_task,
TP_PROTO(const char *rcuname, int pid, unsigned long gpnum),
@@
-206,7
+206,7
@@
LTTNG_TRACEPOINT_EVENT(rcu_preempt_task,
* read-side critical section exiting that critical section. Track the
* type of RCU (which one day might include SRCU) and the task's PID.
*/
* read-side critical section exiting that critical section. Track the
* type of RCU (which one day might include SRCU) and the task's PID.
*/
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(4,19,0) || \
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(4,19,0) || \
LTTNG_RHEL_KERNEL_RANGE(4,18,0,80,0,0, 4,19,0,0,0,0))
LTTNG_TRACEPOINT_EVENT(rcu_unlock_preempted_task,
LTTNG_RHEL_KERNEL_RANGE(4,18,0,80,0,0, 4,19,0,0,0,0))
LTTNG_TRACEPOINT_EVENT(rcu_unlock_preempted_task,
@@
-220,7
+220,7
@@
LTTNG_TRACEPOINT_EVENT(rcu_unlock_preempted_task,
ctf_integer(int, pid, pid)
)
)
ctf_integer(int, pid, pid)
)
)
-#elif (L
INUX_VERSION_CODE >=
KERNEL_VERSION(3,12,0))
+#elif (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(3,12,0))
LTTNG_TRACEPOINT_EVENT(rcu_unlock_preempted_task,
TP_PROTO(const char *rcuname, unsigned long gpnum, int pid),
LTTNG_TRACEPOINT_EVENT(rcu_unlock_preempted_task,
TP_PROTO(const char *rcuname, unsigned long gpnum, int pid),
@@
-256,7
+256,7
@@
LTTNG_TRACEPOINT_EVENT(rcu_unlock_preempted_task,
* whether there are any blocked tasks blocking the current grace period.
* All but the type of RCU are extracted from the rcu_node structure.
*/
* whether there are any blocked tasks blocking the current grace period.
* All but the type of RCU are extracted from the rcu_node structure.
*/
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(4,19,0) || \
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(4,19,0) || \
LTTNG_RHEL_KERNEL_RANGE(4,18,0,80,0,0, 4,19,0,0,0,0))
LTTNG_TRACEPOINT_EVENT(rcu_quiescent_state_report,
LTTNG_RHEL_KERNEL_RANGE(4,18,0,80,0,0, 4,19,0,0,0,0))
LTTNG_TRACEPOINT_EVENT(rcu_quiescent_state_report,
@@
-277,7
+277,7
@@
LTTNG_TRACEPOINT_EVENT(rcu_quiescent_state_report,
ctf_integer(u8, gp_tasks, gp_tasks)
)
)
ctf_integer(u8, gp_tasks, gp_tasks)
)
)
-#elif (L
INUX_VERSION_CODE >=
KERNEL_VERSION(3,12,0))
+#elif (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(3,12,0))
LTTNG_TRACEPOINT_EVENT(rcu_quiescent_state_report,
TP_PROTO(const char *rcuname, unsigned long gpnum,
LTTNG_TRACEPOINT_EVENT(rcu_quiescent_state_report,
TP_PROTO(const char *rcuname, unsigned long gpnum,
@@
-327,7
+327,7
@@
LTTNG_TRACEPOINT_EVENT(rcu_quiescent_state_report,
* or "kick" when kicking a CPU that has been in dyntick-idle mode for
* too long.
*/
* or "kick" when kicking a CPU that has been in dyntick-idle mode for
* too long.
*/
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(4,19,0) || \
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(4,19,0) || \
LTTNG_RHEL_KERNEL_RANGE(4,18,0,80,0,0, 4,19,0,0,0,0))
LTTNG_TRACEPOINT_EVENT(rcu_fqs,
LTTNG_RHEL_KERNEL_RANGE(4,18,0,80,0,0, 4,19,0,0,0,0))
LTTNG_TRACEPOINT_EVENT(rcu_fqs,
@@
-342,7
+342,7
@@
LTTNG_TRACEPOINT_EVENT(rcu_fqs,
ctf_string(qsevent, qsevent)
)
)
ctf_string(qsevent, qsevent)
)
)
-#elif (L
INUX_VERSION_CODE >=
KERNEL_VERSION(3,12,0))
+#elif (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(3,12,0))
LTTNG_TRACEPOINT_EVENT(rcu_fqs,
TP_PROTO(const char *rcuname, unsigned long gpnum, int cpu, const char *qsevent),
LTTNG_TRACEPOINT_EVENT(rcu_fqs,
TP_PROTO(const char *rcuname, unsigned long gpnum, int cpu, const char *qsevent),
@@
-374,7
+374,7
@@
LTTNG_TRACEPOINT_EVENT(rcu_fqs,
#endif /*
* #if defined(CONFIG_TREE_RCU)
#endif /*
* #if defined(CONFIG_TREE_RCU)
- * || (L
INUX_VERSION_CODE >=
KERNEL_VERSION(3,19,0)
+ * || (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(3,19,0)
* && defined(CONFIG_PREEMPT_RCU))
* || defined(CONFIG_TREE_PREEMPT_RCU)
*/
* && defined(CONFIG_PREEMPT_RCU))
* || defined(CONFIG_TREE_PREEMPT_RCU)
*/
@@
-392,7
+392,7
@@
LTTNG_TRACEPOINT_EVENT(rcu_fqs,
* events use the upper bits of each number, while interrupt-related
* events use the lower bits.
*/
* events use the upper bits of each number, while interrupt-related
* events use the lower bits.
*/
-#if (L
INUX_VERSION_CODE >= KERNEL_VERSION(5,6,0))
\
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,6,0))
\
|| LTTNG_KERNEL_RANGE(5,5,6, 5,6,0) \
|| LTTNG_KERNEL_RANGE(5,4,22, 5,5,0) \
|| LTTNG_UBUNTU_KERNEL_RANGE(5,0,21,46, 5,1,0,0)
|| LTTNG_KERNEL_RANGE(5,5,6, 5,6,0) \
|| LTTNG_KERNEL_RANGE(5,4,22, 5,5,0) \
|| LTTNG_UBUNTU_KERNEL_RANGE(5,0,21,46, 5,1,0,0)
@@
-410,7
+410,7
@@
LTTNG_TRACEPOINT_EVENT(rcu_dyntick,
)
)
)
)
-#elif (L
INUX_VERSION_CODE >=
KERNEL_VERSION(4,16,0))
+#elif (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(4,16,0))
LTTNG_TRACEPOINT_EVENT(rcu_dyntick,
TP_PROTO(const char *polarity, long oldnesting, long newnesting, atomic_t dynticks),
LTTNG_TRACEPOINT_EVENT(rcu_dyntick,
TP_PROTO(const char *polarity, long oldnesting, long newnesting, atomic_t dynticks),
@@
-425,7
+425,7
@@
LTTNG_TRACEPOINT_EVENT(rcu_dyntick,
)
)
)
)
-#elif (L
INUX_VERSION_CODE >=
KERNEL_VERSION(3,12,0))
+#elif (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(3,12,0))
LTTNG_TRACEPOINT_EVENT(rcu_dyntick,
TP_PROTO(const char *polarity, long long oldnesting, long long newnesting),
LTTNG_TRACEPOINT_EVENT(rcu_dyntick,
TP_PROTO(const char *polarity, long long oldnesting, long long newnesting),
@@
-438,7
+438,7
@@
LTTNG_TRACEPOINT_EVENT(rcu_dyntick,
ctf_integer(long long, newnesting, newnesting)
)
)
ctf_integer(long long, newnesting, newnesting)
)
)
-#elif (L
INUX_VERSION_CODE >=
KERNEL_VERSION(3,3,0))
+#elif (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(3,3,0))
LTTNG_TRACEPOINT_EVENT(rcu_dyntick,
TP_PROTO(char *polarity, long long oldnesting, long long newnesting),
LTTNG_TRACEPOINT_EVENT(rcu_dyntick,
TP_PROTO(char *polarity, long long oldnesting, long long newnesting),
@@
-465,7
+465,7
@@
LTTNG_TRACEPOINT_EVENT(rcu_dyntick,
#endif
#endif
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(3,3,0))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(3,3,0))
/*
* Tracepoint for RCU preparation for idle, the goal being to get RCU
* processing done so that the current CPU can shut off its scheduling
/*
* Tracepoint for RCU preparation for idle, the goal being to get RCU
* processing done so that the current CPU can shut off its scheduling
@@
-490,11
+490,11
@@
LTTNG_TRACEPOINT_EVENT(rcu_dyntick,
*/
LTTNG_TRACEPOINT_EVENT(rcu_prep_idle,
*/
LTTNG_TRACEPOINT_EVENT(rcu_prep_idle,
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(3,12,0))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(3,12,0))
TP_PROTO(const char *reason),
TP_PROTO(const char *reason),
-#else /* #if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(3,12,0)) */
+#else /* #if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(3,12,0)) */
TP_PROTO(char *reason),
TP_PROTO(char *reason),
-#endif /* #else #if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(3,12,0)) */
+#endif /* #else #if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(3,12,0)) */
TP_ARGS(reason),
TP_ARGS(reason),
@@
-511,7
+511,7
@@
LTTNG_TRACEPOINT_EVENT(rcu_prep_idle,
* number of lazy callbacks queued, and the fourth element is the
* total number of callbacks queued.
*/
* number of lazy callbacks queued, and the fourth element is the
* total number of callbacks queued.
*/
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(5,6,0))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(5,6,0))
LTTNG_TRACEPOINT_EVENT(rcu_callback,
TP_PROTO(const char *rcuname, struct rcu_head *rhp, long qlen),
LTTNG_TRACEPOINT_EVENT(rcu_callback,
TP_PROTO(const char *rcuname, struct rcu_head *rhp, long qlen),
@@
-525,7
+525,7
@@
LTTNG_TRACEPOINT_EVENT(rcu_callback,
ctf_integer(long, qlen, qlen)
)
)
ctf_integer(long, qlen, qlen)
)
)
-#elif (L
INUX_VERSION_CODE >=
KERNEL_VERSION(3,12,0))
+#elif (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(3,12,0))
LTTNG_TRACEPOINT_EVENT(rcu_callback,
TP_PROTO(const char *rcuname, struct rcu_head *rhp, long qlen_lazy,
LTTNG_TRACEPOINT_EVENT(rcu_callback,
TP_PROTO(const char *rcuname, struct rcu_head *rhp, long qlen_lazy,
@@
-541,7
+541,7
@@
LTTNG_TRACEPOINT_EVENT(rcu_callback,
ctf_integer(long, qlen, qlen)
)
)
ctf_integer(long, qlen, qlen)
)
)
-#elif (L
INUX_VERSION_CODE >=
KERNEL_VERSION(3,4,0))
+#elif (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(3,4,0))
LTTNG_TRACEPOINT_EVENT(rcu_callback,
TP_PROTO(char *rcuname, struct rcu_head *rhp, long qlen_lazy,
LTTNG_TRACEPOINT_EVENT(rcu_callback,
TP_PROTO(char *rcuname, struct rcu_head *rhp, long qlen_lazy,
@@
-582,7
+582,7
@@
LTTNG_TRACEPOINT_EVENT(rcu_callback,
* the fourth argument is the number of lazy callbacks queued, and the
* fifth argument is the total number of callbacks queued.
*/
* the fourth argument is the number of lazy callbacks queued, and the
* fifth argument is the total number of callbacks queued.
*/
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(5,6,0))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(5,6,0))
LTTNG_TRACEPOINT_EVENT(rcu_kfree_callback,
TP_PROTO(const char *rcuname, struct rcu_head *rhp, unsigned long offset,
LTTNG_TRACEPOINT_EVENT(rcu_kfree_callback,
TP_PROTO(const char *rcuname, struct rcu_head *rhp, unsigned long offset,
@@
-597,7
+597,7
@@
LTTNG_TRACEPOINT_EVENT(rcu_kfree_callback,
ctf_integer(long, qlen, qlen)
)
)
ctf_integer(long, qlen, qlen)
)
)
-#elif (L
INUX_VERSION_CODE >=
KERNEL_VERSION(3,12,0))
+#elif (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(3,12,0))
LTTNG_TRACEPOINT_EVENT(rcu_kfree_callback,
TP_PROTO(const char *rcuname, struct rcu_head *rhp, unsigned long offset,
LTTNG_TRACEPOINT_EVENT(rcu_kfree_callback,
TP_PROTO(const char *rcuname, struct rcu_head *rhp, unsigned long offset,
@@
-613,7
+613,7
@@
LTTNG_TRACEPOINT_EVENT(rcu_kfree_callback,
ctf_integer(long, qlen, qlen)
)
)
ctf_integer(long, qlen, qlen)
)
)
-#elif (L
INUX_VERSION_CODE >=
KERNEL_VERSION(3,4,0))
+#elif (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(3,4,0))
LTTNG_TRACEPOINT_EVENT(rcu_kfree_callback,
TP_PROTO(char *rcuname, struct rcu_head *rhp, unsigned long offset,
LTTNG_TRACEPOINT_EVENT(rcu_kfree_callback,
TP_PROTO(char *rcuname, struct rcu_head *rhp, unsigned long offset,
@@
-653,7
+653,7
@@
LTTNG_TRACEPOINT_EVENT(rcu_kfree_callback,
* the total number of callbacks queued, and the fourth argument is
* the current RCU-callback batch limit.
*/
* the total number of callbacks queued, and the fourth argument is
* the current RCU-callback batch limit.
*/
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(5,6,0))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(5,6,0))
LTTNG_TRACEPOINT_EVENT(rcu_batch_start,
TP_PROTO(const char *rcuname, long qlen, long blimit),
LTTNG_TRACEPOINT_EVENT(rcu_batch_start,
TP_PROTO(const char *rcuname, long qlen, long blimit),
@@
-666,7
+666,7
@@
LTTNG_TRACEPOINT_EVENT(rcu_batch_start,
ctf_integer(long, blimit, blimit)
)
)
ctf_integer(long, blimit, blimit)
)
)
-#elif (L
INUX_VERSION_CODE >=
KERNEL_VERSION(3,12,0))
+#elif (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(3,12,0))
LTTNG_TRACEPOINT_EVENT(rcu_batch_start,
TP_PROTO(const char *rcuname, long qlen_lazy, long qlen, long blimit),
LTTNG_TRACEPOINT_EVENT(rcu_batch_start,
TP_PROTO(const char *rcuname, long qlen_lazy, long qlen, long blimit),
@@
-680,7
+680,7
@@
LTTNG_TRACEPOINT_EVENT(rcu_batch_start,
ctf_integer(long, blimit, blimit)
)
)
ctf_integer(long, blimit, blimit)
)
)
-#elif (L
INUX_VERSION_CODE >=
KERNEL_VERSION(3,9,0))
+#elif (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(3,9,0))
LTTNG_TRACEPOINT_EVENT(rcu_batch_start,
TP_PROTO(char *rcuname, long qlen_lazy, long qlen, long blimit),
LTTNG_TRACEPOINT_EVENT(rcu_batch_start,
TP_PROTO(char *rcuname, long qlen_lazy, long qlen, long blimit),
@@
-694,7
+694,7
@@
LTTNG_TRACEPOINT_EVENT(rcu_batch_start,
ctf_integer(long, blimit, blimit)
)
)
ctf_integer(long, blimit, blimit)
)
)
-#elif (L
INUX_VERSION_CODE >=
KERNEL_VERSION(3,4,0))
+#elif (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(3,4,0))
LTTNG_TRACEPOINT_EVENT(rcu_batch_start,
TP_PROTO(char *rcuname, long qlen_lazy, long qlen, int blimit),
LTTNG_TRACEPOINT_EVENT(rcu_batch_start,
TP_PROTO(char *rcuname, long qlen_lazy, long qlen, int blimit),
@@
-730,11
+730,11
@@
LTTNG_TRACEPOINT_EVENT(rcu_batch_start,
*/
LTTNG_TRACEPOINT_EVENT(rcu_invoke_callback,
*/
LTTNG_TRACEPOINT_EVENT(rcu_invoke_callback,
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(3,12,0))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(3,12,0))
TP_PROTO(const char *rcuname, struct rcu_head *rhp),
TP_PROTO(const char *rcuname, struct rcu_head *rhp),
-#else /* #if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(3,12,0)) */
+#else /* #if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(3,12,0)) */
TP_PROTO(char *rcuname, struct rcu_head *rhp),
TP_PROTO(char *rcuname, struct rcu_head *rhp),
-#endif /* #else #if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(3,12,0)) */
+#endif /* #else #if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(3,12,0)) */
TP_ARGS(rcuname, rhp),
TP_ARGS(rcuname, rhp),
@@
-754,11
+754,11
@@
LTTNG_TRACEPOINT_EVENT(rcu_invoke_callback,
*/
LTTNG_TRACEPOINT_EVENT(rcu_invoke_kfree_callback,
*/
LTTNG_TRACEPOINT_EVENT(rcu_invoke_kfree_callback,
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(3,12,0))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(3,12,0))
TP_PROTO(const char *rcuname, struct rcu_head *rhp, unsigned long offset),
TP_PROTO(const char *rcuname, struct rcu_head *rhp, unsigned long offset),
-#else /* #if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(3,12,0)) */
+#else /* #if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(3,12,0)) */
TP_PROTO(char *rcuname, struct rcu_head *rhp, unsigned long offset),
TP_PROTO(char *rcuname, struct rcu_head *rhp, unsigned long offset),
-#endif /* #else #if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(3,12,0)) */
+#endif /* #else #if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(3,12,0)) */
TP_ARGS(rcuname, rhp, offset),
TP_ARGS(rcuname, rhp, offset),
@@
-782,17
+782,17
@@
LTTNG_TRACEPOINT_EVENT(rcu_invoke_kfree_callback,
*/
LTTNG_TRACEPOINT_EVENT(rcu_batch_end,
*/
LTTNG_TRACEPOINT_EVENT(rcu_batch_end,
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(3,13,0))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(3,13,0))
TP_PROTO(const char *rcuname, int callbacks_invoked,
char cb, char nr, char iit, char risk),
TP_ARGS(rcuname, callbacks_invoked, cb, nr, iit, risk),
TP_PROTO(const char *rcuname, int callbacks_invoked,
char cb, char nr, char iit, char risk),
TP_ARGS(rcuname, callbacks_invoked, cb, nr, iit, risk),
-#elif (L
INUX_VERSION_CODE >=
KERNEL_VERSION(3,12,0))
+#elif (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(3,12,0))
TP_PROTO(const char *rcuname, int callbacks_invoked,
bool cb, bool nr, bool iit, bool risk),
TP_ARGS(rcuname, callbacks_invoked, cb, nr, iit, risk),
TP_PROTO(const char *rcuname, int callbacks_invoked,
bool cb, bool nr, bool iit, bool risk),
TP_ARGS(rcuname, callbacks_invoked, cb, nr, iit, risk),
-#elif (L
INUX_VERSION_CODE >=
KERNEL_VERSION(3,3,0))
+#elif (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(3,3,0))
TP_PROTO(char *rcuname, int callbacks_invoked,
bool cb, bool nr, bool iit, bool risk),
TP_PROTO(char *rcuname, int callbacks_invoked,
bool cb, bool nr, bool iit, bool risk),
@@
-806,12
+806,12
@@
LTTNG_TRACEPOINT_EVENT(rcu_batch_end,
TP_FIELDS(
ctf_string(rcuname, rcuname)
ctf_integer(int, callbacks_invoked, callbacks_invoked)
TP_FIELDS(
ctf_string(rcuname, rcuname)
ctf_integer(int, callbacks_invoked, callbacks_invoked)
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(3,13,0))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(3,13,0))
ctf_integer(char, cb, cb)
ctf_integer(char, nr, nr)
ctf_integer(char, iit, iit)
ctf_integer(char, risk, risk)
ctf_integer(char, cb, cb)
ctf_integer(char, nr, nr)
ctf_integer(char, iit, iit)
ctf_integer(char, risk, risk)
-#elif (L
INUX_VERSION_CODE >=
KERNEL_VERSION(3,3,0))
+#elif (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(3,3,0))
ctf_integer(bool, cb, cb)
ctf_integer(bool, nr, nr)
ctf_integer(bool, iit, iit)
ctf_integer(bool, cb, cb)
ctf_integer(bool, nr, nr)
ctf_integer(bool, iit, iit)
@@
-820,7
+820,7
@@
LTTNG_TRACEPOINT_EVENT(rcu_batch_end,
)
)
)
)
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(3,3,0))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(3,3,0))
/*
* Tracepoint for rcutorture readers. The first argument is the name
* of the RCU flavor from rcutorture's viewpoint and the second argument
/*
* Tracepoint for rcutorture readers. The first argument is the name
* of the RCU flavor from rcutorture's viewpoint and the second argument
@@
-828,12
+828,12
@@
LTTNG_TRACEPOINT_EVENT(rcu_batch_end,
*/
LTTNG_TRACEPOINT_EVENT(rcu_torture_read,
*/
LTTNG_TRACEPOINT_EVENT(rcu_torture_read,
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(3,12,0))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(3,12,0))
TP_PROTO(const char *rcutorturename, struct rcu_head *rhp,
unsigned long secs, unsigned long c_old, unsigned long c),
TP_ARGS(rcutorturename, rhp, secs, c_old, c),
TP_PROTO(const char *rcutorturename, struct rcu_head *rhp,
unsigned long secs, unsigned long c_old, unsigned long c),
TP_ARGS(rcutorturename, rhp, secs, c_old, c),
-#elif (L
INUX_VERSION_CODE >=
KERNEL_VERSION(3,9,0))
+#elif (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(3,9,0))
TP_PROTO(char *rcutorturename, struct rcu_head *rhp,
unsigned long secs, unsigned long c_old, unsigned long c),
TP_PROTO(char *rcutorturename, struct rcu_head *rhp,
unsigned long secs, unsigned long c_old, unsigned long c),
@@
-847,7
+847,7
@@
LTTNG_TRACEPOINT_EVENT(rcu_torture_read,
TP_FIELDS(
ctf_string(rcutorturename, rcutorturename)
ctf_integer_hex(struct rcu_head *, rhp, rhp)
TP_FIELDS(
ctf_string(rcutorturename, rcutorturename)
ctf_integer_hex(struct rcu_head *, rhp, rhp)
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(3,9,0))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(3,9,0))
ctf_integer(unsigned long, secs, secs)
ctf_integer(unsigned long, c_old, c_old)
ctf_integer(unsigned long, c, c)
ctf_integer(unsigned long, secs, secs)
ctf_integer(unsigned long, c_old, c_old)
ctf_integer(unsigned long, c, c)
@@
-856,7
+856,7
@@
LTTNG_TRACEPOINT_EVENT(rcu_torture_read,
)
#endif
)
#endif
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(3,6,0))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(3,6,0))
/*
* Tracepoint for _rcu_barrier() execution. The string "s" describes
* the _rcu_barrier phase:
/*
* Tracepoint for _rcu_barrier() execution. The string "s" describes
* the _rcu_barrier phase:
@@
-876,11
+876,11
@@
LTTNG_TRACEPOINT_EVENT(rcu_torture_read,
*/
LTTNG_TRACEPOINT_EVENT(rcu_barrier,
*/
LTTNG_TRACEPOINT_EVENT(rcu_barrier,
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(3,12,0))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(3,12,0))
TP_PROTO(const char *rcuname, const char *s, int cpu, int cnt, unsigned long done),
TP_PROTO(const char *rcuname, const char *s, int cpu, int cnt, unsigned long done),
-#else /* #if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(3,12,0)) */
+#else /* #if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(3,12,0)) */
TP_PROTO(char *rcuname, char *s, int cpu, int cnt, unsigned long done),
TP_PROTO(char *rcuname, char *s, int cpu, int cnt, unsigned long done),
-#endif /* #else #if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(3,12,0)) */
+#endif /* #else #if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(3,12,0)) */
TP_ARGS(rcuname, s, cpu, cnt, done),
TP_ARGS(rcuname, s, cpu, cnt, done),
@@
-896,7
+896,7
@@
LTTNG_TRACEPOINT_EVENT(rcu_barrier,
#else /* #ifdef CONFIG_RCU_TRACE */
#else /* #ifdef CONFIG_RCU_TRACE */
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(4,19,0) || \
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(4,19,0) || \
LTTNG_RHEL_KERNEL_RANGE(4,18,0,80,0,0, 4,19,0,0,0,0))
#define trace_rcu_grace_period(rcuname, gp_seq, gpevent) do { } while (0)
#define trace_rcu_grace_period_init(rcuname, gp_seq, level, grplo, grphi, \
LTTNG_RHEL_KERNEL_RANGE(4,18,0,80,0,0, 4,19,0,0,0,0))
#define trace_rcu_grace_period(rcuname, gp_seq, gpevent) do { } while (0)
#define trace_rcu_grace_period_init(rcuname, gp_seq, level, grplo, grphi, \
@@
-919,17
+919,17
@@
LTTNG_TRACEPOINT_EVENT(rcu_barrier,
#define trace_rcu_fqs(rcuname, gpnum, cpu, qsevent) do { } while (0)
#endif
#define trace_rcu_fqs(rcuname, gpnum, cpu, qsevent) do { } while (0)
#endif
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(4,16,0))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(4,16,0))
#define trace_rcu_dyntick(polarity, oldnesting, newnesting, dyntick) do { } while (0)
#define trace_rcu_dyntick(polarity, oldnesting, newnesting, dyntick) do { } while (0)
-#elif (L
INUX_VERSION_CODE >=
KERNEL_VERSION(3,3,0))
+#elif (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(3,3,0))
#define trace_rcu_dyntick(polarity, oldnesting, newnesting) do { } while (0)
#else
#define trace_rcu_dyntick(polarity) do { } while (0)
#endif
#define trace_rcu_dyntick(polarity, oldnesting, newnesting) do { } while (0)
#else
#define trace_rcu_dyntick(polarity) do { } while (0)
#endif
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(3,3,0))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(3,3,0))
#define trace_rcu_prep_idle(reason) do { } while (0)
#endif
#define trace_rcu_prep_idle(reason) do { } while (0)
#endif
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(3,4,0))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(3,4,0))
#define trace_rcu_callback(rcuname, rhp, qlen_lazy, qlen) do { } while (0)
#define trace_rcu_kfree_callback(rcuname, rhp, offset, qlen_lazy, qlen) \
do { } while (0)
#define trace_rcu_callback(rcuname, rhp, qlen_lazy, qlen) do { } while (0)
#define trace_rcu_kfree_callback(rcuname, rhp, offset, qlen_lazy, qlen) \
do { } while (0)
@@
-942,19
+942,19
@@
LTTNG_TRACEPOINT_EVENT(rcu_barrier,
#endif
#define trace_rcu_invoke_callback(rcuname, rhp) do { } while (0)
#define trace_rcu_invoke_kfree_callback(rcuname, rhp, offset) do { } while (0)
#endif
#define trace_rcu_invoke_callback(rcuname, rhp) do { } while (0)
#define trace_rcu_invoke_kfree_callback(rcuname, rhp, offset) do { } while (0)
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(3,3,0))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(3,3,0))
#define trace_rcu_batch_end(rcuname, callbacks_invoked, cb, nr, iit, risk) \
do { } while (0)
#else
#define trace_rcu_batch_end(rcuname, callbacks_invoked) do { } while (0)
#endif
#define trace_rcu_batch_end(rcuname, callbacks_invoked, cb, nr, iit, risk) \
do { } while (0)
#else
#define trace_rcu_batch_end(rcuname, callbacks_invoked) do { } while (0)
#endif
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(3,9,0))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(3,9,0))
#define trace_rcu_torture_read(rcutorturename, rhp, secs, c_old, c) \
do { } while (0)
#define trace_rcu_torture_read(rcutorturename, rhp, secs, c_old, c) \
do { } while (0)
-#elif (L
INUX_VERSION_CODE >=
KERNEL_VERSION(3,3,0))
+#elif (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(3,3,0))
#define trace_rcu_torture_read(rcutorturename, rhp) do { } while (0)
#endif
#define trace_rcu_torture_read(rcutorturename, rhp) do { } while (0)
#endif
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(3,6,0))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(3,6,0))
#define trace_rcu_barrier(name, s, cpu, cnt, done) do { } while (0)
#endif
#endif /* #else #ifdef CONFIG_RCU_TRACE */
#define trace_rcu_barrier(name, s, cpu, cnt, done) do { } while (0)
#endif
#endif /* #else #ifdef CONFIG_RCU_TRACE */
diff --git
a/instrumentation/events/lttng-module/regmap.h
b/instrumentation/events/lttng-module/regmap.h
index badfd32b29a309671233b9b8a339df1aeee2360c..f02d3af49969c8d7da94bc3e77877b34f132bcc9 100644
(file)
--- a/
instrumentation/events/lttng-module/regmap.h
+++ b/
instrumentation/events/lttng-module/regmap.h
@@
-7,7
+7,7
@@
#include <probes/lttng-tracepoint-event.h>
#include <linux/ktime.h>
#include <probes/lttng-tracepoint-event.h>
#include <linux/ktime.h>
-#include <l
inux/
version.h>
+#include <l
ttng-kernel-
version.h>
#ifndef _TRACE_REGMAP_DEF_
#define _TRACE_REGMAP_DEF_
#ifndef _TRACE_REGMAP_DEF_
#define _TRACE_REGMAP_DEF_
diff --git
a/instrumentation/events/lttng-module/rpc.h
b/instrumentation/events/lttng-module/rpc.h
index ceaf9dbf4089f6b00c1ebf3ace7b5eedd374330f..12cdb4ac8e43bdb42f3b986ab524fd1bfaaf29c4 100644
(file)
--- a/
instrumentation/events/lttng-module/rpc.h
+++ b/
instrumentation/events/lttng-module/rpc.h
@@
-12,7
+12,7
@@
#ifndef ONCE_LTTNG_RPC_H
#define ONCE_LTTNG_RPC_H
#ifndef ONCE_LTTNG_RPC_H
#define ONCE_LTTNG_RPC_H
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(3,12,0))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(3,12,0))
static inline
int lttng_get_clid(const struct rpc_task *task)
{
static inline
int lttng_get_clid(const struct rpc_task *task)
{
@@
-28,11
+28,11
@@
int lttng_get_clid(const struct rpc_task *task)
*/
return (int) tk_client->cl_clid;
}
*/
return (int) tk_client->cl_clid;
}
-#endif /* #if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(3,12,0)) */
+#endif /* #if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(3,12,0)) */
#endif /* ONCE_LTTNG_RPC_H */
#endif /* ONCE_LTTNG_RPC_H */
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(5,0,0))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(5,0,0))
LTTNG_TRACEPOINT_EVENT_CLASS(rpc_task_status,
TP_PROTO(const struct rpc_task *task),
LTTNG_TRACEPOINT_EVENT_CLASS(rpc_task_status,
TP_PROTO(const struct rpc_task *task),
@@
-57,7
+57,7
@@
LTTNG_TRACEPOINT_EVENT_INSTANCE(rpc_task_status, rpc_bind_status,
TP_ARGS(task)
)
TP_ARGS(task)
)
-#elif (L
INUX_VERSION_CODE >=
KERNEL_VERSION(3,12,0))
+#elif (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(3,12,0))
LTTNG_TRACEPOINT_EVENT_CLASS(rpc_task_status,
TP_PROTO(struct rpc_task *task),
LTTNG_TRACEPOINT_EVENT_CLASS(rpc_task_status,
TP_PROTO(struct rpc_task *task),
@@
-109,13
+109,13
@@
LTTNG_TRACEPOINT_EVENT_INSTANCE(rpc_task_status, rpc_bind_status,
)
#endif
)
#endif
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(5,0,0))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(5,0,0))
LTTNG_TRACEPOINT_EVENT_INSTANCE(rpc_task_status, rpc_connect_status,
TP_PROTO(const struct rpc_task *task),
TP_ARGS(task)
)
LTTNG_TRACEPOINT_EVENT_INSTANCE(rpc_task_status, rpc_connect_status,
TP_PROTO(const struct rpc_task *task),
TP_ARGS(task)
)
-#elif (L
INUX_VERSION_CODE >=
KERNEL_VERSION(4,17,0))
+#elif (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(4,17,0))
LTTNG_TRACEPOINT_EVENT(rpc_connect_status,
TP_PROTO(const struct rpc_task *task),
LTTNG_TRACEPOINT_EVENT(rpc_connect_status,
TP_PROTO(const struct rpc_task *task),
@@
-127,7
+127,7
@@
LTTNG_TRACEPOINT_EVENT(rpc_connect_status,
ctf_integer(int, status, task->tk_status)
)
)
ctf_integer(int, status, task->tk_status)
)
)
-#elif (L
INUX_VERSION_CODE >=
KERNEL_VERSION(3,12,0))
+#elif (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(3,12,0))
LTTNG_TRACEPOINT_EVENT(rpc_connect_status,
TP_PROTO(struct rpc_task *task, int status),
LTTNG_TRACEPOINT_EVENT(rpc_connect_status,
TP_PROTO(struct rpc_task *task, int status),
@@
-153,7
+153,7
@@
LTTNG_TRACEPOINT_EVENT(rpc_connect_status,
)
#endif
)
#endif
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(4,17,0))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(4,17,0))
LTTNG_TRACEPOINT_EVENT_CLASS(rpc_task_running,
TP_PROTO(const struct rpc_task *task, const void *action),
LTTNG_TRACEPOINT_EVENT_CLASS(rpc_task_running,
TP_PROTO(const struct rpc_task *task, const void *action),
@@
-222,7
+222,7
@@
LTTNG_TRACEPOINT_EVENT_INSTANCE(rpc_task_queued, rpc_task_wakeup,
TP_ARGS(task, q)
)
TP_ARGS(task, q)
)
-#elif (L
INUX_VERSION_CODE >=
KERNEL_VERSION(3,12,0))
+#elif (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(3,12,0))
LTTNG_TRACEPOINT_EVENT_CLASS(rpc_task_running,
TP_PROTO(const struct rpc_clnt *clnt, const struct rpc_task *task, const void *action),
LTTNG_TRACEPOINT_EVENT_CLASS(rpc_task_running,
TP_PROTO(const struct rpc_clnt *clnt, const struct rpc_task *task, const void *action),
diff --git
a/instrumentation/events/lttng-module/sched.h
b/instrumentation/events/lttng-module/sched.h
index c505961745af047a3b6254343fa78aa23570d946..964f724ad74793404d038808bde7e32c7618edc4 100644
(file)
--- a/
instrumentation/events/lttng-module/sched.h
+++ b/
instrumentation/events/lttng-module/sched.h
@@
-9,8
+9,8
@@
#include <linux/sched.h>
#include <linux/pid_namespace.h>
#include <linux/binfmts.h>
#include <linux/sched.h>
#include <linux/pid_namespace.h>
#include <linux/binfmts.h>
-#include <l
inux/
version.h>
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(3,9,0))
+#include <l
ttng-kernel-
version.h>
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(3,9,0))
#include <linux/sched/rt.h>
#endif
#include <wrapper/namespace.h>
#include <linux/sched/rt.h>
#endif
#include <wrapper/namespace.h>
@@
-20,7
+20,7
@@
#ifndef _TRACE_SCHED_DEF_
#define _TRACE_SCHED_DEF_
#ifndef _TRACE_SCHED_DEF_
#define _TRACE_SCHED_DEF_
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(4,15,0))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(4,15,0))
static inline long __trace_sched_switch_state(bool preempt, struct task_struct *p)
{
static inline long __trace_sched_switch_state(bool preempt, struct task_struct *p)
{
@@
-48,7
+48,7
@@
static inline long __trace_sched_switch_state(bool preempt, struct task_struct *
return state ? (1 << (state - 1)) : state;
}
return state ? (1 << (state - 1)) : state;
}
-#elif (L
INUX_VERSION_CODE >=
KERNEL_VERSION(4,14,0))
+#elif (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(4,14,0))
static inline long __trace_sched_switch_state(bool preempt, struct task_struct *p)
{
static inline long __trace_sched_switch_state(bool preempt, struct task_struct *p)
{
@@
-76,7
+76,7
@@
static inline long __trace_sched_switch_state(bool preempt, struct task_struct *
return state ? (1 << (state - 1)) : state;
}
return state ? (1 << (state - 1)) : state;
}
-#elif (L
INUX_VERSION_CODE >=
KERNEL_VERSION(4,4,0))
+#elif (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(4,4,0))
static inline long __trace_sched_switch_state(bool preempt, struct task_struct *p)
{
static inline long __trace_sched_switch_state(bool preempt, struct task_struct *p)
{
@@
-90,7
+90,7
@@
static inline long __trace_sched_switch_state(bool preempt, struct task_struct *
return preempt ? TASK_RUNNING | TASK_STATE_MAX : p->state;
}
return preempt ? TASK_RUNNING | TASK_STATE_MAX : p->state;
}
-#elif (L
INUX_VERSION_CODE >=
KERNEL_VERSION(3,19,0))
+#elif (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(3,19,0))
static inline long __trace_sched_switch_state(struct task_struct *p)
{
static inline long __trace_sched_switch_state(struct task_struct *p)
{
@@
-110,7
+110,7
@@
static inline long __trace_sched_switch_state(struct task_struct *p)
return state;
}
return state;
}
-#elif (L
INUX_VERSION_CODE >=
KERNEL_VERSION(3,13,0))
+#elif (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(3,13,0))
static inline long __trace_sched_switch_state(struct task_struct *p)
{
static inline long __trace_sched_switch_state(struct task_struct *p)
{
@@
-127,7
+127,7
@@
static inline long __trace_sched_switch_state(struct task_struct *p)
return state;
}
return state;
}
-#elif (L
INUX_VERSION_CODE >=
KERNEL_VERSION(3,2,0))
+#elif (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(3,2,0))
static inline long __trace_sched_switch_state(struct task_struct *p)
{
static inline long __trace_sched_switch_state(struct task_struct *p)
{
@@
-179,21
+179,21
@@
LTTNG_TRACEPOINT_ENUM(task_state,
ctf_enum_value("EXIT_DEAD", EXIT_DEAD)
ctf_enum_value("EXIT_ZOMBIE", EXIT_ZOMBIE)
ctf_enum_value("EXIT_DEAD", EXIT_DEAD)
ctf_enum_value("EXIT_ZOMBIE", EXIT_ZOMBIE)
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(3,9,0))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(3,9,0))
ctf_enum_value("TASK_PARKED", TASK_PARKED)
ctf_enum_value("TASK_PARKED", TASK_PARKED)
-#endif /* #if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(3,9,0)) */
+#endif /* #if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(3,9,0)) */
ctf_enum_value("TASK_DEAD", TASK_DEAD)
ctf_enum_value("TASK_WAKEKILL", TASK_WAKEKILL)
ctf_enum_value("TASK_WAKING", TASK_WAKING)
ctf_enum_value("TASK_DEAD", TASK_DEAD)
ctf_enum_value("TASK_WAKEKILL", TASK_WAKEKILL)
ctf_enum_value("TASK_WAKING", TASK_WAKING)
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(4,2,0))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(4,2,0))
ctf_enum_value("TASK_NOLOAD", TASK_NOLOAD)
ctf_enum_value("TASK_NOLOAD", TASK_NOLOAD)
-#endif /* #if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(4,2,0)) */
+#endif /* #if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(4,2,0)) */
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(4,8,0))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(4,8,0))
ctf_enum_value("TASK_NEW", TASK_NEW)
ctf_enum_value("TASK_NEW", TASK_NEW)
-#endif /* #if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(4,8,0)) */
+#endif /* #if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(4,8,0)) */
ctf_enum_value("TASK_STATE_MAX", TASK_STATE_MAX)
)
ctf_enum_value("TASK_STATE_MAX", TASK_STATE_MAX)
)
@@
-231,7
+231,7
@@
LTTNG_TRACEPOINT_EVENT(sched_kthread_stop_ret,
/*
* Tracepoint for waking up a task:
*/
/*
* Tracepoint for waking up a task:
*/
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(4,3,0) || \
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(4,3,0) || \
LTTNG_RT_KERNEL_RANGE(4,1,10,11, 4,2,0,0) || \
LTTNG_RT_KERNEL_RANGE(3,18,27,26, 3,19,0,0) || \
LTTNG_RT_KERNEL_RANGE(3,14,61,63, 3,15,0,0) || \
LTTNG_RT_KERNEL_RANGE(4,1,10,11, 4,2,0,0) || \
LTTNG_RT_KERNEL_RANGE(3,18,27,26, 3,19,0,0) || \
LTTNG_RT_KERNEL_RANGE(3,14,61,63, 3,15,0,0) || \
@@
-252,7
+252,7
@@
LTTNG_TRACEPOINT_EVENT_CLASS(sched_wakeup_template,
ctf_integer(int, target_cpu, task_cpu(p))
)
)
ctf_integer(int, target_cpu, task_cpu(p))
)
)
-#else /* #if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(4,3,0)) */
+#else /* #if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(4,3,0)) */
LTTNG_TRACEPOINT_EVENT_CLASS(sched_wakeup_template,
TP_PROTO(struct task_struct *p, int success),
LTTNG_TRACEPOINT_EVENT_CLASS(sched_wakeup_template,
TP_PROTO(struct task_struct *p, int success),
@@
-267,9
+267,9
@@
LTTNG_TRACEPOINT_EVENT_CLASS(sched_wakeup_template,
ctf_integer(int, target_cpu, task_cpu(p))
)
)
ctf_integer(int, target_cpu, task_cpu(p))
)
)
-#endif /* #else #if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(4,3,0)) */
+#endif /* #else #if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(4,3,0)) */
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(4,3,0) || \
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(4,3,0) || \
LTTNG_RT_KERNEL_RANGE(4,1,10,11, 4,2,0,0) || \
LTTNG_RT_KERNEL_RANGE(3,18,27,26, 3,19,0,0) || \
LTTNG_RT_KERNEL_RANGE(3,14,61,63, 3,15,0,0) || \
LTTNG_RT_KERNEL_RANGE(4,1,10,11, 4,2,0,0) || \
LTTNG_RT_KERNEL_RANGE(3,18,27,26, 3,19,0,0) || \
LTTNG_RT_KERNEL_RANGE(3,14,61,63, 3,15,0,0) || \
@@
-314,14
+314,14
@@
LTTNG_TRACEPOINT_EVENT_INSTANCE(sched_wakeup_template, sched_wakeup_new,
TP_PROTO(struct task_struct *p, int success),
TP_ARGS(p, success))
TP_PROTO(struct task_struct *p, int success),
TP_ARGS(p, success))
-#endif /* #if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(4,3,0)) */
+#endif /* #if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(4,3,0)) */
/*
* Tracepoint for task switches, performed by the scheduler:
*/
LTTNG_TRACEPOINT_EVENT(sched_switch,
/*
* Tracepoint for task switches, performed by the scheduler:
*/
LTTNG_TRACEPOINT_EVENT(sched_switch,
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(4,4,0))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(4,4,0))
TP_PROTO(bool preempt,
struct task_struct *prev,
struct task_struct *next),
TP_PROTO(bool preempt,
struct task_struct *prev,
struct task_struct *next),
@@
-332,13
+332,13
@@
LTTNG_TRACEPOINT_EVENT(sched_switch,
struct task_struct *next),
TP_ARGS(prev, next),
struct task_struct *next),
TP_ARGS(prev, next),
-#endif /* #if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(4,4,0)) */
+#endif /* #if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(4,4,0)) */
TP_FIELDS(
ctf_array_text(char, prev_comm, prev->comm, TASK_COMM_LEN)
ctf_integer(pid_t, prev_tid, prev->pid)
ctf_integer(int, prev_prio, prev->prio - MAX_RT_PRIO)
TP_FIELDS(
ctf_array_text(char, prev_comm, prev->comm, TASK_COMM_LEN)
ctf_integer(pid_t, prev_tid, prev->pid)
ctf_integer(int, prev_prio, prev->prio - MAX_RT_PRIO)
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(4,4,0))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(4,4,0))
ctf_enum(task_state, long, prev_state, __trace_sched_switch_state(preempt, prev))
#else
ctf_enum(task_state, long, prev_state, __trace_sched_switch_state(prev))
ctf_enum(task_state, long, prev_state, __trace_sched_switch_state(preempt, prev))
#else
ctf_enum(task_state, long, prev_state, __trace_sched_switch_state(prev))
@@
-455,7
+455,7
@@
LTTNG_TRACEPOINT_EVENT_CODE(sched_process_fork,
ctf_array_text(char, parent_comm, parent->comm, TASK_COMM_LEN)
ctf_integer(pid_t, parent_tid, parent->pid)
ctf_integer(pid_t, parent_pid, parent->tgid)
ctf_array_text(char, parent_comm, parent->comm, TASK_COMM_LEN)
ctf_integer(pid_t, parent_tid, parent->pid)
ctf_integer(pid_t, parent_pid, parent->tgid)
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(3,8,0))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(3,8,0))
ctf_integer(unsigned int, parent_ns_inum,
({
unsigned int parent_ns_inum = 0;
ctf_integer(unsigned int, parent_ns_inum,
({
unsigned int parent_ns_inum = 0;
@@
-475,7
+475,7
@@
LTTNG_TRACEPOINT_EVENT_CODE(sched_process_fork,
ctf_integer(pid_t, child_tid, child->pid)
ctf_sequence(pid_t, vtids, tp_locvar->vtids, u8, tp_locvar->ns_level)
ctf_integer(pid_t, child_pid, child->tgid)
ctf_integer(pid_t, child_tid, child->pid)
ctf_sequence(pid_t, vtids, tp_locvar->vtids, u8, tp_locvar->ns_level)
ctf_integer(pid_t, child_pid, child->tgid)
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(3,8,0))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(3,8,0))
ctf_integer(unsigned int, child_ns_inum,
({
unsigned int child_ns_inum = 0;
ctf_integer(unsigned int, child_ns_inum,
({
unsigned int child_ns_inum = 0;
@@
-496,7
+496,7
@@
LTTNG_TRACEPOINT_EVENT_CODE(sched_process_fork,
TP_code_post()
)
TP_code_post()
)
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(3,4,0))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(3,4,0))
/*
* Tracepoint for exec:
*/
/*
* Tracepoint for exec:
*/
@@
-557,7
+557,7
@@
LTTNG_TRACEPOINT_EVENT_INSTANCE(sched_stat_template, sched_stat_iowait,
TP_PROTO(struct task_struct *tsk, u64 delay),
TP_ARGS(tsk, delay))
TP_PROTO(struct task_struct *tsk, u64 delay),
TP_ARGS(tsk, delay))
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(3,3,0))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(3,3,0))
/*
* Tracepoint for accounting blocked time (time the task is in uninterruptible).
*/
/*
* Tracepoint for accounting blocked time (time the task is in uninterruptible).
*/
@@
-584,7
+584,7
@@
LTTNG_TRACEPOINT_EVENT(sched_stat_runtime,
)
)
)
)
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(4,12,0) || \
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(4,12,0) || \
LTTNG_RT_KERNEL_RANGE(4,9,27,18, 4,10,0,0) || \
LTTNG_RT_KERNEL_RANGE(4,11,5,1, 4,12,0,0))
/*
LTTNG_RT_KERNEL_RANGE(4,9,27,18, 4,10,0,0) || \
LTTNG_RT_KERNEL_RANGE(4,11,5,1, 4,12,0,0))
/*
diff --git
a/instrumentation/events/lttng-module/scsi.h
b/instrumentation/events/lttng-module/scsi.h
index 7882def286f9a234fc93b8ef4293fd600c972d06..b3e2564d10815c6ccf54eada69132b4e5689ff1d 100644
(file)
--- a/
instrumentation/events/lttng-module/scsi.h
+++ b/
instrumentation/events/lttng-module/scsi.h
@@
-9,14
+9,14
@@
#include <scsi/scsi_cmnd.h>
#include <scsi/scsi_host.h>
#include <linux/trace_seq.h>
#include <scsi/scsi_cmnd.h>
#include <scsi/scsi_host.h>
#include <linux/trace_seq.h>
-#include <l
inux/
version.h>
+#include <l
ttng-kernel-
version.h>
#ifndef _TRACE_SCSI_DEF
#define _TRACE_SCSI_DEF
#define scsi_opcode_name(opcode) { opcode, #opcode }
#ifndef _TRACE_SCSI_DEF
#define _TRACE_SCSI_DEF
#define scsi_opcode_name(opcode) { opcode, #opcode }
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(4,7,0) \
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(4,7,0) \
|| LTTNG_SLE_KERNEL_RANGE(4,4,9,36,0,0, 4,5,0,0,0,0))
#define show_opcode_name(val) \
|| LTTNG_SLE_KERNEL_RANGE(4,4,9,36,0,0, 4,5,0,0,0,0))
#define show_opcode_name(val) \
@@
-112,7
+112,7
@@
scsi_opcode_name(ATA_16), \
scsi_opcode_name(ATA_12))
scsi_opcode_name(ATA_16), \
scsi_opcode_name(ATA_12))
-#elif (L
INUX_VERSION_CODE >=
KERNEL_VERSION(3,19,0) \
+#elif (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(3,19,0) \
|| LTTNG_RHEL_KERNEL_RANGE(3,10,0,327,0,0, 3,11,0,0,0,0))
#define show_opcode_name(val) \
|| LTTNG_RHEL_KERNEL_RANGE(3,10,0,327,0,0, 3,11,0,0,0,0))
#define show_opcode_name(val) \
@@
-210,7
+210,7
@@
scsi_opcode_name(ATA_16), \
scsi_opcode_name(ATA_12))
scsi_opcode_name(ATA_16), \
scsi_opcode_name(ATA_12))
-#else /* #if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(3,19,0)) */
+#else /* #if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(3,19,0)) */
#define show_opcode_name(val) \
__print_symbolic(val, \
#define show_opcode_name(val) \
__print_symbolic(val, \
@@
-307,7
+307,7
@@
scsi_opcode_name(ATA_16), \
scsi_opcode_name(ATA_12))
scsi_opcode_name(ATA_16), \
scsi_opcode_name(ATA_12))
-#endif /* #else #if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(3,19,0)) */
+#endif /* #else #if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(3,19,0)) */
#define scsi_hostbyte_name(result) { result, #result }
#define show_hostbyte_name(val) \
#define scsi_hostbyte_name(result) { result, #result }
#define show_hostbyte_name(val) \
diff --git
a/instrumentation/events/lttng-module/signal.h
b/instrumentation/events/lttng-module/signal.h
index 7c44cb14fc25ddcc8f73fe9c344f4eea00deb2c1..d667af411d923f9c15eb847d8b948a77997f3248 100644
(file)
--- a/
instrumentation/events/lttng-module/signal.h
+++ b/
instrumentation/events/lttng-module/signal.h
@@
-6,14
+6,14
@@
#define LTTNG_TRACE_SIGNAL_H
#include <probes/lttng-tracepoint-event.h>
#define LTTNG_TRACE_SIGNAL_H
#include <probes/lttng-tracepoint-event.h>
-#include <l
inux/
version.h>
+#include <l
ttng-kernel-
version.h>
#ifndef _TRACE_SIGNAL_DEF
#define _TRACE_SIGNAL_DEF
#include <linux/signal.h>
#include <linux/sched.h>
#undef LTTNG_FIELDS_SIGINFO
#ifndef _TRACE_SIGNAL_DEF
#define _TRACE_SIGNAL_DEF
#include <linux/signal.h>
#include <linux/sched.h>
#undef LTTNG_FIELDS_SIGINFO
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(4,20,0) || \
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(4,20,0) || \
LTTNG_RHEL_KERNEL_RANGE(4,18,0,147,0,0, 4,19,0,0,0,0))
#define LTTNG_FIELDS_SIGINFO(info) \
ctf_integer(int, errno, \
LTTNG_RHEL_KERNEL_RANGE(4,18,0,147,0,0, 4,19,0,0,0,0))
#define LTTNG_FIELDS_SIGINFO(info) \
ctf_integer(int, errno, \
@@
-24,7
+24,7
@@
(info == SEND_SIG_NOINFO) ? \
SI_USER : \
((info == SEND_SIG_PRIV) ? SI_KERNEL : info->si_code))
(info == SEND_SIG_NOINFO) ? \
SI_USER : \
((info == SEND_SIG_PRIV) ? SI_KERNEL : info->si_code))
-#else /* L
INUX_VERSION_CODE >=
KERNEL_VERSION(4,20,0) */
+#else /* L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(4,20,0) */
#define LTTNG_FIELDS_SIGINFO(info) \
ctf_integer(int, errno, \
(info == SEND_SIG_NOINFO || info == SEND_SIG_FORCED || info == SEND_SIG_PRIV) ? \
#define LTTNG_FIELDS_SIGINFO(info) \
ctf_integer(int, errno, \
(info == SEND_SIG_NOINFO || info == SEND_SIG_FORCED || info == SEND_SIG_PRIV) ? \
@@
-34,7
+34,7
@@
(info == SEND_SIG_NOINFO || info == SEND_SIG_FORCED) ? \
SI_USER : \
((info == SEND_SIG_PRIV) ? SI_KERNEL : info->si_code))
(info == SEND_SIG_NOINFO || info == SEND_SIG_FORCED) ? \
SI_USER : \
((info == SEND_SIG_PRIV) ? SI_KERNEL : info->si_code))
-#endif /* L
INUX_VERSION_CODE >=
KERNEL_VERSION(4,20,0) */
+#endif /* L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(4,20,0) */
#endif /* _TRACE_SIGNAL_DEF */
/**
#endif /* _TRACE_SIGNAL_DEF */
/**
@@
-49,7
+49,7
@@
* SEND_SIG_NOINFO means that si_code is SI_USER, and SEND_SIG_PRIV
* means that si_code is SI_KERNEL.
*/
* SEND_SIG_NOINFO means that si_code is SI_USER, and SEND_SIG_PRIV
* means that si_code is SI_KERNEL.
*/
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(4,20,0) || \
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(4,20,0) || \
LTTNG_RHEL_KERNEL_RANGE(4,18,0,147,0,0, 4,19,0,0,0,0))
LTTNG_TRACEPOINT_EVENT(signal_generate,
LTTNG_RHEL_KERNEL_RANGE(4,18,0,147,0,0, 4,19,0,0,0,0))
LTTNG_TRACEPOINT_EVENT(signal_generate,
@@
-67,7
+67,7
@@
LTTNG_TRACEPOINT_EVENT(signal_generate,
ctf_integer(int, result, result)
)
)
ctf_integer(int, result, result)
)
)
-#elif (L
INUX_VERSION_CODE >=
KERNEL_VERSION(3,4,0))
+#elif (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(3,4,0))
LTTNG_TRACEPOINT_EVENT(signal_generate,
TP_PROTO(int sig, struct siginfo *info, struct task_struct *task,
LTTNG_TRACEPOINT_EVENT(signal_generate,
TP_PROTO(int sig, struct siginfo *info, struct task_struct *task,
@@
-114,7
+114,7
@@
LTTNG_TRACEPOINT_EVENT(signal_generate,
* This means, this can show which signals are actually delivered, but
* matching generated signals and delivered signals may not be correct.
*/
* This means, this can show which signals are actually delivered, but
* matching generated signals and delivered signals may not be correct.
*/
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(4,20,0) || \
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(4,20,0) || \
LTTNG_RHEL_KERNEL_RANGE(4,18,0,147,0,0, 4,19,0,0,0,0))
LTTNG_TRACEPOINT_EVENT(signal_deliver,
LTTNG_RHEL_KERNEL_RANGE(4,18,0,147,0,0, 4,19,0,0,0,0))
LTTNG_TRACEPOINT_EVENT(signal_deliver,
@@
-145,7
+145,7
@@
LTTNG_TRACEPOINT_EVENT(signal_deliver,
)
#endif
)
#endif
-#if (L
INUX_VERSION_CODE <
KERNEL_VERSION(3,4,0))
+#if (L
TTNG_LINUX_VERSION_CODE < LTTNG_
KERNEL_VERSION(3,4,0))
LTTNG_TRACEPOINT_EVENT_CLASS(signal_queue_overflow,
TP_PROTO(int sig, int group, struct siginfo *info),
LTTNG_TRACEPOINT_EVENT_CLASS(signal_queue_overflow,
TP_PROTO(int sig, int group, struct siginfo *info),
diff --git
a/instrumentation/events/lttng-module/skb.h
b/instrumentation/events/lttng-module/skb.h
index 1726b4457c567bf99f652a1346d4ebfd02845b1d..6cf813aecb57cbe014dd1aa1948025bf245e652c 100644
(file)
--- a/
instrumentation/events/lttng-module/skb.h
+++ b/
instrumentation/events/lttng-module/skb.h
@@
-8,7
+8,7
@@
#include <probes/lttng-tracepoint-event.h>
#include <linux/skbuff.h>
#include <linux/netdevice.h>
#include <probes/lttng-tracepoint-event.h>
#include <linux/skbuff.h>
#include <linux/netdevice.h>
-#include <l
inux/
version.h>
+#include <l
ttng-kernel-
version.h>
/*
* Tracepoint for free an sk_buff:
/*
* Tracepoint for free an sk_buff:
diff --git
a/instrumentation/events/lttng-module/sock.h
b/instrumentation/events/lttng-module/sock.h
index a1032b3390faa4f94591e9d5445c428b48c5a515..de903d68fcc31bfd8835f9d478d7de4462c862e6 100644
(file)
--- a/
instrumentation/events/lttng-module/sock.h
+++ b/
instrumentation/events/lttng-module/sock.h
@@
-6,7
+6,7
@@
#define LTTNG_TRACE_SOCK_H
#include <probes/lttng-tracepoint-event.h>
#define LTTNG_TRACE_SOCK_H
#include <probes/lttng-tracepoint-event.h>
-#include <l
inux/
version.h>
+#include <l
ttng-kernel-
version.h>
#include <net/sock.h>
LTTNG_TRACEPOINT_EVENT(sock_rcvqueue_full,
#include <net/sock.h>
LTTNG_TRACEPOINT_EVENT(sock_rcvqueue_full,
@@
-22,7
+22,7
@@
LTTNG_TRACEPOINT_EVENT(sock_rcvqueue_full,
)
)
)
)
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(4,19,0))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(4,19,0))
LTTNG_TRACEPOINT_EVENT(sock_exceed_buf_limit,
LTTNG_TRACEPOINT_EVENT(sock_exceed_buf_limit,
@@
-43,7
+43,7
@@
LTTNG_TRACEPOINT_EVENT(sock_exceed_buf_limit,
)
)
)
)
-#elif (L
INUX_VERSION_CODE >=
KERNEL_VERSION(4,15,0))
+#elif (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(4,15,0))
LTTNG_TRACEPOINT_EVENT(sock_exceed_buf_limit,
LTTNG_TRACEPOINT_EVENT(sock_exceed_buf_limit,
@@
-60,7
+60,7
@@
LTTNG_TRACEPOINT_EVENT(sock_exceed_buf_limit,
)
)
)
)
-#else /* #if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(4,15,0)) */
+#else /* #if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(4,15,0)) */
LTTNG_TRACEPOINT_EVENT(sock_exceed_buf_limit,
LTTNG_TRACEPOINT_EVENT(sock_exceed_buf_limit,
@@
-77,7
+77,7
@@
LTTNG_TRACEPOINT_EVENT(sock_exceed_buf_limit,
)
)
)
)
-#endif /* #else #if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(4,15,0)) */
+#endif /* #else #if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(4,15,0)) */
#endif /* LTTNG_TRACE_SOCK_H */
#endif /* LTTNG_TRACE_SOCK_H */
diff --git
a/instrumentation/events/lttng-module/timer.h
b/instrumentation/events/lttng-module/timer.h
index 1a45d82b38b7f44202361a8d244bc416bdfd94e8..26f0b21233ffe5c6462c968611554bc421a5cbc8 100644
(file)
--- a/
instrumentation/events/lttng-module/timer.h
+++ b/
instrumentation/events/lttng-module/timer.h
@@
-11,17
+11,17
@@
#define _TRACE_TIMER_DEF_
#include <linux/hrtimer.h>
#include <linux/timer.h>
#define _TRACE_TIMER_DEF_
#include <linux/hrtimer.h>
#include <linux/timer.h>
-#include <l
inux/
version.h>
+#include <l
ttng-kernel-
version.h>
struct timer_list;
#endif /* _TRACE_TIMER_DEF_ */
struct timer_list;
#endif /* _TRACE_TIMER_DEF_ */
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(4,10,0))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(4,10,0))
#define lttng_ktime_get_tv64(kt) (kt)
#define lttng_ktime_get_tv64(kt) (kt)
-#else /* #if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(4,10,0)) */
+#else /* #if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(4,10,0)) */
#define lttng_ktime_get_tv64(kt) ((kt).tv64)
#define lttng_ktime_get_tv64(kt) ((kt).tv64)
-#endif /* #else #if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(4,10,0)) */
+#endif /* #else #if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(4,10,0)) */
LTTNG_TRACEPOINT_EVENT_CLASS(timer_class,
LTTNG_TRACEPOINT_EVENT_CLASS(timer_class,
@@
-45,7
+45,7
@@
LTTNG_TRACEPOINT_EVENT_INSTANCE(timer_class, timer_init,
TP_ARGS(timer)
)
TP_ARGS(timer)
)
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(4,2,0) || \
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(4,2,0) || \
LTTNG_RHEL_KERNEL_RANGE(3,10,0,957,0,0, 3,11,0,0,0,0))
/**
* timer_start - called when the timer is started
LTTNG_RHEL_KERNEL_RANGE(3,10,0,957,0,0, 3,11,0,0,0,0))
/**
* timer_start - called when the timer is started
@@
-68,7
+68,7
@@
LTTNG_TRACEPOINT_EVENT(timer_start,
ctf_integer(unsigned int, flags, flags)
)
)
ctf_integer(unsigned int, flags, flags)
)
)
-#else /* #if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(4,2,0)) */
+#else /* #if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(4,2,0)) */
/**
* timer_start - called when the timer is started
* @timer: pointer to struct timer_list
/**
* timer_start - called when the timer is started
* @timer: pointer to struct timer_list
@@
-87,9
+87,9
@@
LTTNG_TRACEPOINT_EVENT(timer_start,
ctf_integer(unsigned long, now, jiffies)
)
)
ctf_integer(unsigned long, now, jiffies)
)
)
-#endif /* #else #if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(4,2,0)) */
+#endif /* #else #if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(4,2,0)) */
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(5,2,0))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(5,2,0))
/**
* timer_expire_entry - called immediately before the timer callback
* @timer: pointer to struct timer_list
/**
* timer_expire_entry - called immediately before the timer callback
* @timer: pointer to struct timer_list
@@
-184,7
+184,7
@@
LTTNG_TRACEPOINT_EVENT_MAP(hrtimer_init,
* hrtimer_start - called when the hrtimer is started
* @timer: pointer to struct hrtimer
*/
* hrtimer_start - called when the hrtimer is started
* @timer: pointer to struct hrtimer
*/
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(4,16,0) || \
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(4,16,0) || \
LTTNG_RT_KERNEL_RANGE(4,14,0,0, 4,15,0,0))
LTTNG_TRACEPOINT_EVENT_MAP(hrtimer_start,
LTTNG_RT_KERNEL_RANGE(4,14,0,0, 4,15,0,0))
LTTNG_TRACEPOINT_EVENT_MAP(hrtimer_start,
@@
-294,7
+294,7
@@
LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP(timer_hrtimer_class, hrtimer_cancel,
* zero, otherwise it is started
* @expires: the itimers expiry time
*/
* zero, otherwise it is started
* @expires: the itimers expiry time
*/
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(5,5,0))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(5,5,0))
LTTNG_TRACEPOINT_EVENT_MAP(itimer_state,
timer_itimer_state,
LTTNG_TRACEPOINT_EVENT_MAP(itimer_state,
timer_itimer_state,
@@
-313,7
+313,7
@@
LTTNG_TRACEPOINT_EVENT_MAP(itimer_state,
ctf_integer(long, interval_nsec, value->it_interval.tv_nsec)
)
)
ctf_integer(long, interval_nsec, value->it_interval.tv_nsec)
)
)
-#elif (L
INUX_VERSION_CODE >=
KERNEL_VERSION(4,11,0))
+#elif (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(4,11,0))
LTTNG_TRACEPOINT_EVENT_MAP(itimer_state,
timer_itimer_state,
LTTNG_TRACEPOINT_EVENT_MAP(itimer_state,
timer_itimer_state,
@@
-332,7
+332,7
@@
LTTNG_TRACEPOINT_EVENT_MAP(itimer_state,
ctf_integer(long, interval_usec, value->it_interval.tv_usec)
)
)
ctf_integer(long, interval_usec, value->it_interval.tv_usec)
)
)
-#else /* if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(4,11,0)) */
+#else /* if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(4,11,0)) */
LTTNG_TRACEPOINT_EVENT_MAP(itimer_state,
timer_itimer_state,
LTTNG_TRACEPOINT_EVENT_MAP(itimer_state,
timer_itimer_state,
@@
-351,7
+351,7
@@
LTTNG_TRACEPOINT_EVENT_MAP(itimer_state,
ctf_integer(long, interval_usec, value->it_interval.tv_usec)
)
)
ctf_integer(long, interval_usec, value->it_interval.tv_usec)
)
)
-#endif /* #else (L
INUX_VERSION_CODE >=
KERNEL_VERSION(4,11,0)) */
+#endif /* #else (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(4,11,0)) */
/**
* itimer_expire - called when itimer expires
/**
* itimer_expire - called when itimer expires
@@
-359,7
+359,7
@@
LTTNG_TRACEPOINT_EVENT_MAP(itimer_state,
* @pid: pid of the process which owns the timer
* @now: current time, used to calculate the latency of itimer
*/
* @pid: pid of the process which owns the timer
* @now: current time, used to calculate the latency of itimer
*/
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(4,11,0))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(4,11,0))
LTTNG_TRACEPOINT_EVENT_MAP(itimer_expire,
timer_itimer_expire,
LTTNG_TRACEPOINT_EVENT_MAP(itimer_expire,
timer_itimer_expire,
@@
-374,7
+374,7
@@
LTTNG_TRACEPOINT_EVENT_MAP(itimer_expire,
ctf_integer(unsigned long long, now, now)
)
)
ctf_integer(unsigned long long, now, now)
)
)
-#else /* if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(4,11,0)) */
+#else /* if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(4,11,0)) */
LTTNG_TRACEPOINT_EVENT_MAP(itimer_expire,
timer_itimer_expire,
LTTNG_TRACEPOINT_EVENT_MAP(itimer_expire,
timer_itimer_expire,
@@
-389,7
+389,7
@@
LTTNG_TRACEPOINT_EVENT_MAP(itimer_expire,
ctf_integer(cputime_t, now, now)
)
)
ctf_integer(cputime_t, now, now)
)
)
-#endif /* #else (L
INUX_VERSION_CODE >=
KERNEL_VERSION(4,11,0)) */
+#endif /* #else (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(4,11,0)) */
#endif /* LTTNG_TRACE_TIMER_H */
#endif /* LTTNG_TRACE_TIMER_H */
diff --git
a/instrumentation/events/lttng-module/v4l2.h
b/instrumentation/events/lttng-module/v4l2.h
index 6b7c78fde36d0f5cc11bf88260ec658d77c1ad8f..f9a052d94200568de4a48c4dac30db870abb8c34 100644
(file)
--- a/
instrumentation/events/lttng-module/v4l2.h
+++ b/
instrumentation/events/lttng-module/v4l2.h
@@
-7,7
+7,7
@@
#include <probes/lttng-tracepoint-event.h>
#include <probes/lttng-tracepoint-event.h>
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(5,6,0))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(5,6,0))
LTTNG_TRACEPOINT_EVENT_CLASS(v4l2_class,
TP_PROTO(int minor, struct v4l2_buffer *buf),
LTTNG_TRACEPOINT_EVENT_CLASS(v4l2_class,
TP_PROTO(int minor, struct v4l2_buffer *buf),
diff --git
a/instrumentation/events/lttng-module/workqueue.h
b/instrumentation/events/lttng-module/workqueue.h
index 5e269e30e8b633022e27e5ea685098c227a23718..367d42a5f3b319e4d0b8368a6db012a49dcedd41 100644
(file)
--- a/
instrumentation/events/lttng-module/workqueue.h
+++ b/
instrumentation/events/lttng-module/workqueue.h
@@
-7,7
+7,7
@@
#include <probes/lttng-tracepoint-event.h>
#include <linux/workqueue.h>
#include <probes/lttng-tracepoint-event.h>
#include <linux/workqueue.h>
-#include <l
inux/
version.h>
+#include <l
ttng-kernel-
version.h>
#ifndef _TRACE_WORKQUEUE_DEF_
#define _TRACE_WORKQUEUE_DEF_
#ifndef _TRACE_WORKQUEUE_DEF_
#define _TRACE_WORKQUEUE_DEF_
@@
-40,7
+40,7
@@
LTTNG_TRACEPOINT_EVENT_CLASS(workqueue_work,
*/
LTTNG_TRACEPOINT_EVENT(workqueue_queue_work,
*/
LTTNG_TRACEPOINT_EVENT(workqueue_queue_work,
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(3,9,0))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(3,9,0))
TP_PROTO(unsigned int req_cpu, struct pool_workqueue *pwq,
struct work_struct *work),
TP_PROTO(unsigned int req_cpu, struct pool_workqueue *pwq,
struct work_struct *work),
@@
-92,7
+92,7
@@
LTTNG_TRACEPOINT_EVENT(workqueue_execute_start,
)
)
)
)
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(5,6,0))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(5,6,0))
/**
* workqueue_execute_end - called immediately after the workqueue callback
* @work: pointer to struct work_struct
/**
* workqueue_execute_end - called immediately after the workqueue callback
* @work: pointer to struct work_struct
diff --git
a/instrumentation/events/lttng-module/writeback.h
b/instrumentation/events/lttng-module/writeback.h
index 0ce4915f167de1eb62afa66fb7a5d0a8a4248427..5e4d0474109cb98bd78e1e030688ba7e34e36db2 100644
(file)
--- a/
instrumentation/events/lttng-module/writeback.h
+++ b/
instrumentation/events/lttng-module/writeback.h
@@
-9,7
+9,7
@@
#include <linux/tracepoint.h>
#include <linux/backing-dev.h>
#include <linux/writeback.h>
#include <linux/tracepoint.h>
#include <linux/backing-dev.h>
#include <linux/writeback.h>
-#include <l
inux/
version.h>
+#include <l
ttng-kernel-
version.h>
#ifndef _TRACE_WRITEBACK_DEF_
#define _TRACE_WRITEBACK_DEF_
#ifndef _TRACE_WRITEBACK_DEF_
#define _TRACE_WRITEBACK_DEF_
@@
-22,7
+22,7
@@
* commit a212b105b07d75b48b1a166378282e8a77fbf53d which inlines
* inode_to_bdi but not sb_is_blkdev_sb making it unusable by modules.
*/
* commit a212b105b07d75b48b1a166378282e8a77fbf53d which inlines
* inode_to_bdi but not sb_is_blkdev_sb making it unusable by modules.
*/
-#if (L
INUX_VERSION_CODE <
KERNEL_VERSION(4,0,0))
+#if (L
TTNG_LINUX_VERSION_CODE < LTTNG_
KERNEL_VERSION(4,0,0))
static inline struct backing_dev_info *lttng_inode_to_bdi(struct inode *inode)
{
struct super_block *sb;
static inline struct backing_dev_info *lttng_inode_to_bdi(struct inode *inode)
{
struct super_block *sb;
@@
-42,11
+42,11
@@
static inline struct backing_dev_info *lttng_inode_to_bdi(struct inode *inode)
{
return inode_to_bdi(inode);
}
{
return inode_to_bdi(inode);
}
-#endif /* #if (L
INUX_VERSION_CODE <
KERNEL_VERSION(4,0,0)) */
+#endif /* #if (L
TTNG_LINUX_VERSION_CODE < LTTNG_
KERNEL_VERSION(4,0,0)) */
#endif
#endif
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(5,9,0))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(5,9,0))
#define show_inode_state(state) \
__print_flags(state, "|", \
{I_DIRTY_SYNC, "I_DIRTY_SYNC"}, \
#define show_inode_state(state) \
__print_flags(state, "|", \
{I_DIRTY_SYNC, "I_DIRTY_SYNC"}, \
@@
-60,7
+60,7
@@
static inline struct backing_dev_info *lttng_inode_to_bdi(struct inode *inode)
{I_DIRTY_TIME, "I_DIRTY_TIME"}, \
{I_REFERENCED, "I_REFERENCED"} \
)
{I_DIRTY_TIME, "I_DIRTY_TIME"}, \
{I_REFERENCED, "I_REFERENCED"} \
)
-#elif (L
INUX_VERSION_CODE >=
KERNEL_VERSION(4,0,0))
+#elif (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(4,0,0))
#define show_inode_state(state) \
__print_flags(state, "|", \
{I_DIRTY_SYNC, "I_DIRTY_SYNC"}, \
#define show_inode_state(state) \
__print_flags(state, "|", \
{I_DIRTY_SYNC, "I_DIRTY_SYNC"}, \
@@
-75,7
+75,7
@@
static inline struct backing_dev_info *lttng_inode_to_bdi(struct inode *inode)
{I_DIRTY_TIME_EXPIRED, "I_DIRTY_TIME_EXPIRED"}, \
{I_REFERENCED, "I_REFERENCED"} \
)
{I_DIRTY_TIME_EXPIRED, "I_DIRTY_TIME_EXPIRED"}, \
{I_REFERENCED, "I_REFERENCED"} \
)
-#else /* #if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(4,0,0)) */
+#else /* #if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(4,0,0)) */
#define show_inode_state(state) \
__print_flags(state, "|", \
{I_DIRTY_SYNC, "I_DIRTY_SYNC"}, \
#define show_inode_state(state) \
__print_flags(state, "|", \
{I_DIRTY_SYNC, "I_DIRTY_SYNC"}, \
@@
-88,9
+88,9
@@
static inline struct backing_dev_info *lttng_inode_to_bdi(struct inode *inode)
{I_SYNC, "I_SYNC"}, \
{I_REFERENCED, "I_REFERENCED"} \
)
{I_SYNC, "I_SYNC"}, \
{I_REFERENCED, "I_REFERENCED"} \
)
-#endif /* #else #if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(4,0,0)) */
+#endif /* #else #if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(4,0,0)) */
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(4,0,0))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(4,0,0))
LTTNG_TRACEPOINT_EVENT(writeback_dirty_page,
TP_PROTO(struct page *page, struct address_space *mapping),
LTTNG_TRACEPOINT_EVENT(writeback_dirty_page,
TP_PROTO(struct page *page, struct address_space *mapping),
@@
-142,7
+142,7
@@
LTTNG_TRACEPOINT_EVENT_INSTANCE(writeback_write_inode_template, name, \
LTTNG_TRACEPOINT_EVENT_WRITEBACK_WRITE_INODE(writeback_write_inode_start)
LTTNG_TRACEPOINT_EVENT_WRITEBACK_WRITE_INODE(writeback_write_inode)
LTTNG_TRACEPOINT_EVENT_WRITEBACK_WRITE_INODE(writeback_write_inode_start)
LTTNG_TRACEPOINT_EVENT_WRITEBACK_WRITE_INODE(writeback_write_inode)
-#elif (L
INUX_VERSION_CODE >=
KERNEL_VERSION(3,9,0))
+#elif (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(3,9,0))
LTTNG_TRACEPOINT_EVENT(writeback_dirty_page,
TP_PROTO(struct page *page, struct address_space *mapping),
LTTNG_TRACEPOINT_EVENT(writeback_dirty_page,
TP_PROTO(struct page *page, struct address_space *mapping),
@@
-193,9
+193,9
@@
LTTNG_TRACEPOINT_EVENT_INSTANCE(writeback_write_inode_template, name, \
LTTNG_TRACEPOINT_EVENT_WRITEBACK_WRITE_INODE(writeback_write_inode_start)
LTTNG_TRACEPOINT_EVENT_WRITEBACK_WRITE_INODE(writeback_write_inode)
LTTNG_TRACEPOINT_EVENT_WRITEBACK_WRITE_INODE(writeback_write_inode_start)
LTTNG_TRACEPOINT_EVENT_WRITEBACK_WRITE_INODE(writeback_write_inode)
-#endif /* (L
INUX_VERSION_CODE >=
KERNEL_VERSION(3,9,0)) */
+#endif /* (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(3,9,0)) */
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(4,3,0))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(4,3,0))
LTTNG_TRACEPOINT_EVENT_CLASS(writeback_work_class,
TP_PROTO(struct bdi_writeback *wb, struct wb_writeback_work *work),
LTTNG_TRACEPOINT_EVENT_CLASS(writeback_work_class,
TP_PROTO(struct bdi_writeback *wb, struct wb_writeback_work *work),
@@
-206,7
+206,7
@@
LTTNG_TRACEPOINT_EVENT_CLASS(writeback_work_class,
)
)
)
)
-#elif (L
INUX_VERSION_CODE >=
KERNEL_VERSION(4,0,0))
+#elif (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(4,0,0))
LTTNG_TRACEPOINT_EVENT_CLASS(writeback_work_class,
TP_PROTO(struct backing_dev_info *bdi, struct wb_writeback_work *work),
LTTNG_TRACEPOINT_EVENT_CLASS(writeback_work_class,
TP_PROTO(struct backing_dev_info *bdi, struct wb_writeback_work *work),
@@
-217,7
+217,7
@@
LTTNG_TRACEPOINT_EVENT_CLASS(writeback_work_class,
)
)
)
)
-#else /* #if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(4,0,0)) */
+#else /* #if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(4,0,0)) */
LTTNG_TRACEPOINT_EVENT_CLASS(writeback_work_class,
TP_PROTO(struct backing_dev_info *bdi, struct wb_writeback_work *work),
LTTNG_TRACEPOINT_EVENT_CLASS(writeback_work_class,
TP_PROTO(struct backing_dev_info *bdi, struct wb_writeback_work *work),
@@
-229,28
+229,28
@@
LTTNG_TRACEPOINT_EVENT_CLASS(writeback_work_class,
)
)
)
)
-#endif /* #else #if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(4,0,0)) */
+#endif /* #else #if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(4,0,0)) */
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(4,3,0))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(4,3,0))
#define LTTNG_TRACEPOINT_EVENT_WRITEBACK_WORK_INSTANCE(name) \
LTTNG_TRACEPOINT_EVENT_INSTANCE(writeback_work_class, name, \
TP_PROTO(struct bdi_writeback *wb, struct wb_writeback_work *work), \
TP_ARGS(wb, work))
#define LTTNG_TRACEPOINT_EVENT_WRITEBACK_WORK_INSTANCE(name) \
LTTNG_TRACEPOINT_EVENT_INSTANCE(writeback_work_class, name, \
TP_PROTO(struct bdi_writeback *wb, struct wb_writeback_work *work), \
TP_ARGS(wb, work))
-#else /* #if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(4,3,0)) */
+#else /* #if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(4,3,0)) */
#define LTTNG_TRACEPOINT_EVENT_WRITEBACK_WORK_INSTANCE(name) \
LTTNG_TRACEPOINT_EVENT_INSTANCE(writeback_work_class, name, \
TP_PROTO(struct backing_dev_info *bdi, struct wb_writeback_work *work), \
TP_ARGS(bdi, work))
#define LTTNG_TRACEPOINT_EVENT_WRITEBACK_WORK_INSTANCE(name) \
LTTNG_TRACEPOINT_EVENT_INSTANCE(writeback_work_class, name, \
TP_PROTO(struct backing_dev_info *bdi, struct wb_writeback_work *work), \
TP_ARGS(bdi, work))
-#endif /* #else #if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(4,3,0)) */
+#endif /* #else #if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(4,3,0)) */
LTTNG_TRACEPOINT_EVENT_WRITEBACK_WORK_INSTANCE(writeback_nothread)
LTTNG_TRACEPOINT_EVENT_WRITEBACK_WORK_INSTANCE(writeback_queue)
LTTNG_TRACEPOINT_EVENT_WRITEBACK_WORK_INSTANCE(writeback_exec)
LTTNG_TRACEPOINT_EVENT_WRITEBACK_WORK_INSTANCE(writeback_nothread)
LTTNG_TRACEPOINT_EVENT_WRITEBACK_WORK_INSTANCE(writeback_queue)
LTTNG_TRACEPOINT_EVENT_WRITEBACK_WORK_INSTANCE(writeback_exec)
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(3,1,0))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(3,1,0))
LTTNG_TRACEPOINT_EVENT_WRITEBACK_WORK_INSTANCE(writeback_start)
LTTNG_TRACEPOINT_EVENT_WRITEBACK_WORK_INSTANCE(writeback_written)
LTTNG_TRACEPOINT_EVENT_WRITEBACK_WORK_INSTANCE(writeback_wait)
LTTNG_TRACEPOINT_EVENT_WRITEBACK_WORK_INSTANCE(writeback_start)
LTTNG_TRACEPOINT_EVENT_WRITEBACK_WORK_INSTANCE(writeback_written)
LTTNG_TRACEPOINT_EVENT_WRITEBACK_WORK_INSTANCE(writeback_wait)
@@
-264,7
+264,7
@@
LTTNG_TRACEPOINT_EVENT(writeback_pages_written,
)
)
)
)
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(4,3,0))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(4,3,0))
LTTNG_TRACEPOINT_EVENT_CLASS(writeback_class,
TP_PROTO(struct bdi_writeback *wb),
LTTNG_TRACEPOINT_EVENT_CLASS(writeback_class,
TP_PROTO(struct bdi_writeback *wb),
@@
-295,7
+295,7
@@
LTTNG_TRACEPOINT_EVENT(writeback_bdi_register,
)
)
)
)
-#else /* #if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(4,3,0)) */
+#else /* #if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(4,3,0)) */
LTTNG_TRACEPOINT_EVENT_CLASS(writeback_class,
TP_PROTO(struct backing_dev_info *bdi),
LTTNG_TRACEPOINT_EVENT_CLASS(writeback_class,
TP_PROTO(struct backing_dev_info *bdi),
@@
-319,7
+319,7
@@
LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP(writeback_class, name, map, \
DEFINE_WRITEBACK_EVENT(writeback_bdi_register)
DEFINE_WRITEBACK_EVENT(writeback_bdi_register)
-#endif /* #else #if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(4,3,0)) */
+#endif /* #else #if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(4,3,0)) */
DEFINE_WRITEBACK_EVENT(writeback_nowork)
DEFINE_WRITEBACK_EVENT(writeback_wake_background)
DEFINE_WRITEBACK_EVENT(writeback_nowork)
DEFINE_WRITEBACK_EVENT(writeback_wake_background)
@@
-359,7
+359,7
@@
LTTNG_TRACEPOINT_EVENT_CLASS(writeback_wbc_class,
ctf_integer(int, for_background, wbc->for_background)
ctf_integer(int, for_reclaim, wbc->for_reclaim)
ctf_integer(int, range_cyclic, wbc->range_cyclic)
ctf_integer(int, for_background, wbc->for_background)
ctf_integer(int, for_reclaim, wbc->for_reclaim)
ctf_integer(int, range_cyclic, wbc->range_cyclic)
-#if (L
INUX_VERSION_CODE <
KERNEL_VERSION(3,1,0))
+#if (L
TTNG_LINUX_VERSION_CODE < LTTNG_
KERNEL_VERSION(3,1,0))
ctf_integer(int, more_io, wbc->more_io)
ctf_integer(unsigned long, older_than_this,
wbc->older_than_this ? *wbc->older_than_this : 0)
ctf_integer(int, more_io, wbc->more_io)
ctf_integer(unsigned long, older_than_this,
wbc->older_than_this ? *wbc->older_than_this : 0)
@@
-374,7
+374,7
@@
LTTNG_TRACEPOINT_EVENT_CLASS(writeback_wbc_class,
LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP(writeback_wbc_class, name, map, \
TP_PROTO(struct writeback_control *wbc, struct backing_dev_info *bdi), \
TP_ARGS(wbc, bdi))
LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP(writeback_wbc_class, name, map, \
TP_PROTO(struct writeback_control *wbc, struct backing_dev_info *bdi), \
TP_ARGS(wbc, bdi))
-#if (L
INUX_VERSION_CODE <
KERNEL_VERSION(3,1,0))
+#if (L
TTNG_LINUX_VERSION_CODE < LTTNG_
KERNEL_VERSION(3,1,0))
LTTNG_TRACEPOINT_EVENT_WBC_INSTANCE(wbc_writeback_start, writeback_wbc_writeback_start)
LTTNG_TRACEPOINT_EVENT_WBC_INSTANCE(wbc_writeback_written, writeback_wbc_writeback_written)
LTTNG_TRACEPOINT_EVENT_WBC_INSTANCE(wbc_writeback_wait, writeback_wbc_writeback_wait)
LTTNG_TRACEPOINT_EVENT_WBC_INSTANCE(wbc_writeback_start, writeback_wbc_writeback_start)
LTTNG_TRACEPOINT_EVENT_WBC_INSTANCE(wbc_writeback_written, writeback_wbc_writeback_written)
LTTNG_TRACEPOINT_EVENT_WBC_INSTANCE(wbc_writeback_wait, writeback_wbc_writeback_wait)
@@
-384,7
+384,7
@@
LTTNG_TRACEPOINT_EVENT_WBC_INSTANCE(wbc_balance_dirty_wait, writeback_wbc_balanc
#endif
LTTNG_TRACEPOINT_EVENT_WBC_INSTANCE(wbc_writepage, writeback_wbc_writepage)
#endif
LTTNG_TRACEPOINT_EVENT_WBC_INSTANCE(wbc_writepage, writeback_wbc_writepage)
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(5,9,0) || \
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(5,9,0) || \
LTTNG_KERNEL_RANGE(5,8,6, 5,9,0) || \
LTTNG_KERNEL_RANGE(5,4,62, 5,5,0) || \
LTTNG_KERNEL_RANGE(4,19,143, 4,20,0) || \
LTTNG_KERNEL_RANGE(5,8,6, 5,9,0) || \
LTTNG_KERNEL_RANGE(5,4,62, 5,5,0) || \
LTTNG_KERNEL_RANGE(4,19,143, 4,20,0) || \
@@
-404,7
+404,7
@@
LTTNG_TRACEPOINT_EVENT(writeback_queue_io,
ctf_integer(int, moved, moved)
)
)
ctf_integer(int, moved, moved)
)
)
-#elif (L
INUX_VERSION_CODE >=
KERNEL_VERSION(3,2,0))
+#elif (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(3,2,0))
LTTNG_TRACEPOINT_EVENT(writeback_queue_io,
TP_PROTO(struct bdi_writeback *wb,
struct wb_writeback_work *work,
LTTNG_TRACEPOINT_EVENT(writeback_queue_io,
TP_PROTO(struct bdi_writeback *wb,
struct wb_writeback_work *work,
@@
-415,7
+415,7
@@
LTTNG_TRACEPOINT_EVENT(writeback_queue_io,
ctf_integer(int, moved, moved)
)
)
ctf_integer(int, moved, moved)
)
)
-#elif (L
INUX_VERSION_CODE >=
KERNEL_VERSION(3,1,0))
+#elif (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(3,1,0))
LTTNG_TRACEPOINT_EVENT(writeback_queue_io,
TP_PROTO(struct bdi_writeback *wb,
unsigned long *older_than_this,
LTTNG_TRACEPOINT_EVENT(writeback_queue_io,
TP_PROTO(struct bdi_writeback *wb,
unsigned long *older_than_this,
@@
-434,7
+434,7
@@
LTTNG_TRACEPOINT_EVENT(writeback_queue_io,
)
#endif
)
#endif
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(5,8,0))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(5,8,0))
LTTNG_TRACEPOINT_EVENT_MAP(global_dirty_state,
writeback_global_dirty_state,
LTTNG_TRACEPOINT_EVENT_MAP(global_dirty_state,
writeback_global_dirty_state,
@@
-457,7
+457,7
@@
LTTNG_TRACEPOINT_EVENT_MAP(global_dirty_state,
ctf_integer(unsigned long, dirty_limit, global_dirty_limit)
)
)
ctf_integer(unsigned long, dirty_limit, global_dirty_limit)
)
)
-#elif (L
INUX_VERSION_CODE >=
KERNEL_VERSION(4,14,0))
+#elif (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(4,14,0))
LTTNG_TRACEPOINT_EVENT_MAP(global_dirty_state,
writeback_global_dirty_state,
LTTNG_TRACEPOINT_EVENT_MAP(global_dirty_state,
writeback_global_dirty_state,
@@
-481,7
+481,7
@@
LTTNG_TRACEPOINT_EVENT_MAP(global_dirty_state,
ctf_integer(unsigned long, dirty_limit, global_dirty_limit)
)
)
ctf_integer(unsigned long, dirty_limit, global_dirty_limit)
)
)
-#elif (L
INUX_VERSION_CODE >=
KERNEL_VERSION(3,1,0))
+#elif (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(3,1,0))
LTTNG_TRACEPOINT_EVENT_MAP(global_dirty_state,
writeback_global_dirty_state,
LTTNG_TRACEPOINT_EVENT_MAP(global_dirty_state,
writeback_global_dirty_state,
@@
-507,11
+507,11
@@
LTTNG_TRACEPOINT_EVENT_MAP(global_dirty_state,
)
#endif
)
#endif
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(3,2,0))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(3,2,0))
#define KBps(x) ((x) << (PAGE_SHIFT - 10))
#define KBps(x) ((x) << (PAGE_SHIFT - 10))
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(4,3,0))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(4,3,0))
LTTNG_TRACEPOINT_EVENT_MAP(bdi_dirty_ratelimit,
LTTNG_TRACEPOINT_EVENT_MAP(bdi_dirty_ratelimit,
@@
-535,7
+535,7
@@
LTTNG_TRACEPOINT_EVENT_MAP(bdi_dirty_ratelimit,
)
)
)
)
-#elif (L
INUX_VERSION_CODE >=
KERNEL_VERSION(4,2,0))
+#elif (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(4,2,0))
LTTNG_TRACEPOINT_EVENT_MAP(bdi_dirty_ratelimit,
LTTNG_TRACEPOINT_EVENT_MAP(bdi_dirty_ratelimit,
@@
-559,7
+559,7
@@
LTTNG_TRACEPOINT_EVENT_MAP(bdi_dirty_ratelimit,
)
)
)
)
-#else /* #if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(4,2,0)) */
+#else /* #if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(4,2,0)) */
LTTNG_TRACEPOINT_EVENT_MAP(bdi_dirty_ratelimit,
LTTNG_TRACEPOINT_EVENT_MAP(bdi_dirty_ratelimit,
@@
-583,9
+583,9
@@
LTTNG_TRACEPOINT_EVENT_MAP(bdi_dirty_ratelimit,
)
)
)
)
-#endif /* #else #if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(4,2,0)) */
+#endif /* #else #if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(4,2,0)) */
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(4,3,0))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(4,3,0))
LTTNG_TRACEPOINT_EVENT_MAP(balance_dirty_pages,
LTTNG_TRACEPOINT_EVENT_MAP(balance_dirty_pages,
@@
-637,7
+637,7
@@
LTTNG_TRACEPOINT_EVENT_MAP(balance_dirty_pages,
)
)
)
)
-#else /* #if L
INUX_VERSION_CODE >=
KERNEL_VERSION(4,3,0)) */
+#else /* #if L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(4,3,0)) */
LTTNG_TRACEPOINT_EVENT_MAP(balance_dirty_pages,
LTTNG_TRACEPOINT_EVENT_MAP(balance_dirty_pages,
@@
-652,7
+652,7
@@
LTTNG_TRACEPOINT_EVENT_MAP(balance_dirty_pages,
unsigned long dirty_ratelimit,
unsigned long task_ratelimit,
unsigned long dirtied,
unsigned long dirty_ratelimit,
unsigned long task_ratelimit,
unsigned long dirtied,
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(3,3,0))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(3,3,0))
unsigned long period,
#endif
long pause,
unsigned long period,
#endif
long pause,
@@
-660,7
+660,7
@@
LTTNG_TRACEPOINT_EVENT_MAP(balance_dirty_pages,
TP_ARGS(bdi, thresh, bg_thresh, dirty, bdi_thresh, bdi_dirty,
dirty_ratelimit, task_ratelimit,
TP_ARGS(bdi, thresh, bg_thresh, dirty, bdi_thresh, bdi_dirty,
dirty_ratelimit, task_ratelimit,
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(3,3,0))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(3,3,0))
dirtied, period, pause, start_time
#else
dirtied, pause, start_time
dirtied, period, pause, start_time
#else
dirtied, pause, start_time
@@
-687,7
+687,7
@@
LTTNG_TRACEPOINT_EVENT_MAP(balance_dirty_pages,
ctf_integer(unsigned long, paused,
(jiffies - start_time) * 1000 / HZ)
ctf_integer(long, pause, pause * 1000 / HZ)
ctf_integer(unsigned long, paused,
(jiffies - start_time) * 1000 / HZ)
ctf_integer(long, pause, pause * 1000 / HZ)
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(3,3,0))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(3,3,0))
ctf_integer(unsigned long, period,
period * 1000 / HZ)
ctf_integer(long, think,
ctf_integer(unsigned long, period,
period * 1000 / HZ)
ctf_integer(long, think,
@@
-696,11
+696,11
@@
LTTNG_TRACEPOINT_EVENT_MAP(balance_dirty_pages,
#endif
)
)
#endif
)
)
-#endif /* #else #if L
INUX_VERSION_CODE >=
KERNEL_VERSION(4,3,0)) */
+#endif /* #else #if L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(4,3,0)) */
-#endif /* #if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(3,2,0)) */
+#endif /* #if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(3,2,0)) */
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(3,5,0))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(3,5,0))
LTTNG_TRACEPOINT_EVENT(writeback_sb_inodes_requeue,
TP_PROTO(struct inode *inode),
LTTNG_TRACEPOINT_EVENT(writeback_sb_inodes_requeue,
TP_PROTO(struct inode *inode),
@@
-742,7
+742,7
@@
LTTNG_TRACEPOINT_EVENT_INSTANCE(writeback_congest_waited_template, writeback_wai
TP_ARGS(usec_timeout, usec_delayed)
)
TP_ARGS(usec_timeout, usec_delayed)
)
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(3,1,0))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(3,1,0))
LTTNG_TRACEPOINT_EVENT_CLASS(writeback_single_inode_template,
TP_PROTO(struct inode *inode,
LTTNG_TRACEPOINT_EVENT_CLASS(writeback_single_inode_template,
TP_PROTO(struct inode *inode,
@@
-766,7
+766,7
@@
LTTNG_TRACEPOINT_EVENT_CLASS(writeback_single_inode_template,
)
)
)
)
-#if (L
INUX_VERSION_CODE <
KERNEL_VERSION(3,5,0))
+#if (L
TTNG_LINUX_VERSION_CODE < LTTNG_
KERNEL_VERSION(3,5,0))
LTTNG_TRACEPOINT_EVENT_INSTANCE(writeback_single_inode_template, writeback_single_inode_requeue,
TP_PROTO(struct inode *inode,
struct writeback_control *wbc,
LTTNG_TRACEPOINT_EVENT_INSTANCE(writeback_single_inode_template, writeback_single_inode_requeue,
TP_PROTO(struct inode *inode,
struct writeback_control *wbc,
diff --git
a/lib/ringbuffer/backend_types.h
b/lib/ringbuffer/backend_types.h
index c443b644d1a3fab23c313aa65b28822479baf5b9..04cecb92707abf4b6a80101b15a4848717e7acd1 100644
(file)
--- a/
lib/ringbuffer/backend_types.h
+++ b/
lib/ringbuffer/backend_types.h
@@
-86,7
+86,7
@@
struct channel_backend {
void *priv; /* Client-specific information */
void *priv_ops; /* Client-specific ops pointer */
void (*release_priv_ops)(void *priv_ops);
void *priv; /* Client-specific information */
void *priv_ops; /* Client-specific ops pointer */
void (*release_priv_ops)(void *priv_ops);
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(4,10,0))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(4,10,0))
struct lttng_cpuhp_node cpuhp_prepare; /* CPU hotplug prepare */
#else
struct notifier_block cpu_hp_notifier; /* CPU hotplug notifier */
struct lttng_cpuhp_node cpuhp_prepare; /* CPU hotplug prepare */
#else
struct notifier_block cpu_hp_notifier; /* CPU hotplug notifier */
diff --git
a/lib/ringbuffer/frontend_types.h
b/lib/ringbuffer/frontend_types.h
index 0d340afb50b3de8f32b9519823fe817ac2c242a2..63cd1e8ca54ba49b22ae6d308b7f0c46ea121833 100644
(file)
--- a/
lib/ringbuffer/frontend_types.h
+++ b/
lib/ringbuffer/frontend_types.h
@@
-53,7
+53,7
@@
struct channel {
unsigned long switch_timer_interval; /* Buffer flush (jiffies) */
unsigned long read_timer_interval; /* Reader wakeup (jiffies) */
unsigned long switch_timer_interval; /* Buffer flush (jiffies) */
unsigned long read_timer_interval; /* Reader wakeup (jiffies) */
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(4,10,0))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(4,10,0))
struct lttng_cpuhp_node cpuhp_prepare;
struct lttng_cpuhp_node cpuhp_online;
struct lttng_cpuhp_node cpuhp_iter_online;
struct lttng_cpuhp_node cpuhp_prepare;
struct lttng_cpuhp_node cpuhp_online;
struct lttng_cpuhp_node cpuhp_iter_online;
diff --git
a/lib/ringbuffer/ring_buffer_backend.c
b/lib/ringbuffer/ring_buffer_backend.c
index d232b7f23e0915f3467b1450f205eb2a479a11a2..a49bb79bc7885d7a4440760df2323d7f7e531030 100644
(file)
--- a/
lib/ringbuffer/ring_buffer_backend.c
+++ b/
lib/ringbuffer/ring_buffer_backend.c
@@
-259,7
+259,7
@@
void channel_backend_reset(struct channel_backend *chanb)
chanb->start_tsc = config->cb.ring_buffer_clock_read(chan);
}
chanb->start_tsc = config->cb.ring_buffer_clock_read(chan);
}
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(4,10,0))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(4,10,0))
/*
* No need to implement a "dead" callback to do a buffer switch here,
/*
* No need to implement a "dead" callback to do a buffer switch here,
@@
-291,7
+291,7
@@
int lttng_cpuhp_rb_backend_prepare(unsigned int cpu,
}
EXPORT_SYMBOL_GPL(lttng_cpuhp_rb_backend_prepare);
}
EXPORT_SYMBOL_GPL(lttng_cpuhp_rb_backend_prepare);
-#else /* #if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(4,10,0)) */
+#else /* #if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(4,10,0)) */
#ifdef CONFIG_HOTPLUG_CPU
#ifdef CONFIG_HOTPLUG_CPU
@@
-341,7
+341,7
@@
int lib_ring_buffer_cpu_hp_callback(struct notifier_block *nb,
#endif
#endif
-#endif /* #else #if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(4,10,0)) */
+#endif /* #else #if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(4,10,0)) */
/**
* channel_backend_init - initialize a channel backend
/**
* channel_backend_init - initialize a channel backend
@@
-419,13
+419,13
@@
int channel_backend_init(struct channel_backend *chanb,
if (!chanb->buf)
goto free_cpumask;
if (!chanb->buf)
goto free_cpumask;
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(4,10,0))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(4,10,0))
chanb->cpuhp_prepare.component = LTTNG_RING_BUFFER_BACKEND;
ret = cpuhp_state_add_instance(lttng_rb_hp_prepare,
&chanb->cpuhp_prepare.node);
if (ret)
goto free_bufs;
chanb->cpuhp_prepare.component = LTTNG_RING_BUFFER_BACKEND;
ret = cpuhp_state_add_instance(lttng_rb_hp_prepare,
&chanb->cpuhp_prepare.node);
if (ret)
goto free_bufs;
-#else /* #if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(4,10,0)) */
+#else /* #if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(4,10,0)) */
{
/*
{
/*
@@
-462,7
+462,7
@@
int channel_backend_init(struct channel_backend *chanb,
}
#endif
}
}
#endif
}
-#endif /* #else #if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(4,10,0)) */
+#endif /* #else #if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(4,10,0)) */
} else {
chanb->buf = kzalloc(sizeof(struct lib_ring_buffer), GFP_KERNEL);
if (!chanb->buf)
} else {
chanb->buf = kzalloc(sizeof(struct lib_ring_buffer), GFP_KERNEL);
if (!chanb->buf)
@@
-477,18
+477,18
@@
int channel_backend_init(struct channel_backend *chanb,
free_bufs:
if (config->alloc == RING_BUFFER_ALLOC_PER_CPU) {
free_bufs:
if (config->alloc == RING_BUFFER_ALLOC_PER_CPU) {
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(4,10,0))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(4,10,0))
/*
* Teardown of lttng_rb_hp_prepare instance
* on "add" error is handled within cpu hotplug,
* no teardown to do from the caller.
*/
/*
* Teardown of lttng_rb_hp_prepare instance
* on "add" error is handled within cpu hotplug,
* no teardown to do from the caller.
*/
-#else /* #if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(4,10,0)) */
+#else /* #if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(4,10,0)) */
#ifdef CONFIG_HOTPLUG_CPU
put_online_cpus();
unregister_hotcpu_notifier(&chanb->cpu_hp_notifier);
#endif
#ifdef CONFIG_HOTPLUG_CPU
put_online_cpus();
unregister_hotcpu_notifier(&chanb->cpu_hp_notifier);
#endif
-#endif /* #else #if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(4,10,0)) */
+#endif /* #else #if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(4,10,0)) */
for_each_possible_cpu(i) {
struct lib_ring_buffer *buf =
per_cpu_ptr(chanb->buf, i);
for_each_possible_cpu(i) {
struct lib_ring_buffer *buf =
per_cpu_ptr(chanb->buf, i);
@@
-517,15
+517,15
@@
void channel_backend_unregister_notifiers(struct channel_backend *chanb)
const struct lib_ring_buffer_config *config = &chanb->config;
if (config->alloc == RING_BUFFER_ALLOC_PER_CPU) {
const struct lib_ring_buffer_config *config = &chanb->config;
if (config->alloc == RING_BUFFER_ALLOC_PER_CPU) {
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(4,10,0))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(4,10,0))
int ret;
ret = cpuhp_state_remove_instance(lttng_rb_hp_prepare,
&chanb->cpuhp_prepare.node);
WARN_ON(ret);
int ret;
ret = cpuhp_state_remove_instance(lttng_rb_hp_prepare,
&chanb->cpuhp_prepare.node);
WARN_ON(ret);
-#else /* #if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(4,10,0)) */
+#else /* #if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(4,10,0)) */
unregister_hotcpu_notifier(&chanb->cpu_hp_notifier);
unregister_hotcpu_notifier(&chanb->cpu_hp_notifier);
-#endif /* #else #if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(4,10,0)) */
+#endif /* #else #if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(4,10,0)) */
}
}
}
}
diff --git
a/lib/ringbuffer/ring_buffer_frontend.c
b/lib/ringbuffer/ring_buffer_frontend.c
index 4980d20ec8be522ee3967e9fa2c95d7968eb8073..9121088f3ac7be9e5d84367675dd456ea656b7db 100644
(file)
--- a/
lib/ringbuffer/ring_buffer_frontend.c
+++ b/
lib/ringbuffer/ring_buffer_frontend.c
@@
-453,7
+453,7
@@
static void lib_ring_buffer_stop_read_timer(struct lib_ring_buffer *buf)
buf->read_timer_enabled = 0;
}
buf->read_timer_enabled = 0;
}
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(4,10,0))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(4,10,0))
enum cpuhp_state lttng_rb_hp_prepare;
enum cpuhp_state lttng_rb_hp_online;
enum cpuhp_state lttng_rb_hp_prepare;
enum cpuhp_state lttng_rb_hp_online;
@@
-524,7
+524,7
@@
int lttng_cpuhp_rb_frontend_offline(unsigned int cpu,
}
EXPORT_SYMBOL_GPL(lttng_cpuhp_rb_frontend_offline);
}
EXPORT_SYMBOL_GPL(lttng_cpuhp_rb_frontend_offline);
-#else /* #if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(4,10,0)) */
+#else /* #if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(4,10,0)) */
#ifdef CONFIG_HOTPLUG_CPU
#ifdef CONFIG_HOTPLUG_CPU
@@
-586,7
+586,7
@@
int lib_ring_buffer_cpu_hp_callback(struct notifier_block *nb,
#endif
#endif
-#endif /* #else #if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(4,10,0)) */
+#endif /* #else #if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(4,10,0)) */
#if defined(CONFIG_NO_HZ) && defined(CONFIG_LIB_RING_BUFFER)
/*
#if defined(CONFIG_NO_HZ) && defined(CONFIG_LIB_RING_BUFFER)
/*
@@
-692,7
+692,7
@@
static void channel_unregister_notifiers(struct channel *chan)
* concurrency.
*/
#endif /* CONFIG_NO_HZ */
* concurrency.
*/
#endif /* CONFIG_NO_HZ */
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(4,10,0))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(4,10,0))
{
int ret;
{
int ret;
@@
-703,7
+703,7
@@
static void channel_unregister_notifiers(struct channel *chan)
&chan->cpuhp_prepare.node);
WARN_ON(ret);
}
&chan->cpuhp_prepare.node);
WARN_ON(ret);
}
-#else /* #if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(4,10,0)) */
+#else /* #if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(4,10,0)) */
{
int cpu;
{
int cpu;
@@
-727,7
+727,7
@@
static void channel_unregister_notifiers(struct channel *chan)
}
#endif
}
}
#endif
}
-#endif /* #else #if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(4,10,0)) */
+#endif /* #else #if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(4,10,0)) */
} else {
struct lib_ring_buffer *buf = chan->backend.buf;
} else {
struct lib_ring_buffer *buf = chan->backend.buf;
@@
-856,7
+856,7
@@
struct channel *channel_create(const struct lib_ring_buffer_config *config,
init_waitqueue_head(&chan->hp_wait);
if (config->alloc == RING_BUFFER_ALLOC_PER_CPU) {
init_waitqueue_head(&chan->hp_wait);
if (config->alloc == RING_BUFFER_ALLOC_PER_CPU) {
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(4,10,0))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(4,10,0))
chan->cpuhp_prepare.component = LTTNG_RING_BUFFER_FRONTEND;
ret = cpuhp_state_add_instance_nocalls(lttng_rb_hp_prepare,
&chan->cpuhp_prepare.node);
chan->cpuhp_prepare.component = LTTNG_RING_BUFFER_FRONTEND;
ret = cpuhp_state_add_instance_nocalls(lttng_rb_hp_prepare,
&chan->cpuhp_prepare.node);
@@
-868,7
+868,7
@@
struct channel *channel_create(const struct lib_ring_buffer_config *config,
&chan->cpuhp_online.node);
if (ret)
goto cpuhp_online_error;
&chan->cpuhp_online.node);
if (ret)
goto cpuhp_online_error;
-#else /* #if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(4,10,0)) */
+#else /* #if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(4,10,0)) */
{
int cpu;
/*
{
int cpu;
/*
@@
-904,7
+904,7
@@
struct channel *channel_create(const struct lib_ring_buffer_config *config,
}
#endif
}
}
#endif
}
-#endif /* #else #if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(4,10,0)) */
+#endif /* #else #if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(4,10,0)) */
#if defined(CONFIG_NO_HZ) && defined(CONFIG_LIB_RING_BUFFER)
/* Only benefit from NO_HZ idle with per-cpu buffers for now. */
#if defined(CONFIG_NO_HZ) && defined(CONFIG_LIB_RING_BUFFER)
/* Only benefit from NO_HZ idle with per-cpu buffers for now. */
@@
-924,13
+924,13
@@
struct channel *channel_create(const struct lib_ring_buffer_config *config,
return chan;
return chan;
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(4,10,0))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(4,10,0))
cpuhp_online_error:
ret = cpuhp_state_remove_instance_nocalls(lttng_rb_hp_prepare,
&chan->cpuhp_prepare.node);
WARN_ON(ret);
cpuhp_prepare_error:
cpuhp_online_error:
ret = cpuhp_state_remove_instance_nocalls(lttng_rb_hp_prepare,
&chan->cpuhp_prepare.node);
WARN_ON(ret);
cpuhp_prepare_error:
-#endif /* #if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(4,10,0)) */
+#endif /* #if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(4,10,0)) */
error_free_backend:
channel_backend_free(&chan->backend);
error:
error_free_backend:
channel_backend_free(&chan->backend);
error:
diff --git
a/lib/ringbuffer/ring_buffer_iterator.c
b/lib/ringbuffer/ring_buffer_iterator.c
index 7b4f20a5a2083d01c9ff70734ec9d38655edb33b..ccfef7ddcf62e70daf4dddeae24258b1e3705f95 100644
(file)
--- a/
lib/ringbuffer/ring_buffer_iterator.c
+++ b/
lib/ringbuffer/ring_buffer_iterator.c
@@
-335,7
+335,7
@@
void lib_ring_buffer_iterator_init(struct channel *chan, struct lib_ring_buffer
list_add(&buf->iter.empty_node, &chan->iter.empty_head);
}
list_add(&buf->iter.empty_node, &chan->iter.empty_head);
}
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(4,10,0))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(4,10,0))
int lttng_cpuhp_rb_iter_online(unsigned int cpu,
struct lttng_cpuhp_node *node)
int lttng_cpuhp_rb_iter_online(unsigned int cpu,
struct lttng_cpuhp_node *node)
@@
-352,7
+352,7
@@
int lttng_cpuhp_rb_iter_online(unsigned int cpu,
}
EXPORT_SYMBOL_GPL(lttng_cpuhp_rb_iter_online);
}
EXPORT_SYMBOL_GPL(lttng_cpuhp_rb_iter_online);
-#else /* #if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(4,10,0)) */
+#else /* #if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(4,10,0)) */
#ifdef CONFIG_HOTPLUG_CPU
static
#ifdef CONFIG_HOTPLUG_CPU
static
@@
-384,7
+384,7
@@
int channel_iterator_cpu_hotplug(struct notifier_block *nb,
}
#endif
}
#endif
-#endif /* #else #if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(4,10,0)) */
+#endif /* #else #if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(4,10,0)) */
int channel_iterator_init(struct channel *chan)
{
int channel_iterator_init(struct channel *chan)
{
@@
-401,13
+401,13
@@
int channel_iterator_init(struct channel *chan)
if (ret)
return ret;
if (ret)
return ret;
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(4,10,0))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(4,10,0))
chan->cpuhp_iter_online.component = LTTNG_RING_BUFFER_ITER;
ret = cpuhp_state_add_instance(lttng_rb_hp_online,
&chan->cpuhp_iter_online.node);
if (ret)
return ret;
chan->cpuhp_iter_online.component = LTTNG_RING_BUFFER_ITER;
ret = cpuhp_state_add_instance(lttng_rb_hp_online,
&chan->cpuhp_iter_online.node);
if (ret)
return ret;
-#else /* #if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(4,10,0)) */
+#else /* #if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(4,10,0)) */
{
int cpu;
{
int cpu;
@@
-436,7
+436,7
@@
int channel_iterator_init(struct channel *chan)
}
#endif
}
}
#endif
}
-#endif /* #else #if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(4,10,0)) */
+#endif /* #else #if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(4,10,0)) */
} else {
buf = channel_get_ring_buffer(config, chan, 0);
lib_ring_buffer_iterator_init(chan, buf);
} else {
buf = channel_get_ring_buffer(config, chan, 0);
lib_ring_buffer_iterator_init(chan, buf);
@@
-449,7
+449,7
@@
void channel_iterator_unregister_notifiers(struct channel *chan)
const struct lib_ring_buffer_config *config = &chan->backend.config;
if (config->alloc == RING_BUFFER_ALLOC_PER_CPU) {
const struct lib_ring_buffer_config *config = &chan->backend.config;
if (config->alloc == RING_BUFFER_ALLOC_PER_CPU) {
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(4,10,0))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(4,10,0))
{
int ret;
{
int ret;
@@
-457,10
+457,10
@@
void channel_iterator_unregister_notifiers(struct channel *chan)
&chan->cpuhp_iter_online.node);
WARN_ON(ret);
}
&chan->cpuhp_iter_online.node);
WARN_ON(ret);
}
-#else /* #if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(4,10,0)) */
+#else /* #if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(4,10,0)) */
chan->hp_iter_enable = 0;
unregister_cpu_notifier(&chan->hp_iter_notifier);
chan->hp_iter_enable = 0;
unregister_cpu_notifier(&chan->hp_iter_notifier);
-#endif /* #else #if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(4,10,0)) */
+#endif /* #else #if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(4,10,0)) */
}
}
}
}
diff --git
a/lib/ringbuffer/ring_buffer_mmap.c
b/lib/ringbuffer/ring_buffer_mmap.c
index fab945887855c0eb20967721b3cdc0b3f5dd21fb..3074becbd90cbff501fede66de877b21ad926822 100644
(file)
--- a/
lib/ringbuffer/ring_buffer_mmap.c
+++ b/
lib/ringbuffer/ring_buffer_mmap.c
@@
-20,7
+20,7
@@
/*
* fault() vm_op implementation for ring buffer file mapping.
*/
/*
* fault() vm_op implementation for ring buffer file mapping.
*/
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(5,1,0))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(5,1,0))
static vm_fault_t lib_ring_buffer_fault_compat(struct vm_area_struct *vma, struct vm_fault *vmf)
#else
static int lib_ring_buffer_fault_compat(struct vm_area_struct *vma, struct vm_fault *vmf)
static vm_fault_t lib_ring_buffer_fault_compat(struct vm_area_struct *vma, struct vm_fault *vmf)
#else
static int lib_ring_buffer_fault_compat(struct vm_area_struct *vma, struct vm_fault *vmf)
@@
-57,24
+57,24
@@
static int lib_ring_buffer_fault_compat(struct vm_area_struct *vma, struct vm_fa
return 0;
}
return 0;
}
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(5,1,0))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(5,1,0))
static vm_fault_t lib_ring_buffer_fault(struct vm_fault *vmf)
{
struct vm_area_struct *vma = vmf->vma;
return lib_ring_buffer_fault_compat(vma, vmf);
}
static vm_fault_t lib_ring_buffer_fault(struct vm_fault *vmf)
{
struct vm_area_struct *vma = vmf->vma;
return lib_ring_buffer_fault_compat(vma, vmf);
}
-#elif (L
INUX_VERSION_CODE >=
KERNEL_VERSION(4,11,0))
+#elif (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(4,11,0))
static int lib_ring_buffer_fault(struct vm_fault *vmf)
{
struct vm_area_struct *vma = vmf->vma;
return lib_ring_buffer_fault_compat(vma, vmf);
}
static int lib_ring_buffer_fault(struct vm_fault *vmf)
{
struct vm_area_struct *vma = vmf->vma;
return lib_ring_buffer_fault_compat(vma, vmf);
}
-#else /* #if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(4,11,0)) */
+#else /* #if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(4,11,0)) */
static int lib_ring_buffer_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
{
return lib_ring_buffer_fault_compat(vma, vmf);
}
static int lib_ring_buffer_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
{
return lib_ring_buffer_fault_compat(vma, vmf);
}
-#endif /* #else #if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(4,11,0)) */
+#endif /* #else #if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(4,11,0)) */
/*
* vm_ops for ring buffer file mappings.
/*
* vm_ops for ring buffer file mappings.
diff --git
a/lib/ringbuffer/ring_buffer_splice.c
b/lib/ringbuffer/ring_buffer_splice.c
index eca591d80f8447fe69e6760c9902c14ca72ca3cf..848f22154a0697698535846ff34fa8998862da4f 100644
(file)
--- a/
lib/ringbuffer/ring_buffer_splice.c
+++ b/
lib/ringbuffer/ring_buffer_splice.c
@@
-12,7
+12,7
@@
#include <linux/module.h>
#include <linux/fs.h>
#include <linux/module.h>
#include <linux/fs.h>
-#include <l
inux/
version.h>
+#include <l
ttng-kernel-
version.h>
#include <wrapper/splice.h>
#include <wrapper/ringbuffer/backend.h>
#include <wrapper/splice.h>
#include <wrapper/ringbuffer/backend.h>
@@
-42,20
+42,20
@@
static void lib_ring_buffer_pipe_buf_release(struct pipe_inode_info *pipe,
__free_page(pbuf->page);
}
__free_page(pbuf->page);
}
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(5,8,0))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(5,8,0))
static const struct pipe_buf_operations ring_buffer_pipe_buf_ops = {
.release = lib_ring_buffer_pipe_buf_release,
.try_steal = generic_pipe_buf_try_steal,
.get = generic_pipe_buf_get
};
static const struct pipe_buf_operations ring_buffer_pipe_buf_ops = {
.release = lib_ring_buffer_pipe_buf_release,
.try_steal = generic_pipe_buf_try_steal,
.get = generic_pipe_buf_get
};
-#elif (L
INUX_VERSION_CODE >=
KERNEL_VERSION(5,1,0))
+#elif (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(5,1,0))
static const struct pipe_buf_operations ring_buffer_pipe_buf_ops = {
.confirm = generic_pipe_buf_confirm,
.release = lib_ring_buffer_pipe_buf_release,
.steal = generic_pipe_buf_steal,
.get = generic_pipe_buf_get
};
static const struct pipe_buf_operations ring_buffer_pipe_buf_ops = {
.confirm = generic_pipe_buf_confirm,
.release = lib_ring_buffer_pipe_buf_release,
.steal = generic_pipe_buf_steal,
.get = generic_pipe_buf_get
};
-#elif (L
INUX_VERSION_CODE >=
KERNEL_VERSION(3,15,0))
+#elif (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(3,15,0))
static const struct pipe_buf_operations ring_buffer_pipe_buf_ops = {
.can_merge = 0,
.confirm = generic_pipe_buf_confirm,
static const struct pipe_buf_operations ring_buffer_pipe_buf_ops = {
.can_merge = 0,
.confirm = generic_pipe_buf_confirm,
@@
-103,7
+103,7
@@
static int subbuf_splice_actor(struct file *in,
.pages = pages,
.nr_pages = 0,
.partial = partial,
.pages = pages,
.nr_pages = 0,
.partial = partial,
-#if (L
INUX_VERSION_CODE <
KERNEL_VERSION(4,12,0))
+#if (L
TTNG_LINUX_VERSION_CODE < LTTNG_
KERNEL_VERSION(4,12,0))
.flags = flags,
#endif
.ops = &ring_buffer_pipe_buf_ops,
.flags = flags,
#endif
.ops = &ring_buffer_pipe_buf_ops,
diff --git
a/lttng-abi.c
b/lttng-abi.c
index b33879d9d6eafcd68f17201a43b6be5e731144f5..18f5123c1f7772de392726f20f5397a6c5511794 100644
(file)
--- a/
lttng-abi.c
+++ b/
lttng-abi.c
@@
-52,7
+52,7
@@
static struct proc_dir_entry *lttng_proc_dentry;
static struct proc_dir_entry *lttng_proc_dentry;
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(5,6,0))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(5,6,0))
static const struct proc_ops lttng_proc_ops;
#else
static const struct file_operations lttng_proc_ops;
static const struct proc_ops lttng_proc_ops;
#else
static const struct file_operations lttng_proc_ops;
@@
-398,7
+398,7
@@
long lttng_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
}
}
}
}
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(5,6,0))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(5,6,0))
static const struct proc_ops lttng_proc_ops = {
.proc_ioctl = lttng_ioctl,
#ifdef CONFIG_COMPAT
static const struct proc_ops lttng_proc_ops = {
.proc_ioctl = lttng_ioctl,
#ifdef CONFIG_COMPAT
diff --git
a/lttng-context-cgroup-ns.c
b/lttng-context-cgroup-ns.c
index f324b7e79e466b60b2686e6e3e62b6d8001acc60..de4a4c9fb0d5da57d9d25878beeeef69a0f18779 100644
(file)
--- a/
lttng-context-cgroup-ns.c
+++ b/
lttng-context-cgroup-ns.c
@@
-20,7
+20,7
@@
#include <lttng-tracer.h>
#if defined(CONFIG_CGROUPS) && \
#include <lttng-tracer.h>
#if defined(CONFIG_CGROUPS) && \
- ((L
INUX_VERSION_CODE >=
KERNEL_VERSION(4,6,0)) || \
+ ((L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(4,6,0)) || \
LTTNG_UBUNTU_KERNEL_RANGE(4,4,0,0, 4,5,0,0))
static
LTTNG_UBUNTU_KERNEL_RANGE(4,4,0,0, 4,5,0,0))
static
diff --git
a/lttng-context-ipc-ns.c
b/lttng-context-ipc-ns.c
index 40b901b4b70c89fb5bd47fd34997507bc904c423..f723e8a72880b255eae69dff3e1c0d7ac215e0d8 100644
(file)
--- a/
lttng-context-ipc-ns.c
+++ b/
lttng-context-ipc-ns.c
@@
-20,7
+20,7
@@
#include <lttng-tracer.h>
#if defined(CONFIG_IPC_NS) && \
#include <lttng-tracer.h>
#if defined(CONFIG_IPC_NS) && \
- (L
INUX_VERSION_CODE >=
KERNEL_VERSION(3,8,0))
+ (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(3,8,0))
static
size_t ipc_ns_get_size(size_t offset)
static
size_t ipc_ns_get_size(size_t offset)
diff --git
a/lttng-context-mnt-ns.c
b/lttng-context-mnt-ns.c
index cb59776c82cca5c41f504ba90194f588863a1222..72f4c8eca2fd1ce7145c0fd249c0bc726ec20db4 100644
(file)
--- a/
lttng-context-mnt-ns.c
+++ b/
lttng-context-mnt-ns.c
@@
-20,7
+20,7
@@
#include <lttng-tracer.h>
#if !defined(LTTNG_MNT_NS_MISSING_HEADER) && \
#include <lttng-tracer.h>
#if !defined(LTTNG_MNT_NS_MISSING_HEADER) && \
- (L
INUX_VERSION_CODE >=
KERNEL_VERSION(3,8,0))
+ (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(3,8,0))
#include <../fs/mount.h>
#include <../fs/mount.h>
diff --git
a/lttng-context-net-ns.c
b/lttng-context-net-ns.c
index 37de09f7bd3c010a53c990b2bacd8beffee375cd..32f0b599cda06c18e55390134ada76fd0f51932b 100644
(file)
--- a/
lttng-context-net-ns.c
+++ b/
lttng-context-net-ns.c
@@
-21,7
+21,7
@@
#include <lttng-tracer.h>
#if defined(CONFIG_NET_NS) && \
#include <lttng-tracer.h>
#if defined(CONFIG_NET_NS) && \
- (L
INUX_VERSION_CODE >=
KERNEL_VERSION(3,8,0))
+ (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(3,8,0))
static
size_t net_ns_get_size(size_t offset)
static
size_t net_ns_get_size(size_t offset)
diff --git
a/lttng-context-perf-counters.c
b/lttng-context-perf-counters.c
index 9887c6d208a27917d6f467ec3234811722d8cba1..e12c73bbdc678c9e049ff4a989a56c5275b224c4 100644
(file)
--- a/
lttng-context-perf-counters.c
+++ b/
lttng-context-perf-counters.c
@@
-59,7
+59,7
@@
void perf_counter_record(struct lttng_ctx_field *field,
chan->ops->event_write(ctx, &value, sizeof(value));
}
chan->ops->event_write(ctx, &value, sizeof(value));
}
-#if defined(CONFIG_PERF_EVENTS) && (L
INUX_VERSION_CODE >=
KERNEL_VERSION(3,1,0))
+#if defined(CONFIG_PERF_EVENTS) && (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(3,1,0))
static
void overflow_callback(struct perf_event *event,
struct perf_sample_data *data,
static
void overflow_callback(struct perf_event *event,
struct perf_sample_data *data,
@@
-80,7
+80,7
@@
void lttng_destroy_perf_counter_field(struct lttng_ctx_field *field)
{
struct perf_event **events = field->u.perf_counter->e;
{
struct perf_event **events = field->u.perf_counter->e;
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(4,10,0))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(4,10,0))
{
int ret;
{
int ret;
@@
-91,7
+91,7
@@
void lttng_destroy_perf_counter_field(struct lttng_ctx_field *field)
&field->u.perf_counter->cpuhp_prepare.node);
WARN_ON(ret);
}
&field->u.perf_counter->cpuhp_prepare.node);
WARN_ON(ret);
}
-#else /* #if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(4,10,0)) */
+#else /* #if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(4,10,0)) */
{
int cpu;
{
int cpu;
@@
-103,14
+103,14
@@
void lttng_destroy_perf_counter_field(struct lttng_ctx_field *field)
unregister_cpu_notifier(&field->u.perf_counter->nb);
#endif
}
unregister_cpu_notifier(&field->u.perf_counter->nb);
#endif
}
-#endif /* #else #if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(4,10,0)) */
+#endif /* #else #if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(4,10,0)) */
kfree(field->event_field.name);
kfree(field->u.perf_counter->attr);
lttng_kvfree(events);
kfree(field->u.perf_counter);
}
kfree(field->event_field.name);
kfree(field->u.perf_counter->attr);
lttng_kvfree(events);
kfree(field->u.perf_counter);
}
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(4,10,0))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(4,10,0))
int lttng_cpuhp_perf_counter_online(unsigned int cpu,
struct lttng_cpuhp_node *node)
int lttng_cpuhp_perf_counter_online(unsigned int cpu,
struct lttng_cpuhp_node *node)
@@
-151,7
+151,7
@@
int lttng_cpuhp_perf_counter_dead(unsigned int cpu,
return 0;
}
return 0;
}
-#else /* #if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(4,10,0)) */
+#else /* #if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(4,10,0)) */
#ifdef CONFIG_HOTPLUG_CPU
#ifdef CONFIG_HOTPLUG_CPU
@@
-210,7
+210,7
@@
int lttng_perf_counter_cpu_hp_callback(struct notifier_block *nb,
#endif
#endif
-#endif /* #else #if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(4,10,0)) */
+#endif /* #else #if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(4,10,0)) */
int lttng_add_perf_counter_to_ctx(uint32_t type,
uint64_t config,
int lttng_add_perf_counter_to_ctx(uint32_t type,
uint64_t config,
@@
-264,7
+264,7
@@
int lttng_add_perf_counter_to_ctx(uint32_t type,
goto find_error;
}
goto find_error;
}
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(4,10,0))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(4,10,0))
perf_field->cpuhp_prepare.component = LTTNG_CONTEXT_PERF_COUNTERS;
ret = cpuhp_state_add_instance(lttng_hp_prepare,
perf_field->cpuhp_prepare.component = LTTNG_CONTEXT_PERF_COUNTERS;
ret = cpuhp_state_add_instance(lttng_hp_prepare,
@@
-278,7
+278,7
@@
int lttng_add_perf_counter_to_ctx(uint32_t type,
if (ret)
goto cpuhp_online_error;
if (ret)
goto cpuhp_online_error;
-#else /* #if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(4,10,0)) */
+#else /* #if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(4,10,0)) */
{
int cpu;
{
int cpu;
@@
-304,7
+304,7
@@
int lttng_add_perf_counter_to_ctx(uint32_t type,
put_online_cpus();
perf_field->hp_enable = 1;
}
put_online_cpus();
perf_field->hp_enable = 1;
}
-#endif /* #else #if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(4,10,0)) */
+#endif /* #else #if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(4,10,0)) */
field->destroy = lttng_destroy_perf_counter_field;
field->destroy = lttng_destroy_perf_counter_field;
@@
-324,7
+324,7
@@
int lttng_add_perf_counter_to_ctx(uint32_t type,
wrapper_vmalloc_sync_mappings();
return 0;
wrapper_vmalloc_sync_mappings();
return 0;
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(4,10,0))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(4,10,0))
cpuhp_online_error:
{
int remove_ret;
cpuhp_online_error:
{
int remove_ret;
@@
-334,7
+334,7
@@
cpuhp_online_error:
WARN_ON(remove_ret);
}
cpuhp_prepare_error:
WARN_ON(remove_ret);
}
cpuhp_prepare_error:
-#else /* #if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(4,10,0)) */
+#else /* #if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(4,10,0)) */
counter_busy:
counter_error:
{
counter_busy:
counter_error:
{
@@
-349,7
+349,7
@@
counter_error:
unregister_cpu_notifier(&perf_field->nb);
#endif
}
unregister_cpu_notifier(&perf_field->nb);
#endif
}
-#endif /* #else #if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(4,10,0)) */
+#endif /* #else #if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(4,10,0)) */
find_error:
lttng_remove_context_field(ctx, field);
append_context_error:
find_error:
lttng_remove_context_field(ctx, field);
append_context_error:
diff --git
a/lttng-context-pid-ns.c
b/lttng-context-pid-ns.c
index ccf629d4f995f7746ff7915f852d52cf3cc6e8f9..68f8274329390a482e099c9d5b27943bc8ec48f5 100644
(file)
--- a/
lttng-context-pid-ns.c
+++ b/
lttng-context-pid-ns.c
@@
-20,7
+20,7
@@
#include <lttng-tracer.h>
#if defined(CONFIG_PID_NS) && \
#include <lttng-tracer.h>
#if defined(CONFIG_PID_NS) && \
- (L
INUX_VERSION_CODE >=
KERNEL_VERSION(3,8,0))
+ (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(3,8,0))
static
size_t pid_ns_get_size(size_t offset)
static
size_t pid_ns_get_size(size_t offset)
diff --git
a/lttng-context-user-ns.c
b/lttng-context-user-ns.c
index 0ed62e36c87b2efc35e61ba635f15d3603b5b5b2..ebf2a2da5fb836b1df616c348b5f5cdca4be0f71 100644
(file)
--- a/
lttng-context-user-ns.c
+++ b/
lttng-context-user-ns.c
@@
-20,7
+20,7
@@
#include <lttng-tracer.h>
#if defined(CONFIG_USER_NS) && \
#include <lttng-tracer.h>
#if defined(CONFIG_USER_NS) && \
- (L
INUX_VERSION_CODE >=
KERNEL_VERSION(3,8,0))
+ (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(3,8,0))
static
size_t user_ns_get_size(size_t offset)
static
size_t user_ns_get_size(size_t offset)
diff --git
a/lttng-context-uts-ns.c
b/lttng-context-uts-ns.c
index 283bc73e5a28245190258b6cff0b988d8ef85ec7..20d96b3a1fa0a30f73d3e696091a10b80ea1a573 100644
(file)
--- a/
lttng-context-uts-ns.c
+++ b/
lttng-context-uts-ns.c
@@
-20,7
+20,7
@@
#include <lttng-tracer.h>
#if defined(CONFIG_UTS_NS) && \
#include <lttng-tracer.h>
#if defined(CONFIG_UTS_NS) && \
- (L
INUX_VERSION_CODE >=
KERNEL_VERSION(3,8,0))
+ (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(3,8,0))
static
size_t uts_ns_get_size(size_t offset)
static
size_t uts_ns_get_size(size_t offset)
diff --git
a/lttng-cpuhotplug.h
b/lttng-cpuhotplug.h
index f261d0452a41d4cb7c1abeee2e38d1a5db355d94..2d301c2ba8b2d0ec2b2e132d8c7189ff053db95a 100644
(file)
--- a/
lttng-cpuhotplug.h
+++ b/
lttng-cpuhotplug.h
@@
-10,7
+10,7
@@
struct lttng_cpuhp_node;
struct lttng_cpuhp_node;
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(4,10,0))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(4,10,0))
#include <linux/cpuhotplug.h>
#include <linux/cpuhotplug.h>
diff --git
a/lttng-events.c
b/lttng-events.c
index 4c0b04a09597bef396dba066fd4d64a0733cf206..f3398adc6f11d6db7bc3ce8844fb2a3c3dcbc10f 100644
(file)
--- a/
lttng-events.c
+++ b/
lttng-events.c
@@
-77,21
+77,21
@@
int _lttng_field_statedump(struct lttng_session *session,
void synchronize_trace(void)
{
void synchronize_trace(void)
{
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(5,1,0))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(5,1,0))
synchronize_rcu();
#else
synchronize_sched();
#endif
synchronize_rcu();
#else
synchronize_sched();
#endif
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(3,4,0))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(3,4,0))
#ifdef CONFIG_PREEMPT_RT_FULL
synchronize_rcu();
#endif
#ifdef CONFIG_PREEMPT_RT_FULL
synchronize_rcu();
#endif
-#else /* (L
INUX_VERSION_CODE >=
KERNEL_VERSION(3,4,0)) */
+#else /* (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(3,4,0)) */
#ifdef CONFIG_PREEMPT_RT
synchronize_rcu();
#endif
#ifdef CONFIG_PREEMPT_RT
synchronize_rcu();
#endif
-#endif /* (L
INUX_VERSION_CODE >=
KERNEL_VERSION(3,4,0)) */
+#endif /* (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(3,4,0)) */
}
void lttng_lock_sessions(void)
}
void lttng_lock_sessions(void)
@@
-2908,7
+2908,7
@@
void lttng_transport_unregister(struct lttng_transport *transport)
}
EXPORT_SYMBOL_GPL(lttng_transport_unregister);
}
EXPORT_SYMBOL_GPL(lttng_transport_unregister);
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(4,10,0))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(4,10,0))
enum cpuhp_state lttng_hp_prepare;
enum cpuhp_state lttng_hp_online;
enum cpuhp_state lttng_hp_prepare;
enum cpuhp_state lttng_hp_online;
@@
-3024,7
+3024,7
@@
static void __exit lttng_exit_cpu_hotplug(void)
cpuhp_remove_multi_state(lttng_hp_prepare);
}
cpuhp_remove_multi_state(lttng_hp_prepare);
}
-#else /* #if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(4,10,0)) */
+#else /* #if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(4,10,0)) */
static int lttng_init_cpu_hotplug(void)
{
return 0;
static int lttng_init_cpu_hotplug(void)
{
return 0;
@@
-3032,7
+3032,7
@@
static int lttng_init_cpu_hotplug(void)
static void lttng_exit_cpu_hotplug(void)
{
}
static void lttng_exit_cpu_hotplug(void)
{
}
-#endif /* #else #if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(4,10,0)) */
+#endif /* #else #if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(4,10,0)) */
static int __init lttng_events_init(void)
static int __init lttng_events_init(void)
diff --git
a/lttng-events.h
b/lttng-events.h
index e47c14780d63018c434dd3ba7a37cc15df5dd767..1b9ab167588ff651d9677d3659e2b920eeca7af4 100644
(file)
--- a/
lttng-events.h
+++ b/
lttng-events.h
@@
-10,7
+10,7
@@
#ifndef _LTTNG_EVENTS_H
#define _LTTNG_EVENTS_H
#ifndef _LTTNG_EVENTS_H
#define _LTTNG_EVENTS_H
-#include <l
inux/
version.h>
+#include <l
ttng-kernel-
version.h>
#include <linux/list.h>
#include <linux/kprobes.h>
#include <linux/kref.h>
#include <linux/list.h>
#include <linux/kprobes.h>
#include <linux/kref.h>
@@
-176,7
+176,7
@@
union lttng_ctx_value {
* lttng_ctx_field because cpu hotplug needs fixed-location addresses.
*/
struct lttng_perf_counter_field {
* lttng_ctx_field because cpu hotplug needs fixed-location addresses.
*/
struct lttng_perf_counter_field {
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(4,10,0))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(4,10,0))
struct lttng_cpuhp_node cpuhp_prepare;
struct lttng_cpuhp_node cpuhp_online;
#else
struct lttng_cpuhp_node cpuhp_prepare;
struct lttng_cpuhp_node cpuhp_online;
#else
@@
-765,7
+765,7
@@
int lttng_add_migratable_to_ctx(struct lttng_ctx **ctx)
int lttng_add_callstack_to_ctx(struct lttng_ctx **ctx, int type);
#if defined(CONFIG_CGROUPS) && \
int lttng_add_callstack_to_ctx(struct lttng_ctx **ctx, int type);
#if defined(CONFIG_CGROUPS) && \
- ((L
INUX_VERSION_CODE >=
KERNEL_VERSION(4,6,0)) || \
+ ((L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(4,6,0)) || \
LTTNG_UBUNTU_KERNEL_RANGE(4,4,0,0, 4,5,0,0))
int lttng_add_cgroup_ns_to_ctx(struct lttng_ctx **ctx);
#else
LTTNG_UBUNTU_KERNEL_RANGE(4,4,0,0, 4,5,0,0))
int lttng_add_cgroup_ns_to_ctx(struct lttng_ctx **ctx);
#else
@@
-777,7
+777,7
@@
int lttng_add_cgroup_ns_to_ctx(struct lttng_ctx **ctx)
#endif
#if defined(CONFIG_IPC_NS) && \
#endif
#if defined(CONFIG_IPC_NS) && \
- (L
INUX_VERSION_CODE >=
KERNEL_VERSION(3,8,0))
+ (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(3,8,0))
int lttng_add_ipc_ns_to_ctx(struct lttng_ctx **ctx);
#else
static inline
int lttng_add_ipc_ns_to_ctx(struct lttng_ctx **ctx);
#else
static inline
@@
-788,7
+788,7
@@
int lttng_add_ipc_ns_to_ctx(struct lttng_ctx **ctx)
#endif
#if !defined(LTTNG_MNT_NS_MISSING_HEADER) && \
#endif
#if !defined(LTTNG_MNT_NS_MISSING_HEADER) && \
- (L
INUX_VERSION_CODE >=
KERNEL_VERSION(3,8,0))
+ (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(3,8,0))
int lttng_add_mnt_ns_to_ctx(struct lttng_ctx **ctx);
#else
static inline
int lttng_add_mnt_ns_to_ctx(struct lttng_ctx **ctx);
#else
static inline
@@
-799,7
+799,7
@@
int lttng_add_mnt_ns_to_ctx(struct lttng_ctx **ctx)
#endif
#if defined(CONFIG_NET_NS) && \
#endif
#if defined(CONFIG_NET_NS) && \
- (L
INUX_VERSION_CODE >=
KERNEL_VERSION(3,8,0))
+ (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(3,8,0))
int lttng_add_net_ns_to_ctx(struct lttng_ctx **ctx);
#else
static inline
int lttng_add_net_ns_to_ctx(struct lttng_ctx **ctx);
#else
static inline
@@
-810,7
+810,7
@@
int lttng_add_net_ns_to_ctx(struct lttng_ctx **ctx)
#endif
#if defined(CONFIG_PID_NS) && \
#endif
#if defined(CONFIG_PID_NS) && \
- (L
INUX_VERSION_CODE >=
KERNEL_VERSION(3,8,0))
+ (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(3,8,0))
int lttng_add_pid_ns_to_ctx(struct lttng_ctx **ctx);
#else
static inline
int lttng_add_pid_ns_to_ctx(struct lttng_ctx **ctx);
#else
static inline
@@
-821,7
+821,7
@@
int lttng_add_pid_ns_to_ctx(struct lttng_ctx **ctx)
#endif
#if defined(CONFIG_USER_NS) && \
#endif
#if defined(CONFIG_USER_NS) && \
- (L
INUX_VERSION_CODE >=
KERNEL_VERSION(3,8,0))
+ (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(3,8,0))
int lttng_add_user_ns_to_ctx(struct lttng_ctx **ctx);
#else
static inline
int lttng_add_user_ns_to_ctx(struct lttng_ctx **ctx);
#else
static inline
@@
-832,7
+832,7
@@
int lttng_add_user_ns_to_ctx(struct lttng_ctx **ctx)
#endif
#if defined(CONFIG_UTS_NS) && \
#endif
#if defined(CONFIG_UTS_NS) && \
- (L
INUX_VERSION_CODE >=
KERNEL_VERSION(3,8,0))
+ (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(3,8,0))
int lttng_add_uts_ns_to_ctx(struct lttng_ctx **ctx);
#else
static inline
int lttng_add_uts_ns_to_ctx(struct lttng_ctx **ctx);
#else
static inline
diff --git
a/lttng-kernel-version.h
b/lttng-kernel-version.h
index 26f816c0a6e75c1ecabcaf28f9e9d2d02a9f36ae..daf2c6adcb75ea9650d9c41c521f3083a7882377 100644
(file)
--- a/
lttng-kernel-version.h
+++ b/
lttng-kernel-version.h
@@
-13,22
+13,25
@@
#include <linux/version.h>
#include <generated/utsrelease.h>
#include <linux/version.h>
#include <generated/utsrelease.h>
+#define LTTNG_KERNEL_VERSION(a, b, c) KERNEL_VERSION(a, b, c)
+#define LTTNG_LINUX_VERSION_CODE LINUX_VERSION_CODE
+
/*
* This macro checks if the kernel version is between the two specified
* versions (lower limit inclusive, upper limit exclusive).
*/
#define LTTNG_KERNEL_RANGE(a_low, b_low, c_low, a_high, b_high, c_high) \
/*
* This macro checks if the kernel version is between the two specified
* versions (lower limit inclusive, upper limit exclusive).
*/
#define LTTNG_KERNEL_RANGE(a_low, b_low, c_low, a_high, b_high, c_high) \
- (L
INUX_VERSION_CODE >=
KERNEL_VERSION(a_low, b_low, c_low) && \
- L
INUX_VERSION_CODE <
KERNEL_VERSION(a_high, b_high, c_high))
+ (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(a_low, b_low, c_low) && \
+ L
TTNG_LINUX_VERSION_CODE < LTTNG_
KERNEL_VERSION(a_high, b_high, c_high))
/* Ubuntu */
#define LTTNG_UBUNTU_KERNEL_VERSION(a, b, c, d) \
/* Ubuntu */
#define LTTNG_UBUNTU_KERNEL_VERSION(a, b, c, d) \
- (((
a) << 24) + ((b) << 16) + ((c
) << 8) + (d))
+ (((
LTTNG_KERNEL_VERSION(a, b, c)
) << 8) + (d))
#ifdef UTS_UBUNTU_RELEASE_ABI
#define LTTNG_UBUNTU_VERSION_CODE \
#ifdef UTS_UBUNTU_RELEASE_ABI
#define LTTNG_UBUNTU_VERSION_CODE \
- ((LINUX_VERSION_CODE << 8) + UTS_UBUNTU_RELEASE_ABI)
+ ((L
TTNG_L
INUX_VERSION_CODE << 8) + UTS_UBUNTU_RELEASE_ABI)
#else
#define LTTNG_UBUNTU_VERSION_CODE 0
#endif
#else
#define LTTNG_UBUNTU_VERSION_CODE 0
#endif
@@
-43,11
+46,11
@@
/* Debian */
#define LTTNG_DEBIAN_KERNEL_VERSION(a, b, c, d, e, f) \
/* Debian */
#define LTTNG_DEBIAN_KERNEL_VERSION(a, b, c, d, e, f) \
- (((
((a) << 16) + ((b) << 8) + (
c)) * 1000000ULL) + ((d) * 10000) + ((e) * 100) + (f))
+ (((
LTTNG_KERNEL_VERSION(a, b,
c)) * 1000000ULL) + ((d) * 10000) + ((e) * 100) + (f))
#ifdef DEBIAN_API_VERSION
#define LTTNG_DEBIAN_VERSION_CODE \
#ifdef DEBIAN_API_VERSION
#define LTTNG_DEBIAN_VERSION_CODE \
- ((LINUX_VERSION_CODE * 1000000ULL) + DEBIAN_API_VERSION)
+ ((L
TTNG_L
INUX_VERSION_CODE * 1000000ULL) + DEBIAN_API_VERSION)
#else
#define LTTNG_DEBIAN_VERSION_CODE 0
#endif
#else
#define LTTNG_DEBIAN_VERSION_CODE 0
#endif
@@
-60,13
+63,13
@@
LTTNG_DEBIAN_KERNEL_VERSION(a_high, b_high, c_high, d_high, e_high, f_high))
#define LTTNG_RHEL_KERNEL_VERSION(a, b, c, d, e, f) \
LTTNG_DEBIAN_KERNEL_VERSION(a_high, b_high, c_high, d_high, e_high, f_high))
#define LTTNG_RHEL_KERNEL_VERSION(a, b, c, d, e, f) \
- (((
((a) << 16) + ((b) << 8) + (
c)) * 10000000ULL) + ((d) * 10000) + ((e) * 100) + (f))
+ (((
LTTNG_KERNEL_VERSION(a, b,
c)) * 10000000ULL) + ((d) * 10000) + ((e) * 100) + (f))
/* RHEL */
#ifdef RHEL_API_VERSION
#define LTTNG_RHEL_VERSION_CODE \
/* RHEL */
#ifdef RHEL_API_VERSION
#define LTTNG_RHEL_VERSION_CODE \
- ((LINUX_VERSION_CODE * 10000000ULL) + RHEL_API_VERSION)
+ ((L
TTNG_L
INUX_VERSION_CODE * 10000000ULL) + RHEL_API_VERSION)
#else
#define LTTNG_RHEL_VERSION_CODE 0
#endif
#else
#define LTTNG_RHEL_VERSION_CODE 0
#endif
@@
-81,11
+84,11
@@
/* SUSE Linux enterprise */
#define LTTNG_SLE_KERNEL_VERSION(a, b, c, d, e, f) \
/* SUSE Linux enterprise */
#define LTTNG_SLE_KERNEL_VERSION(a, b, c, d, e, f) \
- (((
((a) << 16) + ((b) << 8) + (
c)) * 10000000ULL) + ((d) * 10000) + ((e) * 100) + (f))
+ (((
LTTNG_KERNEL_VERSION(a, b,
c)) * 10000000ULL) + ((d) * 10000) + ((e) * 100) + (f))
#ifdef SLE_API_VERSION
#define LTTNG_SLE_VERSION_CODE \
#ifdef SLE_API_VERSION
#define LTTNG_SLE_VERSION_CODE \
- ((LINUX_VERSION_CODE * 10000000ULL) + SLE_API_VERSION)
+ ((L
TTNG_L
INUX_VERSION_CODE * 10000000ULL) + SLE_API_VERSION)
#else
#define LTTNG_SLE_VERSION_CODE 0
#endif
#else
#define LTTNG_SLE_VERSION_CODE 0
#endif
@@
-100,11
+103,11
@@
/* Fedora */
#define LTTNG_FEDORA_KERNEL_VERSION(a, b, c, d) \
/* Fedora */
#define LTTNG_FEDORA_KERNEL_VERSION(a, b, c, d) \
- (((
((a) << 16) + ((b) << 8) + (
c)) * 10000ULL) + (d))
+ (((
LTTNG_KERNEL_VERSION(a, b,
c)) * 10000ULL) + (d))
#ifdef FEDORA_REVISION_VERSION
#define LTTNG_FEDORA_VERSION_CODE \
#ifdef FEDORA_REVISION_VERSION
#define LTTNG_FEDORA_VERSION_CODE \
- ((LINUX_VERSION_CODE * 10000ULL) + FEDORA_REVISION_VERSION)
+ ((L
TTNG_L
INUX_VERSION_CODE * 10000ULL) + FEDORA_REVISION_VERSION)
#else
#define LTTNG_FEDORA_VERSION_CODE 0
#endif
#else
#define LTTNG_FEDORA_VERSION_CODE 0
#endif
@@
-119,11
+122,11
@@
/* RT patch */
#define LTTNG_RT_KERNEL_VERSION(a, b, c, d) \
/* RT patch */
#define LTTNG_RT_KERNEL_VERSION(a, b, c, d) \
- (((
a) << 24) + ((b) << 16) + ((c
) << 8) + (d))
+ (((
LTTNG_KERNEL_VERSION(a, b, c)
) << 8) + (d))
#ifdef RT_PATCH_VERSION
#define LTTNG_RT_VERSION_CODE \
#ifdef RT_PATCH_VERSION
#define LTTNG_RT_VERSION_CODE \
- ((LINUX_VERSION_CODE << 8) + RT_PATCH_VERSION)
+ ((L
TTNG_L
INUX_VERSION_CODE << 8) + RT_PATCH_VERSION)
#else
#define LTTNG_RT_VERSION_CODE 0
#endif
#else
#define LTTNG_RT_VERSION_CODE 0
#endif
diff --git
a/lttng-statedump-impl.c
b/lttng-statedump-impl.c
index 7dde1d23e3337ba3704a5b815fb33cd2ec885330..60b937c98b77f22ab5a1cac6eb331f4900eedbf2 100644
(file)
--- a/
lttng-statedump-impl.c
+++ b/
lttng-statedump-impl.c
@@
-94,7
+94,7
@@
LTTNG_DEFINE_TRACE(lttng_statedump_process_pid_ns,
struct pid_namespace *pid_ns),
TP_ARGS(session, p, pid_ns));
struct pid_namespace *pid_ns),
TP_ARGS(session, p, pid_ns));
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(4,6,0))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(4,6,0))
LTTNG_DEFINE_TRACE(lttng_statedump_process_cgroup_ns,
TP_PROTO(struct lttng_session *session,
struct task_struct *p,
LTTNG_DEFINE_TRACE(lttng_statedump_process_cgroup_ns,
TP_PROTO(struct lttng_session *session,
struct task_struct *p,
@@
-189,7
+189,7
@@
enum lttng_process_status {
};
};
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(5,11,0))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(5,11,0))
#define LTTNG_PART_STRUCT_TYPE struct block_device
#define LTTNG_PART_STRUCT_TYPE struct block_device
@@
-546,7
+546,7
@@
void lttng_statedump_process_ns(struct lttng_session *session,
* "namespaces: Use task_lock and not rcu to protect nsproxy"
* for details.
*/
* "namespaces: Use task_lock and not rcu to protect nsproxy"
* for details.
*/
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(3,17,0) || \
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(3,17,0) || \
LTTNG_UBUNTU_KERNEL_RANGE(3,13,11,36, 3,14,0,0) || \
LTTNG_UBUNTU_KERNEL_RANGE(3,16,1,11, 3,17,0,0) || \
LTTNG_RHEL_KERNEL_RANGE(3,10,0,229,13,0, 3,11,0,0,0,0))
LTTNG_UBUNTU_KERNEL_RANGE(3,13,11,36, 3,14,0,0) || \
LTTNG_UBUNTU_KERNEL_RANGE(3,16,1,11, 3,17,0,0) || \
LTTNG_RHEL_KERNEL_RANGE(3,10,0,229,13,0, 3,11,0,0,0,0))
@@
-556,7
+556,7
@@
void lttng_statedump_process_ns(struct lttng_session *session,
proxy = task_nsproxy(p);
#endif
if (proxy) {
proxy = task_nsproxy(p);
#endif
if (proxy) {
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(4,6,0))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(4,6,0))
trace_lttng_statedump_process_cgroup_ns(session, p, proxy->cgroup_ns);
#endif
trace_lttng_statedump_process_ipc_ns(session, p, proxy->ipc_ns);
trace_lttng_statedump_process_cgroup_ns(session, p, proxy->cgroup_ns);
#endif
trace_lttng_statedump_process_ipc_ns(session, p, proxy->ipc_ns);
@@
-566,7
+566,7
@@
void lttng_statedump_process_ns(struct lttng_session *session,
trace_lttng_statedump_process_net_ns(session, p, proxy->net_ns);
trace_lttng_statedump_process_uts_ns(session, p, proxy->uts_ns);
}
trace_lttng_statedump_process_net_ns(session, p, proxy->net_ns);
trace_lttng_statedump_process_uts_ns(session, p, proxy->uts_ns);
}
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(3,17,0) || \
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(3,17,0) || \
LTTNG_UBUNTU_KERNEL_RANGE(3,13,11,36, 3,14,0,0) || \
LTTNG_UBUNTU_KERNEL_RANGE(3,16,1,11, 3,17,0,0) || \
LTTNG_RHEL_KERNEL_RANGE(3,10,0,229,13,0, 3,11,0,0,0,0))
LTTNG_UBUNTU_KERNEL_RANGE(3,13,11,36, 3,14,0,0) || \
LTTNG_UBUNTU_KERNEL_RANGE(3,16,1,11, 3,17,0,0) || \
LTTNG_RHEL_KERNEL_RANGE(3,10,0,229,13,0, 3,11,0,0,0,0))
diff --git
a/lttng-syscalls.c
b/lttng-syscalls.c
index b43dd570a029d1d5b1a4f6160765ae31668a6003..4596ccfc1280f82eaefdd0b5b6462bceffee0f8f 100644
(file)
--- a/
lttng-syscalls.c
+++ b/
lttng-syscalls.c
@@
-81,7
+81,7
@@
struct timeval;
struct itimerval;
struct itimerspec;
struct itimerval;
struct itimerspec;
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(5,6,0))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(5,6,0))
typedef __kernel_old_time_t time_t;
#endif
typedef __kernel_old_time_t time_t;
#endif
diff --git
a/probes/lttng-probe-btrfs.c
b/probes/lttng-probe-btrfs.c
index 69e69aaffd6c0ac222b1a46b637f3091f4c20498..02963efdc55ab27ebec39755e7acc8036246ee48 100644
(file)
--- a/
probes/lttng-probe-btrfs.c
+++ b/
probes/lttng-probe-btrfs.c
@@
-10,11
+10,11
@@
#include <linux/module.h>
#include <linux/fs.h>
#include <linux/module.h>
#include <linux/fs.h>
-#include <l
inux/
version.h>
+#include <l
ttng-kernel-
version.h>
#include <../fs/btrfs/ctree.h>
#include <../fs/btrfs/transaction.h>
#include <../fs/btrfs/volumes.h>
#include <../fs/btrfs/ctree.h>
#include <../fs/btrfs/transaction.h>
#include <../fs/btrfs/volumes.h>
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(5,4,0))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(5,4,0))
#include <../fs/btrfs/block-group.h>
#endif
#include <linux/dcache.h>
#include <../fs/btrfs/block-group.h>
#endif
#include <linux/dcache.h>
diff --git
a/probes/lttng-probe-ext3.c
b/probes/lttng-probe-ext3.c
index 22d4f25f10cb351521dce9035d67c9ae39bf91e0..8aa9fdc0787ba014ba1621635bfd774bb9c0c1c0 100644
(file)
--- a/
probes/lttng-probe-ext3.c
+++ b/
probes/lttng-probe-ext3.c
@@
-11,10
+11,10
@@
#include <linux/module.h>
#include <linux/fs.h>
#include <linux/dcache.h>
#include <linux/module.h>
#include <linux/fs.h>
#include <linux/dcache.h>
-#include <l
inux/
version.h>
+#include <l
ttng-kernel-
version.h>
#include <lttng-tracer.h>
#include <lttng-tracer.h>
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(3,4,0))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(3,4,0))
#include <../fs/ext3/ext3.h>
#else
#include <linux/ext3_fs_i.h>
#include <../fs/ext3/ext3.h>
#else
#include <linux/ext3_fs_i.h>
diff --git
a/probes/lttng-probe-kvm-x86-mmu.c
b/probes/lttng-probe-kvm-x86-mmu.c
index 5043c776e35cfa890e3eae4add05a315be059384..3920f0dbdbc00898ac51a6bfa51f22b4e039ab15 100644
(file)
--- a/
probes/lttng-probe-kvm-x86-mmu.c
+++ b/
probes/lttng-probe-kvm-x86-mmu.c
@@
-12,11
+12,11
@@
#include <lttng-tracer.h>
#include <lttng-kernel-version.h>
#include <lttng-tracer.h>
#include <lttng-kernel-version.h>
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(4,1,0))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(4,1,0))
#include <kvm/iodev.h>
#include <kvm/iodev.h>
-#else /* #if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(4,1,0)) */
+#else /* #if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(4,1,0)) */
#include <../../virt/kvm/iodev.h>
#include <../../virt/kvm/iodev.h>
-#endif /* #else #if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(4,1,0)) */
+#endif /* #else #if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(4,1,0)) */
/*
* Create the tracepoint static inlines from the kernel to validate that our
/*
* Create the tracepoint static inlines from the kernel to validate that our
@@
-24,14
+24,14
@@
*/
#include <wrapper/tracepoint.h>
*/
#include <wrapper/tracepoint.h>
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(5,9,0))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(5,9,0))
#include <../../arch/x86/kvm/mmu/mmu_internal.h>
#include <../../arch/x86/kvm/mmu/mmutrace.h>
#else
#include <../../arch/x86/kvm/mmutrace.h>
#endif
#include <../../arch/x86/kvm/mmu/mmu_internal.h>
#include <../../arch/x86/kvm/mmu/mmutrace.h>
#else
#include <../../arch/x86/kvm/mmutrace.h>
#endif
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(5,10,0))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(5,10,0))
#include <../arch/x86/kvm/mmu.h>
#include <../arch/x86/kvm/mmu/spte.h>
#endif
#include <../arch/x86/kvm/mmu.h>
#include <../arch/x86/kvm/mmu/spte.h>
#endif
diff --git
a/probes/lttng-probe-kvm-x86.c
b/probes/lttng-probe-kvm-x86.c
index 6dfaa31e08ec7329a412bc4282749aca0f87f767..d74771d0fed421380b7eaad9d0650968c21b9ae7 100644
(file)
--- a/
probes/lttng-probe-kvm-x86.c
+++ b/
probes/lttng-probe-kvm-x86.c
@@
-12,15
+12,15
@@
#include <lttng-tracer.h>
#include <lttng-kernel-version.h>
#include <lttng-tracer.h>
#include <lttng-kernel-version.h>
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(5,7,0))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(5,7,0))
#include <kvm_emulate.h>
#endif
#include <kvm_emulate.h>
#endif
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(4,1,0))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(4,1,0))
#include <kvm/iodev.h>
#include <kvm/iodev.h>
-#else /* #if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(4,1,0)) */
+#else /* #if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(4,1,0)) */
#include <../../virt/kvm/iodev.h>
#include <../../virt/kvm/iodev.h>
-#endif /* #else #if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(4,1,0)) */
+#endif /* #else #if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(4,1,0)) */
/*
* Create the tracepoint static inlines from the kernel to validate that our
/*
* Create the tracepoint static inlines from the kernel to validate that our
diff --git
a/probes/lttng-probe-lock.c
b/probes/lttng-probe-lock.c
index e81eb3652a62197d0613446e4401933055bd5a2b..8db7a5e3c71f245f54a611c89c88464118048465 100644
(file)
--- a/
probes/lttng-probe-lock.c
+++ b/
probes/lttng-probe-lock.c
@@
-9,7
+9,7
@@
*/
#include <linux/module.h>
*/
#include <linux/module.h>
-#include <l
inux/
version.h>
+#include <l
ttng-kernel-
version.h>
#include <lttng-tracer.h>
/*
#include <lttng-tracer.h>
/*
diff --git
a/probes/lttng.c
b/probes/lttng.c
index 7ddaa69f00281c347b49a27c78ba14326a864167..d20905ebb22ea0c72938d2e76af12fff6ca8e713 100644
(file)
--- a/
probes/lttng.c
+++ b/
probes/lttng.c
@@
-100,7
+100,7
@@
static const struct file_operations lttng_logger_operations = {
* Linux 5.6 introduced a separate proc_ops struct for /proc operations
* to decouple it from the vfs.
*/
* Linux 5.6 introduced a separate proc_ops struct for /proc operations
* to decouple it from the vfs.
*/
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(5,6,0))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(5,6,0))
static const struct proc_ops lttng_logger_proc_ops = {
.proc_write = lttng_logger_write,
};
static const struct proc_ops lttng_logger_proc_ops = {
.proc_write = lttng_logger_write,
};
diff --git
a/tests/probes/lttng-test.c
b/tests/probes/lttng-test.c
index a4fa06450a747b6fe2d9c993269166b3136135e1..d550398e4d7e6cf4ca71ad192deca77d0b8b6821 100644
(file)
--- a/
tests/probes/lttng-test.c
+++ b/
tests/probes/lttng-test.c
@@
-86,7
+86,7
@@
end:
return written;
}
return written;
}
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(5,6,0))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(5,6,0))
static const struct proc_ops lttng_test_filter_event_proc_ops = {
.proc_write = lttng_test_filter_event_write,
};
static const struct proc_ops lttng_test_filter_event_proc_ops = {
.proc_write = lttng_test_filter_event_write,
};
diff --git
a/wrapper/atomic.h
b/wrapper/atomic.h
index 5ead89921924cd428bd19ef1339e79295c23372f..e0e899bdf075a313903eada317d084b52fa0b019 100644
(file)
--- a/
wrapper/atomic.h
+++ b/
wrapper/atomic.h
@@
-10,10
+10,10
@@
#ifndef _LTTNG_WRAPPER_ATOMIC_H
#define _LTTNG_WRAPPER_ATOMIC_H
#ifndef _LTTNG_WRAPPER_ATOMIC_H
#define _LTTNG_WRAPPER_ATOMIC_H
-#include <l
inux/
version.h>
+#include <l
ttng-kernel-
version.h>
#include <linux/atomic.h>
#include <linux/atomic.h>
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(3,16,0))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(3,16,0))
static inline void lttng_smp_mb__before_atomic(void)
{
smp_mb__before_atomic();
static inline void lttng_smp_mb__before_atomic(void)
{
smp_mb__before_atomic();
@@
-23,7
+23,7
@@
static inline void lttng_smp_mb__after_atomic(void)
{
smp_mb__after_atomic();
}
{
smp_mb__after_atomic();
}
-#else /* #if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(3,16,0)) */
+#else /* #if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(3,16,0)) */
static inline void lttng_smp_mb__before_atomic(void)
{
smp_mb__before_atomic_inc();
static inline void lttng_smp_mb__before_atomic(void)
{
smp_mb__before_atomic_inc();
@@
-33,6
+33,6
@@
static inline void lttng_smp_mb__after_atomic(void)
{
smp_mb__after_atomic_inc();
}
{
smp_mb__after_atomic_inc();
}
-#endif /* #else #if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(3,16,0)) */
+#endif /* #else #if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(3,16,0)) */
#endif /* _LTTNG_WRAPPER_ATOMIC_H */
#endif /* _LTTNG_WRAPPER_ATOMIC_H */
diff --git
a/wrapper/compiler.h
b/wrapper/compiler.h
index 7413891961f31c2fbc40104bb2b7284cc5b4808c..c34440d9eae16989d81760d211030ebd2752d09d 100644
(file)
--- a/
wrapper/compiler.h
+++ b/
wrapper/compiler.h
@@
-9,7
+9,7
@@
#define _LTTNG_WRAPPER_COMPILER_H
#include <linux/compiler.h>
#define _LTTNG_WRAPPER_COMPILER_H
#include <linux/compiler.h>
-#include <l
inux/
version.h>
+#include <l
ttng-kernel-
version.h>
/*
* Don't allow compiling with buggy compiler.
/*
* Don't allow compiling with buggy compiler.
@@
-56,7
+56,7
@@
* and remove calls to smp_read_barrier_depends which was dropped
* in v5.9.
*/
* and remove calls to smp_read_barrier_depends which was dropped
* in v5.9.
*/
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(4,15,0))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(4,15,0))
#define LTTNG_READ_ONCE(x) READ_ONCE(x)
#else
#define LTTNG_READ_ONCE(x) \
#define LTTNG_READ_ONCE(x) READ_ONCE(x)
#else
#define LTTNG_READ_ONCE(x) \
diff --git
a/wrapper/fdtable.c
b/wrapper/fdtable.c
index 89fd9c46ac0c60cc736986969bf818cf90d0a1b1..71dba9f9e0b5d5e424f20e503a1476a4218e4ecf 100644
(file)
--- a/
wrapper/fdtable.c
+++ b/
wrapper/fdtable.c
@@
-4,11
+4,11
@@
* Copyright (C) 2013 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
*/
* Copyright (C) 2013 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
*/
-#include <l
inux/
version.h>
+#include <l
ttng-kernel-
version.h>
#include <linux/spinlock.h>
#include <wrapper/fdtable.h>
#include <linux/spinlock.h>
#include <wrapper/fdtable.h>
-#if (L
INUX_VERSION_CODE <
KERNEL_VERSION(3,7,0))
+#if (L
TTNG_LINUX_VERSION_CODE < LTTNG_
KERNEL_VERSION(3,7,0))
/*
* Reimplementation of iterate_fd() for kernels between 2.6.32 and 3.6
/*
* Reimplementation of iterate_fd() for kernels between 2.6.32 and 3.6
diff --git
a/wrapper/fdtable.h
b/wrapper/fdtable.h
index 8f73559796a0655cdd36e770c674c60e23ba4a46..b8b1a471d79626055f597128e52164404aacd4b8 100644
(file)
--- a/
wrapper/fdtable.h
+++ b/
wrapper/fdtable.h
@@
-8,10
+8,10
@@
#ifndef _LTTNG_WRAPPER_FDTABLE_H
#define _LTTNG_WRAPPER_FDTABLE_H
#ifndef _LTTNG_WRAPPER_FDTABLE_H
#define _LTTNG_WRAPPER_FDTABLE_H
-#include <l
inux/
version.h>
+#include <l
ttng-kernel-
version.h>
#include <linux/fdtable.h>
#include <linux/fdtable.h>
-#if (L
INUX_VERSION_CODE <
KERNEL_VERSION(3,7,0))
+#if (L
TTNG_LINUX_VERSION_CODE < LTTNG_
KERNEL_VERSION(3,7,0))
int lttng_iterate_fd(struct files_struct *files,
unsigned int first,
int lttng_iterate_fd(struct files_struct *files,
unsigned int first,
@@
-29,7
+29,7
@@
int lttng_iterate_fd(struct files_struct *files,
#endif
#endif
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(3,4,0))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(3,4,0))
static inline bool lttng_close_on_exec(int fd, const struct fdtable *fdt)
{
static inline bool lttng_close_on_exec(int fd, const struct fdtable *fdt)
{
diff --git
a/wrapper/file.h
b/wrapper/file.h
index fd77aa7bdd8487b278328fc5630ce17f55450851..47c389391fb268fb8a5cfd7bb86444df41860220 100644
(file)
--- a/
wrapper/file.h
+++ b/
wrapper/file.h
@@
-10,10
+10,10
@@
#ifndef _LTTNG_WRAPPER_FILE_H
#define _LTTNG_WRAPPER_FILE_H
#ifndef _LTTNG_WRAPPER_FILE_H
#define _LTTNG_WRAPPER_FILE_H
-#include <l
inux/
version.h>
+#include <l
ttng-kernel-
version.h>
#include <linux/file.h>
#include <linux/file.h>
-#if L
INUX_VERSION_CODE >=
KERNEL_VERSION(3,19,0)
+#if L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(3,19,0)
static
inline int lttng_get_unused_fd(void)
static
inline int lttng_get_unused_fd(void)
@@
-23,7
+23,7
@@
inline int lttng_get_unused_fd(void)
#define lttng_f_dentry f_path.dentry
#define lttng_f_dentry f_path.dentry
-#else /* #if L
INUX_VERSION_CODE >=
KERNEL_VERSION(3,19,0) */
+#else /* #if L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(3,19,0) */
static
inline int lttng_get_unused_fd(void)
static
inline int lttng_get_unused_fd(void)
@@
-33,6
+33,6
@@
inline int lttng_get_unused_fd(void)
#define lttng_f_dentry f_dentry
#define lttng_f_dentry f_dentry
-#endif /* #else #if L
INUX_VERSION_CODE >=
KERNEL_VERSION(3,19,0) */
+#endif /* #else #if L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(3,19,0) */
#endif /* _LTTNG_WRAPPER_FILE_H */
#endif /* _LTTNG_WRAPPER_FILE_H */
diff --git
a/wrapper/fs.h
b/wrapper/fs.h
index 99697f8791bb4307324145c8ccdd07101e31e755..015868f33bbcba80312121d16903c8e29d277fdf 100644
(file)
--- a/
wrapper/fs.h
+++ b/
wrapper/fs.h
@@
-11,7
+11,7
@@
#include <linux/fs.h>
#include <lttng-kernel-version.h>
#include <linux/fs.h>
#include <lttng-kernel-version.h>
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(4,14,0))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(4,14,0))
static inline
ssize_t lttng_kernel_read(struct file *file, void *buf, size_t count, loff_t *pos)
static inline
ssize_t lttng_kernel_read(struct file *file, void *buf, size_t count, loff_t *pos)
@@
-19,7
+19,7
@@
ssize_t lttng_kernel_read(struct file *file, void *buf, size_t count, loff_t *po
return kernel_read(file, buf, count, pos);
}
return kernel_read(file, buf, count, pos);
}
-#else /* L
INUX_VERSION_CODE >=
KERNEL_VERSION(4,14,0) */
+#else /* L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(4,14,0) */
static inline
ssize_t lttng_kernel_read(struct file *file, void *buf, size_t count, loff_t *pos)
static inline
ssize_t lttng_kernel_read(struct file *file, void *buf, size_t count, loff_t *pos)
@@
-38,6
+38,6
@@
ssize_t lttng_kernel_read(struct file *file, void *buf, size_t count, loff_t *po
return len;
}
return len;
}
-#endif /* L
INUX_VERSION_CODE >=
KERNEL_VERSION(4,14,0) */
+#endif /* L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(4,14,0) */
#endif /* _LTTNG_WRAPPER_FS_H */
#endif /* _LTTNG_WRAPPER_FS_H */
diff --git
a/wrapper/irq.h
b/wrapper/irq.h
index 14db8ac7e5d8d05989c1794cdbaac150fbb0e843..5c6b27d09cd357afb40fc73f31b54c601794910a 100644
(file)
--- a/
wrapper/irq.h
+++ b/
wrapper/irq.h
@@
-10,14
+10,14
@@
#ifndef _LTTNG_WRAPPER_IRQ_H
#define _LTTNG_WRAPPER_IRQ_H
#ifndef _LTTNG_WRAPPER_IRQ_H
#define _LTTNG_WRAPPER_IRQ_H
-#include <l
inux/
version.h>
+#include <l
ttng-kernel-
version.h>
/*
* Starting from the 3.12 Linux kernel, all architectures use the
* generic hard irqs system. More details can be seen at commit
* 0244ad004a54e39308d495fee0a2e637f8b5c317 in the Linux kernel GIT.
*/
/*
* Starting from the 3.12 Linux kernel, all architectures use the
* generic hard irqs system. More details can be seen at commit
* 0244ad004a54e39308d495fee0a2e637f8b5c317 in the Linux kernel GIT.
*/
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(3,12,0) \
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(3,12,0) \
|| defined(CONFIG_GENERIC_HARDIRQS))
# define CONFIG_LTTNG_HAS_LIST_IRQ
#endif
|| defined(CONFIG_GENERIC_HARDIRQS))
# define CONFIG_LTTNG_HAS_LIST_IRQ
#endif
diff --git
a/wrapper/irqdesc.c
b/wrapper/irqdesc.c
index d8858c439054390f3e4036e8e82d89475e93348f..6dcfaf99a7f89f5443cddfbb0e0888554d26fadc 100644
(file)
--- a/
wrapper/irqdesc.c
+++ b/
wrapper/irqdesc.c
@@
-13,8
+13,8
@@
#include <linux/module.h>
#if (defined(CONFIG_KALLSYMS) && \
#include <linux/module.h>
#if (defined(CONFIG_KALLSYMS) && \
- ((L
INUX_VERSION_CODE >=
KERNEL_VERSION(5,11,0)) || \
- (L
INUX_VERSION_CODE <
KERNEL_VERSION(3,4,0))))
+ ((L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(5,11,0)) || \
+ (L
TTNG_LINUX_VERSION_CODE < LTTNG_
KERNEL_VERSION(3,4,0))))
#include <linux/kallsyms.h>
#include <linux/interrupt.h>
#include <linux/kallsyms.h>
#include <linux/interrupt.h>
diff --git
a/wrapper/irqflags.h
b/wrapper/irqflags.h
index 7c33c137dd171990b7fce60573108e778e06440e..6e5ac63da51ffa7e14c90700293601d3d87d093a 100644
(file)
--- a/
wrapper/irqflags.h
+++ b/
wrapper/irqflags.h
@@
-10,7
+10,7
@@
#ifndef _LTTNG_WRAPPER_IRQFLAGS_H
#define _LTTNG_WRAPPER_IRQFLAGS_H
#ifndef _LTTNG_WRAPPER_IRQFLAGS_H
#define _LTTNG_WRAPPER_IRQFLAGS_H
-#include <l
inux/
version.h>
+#include <l
ttng-kernel-
version.h>
#include <linux/irqflags.h>
#ifdef CONFIG_X86
#include <linux/irqflags.h>
#ifdef CONFIG_X86
diff --git
a/wrapper/kallsyms.c
b/wrapper/kallsyms.c
index 6af77f538950d7b3718bd33fffb749053ae03333..d892a2f4860a3b783296b3a0ad8f87011114fea9 100644
(file)
--- a/
wrapper/kallsyms.c
+++ b/
wrapper/kallsyms.c
@@
-14,7
+14,7
@@
#include <linux/module.h>
#include <wrapper/kallsyms.h>
#include <linux/module.h>
#include <wrapper/kallsyms.h>
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(5,7,0))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(5,7,0))
#ifndef CONFIG_KPROBES
# error "LTTng-modules requires CONFIG_KPROBES on kernels >= 5.7.0"
#ifndef CONFIG_KPROBES
# error "LTTng-modules requires CONFIG_KPROBES on kernels >= 5.7.0"
diff --git
a/wrapper/kallsyms.h
b/wrapper/kallsyms.h
index 5f48847fb22a936595c8f637b3e552194a07062e..a6357ab2814c827167316fbd0fb14af3f40a9a87 100644
(file)
--- a/
wrapper/kallsyms.h
+++ b/
wrapper/kallsyms.h
@@
-14,7
+14,7
@@
#define _LTTNG_WRAPPER_KALLSYMS_H
#include <linux/kallsyms.h>
#define _LTTNG_WRAPPER_KALLSYMS_H
#include <linux/kallsyms.h>
-#include <l
inux/
version.h>
+#include <l
ttng-kernel-
version.h>
/*
* PowerPC ABIv1 needs KALLSYMS_ALL to get the function descriptor,
/*
* PowerPC ABIv1 needs KALLSYMS_ALL to get the function descriptor,
@@
-26,11
+26,11
@@
# endif
#endif
# endif
#endif
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(5,7,0))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(5,7,0))
unsigned long wrapper_kallsyms_lookup_name(const char *name);
unsigned long wrapper_kallsyms_lookup_name(const char *name);
-#else /* #if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(5,7,0)) */
+#else /* #if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(5,7,0)) */
static inline
unsigned long wrapper_kallsyms_lookup_name(const char *name)
static inline
unsigned long wrapper_kallsyms_lookup_name(const char *name)
@@
-38,7
+38,7
@@
unsigned long wrapper_kallsyms_lookup_name(const char *name)
return kallsyms_lookup_name(name);
}
return kallsyms_lookup_name(name);
}
-#endif /* #else #if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(5,7,0)) */
+#endif /* #else #if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(5,7,0)) */
static inline
unsigned long kallsyms_lookup_funcptr(const char *name)
static inline
unsigned long kallsyms_lookup_funcptr(const char *name)
diff --git
a/wrapper/kprobes.h
b/wrapper/kprobes.h
index 4d6993e26d7dab40c77675ef8c09e5d96ca36a68..2f9d011d79f23ddfbaf198bd6e84e1fc04aa599f 100644
(file)
--- a/
wrapper/kprobes.h
+++ b/
wrapper/kprobes.h
@@
-9,9
+9,9
@@
#define _LTTNG_WRAPPER_KPROBES_H
#include <linux/kprobes.h>
#define _LTTNG_WRAPPER_KPROBES_H
#include <linux/kprobes.h>
-#include <l
inux/
version.h>
+#include <l
ttng-kernel-
version.h>
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(5,11,0))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(5,11,0))
static inline
struct kretprobe *lttng_get_kretprobe(struct kretprobe_instance *ri)
static inline
struct kretprobe *lttng_get_kretprobe(struct kretprobe_instance *ri)
@@
-19,7
+19,7
@@
struct kretprobe *lttng_get_kretprobe(struct kretprobe_instance *ri)
return get_kretprobe(ri);
}
return get_kretprobe(ri);
}
-#else /* L
INUX_VERSION_CODE >=
KERNEL_VERSION(5,11,0) */
+#else /* L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(5,11,0) */
static inline
struct kretprobe *lttng_get_kretprobe(struct kretprobe_instance *ri)
static inline
struct kretprobe *lttng_get_kretprobe(struct kretprobe_instance *ri)
@@
-27,6
+27,6
@@
struct kretprobe *lttng_get_kretprobe(struct kretprobe_instance *ri)
return ri->rp;
}
return ri->rp;
}
-#endif /* L
INUX_VERSION_CODE >=
KERNEL_VERSION(5,11,0) */
+#endif /* L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(5,11,0) */
#endif /* _LTTNG_WRAPPER_KPROBES_H */
#endif /* _LTTNG_WRAPPER_KPROBES_H */
diff --git
a/wrapper/kref.h
b/wrapper/kref.h
index f220ddbfaaea098d56f1ebe770408e544390145f..7bae66064a741748fd5947450127509976a82f10 100644
(file)
--- a/
wrapper/kref.h
+++ b/
wrapper/kref.h
@@
-16,24
+16,24
@@
#include <linux/kref.h>
#include <linux/rculist.h>
#include <linux/kref.h>
#include <linux/rculist.h>
-#include <l
inux/
version.h>
+#include <l
ttng-kernel-
version.h>
/*
* lttng_kref_get: get reference count, checking for overflow.
*
* Return 1 if reference is taken, 0 otherwise (overflow).
*/
/*
* lttng_kref_get: get reference count, checking for overflow.
*
* Return 1 if reference is taken, 0 otherwise (overflow).
*/
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(4,11,0))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(4,11,0))
static inline int lttng_kref_get(struct kref *kref)
{
kref_get(kref);
return 1;
}
static inline int lttng_kref_get(struct kref *kref)
{
kref_get(kref);
return 1;
}
-#else /* #if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(4,11,0)) */
+#else /* #if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(4,11,0)) */
static inline int lttng_kref_get(struct kref *kref)
{
return atomic_add_unless(&kref->refcount, 1, INT_MAX);
}
static inline int lttng_kref_get(struct kref *kref)
{
return atomic_add_unless(&kref->refcount, 1, INT_MAX);
}
-#endif /* #else #if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(4,11,0)) */
+#endif /* #else #if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(4,11,0)) */
#endif /* _LTTNG_WRAPPER_KREF_H */
#endif /* _LTTNG_WRAPPER_KREF_H */
diff --git
a/wrapper/mm.h
b/wrapper/mm.h
index 405248a9a48ac4f4e25fed322ac8b9e674389405..e92e918c04eced3f45cf22e290e1b7843cea6fbc 100644
(file)
--- a/
wrapper/mm.h
+++ b/
wrapper/mm.h
@@
-13,7
+13,7
@@
#include <lttng-kernel-version.h>
#include <lttng-kernel-version.h>
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(4,6,0) \
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(4,6,0) \
|| LTTNG_UBUNTU_KERNEL_RANGE(4,4,25,44, 4,5,0,0))
/*
|| LTTNG_UBUNTU_KERNEL_RANGE(4,4,25,44, 4,5,0,0))
/*
@@
-40,7
+40,7
@@
bool wrapper_check_enough_free_pages(unsigned long num_pages)
}
#endif
}
#endif
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(3,8,0))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(3,8,0))
static inline
void wrapper_set_current_oom_origin(void)
{
static inline
void wrapper_set_current_oom_origin(void)
{
@@
-53,7
+53,7
@@
void wrapper_clear_current_oom_origin(void)
return clear_current_oom_origin();
}
return clear_current_oom_origin();
}
-#else /* #if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(3,8,0)) */
+#else /* #if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(3,8,0)) */
static inline
void wrapper_set_current_oom_origin(void)
static inline
void wrapper_set_current_oom_origin(void)
@@
-66,5
+66,5
@@
void wrapper_clear_current_oom_origin(void)
{
return;
}
{
return;
}
-#endif /* #else #if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(3,8,0)) */
+#endif /* #else #if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(3,8,0)) */
#endif /* _LTTNG_WRAPPER_MM_H */
#endif /* _LTTNG_WRAPPER_MM_H */
diff --git
a/wrapper/namespace.h
b/wrapper/namespace.h
index 0e7833e1f1e8c528d2ae83a121fae564530c0378..d4a1401a83bb72353701953e99aab0af08ec3c8d 100644
(file)
--- a/
wrapper/namespace.h
+++ b/
wrapper/namespace.h
@@
-10,15
+10,15
@@
#ifndef _LTTNG_WRAPPER_NAMESPACE_H
#define _LTTNG_WRAPPER_NAMESPACE_H
#ifndef _LTTNG_WRAPPER_NAMESPACE_H
#define _LTTNG_WRAPPER_NAMESPACE_H
-#include <l
inux/
version.h>
+#include <l
ttng-kernel-
version.h>
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(3,19,0))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(3,19,0))
#define lttng_ns_inum ns.inum
#else
#define lttng_ns_inum proc_inum
#endif
#define lttng_ns_inum ns.inum
#else
#define lttng_ns_inum proc_inum
#endif
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(3,5,0))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(3,5,0))
#define lttng_user_ns_parent parent
#else
#define lttng_user_ns_parent creator->user_ns
#define lttng_user_ns_parent parent
#else
#define lttng_user_ns_parent creator->user_ns
diff --git
a/wrapper/objtool.h
b/wrapper/objtool.h
index 3b997cae56d7837ca6bcd4493d7794c2fc16c074..67bc1f5ff35192b5fad08922b27de7cab31b93e6 100644
(file)
--- a/
wrapper/objtool.h
+++ b/
wrapper/objtool.h
@@
-8,16
+8,16
@@
#ifndef _LTTNG_WRAPPER_OBJTOOL_H
#define _LTTNG_WRAPPER_OBJTOOL_H
#ifndef _LTTNG_WRAPPER_OBJTOOL_H
#define _LTTNG_WRAPPER_OBJTOOL_H
-#include <l
inux/
version.h>
+#include <l
ttng-kernel-
version.h>
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(5,10,0))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(5,10,0))
#include <linux/objtool.h>
#include <linux/objtool.h>
-#elif (L
INUX_VERSION_CODE >=
KERNEL_VERSION(4,6,0))
+#elif (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(4,6,0))
#include <linux/frame.h>
#endif
#include <linux/frame.h>
#endif
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(4,6,0))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(4,6,0))
#define LTTNG_STACK_FRAME_NON_STANDARD(func) \
STACK_FRAME_NON_STANDARD(func)
#define LTTNG_STACK_FRAME_NON_STANDARD(func) \
STACK_FRAME_NON_STANDARD(func)
diff --git
a/wrapper/page_alloc.c
b/wrapper/page_alloc.c
index 2de24f9e07edc62daf1caae51824464f31eeb5ff..b464f4d19331facd14510bf6aeed8294ff1c5135 100644
(file)
--- a/
wrapper/page_alloc.c
+++ b/
wrapper/page_alloc.c
@@
-12,7
+12,7
@@
#include <lttng-kernel-version.h>
#if (defined(CONFIG_KALLSYMS) \
#include <lttng-kernel-version.h>
#if (defined(CONFIG_KALLSYMS) \
- && (L
INUX_VERSION_CODE >= KERNEL_VERSION(3,19,2)
\
+ && (L
TTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(3,19,2)
\
|| LTTNG_KERNEL_RANGE(3,14,36, 3,15,0) \
|| LTTNG_KERNEL_RANGE(3,18,10, 3,19,0) \
|| LTTNG_DEBIAN_KERNEL_RANGE(3,16,7,9,0,0, 3,17,0,0,0,0) \
|| LTTNG_KERNEL_RANGE(3,14,36, 3,15,0) \
|| LTTNG_KERNEL_RANGE(3,18,10, 3,19,0) \
|| LTTNG_DEBIAN_KERNEL_RANGE(3,16,7,9,0,0, 3,17,0,0,0,0) \
diff --git
a/wrapper/page_alloc.h
b/wrapper/page_alloc.h
index 45462ac83dcc0f693a0d30895f3cc97afcc1a28c..6d833d9970096fea98ddd745e10c0ce761f827a9 100644
(file)
--- a/
wrapper/page_alloc.h
+++ b/
wrapper/page_alloc.h
@@
-19,7
+19,7
@@
* the get_pageblock_migratetype() macro uses it.
*/
#if (defined(CONFIG_KALLSYMS) \
* the get_pageblock_migratetype() macro uses it.
*/
#if (defined(CONFIG_KALLSYMS) \
- && (L
INUX_VERSION_CODE >= KERNEL_VERSION(3,19,2)
\
+ && (L
TTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(3,19,2)
\
|| LTTNG_KERNEL_RANGE(3,14,36, 3,15,0) \
|| LTTNG_KERNEL_RANGE(3,18,10, 3,19,0) \
|| LTTNG_DEBIAN_KERNEL_RANGE(3,16,7,9,0,0, 3,17,0,0,0,0) \
|| LTTNG_KERNEL_RANGE(3,14,36, 3,15,0) \
|| LTTNG_KERNEL_RANGE(3,18,10, 3,19,0) \
|| LTTNG_DEBIAN_KERNEL_RANGE(3,16,7,9,0,0, 3,17,0,0,0,0) \
diff --git
a/wrapper/percpu-defs.h
b/wrapper/percpu-defs.h
index 53868adafd92c8977de033e305ff7d743ac6d83c..931196bd114bbfb1a9cd4d21c83c43c58ebd2192 100644
(file)
--- a/
wrapper/percpu-defs.h
+++ b/
wrapper/percpu-defs.h
@@
-10,20
+10,20
@@
#ifndef _LTTNG_WRAPPER_PERCPU_DEFS_H
#define _LTTNG_WRAPPER_PERCPU_DEFS_H
#ifndef _LTTNG_WRAPPER_PERCPU_DEFS_H
#define _LTTNG_WRAPPER_PERCPU_DEFS_H
-#include <l
inux/
version.h>
+#include <l
ttng-kernel-
version.h>
-#if L
INUX_VERSION_CODE >=
KERNEL_VERSION(3,19,0)
+#if L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(3,19,0)
#include <linux/percpu-defs.h>
#define lttng_this_cpu_ptr(ptr) this_cpu_ptr(ptr)
#include <linux/percpu-defs.h>
#define lttng_this_cpu_ptr(ptr) this_cpu_ptr(ptr)
-#else /* #if L
INUX_VERSION_CODE >=
KERNEL_VERSION(3,19,0) */
+#else /* #if L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(3,19,0) */
#include <linux/percpu.h>
#define lttng_this_cpu_ptr(ptr) (&__get_cpu_var(*(ptr)))
#include <linux/percpu.h>
#define lttng_this_cpu_ptr(ptr) (&__get_cpu_var(*(ptr)))
-#endif /* #else #if L
INUX_VERSION_CODE >=
KERNEL_VERSION(3,19,0) */
+#endif /* #else #if L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(3,19,0) */
#endif /* _LTTNG_WRAPPER_PERCPU_DEFS_H */
#endif /* _LTTNG_WRAPPER_PERCPU_DEFS_H */
diff --git
a/wrapper/perf.h
b/wrapper/perf.h
index 4a7f6d8582873b9075a021595aea291cec2971b0..4eb06c68d14a07e04074613b9c782dadfddcf5b7 100644
(file)
--- a/
wrapper/perf.h
+++ b/
wrapper/perf.h
@@
-12,7
+12,7
@@
#ifdef CONFIG_PERF_EVENTS
#ifdef CONFIG_PERF_EVENTS
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(3,1,0))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(3,1,0))
static inline struct perf_event *
wrapper_perf_event_create_kernel_counter(struct perf_event_attr *attr,
int cpu,
static inline struct perf_event *
wrapper_perf_event_create_kernel_counter(struct perf_event_attr *attr,
int cpu,
@@
-21,7
+21,7
@@
wrapper_perf_event_create_kernel_counter(struct perf_event_attr *attr,
{
return perf_event_create_kernel_counter(attr, cpu, task, callback, NULL);
}
{
return perf_event_create_kernel_counter(attr, cpu, task, callback, NULL);
}
-#else /* (L
INUX_VERSION_CODE >=
KERNEL_VERSION(3,1,0)) */
+#else /* (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(3,1,0)) */
static inline struct perf_event *
wrapper_perf_event_create_kernel_counter(struct perf_event_attr *attr,
int cpu,
static inline struct perf_event *
wrapper_perf_event_create_kernel_counter(struct perf_event_attr *attr,
int cpu,
@@
-30,7
+30,7
@@
wrapper_perf_event_create_kernel_counter(struct perf_event_attr *attr,
{
return perf_event_create_kernel_counter(attr, cpu, task, callback);
}
{
return perf_event_create_kernel_counter(attr, cpu, task, callback);
}
-#endif /* (L
INUX_VERSION_CODE >=
KERNEL_VERSION(3,1,0)) */
+#endif /* (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(3,1,0)) */
#endif /* CONFIG_PERF_EVENTS */
#endif /* CONFIG_PERF_EVENTS */
diff --git
a/wrapper/rcu.h
b/wrapper/rcu.h
index c2f2115eddfc7ecedeeb50e0b84d5f4ea688abd7..071c3a2744c3d0760903e45d2f34858d601fe642 100644
(file)
--- a/
wrapper/rcu.h
+++ b/
wrapper/rcu.h
@@
-10,7
+10,7
@@
#ifndef _LTTNG_WRAPPER_RCU_H
#define _LTTNG_WRAPPER_RCU_H
#ifndef _LTTNG_WRAPPER_RCU_H
#define _LTTNG_WRAPPER_RCU_H
-#include <l
inux/
version.h>
+#include <l
ttng-kernel-
version.h>
#include <linux/rculist.h>
#include <linux/rcupdate.h>
#include <wrapper/list.h>
#include <linux/rculist.h>
#include <linux/rcupdate.h>
#include <wrapper/list.h>
diff --git
a/wrapper/splice.c
b/wrapper/splice.c
index 282bd863e2cb849ec57ec4336c43539d7a495858..7160ea1aa009c148836ce636a27a79c356b3273f 100644
(file)
--- a/
wrapper/splice.c
+++ b/
wrapper/splice.c
@@
-12,7
+12,7
@@
#include <lttng-kernel-version.h>
#if (defined(CONFIG_KALLSYMS) \
#include <lttng-kernel-version.h>
#if (defined(CONFIG_KALLSYMS) \
- && (L
INUX_VERSION_CODE <
KERNEL_VERSION(4,2,0)))
+ && (L
TTNG_LINUX_VERSION_CODE < LTTNG_
KERNEL_VERSION(4,2,0)))
#include <linux/kallsyms.h>
#include <linux/fs.h>
#include <linux/kallsyms.h>
#include <linux/fs.h>
diff --git
a/wrapper/syscall.h
b/wrapper/syscall.h
index 8715f0c54c59d548e9e980534e0379c1f73fbbae..9224d9f1b411fe58edf38eda53482f8cabbd1170 100644
(file)
--- a/
wrapper/syscall.h
+++ b/
wrapper/syscall.h
@@
-15,12
+15,12
@@
#define LTTNG_SYSCALL_NR_ARGS 6
#define LTTNG_SYSCALL_NR_ARGS 6
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(5,1,0))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(5,1,0))
#define lttng_syscall_get_arguments(task, regs, args) \
syscall_get_arguments(task, regs, args)
#define lttng_syscall_get_arguments(task, regs, args) \
syscall_get_arguments(task, regs, args)
-#else /* L
INUX_VERSION_CODE >=
KERNEL_VERSION(5,1,0) */
+#else /* L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(5,1,0) */
static inline
void lttng_syscall_get_arguments(struct task_struct *task,
static inline
void lttng_syscall_get_arguments(struct task_struct *task,
@@
-29,6
+29,6
@@
void lttng_syscall_get_arguments(struct task_struct *task,
syscall_get_arguments(task, regs, 0, LTTNG_SYSCALL_NR_ARGS, args);
}
syscall_get_arguments(task, regs, 0, LTTNG_SYSCALL_NR_ARGS, args);
}
-#endif /* L
INUX_VERSION_CODE >=
KERNEL_VERSION(5,1,0) */
+#endif /* L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(5,1,0) */
#endif /* _LTTNG_WRAPPER_SYSCALL_H */
#endif /* _LTTNG_WRAPPER_SYSCALL_H */
diff --git
a/wrapper/time.h
b/wrapper/time.h
index 362f314ac75df0c10b6106f7f907b2cc3d61e6a6..bec5f984d8da574126254ac52c7908307a4490b6 100644
(file)
--- a/
wrapper/time.h
+++ b/
wrapper/time.h
@@
-9,13
+9,13
@@
#ifndef _LTTNG_WRAPPER_TIME_H
#define _LTTNG_WRAPPER_TIME_H
#ifndef _LTTNG_WRAPPER_TIME_H
#define _LTTNG_WRAPPER_TIME_H
-#include <l
inux/
version.h>
+#include <l
ttng-kernel-
version.h>
/*
* Use 64bit timespec on kernels that have it, this makes 32bit arch
* y2038 compliant.
*/
/*
* Use 64bit timespec on kernels that have it, this makes 32bit arch
* y2038 compliant.
*/
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(3,17,0))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(3,17,0))
# define LTTNG_KERNEL_HAS_TIMESPEC64
#endif
# define LTTNG_KERNEL_HAS_TIMESPEC64
#endif
diff --git
a/wrapper/timer.h
b/wrapper/timer.h
index a115cf301fd527e10f4caa6a797d98a4bcd5271c..43fda29cc076d275b9c4993f0b24e77fbf33c9bc 100644
(file)
--- a/
wrapper/timer.h
+++ b/
wrapper/timer.h
@@
-10,7
+10,7
@@
#ifndef _LTTNG_WRAPPER_TIMER_H
#define _LTTNG_WRAPPER_TIMER_H
#ifndef _LTTNG_WRAPPER_TIMER_H
#define _LTTNG_WRAPPER_TIMER_H
-#include <l
inux/
version.h>
+#include <l
ttng-kernel-
version.h>
#include <linux/timer.h>
#include <lttng-kernel-version.h>
#include <linux/timer.h>
#include <lttng-kernel-version.h>
@@
-26,7
+26,7
@@
*/
*/
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(4,15,0))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(4,15,0))
#define LTTNG_TIMER_PINNED TIMER_PINNED
#define LTTNG_TIMER_FUNC_ARG_TYPE struct timer_list *
#define LTTNG_TIMER_PINNED TIMER_PINNED
#define LTTNG_TIMER_FUNC_ARG_TYPE struct timer_list *
@@
-41,11
+41,11
@@
timer_setup(timer, callback, flags)
timer_setup(timer, callback, flags)
-#else /* L
INUX_VERSION_CODE >=
KERNEL_VERSION(4,15,0) */
+#else /* L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(4,15,0) */
# if (LTTNG_RT_VERSION_CODE >= LTTNG_RT_KERNEL_VERSION(4,6,4,8) \
# if (LTTNG_RT_VERSION_CODE >= LTTNG_RT_KERNEL_VERSION(4,6,4,8) \
- || L
INUX_VERSION_CODE >=
KERNEL_VERSION(4,8,0))
+ || L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(4,8,0))
#define lttng_init_timer_pinned(timer) \
init_timer_pinned(timer)
#define lttng_init_timer_pinned(timer) \
init_timer_pinned(timer)
@@
-84,6
+84,6
@@
static inline void lttng_timer_setup(struct timer_list *timer,
timer->data = (unsigned long)data;
}
timer->data = (unsigned long)data;
}
-#endif /* L
INUX_VERSION_CODE >=
KERNEL_VERSION(4,15,0) */
+#endif /* L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(4,15,0) */
#endif /* _LTTNG_WRAPPER_TIMER_H */
#endif /* _LTTNG_WRAPPER_TIMER_H */
diff --git
a/wrapper/trace-clock.h
b/wrapper/trace-clock.h
index 187fc82b650d01a5d536724f92885c3bf24f9d47..211c1e93ceaa9736e7b4cff8c438a20380cd0edb 100644
(file)
--- a/
wrapper/trace-clock.h
+++ b/
wrapper/trace-clock.h
@@
-20,7
+20,7
@@
#include <linux/time.h>
#include <linux/hrtimer.h>
#include <linux/percpu.h>
#include <linux/time.h>
#include <linux/hrtimer.h>
#include <linux/percpu.h>
-#include <l
inux/
version.h>
+#include <l
ttng-kernel-
version.h>
#include <asm/local.h>
#include <lttng-kernel-version.h>
#include <lttng-clock.h>
#include <asm/local.h>
#include <lttng-kernel-version.h>
#include <lttng-clock.h>
@@
-51,7
+51,7
@@
extern struct lttng_trace_clock *lttng_trace_clock;
* this feature on 64-bit architectures.
*/
* this feature on 64-bit architectures.
*/
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(3,17,0) \
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(3,17,0) \
&& BITS_PER_LONG == 64 \
&& !defined(LTTNG_CLOCK_NMI_SAFE_BROKEN))
#define LTTNG_USE_NMI_SAFE_CLOCK
&& BITS_PER_LONG == 64 \
&& !defined(LTTNG_CLOCK_NMI_SAFE_BROKEN))
#define LTTNG_USE_NMI_SAFE_CLOCK
diff --git
a/wrapper/tracepoint.h
b/wrapper/tracepoint.h
index bc19d8c123139cd27aceea1c579b9f962e7e044f..43dabc7e8b99c625fe41628ed920162e4ac1b253 100644
(file)
--- a/
wrapper/tracepoint.h
+++ b/
wrapper/tracepoint.h
@@
-10,11
+10,11
@@
#ifndef _LTTNG_WRAPPER_TRACEPOINT_H
#define _LTTNG_WRAPPER_TRACEPOINT_H
#ifndef _LTTNG_WRAPPER_TRACEPOINT_H
#define _LTTNG_WRAPPER_TRACEPOINT_H
-#include <l
inux/
version.h>
+#include <l
ttng-kernel-
version.h>
#include <linux/tracepoint.h>
#include <linux/module.h>
#include <linux/tracepoint.h>
#include <linux/module.h>
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(5,10,0))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(5,10,0))
#define LTTNG_DEFINE_TRACE(name, proto, args) \
DEFINE_TRACE(name, PARAMS(proto), PARAMS(args))
#else
#define LTTNG_DEFINE_TRACE(name, proto, args) \
DEFINE_TRACE(name, PARAMS(proto), PARAMS(args))
#else
@@
-29,14
+29,14
@@
#endif /* HAVE_KABI_2635_TRACEPOINT */
#endif /* HAVE_KABI_2635_TRACEPOINT */
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(3,15,0))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(3,15,0))
#include <lttng-tracepoint.h>
#define lttng_wrapper_tracepoint_probe_register lttng_tracepoint_probe_register
#define lttng_wrapper_tracepoint_probe_unregister lttng_tracepoint_probe_unregister
#include <lttng-tracepoint.h>
#define lttng_wrapper_tracepoint_probe_register lttng_tracepoint_probe_register
#define lttng_wrapper_tracepoint_probe_unregister lttng_tracepoint_probe_unregister
-#else /* #if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(3,15,0)) */
+#else /* #if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(3,15,0)) */
#define lttng_wrapper_tracepoint_probe_register kabi_2635_tracepoint_probe_register
#define lttng_wrapper_tracepoint_probe_unregister kabi_2635_tracepoint_probe_unregister
#define lttng_wrapper_tracepoint_probe_register kabi_2635_tracepoint_probe_register
#define lttng_wrapper_tracepoint_probe_unregister kabi_2635_tracepoint_probe_unregister
@@
-52,9
+52,9
@@
void lttng_tracepoint_exit(void)
{
}
{
}
-#endif /* #else #if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(3,15,0)) */
+#endif /* #else #if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(3,15,0)) */
-#if (L
INUX_VERSION_CODE <
KERNEL_VERSION(3,15,0) && defined(CONFIG_MODULE_SIG))
+#if (L
TTNG_LINUX_VERSION_CODE < LTTNG_
KERNEL_VERSION(3,15,0) && defined(CONFIG_MODULE_SIG))
#include <linux/kallsyms.h>
#include <wrapper/kallsyms.h>
#include <linux/kallsyms.h>
#include <wrapper/kallsyms.h>
@@
-87,9
+87,9
@@
int wrapper_tracepoint_module_notify(struct notifier_block *nb,
* }
*/
* }
*/
-#endif /* #if (L
INUX_VERSION_CODE <
KERNEL_VERSION(3,15,0) && defined(CONFIG_MODULE_SIG)) */
+#endif /* #if (L
TTNG_LINUX_VERSION_CODE < LTTNG_
KERNEL_VERSION(3,15,0) && defined(CONFIG_MODULE_SIG)) */
-#if (L
INUX_VERSION_CODE <
KERNEL_VERSION(3,15,0) && defined(CONFIG_MODULE_SIG) && defined(MODULE))
+#if (L
TTNG_LINUX_VERSION_CODE < LTTNG_
KERNEL_VERSION(3,15,0) && defined(CONFIG_MODULE_SIG) && defined(MODULE))
static inline
int wrapper_lttng_fixup_sig(struct module *mod)
static inline
int wrapper_lttng_fixup_sig(struct module *mod)
@@
-110,7
+110,7
@@
int wrapper_lttng_fixup_sig(struct module *mod)
return ret;
}
return ret;
}
-#else /* #if (L
INUX_VERSION_CODE <
KERNEL_VERSION(3,15,0) && defined(CONFIG_MODULE_SIG) && defined(MODULE)) */
+#else /* #if (L
TTNG_LINUX_VERSION_CODE < LTTNG_
KERNEL_VERSION(3,15,0) && defined(CONFIG_MODULE_SIG) && defined(MODULE)) */
static inline
int wrapper_lttng_fixup_sig(struct module *mod)
static inline
int wrapper_lttng_fixup_sig(struct module *mod)
@@
-118,18
+118,18
@@
int wrapper_lttng_fixup_sig(struct module *mod)
return 0;
}
return 0;
}
-#endif /* #else #if (L
INUX_VERSION_CODE <
KERNEL_VERSION(3,15,0) && defined(CONFIG_MODULE_SIG) && defined(MODULE)) */
+#endif /* #else #if (L
TTNG_LINUX_VERSION_CODE < LTTNG_
KERNEL_VERSION(3,15,0) && defined(CONFIG_MODULE_SIG) && defined(MODULE)) */
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(4,19,0))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(4,19,0))
static inline struct tracepoint *lttng_tracepoint_ptr_deref(tracepoint_ptr_t *p)
{
return tracepoint_ptr_deref(p);
}
static inline struct tracepoint *lttng_tracepoint_ptr_deref(tracepoint_ptr_t *p)
{
return tracepoint_ptr_deref(p);
}
-#else /* #if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(4,19,0)) */
+#else /* #if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(4,19,0)) */
static inline struct tracepoint *lttng_tracepoint_ptr_deref(struct tracepoint * const *p)
{
return *p;
}
static inline struct tracepoint *lttng_tracepoint_ptr_deref(struct tracepoint * const *p)
{
return *p;
}
-#endif /* #else #if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(4,19,0)) */
+#endif /* #else #if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(4,19,0)) */
#endif /* _LTTNG_WRAPPER_TRACEPOINT_H */
#endif /* _LTTNG_WRAPPER_TRACEPOINT_H */
diff --git
a/wrapper/uaccess.h
b/wrapper/uaccess.h
index c562e349648599ec60314b1eec8b835ade0973b1..6277d78f22eb911264a78dab5bc595f0ba990c65 100644
(file)
--- a/
wrapper/uaccess.h
+++ b/
wrapper/uaccess.h
@@
-13,17
+13,17
@@
#include <linux/uaccess.h>
#include <lttng-kernel-version.h>
#include <linux/uaccess.h>
#include <lttng-kernel-version.h>
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(5,0,0) || \
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(5,0,0) || \
LTTNG_RHEL_KERNEL_RANGE(4,18,0,147,0,0, 4,19,0,0,0,0))
#define VERIFY_READ 0
#define VERIFY_WRITE 1
#define lttng_access_ok(type, addr, size) access_ok(addr, size)
LTTNG_RHEL_KERNEL_RANGE(4,18,0,147,0,0, 4,19,0,0,0,0))
#define VERIFY_READ 0
#define VERIFY_WRITE 1
#define lttng_access_ok(type, addr, size) access_ok(addr, size)
-#else /* L
INUX_VERSION_CODE >=
KERNEL_VERSION(5,0,0) */
+#else /* L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(5,0,0) */
#define lttng_access_ok(type, addr, size) access_ok(type, addr, size)
#define lttng_access_ok(type, addr, size) access_ok(type, addr, size)
-#endif /* L
INUX_VERSION_CODE >=
KERNEL_VERSION(5,0,0) */
+#endif /* L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(5,0,0) */
#endif /* _LTTNG_WRAPPER_UACCESS_H */
#endif /* _LTTNG_WRAPPER_UACCESS_H */
diff --git
a/wrapper/uprobes.h
b/wrapper/uprobes.h
index d180e1a93ac947a7277092da3fe7ef80c91fb7ba..5a678c5d8d0317cccd366e1abdc39b741d75546c 100644
(file)
--- a/
wrapper/uprobes.h
+++ b/
wrapper/uprobes.h
@@
-14,13
+14,13
@@
#ifndef _LTTNG_WRAPPER_UPROBES_H
#define _LTTNG_WRAPPER_UPROBES_H
#ifndef _LTTNG_WRAPPER_UPROBES_H
#define _LTTNG_WRAPPER_UPROBES_H
-#include <l
inux/
version.h>
+#include <l
ttng-kernel-
version.h>
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(3,5,0))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(3,5,0))
#include <linux/uprobes.h>
/* Use kallsym lookup for version before 3.9. */
#include <linux/uprobes.h>
/* Use kallsym lookup for version before 3.9. */
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(3,9,0))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(3,9,0))
static inline
int wrapper_uprobe_register(struct inode *inode, loff_t offset, struct uprobe_consumer *uc)
static inline
int wrapper_uprobe_register(struct inode *inode, loff_t offset, struct uprobe_consumer *uc)
diff --git
a/wrapper/user_namespace.h
b/wrapper/user_namespace.h
index 851674b06759f91c680c320b8290248dd3df0a13..daebbf2dddcd0dbdcde5e182518320d8ee49e174 100644
(file)
--- a/
wrapper/user_namespace.h
+++ b/
wrapper/user_namespace.h
@@
-9,11
+9,11
@@
#ifndef _LTTNG_WRAPPER_USER_NAMESPACE_H
#define _LTTNG_WRAPPER_USER_NAMESPACE_H
#ifndef _LTTNG_WRAPPER_USER_NAMESPACE_H
#define _LTTNG_WRAPPER_USER_NAMESPACE_H
-#include <l
inux/
version.h>
+#include <l
ttng-kernel-
version.h>
#include <linux/user_namespace.h>
#include <linux/user_namespace.h>
-#if L
INUX_VERSION_CODE >=
KERNEL_VERSION(3, 5, 0)
+#if L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(3, 5, 0)
#define lttng_current_xxuid(xxx) \
(from_kuid_munged(&init_user_ns, current_##xxx()))
#define lttng_current_xxuid(xxx) \
(from_kuid_munged(&init_user_ns, current_##xxx()))
diff --git
a/wrapper/uuid.h
b/wrapper/uuid.h
index d8ac53d33134995aa335f29b5c4cffbfc3632ed4..7c334947689f21aaeddf2516d1b23ad10afc17ef 100644
(file)
--- a/
wrapper/uuid.h
+++ b/
wrapper/uuid.h
@@
-8,16
+8,16
@@
#ifndef _LTTNG_WRAPPER_UUID_H
#define _LTTNG_WRAPPER_UUID_H
#ifndef _LTTNG_WRAPPER_UUID_H
#define _LTTNG_WRAPPER_UUID_H
-#include <l
inux/
version.h>
+#include <l
ttng-kernel-
version.h>
#include <linux/uuid.h>
#include <linux/uuid.h>
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(5,7,0))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(5,7,0))
static inline
void lttng_guid_gen(guid_t *u)
{
return guid_gen(u);
}
static inline
void lttng_guid_gen(guid_t *u)
{
return guid_gen(u);
}
-#else /* #if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(5,7,0)) */
+#else /* #if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(5,7,0)) */
typedef uuid_le guid_t;
typedef uuid_le guid_t;
@@
-26,6
+26,6
@@
void lttng_guid_gen(guid_t *u)
{
return uuid_le_gen(u);
}
{
return uuid_le_gen(u);
}
-#endif /* #else #if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(5,7,0)) */
+#endif /* #else #if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(5,7,0)) */
#endif /* _LTTNG_WRAPPER_UUID_H */
#endif /* _LTTNG_WRAPPER_UUID_H */
diff --git
a/wrapper/vmalloc.h
b/wrapper/vmalloc.h
index 91d46bd1a1aa950fc4fbc32110218fc17460abe9..d65a8e9c37fe85bdfcaee069f6640ee167108f0e 100644
(file)
--- a/
wrapper/vmalloc.h
+++ b/
wrapper/vmalloc.h
@@
-12,7
+12,7
@@
#ifndef _LTTNG_WRAPPER_VMALLOC_H
#define _LTTNG_WRAPPER_VMALLOC_H
#ifndef _LTTNG_WRAPPER_VMALLOC_H
#define _LTTNG_WRAPPER_VMALLOC_H
-#include <l
inux/
version.h>
+#include <l
ttng-kernel-
version.h>
#include <linux/vmalloc.h>
#include <linux/mm.h>
#include <linux/vmalloc.h>
#include <linux/mm.h>
@@
-22,7
+22,7
@@
#include <wrapper/kallsyms.h>
#include <lttng-kernel-version.h>
#include <wrapper/kallsyms.h>
#include <lttng-kernel-version.h>
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(5,8,0))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(5,8,0))
/*
* wrapper_vmalloc_sync_mappings was removed in v5.8, the vmalloc mappings
/*
* wrapper_vmalloc_sync_mappings was removed in v5.8, the vmalloc mappings
@@
-32,7
+32,7
@@
static inline
void wrapper_vmalloc_sync_mappings(void)
{}
void wrapper_vmalloc_sync_mappings(void)
{}
-#elif (L
INUX_VERSION_CODE >=
KERNEL_VERSION(5,6,0) \
+#elif (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(5,6,0) \
|| LTTNG_KERNEL_RANGE(5,5,12, 5,6,0) \
|| LTTNG_KERNEL_RANGE(5,4,28, 5,5,0) \
|| LTTNG_KERNEL_RANGE(5,2,37, 5,3,0) \
|| LTTNG_KERNEL_RANGE(5,5,12, 5,6,0) \
|| LTTNG_KERNEL_RANGE(5,4,28, 5,5,0) \
|| LTTNG_KERNEL_RANGE(5,2,37, 5,3,0) \
@@
-77,7
+77,7
@@
void __canary__vmalloc_sync_mappings(void)
vmalloc_sync_mappings();
}
vmalloc_sync_mappings();
}
-#else /* #if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(5,6,0)) */
+#else /* #if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(5,6,0)) */
/*
* Map vmalloc_sync_mappings to vmalloc_sync_all() on kernels before 5.6.
/*
* Map vmalloc_sync_mappings to vmalloc_sync_all() on kernels before 5.6.
@@
-115,11
+115,11
@@
void __canary__vmalloc_sync_all(void)
vmalloc_sync_all();
}
vmalloc_sync_all();
}
-#endif /* #else #if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(5,6,0)) */
+#endif /* #else #if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(5,6,0)) */
#else /* CONFIG_KALLSYMS */
#else /* CONFIG_KALLSYMS */
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(5,8,0))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(5,8,0))
/*
* wrapper_vmalloc_sync_mappings was removed in v5.8, the vmalloc mappings
/*
* wrapper_vmalloc_sync_mappings was removed in v5.8, the vmalloc mappings
@@
-129,7
+129,7
@@
static inline
void wrapper_vmalloc_sync_mappings(void)
{}
void wrapper_vmalloc_sync_mappings(void)
{}
-#elif (L
INUX_VERSION_CODE >=
KERNEL_VERSION(5,6,0) \
+#elif (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(5,6,0) \
|| LTTNG_KERNEL_RANGE(5,5,12, 5,6,0) \
|| LTTNG_KERNEL_RANGE(5,4,28, 5,5,0) \
|| LTTNG_KERNEL_RANGE(5,2,37, 5,3,0) \
|| LTTNG_KERNEL_RANGE(5,5,12, 5,6,0) \
|| LTTNG_KERNEL_RANGE(5,4,28, 5,5,0) \
|| LTTNG_KERNEL_RANGE(5,2,37, 5,3,0) \
@@
-147,7
+147,7
@@
void wrapper_vmalloc_sync_mappings(void)
return vmalloc_sync_mappings();
}
return vmalloc_sync_mappings();
}
-#else /* #if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(5,6,0)) */
+#else /* #if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(5,6,0)) */
static inline
void wrapper_vmalloc_sync_mappings(void)
static inline
void wrapper_vmalloc_sync_mappings(void)
@@
-155,11
+155,11
@@
void wrapper_vmalloc_sync_mappings(void)
return vmalloc_sync_all();
}
return vmalloc_sync_all();
}
-#endif /* #else #if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(5,6,0)) */
+#endif /* #else #if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(5,6,0)) */
#endif
#endif
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(4,12,0))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(4,12,0))
static inline
void *lttng_kvmalloc_node(unsigned long size, gfp_t flags, int node)
{
static inline
void *lttng_kvmalloc_node(unsigned long size, gfp_t flags, int node)
{
@@
-212,7
+212,7
@@
void print_vmalloc_node_range_warning(void)
printk_once(KERN_WARNING "Please rebuild your kernel with CONFIG_KALLSYMS enabled.\n");
}
printk_once(KERN_WARNING "Please rebuild your kernel with CONFIG_KALLSYMS enabled.\n");
}
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(4,0,0))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(4,0,0))
/*
* kallsyms wrapper of __vmalloc_node with a fallback to kmalloc_node.
/*
* kallsyms wrapper of __vmalloc_node with a fallback to kmalloc_node.
@@
-262,7
+262,7
@@
void *__canary____lttng_vmalloc_node_range(unsigned long size, unsigned long ali
vm_flags, node, caller);
}
vm_flags, node, caller);
}
-#elif (L
INUX_VERSION_CODE >=
KERNEL_VERSION(3,6,0))
+#elif (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(3,6,0))
/*
* kallsyms wrapper of __vmalloc_node with a fallback to kmalloc_node.
/*
* kallsyms wrapper of __vmalloc_node with a fallback to kmalloc_node.
@@
-310,7
+310,7
@@
void *__canary____lttng_vmalloc_node_range(unsigned long size, unsigned long ali
node, caller);
}
node, caller);
}
-#else /* (L
INUX_VERSION_CODE >=
KERNEL_VERSION(3,6,0)) */
+#else /* (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(3,6,0)) */
/*
* kallsyms wrapper of __vmalloc_node with a fallback to kmalloc_node.
/*
* kallsyms wrapper of __vmalloc_node with a fallback to kmalloc_node.
diff --git
a/wrapper/writeback.h
b/wrapper/writeback.h
index 328c9323549ee8aee5ef8711dbab153513b1ad3d..6601e0f70963b501021b4dbdd9953ed511e0f7e9 100644
(file)
--- a/
wrapper/writeback.h
+++ b/
wrapper/writeback.h
@@
-20,7
+20,7
@@
-#if L
INUX_VERSION_CODE >=
KERNEL_VERSION(4,2,0)
+#if L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(4,2,0)
static struct wb_domain *global_wb_domain_sym;
static struct wb_domain *global_wb_domain_sym;
@@
-51,7
+51,7
@@
unsigned long __canary__global_wb_domain(void)
return global_wb_domain.dirty_limit;
}
return global_wb_domain.dirty_limit;
}
-#elif L
INUX_VERSION_CODE >=
KERNEL_VERSION(3,1,0)
+#elif L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(3,1,0)
static unsigned long *global_dirty_limit_sym;
static unsigned long *global_dirty_limit_sym;
@@
-88,7
+88,7
@@
unsigned long __canary__global_dirty_limit(void)
#include <linux/writeback.h>
#include <linux/writeback.h>
-#if L
INUX_VERSION_CODE >=
KERNEL_VERSION(3,1,0)
+#if L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(3,1,0)
static inline
unsigned long wrapper_global_dirty_limit(void)
{
static inline
unsigned long wrapper_global_dirty_limit(void)
{
This page took
0.16327 seconds
and
4
git commands to generate.