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:
c8d38a6
)
Namespace kernel version macros
author
Michael Jeanson
<mjeanson@efficios.com>
Wed, 10 Feb 2021 15:28:52 +0000
(10:28 -0500)
committer
Mathieu Desnoyers
<mathieu.desnoyers@efficios.com>
Wed, 10 Feb 2021 15:51:38 +0000
(10:51 -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: Ie74cd03d830366117dc78d084977bc596ad34b85
88 files changed:
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/irq.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/lock.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/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/bug.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-perf-counters.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/fdtable.c
patch
|
blob
|
blame
|
history
wrapper/fdtable.h
patch
|
blob
|
blame
|
history
wrapper/file.h
patch
|
blob
|
blame
|
history
wrapper/frame.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/kref.h
patch
|
blob
|
blame
|
history
wrapper/kstrtox.h
patch
|
blob
|
blame
|
history
wrapper/mm.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/spinlock.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/uuid.h
patch
|
blob
|
blame
|
history
wrapper/vmalloc.h
patch
|
blob
|
blame
|
history
wrapper/vzalloc.h
patch
|
blob
|
blame
|
history
wrapper/writeback.h
patch
|
blob
|
blame
|
history
diff --git
a/instrumentation/events/lttng-module/arch/x86/exceptions.h
b/instrumentation/events/lttng-module/arch/x86/exceptions.h
index a4546ccaed1a9e65b10ae0d084218cd41017fbb2..37173efed4658ea515f2a8fc507e880d653d9f83 100644
(file)
--- a/
instrumentation/events/lttng-module/arch/x86/exceptions.h
+++ b/
instrumentation/events/lttng-module/arch/x86/exceptions.h
@@
-2,7
+2,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 c522aa7a976b3408e215deac30a9322cb8bb2c17..bdec0375941d0f00ccc3262199633899dc22a5e9 100644
(file)
--- a/
instrumentation/events/lttng-module/arch/x86/irq_vectors.h
+++ b/
instrumentation/events/lttng-module/arch/x86/irq_vectors.h
@@
-2,7
+2,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 e0fcae3702e89e8305d2f3a9c05c66ecc11458e0..22ea98991711df36a62433c6833bf0bd933ae701 100644
(file)
--- a/
instrumentation/events/lttng-module/arch/x86/kvm/mmutrace.h
+++ b/
instrumentation/events/lttng-module/arch/x86/kvm/mmutrace.h
@@
-2,18
+2,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 \
@@
-22,7
+22,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) \
@@
-31,7
+31,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) \
@@
-39,9
+39,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
*/
@@
-55,7
+55,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
*/
@@
-71,7
+71,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(
@@
-162,7
+162,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(3,11,0))
+#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,
@@
-180,7
+180,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,
@@
-197,7
+197,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,
@@
-214,7
+214,7
@@
LTTNG_TRACEPOINT_EVENT_MAP(
)
)
)
)
-#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(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 4d8e76316780aad4080dee76a166ec868a421949..082d61b16ce73b6aa61c25b937e7da5835959695 100644
(file)
--- a/
instrumentation/events/lttng-module/arch/x86/kvm/trace.h
+++ b/
instrumentation/events/lttng-module/arch/x86/kvm/trace.h
@@
-4,10
+4,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>
@@
-423,13
+423,13
@@
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(__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)
-#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
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
@@
-465,7
+465,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),
@@
-479,7
+479,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,
@@
-510,7
+510,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 4c5833c3cbc4ff9c518fb79be03a8296bf2cb3a5..22f0820e2659ee680ca7adac7daff708570f9456 100644
(file)
--- a/
instrumentation/events/lttng-module/asoc.h
+++ b/
instrumentation/events/lttng-module/asoc.h
@@
-6,28
+6,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
@@
-36,7
+36,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
*/
@@
-78,8
+78,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,
@@
-223,7
+223,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,
@@
-241,7
+241,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,
@@
-261,7
+261,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,
@@
-299,7
+299,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,
@@
-328,7
+328,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,
@@
-388,7
+388,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 07c35043323371f477dac067c6db0ea0c7fa34aa..2fffcc2a13bfc599da9160afcee6b66dfae47133 100644
(file)
--- a/
instrumentation/events/lttng-module/block.h
+++ b/
instrumentation/events/lttng-module/block.h
@@
-8,11
+8,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_
@@
-33,7
+33,7
@@
enum {
#endif /* _TRACE_BLOCK_DEF_ */
#endif /* _TRACE_BLOCK_DEF_ */
-#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) || \
@@
-61,7
+61,7
@@
enum {
| ((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)
@@
-80,7
+80,7
@@
enum {
| ((rw) & REQ_FLUSH ? RWBS_FLAG_FLUSH : 0) \
| ((rw) & REQ_FUA ? RWBS_FLAG_FUA : 0))
| ((rw) & REQ_FLUSH ? RWBS_FLAG_FLUSH : 0) \
| ((rw) & REQ_FUA ? RWBS_FLAG_FUA : 0))
-#elif (L
INUX_VERSION_CODE >=
KERNEL_VERSION(2,6,37))
+#elif (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(2,6,37))
#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)
@@
-97,7
+97,7
@@
enum {
| ((rw) & REQ_META ? RWBS_FLAG_META : 0) \
| ((rw) & REQ_SECURE ? RWBS_FLAG_SECURE : 0))
| ((rw) & REQ_META ? RWBS_FLAG_META : 0) \
| ((rw) & REQ_SECURE ? RWBS_FLAG_SECURE : 0))
-#elif (L
INUX_VERSION_CODE >=
KERNEL_VERSION(2,6,36))
+#elif (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(2,6,36))
#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)
@@
-134,7
+134,7
@@
enum {
#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),
@@
-175,9
+175,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),
@@
-220,7
+220,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),
@@
-263,9
+263,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
@@
-293,7
+293,7
@@
LTTNG_TRACEPOINT_EVENT_INSTANCE(block_rq_with_error, block_rq_abort,
* @q. For some reason the request was not completed and needs to be
* put back in the queue.
*/
* @q. For some reason the request was not completed and needs to be
* put back in the queue.
*/
-#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_requeue,
TP_PROTO(struct request_queue *q, struct request *rq),
LTTNG_TRACEPOINT_EVENT(block_rq_requeue,
TP_PROTO(struct request_queue *q, struct request *rq),
@@
-330,7
+330,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),
@@
-347,7
+347,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,
@@
-385,7
+385,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) \
@@
-430,7
+430,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
@@
-450,9
+450,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(4,12,0))
+#if (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),
@@
-471,7
+471,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),
@@
-519,7
+519,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),
@@
-566,7
+566,7
@@
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)) */
/**
* block_rq_insert - insert block operation request into queue
/**
* block_rq_insert - insert block operation request into queue
@@
-618,24
+618,24
@@
LTTNG_TRACEPOINT_EVENT(block_bio_bounce,
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 ? bio->bi_bdev->bd_dev : 0)
#endif
ctf_integer(dev_t, dev, bio_dev(bio))
#else
ctf_integer(dev_t, dev, bio->bi_bdev ? 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->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)
)
@@
-652,7
+652,7
@@
LTTNG_TRACEPOINT_EVENT(block_bio_bounce,
*/
LTTNG_TRACEPOINT_EVENT(block_bio_complete,
*/
LTTNG_TRACEPOINT_EVENT(block_bio_complete,
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(2,6,38))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(2,6,38))
TP_PROTO(struct request_queue *q, struct bio *bio, int error),
TP_ARGS(q, bio, error),
TP_PROTO(struct request_queue *q, struct bio *bio, int error),
TP_ARGS(q, bio, error),
@@
-663,33
+663,33
@@
LTTNG_TRACEPOINT_EVENT(block_bio_complete,
#endif
TP_FIELDS(
#endif
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))
ctf_integer(int, error, error)
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))
ctf_integer(int, error, error)
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)
ctf_integer(sector_t, sector, bio->bi_sector)
ctf_integer(unsigned int, nr_sector, bio->bi_size >> 9)
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(2,6,38))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(2,6,38))
ctf_integer(int, error, error)
#else
ctf_integer(int, error, 0)
#endif
blk_rwbs_ctf_integer(unsigned int, rwbs,
lttng_bio_op(bio), lttng_bio_rw(bio), bio->bi_size)
ctf_integer(int, error, error)
#else
ctf_integer(int, error, 0)
#endif
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)) */
)
)
)
)
-#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_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),
@@
-697,23
+697,23
@@
LTTNG_TRACEPOINT_EVENT_CLASS(block_bio_merge,
TP_ARGS(q, rq, bio),
TP_FIELDS(
TP_ARGS(q, rq, 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)
)
@@
-763,28
+763,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),
@@
-845,7
+845,7
@@
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)) */
LTTNG_TRACEPOINT_EVENT_CLASS(block_get_rq,
LTTNG_TRACEPOINT_EVENT_CLASS(block_get_rq,
@@
-854,12
+854,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)
@@
-867,7
+867,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)
@@
-875,7
+875,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)
)
@@
-937,7
+937,7
@@
LTTNG_TRACEPOINT_EVENT(block_plug,
LTTNG_TRACEPOINT_EVENT_CLASS(block_unplug,
LTTNG_TRACEPOINT_EVENT_CLASS(block_unplug,
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(2,6,39))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(2,6,39))
TP_PROTO(struct request_queue *q, unsigned int depth, bool explicit),
TP_ARGS(q, depth, explicit),
TP_PROTO(struct request_queue *q, unsigned int depth, bool explicit),
TP_ARGS(q, depth, explicit),
@@
-948,7
+948,7
@@
LTTNG_TRACEPOINT_EVENT_CLASS(block_unplug,
#endif
TP_FIELDS(
#endif
TP_FIELDS(
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(2,6,39))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(2,6,39))
ctf_integer(int, nr_rq, depth)
#else
ctf_integer(int, nr_rq, q->rq.count[READ] + q->rq.count[WRITE])
ctf_integer(int, nr_rq, depth)
#else
ctf_integer(int, nr_rq, q->rq.count[READ] + q->rq.count[WRITE])
@@
-958,7
+958,7
@@
LTTNG_TRACEPOINT_EVENT_CLASS(block_unplug,
)
)
)
)
-#if (L
INUX_VERSION_CODE <
KERNEL_VERSION(2,6,39))
+#if (L
TTNG_LINUX_VERSION_CODE < LTTNG_
KERNEL_VERSION(2,6,39))
/**
* block_unplug_timer - timed release of operations requests in queue to device driver
* @q: request queue to unplug
/**
* block_unplug_timer - timed release of operations requests in queue to device driver
* @q: request queue to unplug
@@
-983,13
+983,13
@@
LTTNG_TRACEPOINT_EVENT_INSTANCE(block_unplug, block_unplug_timer,
* Unplug request queue @q because device driver is scheduled to work
* on elements in the request queue.
*/
* Unplug request queue @q because device driver is scheduled to work
* on elements in the request queue.
*/
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(2,6,39))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(2,6,39))
LTTNG_TRACEPOINT_EVENT_INSTANCE(block_unplug, block_unplug,
#else
LTTNG_TRACEPOINT_EVENT_INSTANCE(block_unplug, block_unplug_io,
#endif
LTTNG_TRACEPOINT_EVENT_INSTANCE(block_unplug, block_unplug,
#else
LTTNG_TRACEPOINT_EVENT_INSTANCE(block_unplug, block_unplug_io,
#endif
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(2,6,39))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(2,6,39))
TP_PROTO(struct request_queue *q, unsigned int depth, bool explicit),
TP_ARGS(q, depth, explicit)
TP_PROTO(struct request_queue *q, unsigned int depth, bool explicit),
TP_ARGS(q, depth, explicit)
@@
-1019,21
+1019,21
@@
LTTNG_TRACEPOINT_EVENT(block_split,
TP_ARGS(q, bio, new_sector),
TP_FIELDS(
TP_ARGS(q, bio, new_sector),
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)
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)
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)
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)
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(sector_t, new_sector, new_sector)
ctf_integer(pid_t, tid, current->pid)
ctf_array_text(char, comm, current->comm, TASK_COMM_LEN)
ctf_integer(sector_t, new_sector, new_sector)
ctf_integer(pid_t, tid, current->pid)
ctf_array_text(char, comm, current->comm, TASK_COMM_LEN)
@@
-1050,7
+1050,7
@@
LTTNG_TRACEPOINT_EVENT(block_split,
* An operation for a logical device has been mapped to the
* raw block device.
*/
* An operation for a logical device has been mapped to the
* raw block device.
*/
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(2,6,38))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(2,6,38))
LTTNG_TRACEPOINT_EVENT(block_bio_remap,
#else
LTTNG_TRACEPOINT_EVENT(block_remap,
LTTNG_TRACEPOINT_EVENT(block_bio_remap,
#else
LTTNG_TRACEPOINT_EVENT(block_remap,
@@
-1062,29
+1062,29
@@
LTTNG_TRACEPOINT_EVENT(block_remap,
TP_ARGS(q, bio, dev, from),
TP_FIELDS(
TP_ARGS(q, bio, dev, from),
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(dev_t, old_dev, dev)
ctf_integer(sector_t, old_sector, from)
)
)
ctf_integer(dev_t, old_dev, dev)
ctf_integer(sector_t, old_sector, from)
)
)
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(2,6,32))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(2,6,32))
/**
* block_rq_remap - map request for a block operation request
* @q: queue holding the operation
/**
* block_rq_remap - map request for a block operation request
* @q: queue holding the operation
diff --git
a/instrumentation/events/lttng-module/btrfs.h
b/instrumentation/events/lttng-module/btrfs.h
index 1f8212389651dd6cc31d987182c3e7fb5f1b9a6f..da783e6f3e6227e02736af83f05c3d1d949695dc 100644
(file)
--- a/
instrumentation/events/lttng-module/btrfs.h
+++ b/
instrumentation/events/lttng-module/btrfs.h
@@
-6,7
+6,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_
@@
-19,30
+19,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) || \
@@
-150,7
+150,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,
@@
-173,7
+173,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,
@@
-196,7
+196,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,
@@
-219,7
+219,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,
@@
-266,7
+266,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,
@@
-287,9
+287,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,
@@
-308,7
+308,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,
@@
-327,7
+327,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),
@@
-345,7
+345,7
@@
LTTNG_TRACEPOINT_EVENT(btrfs_handle_em_exist,
)
#endif
)
#endif
-#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(btrfs__ordered_extent,
TP_PROTO(const struct inode *inode,
LTTNG_TRACEPOINT_EVENT_CLASS(btrfs__ordered_extent,
TP_PROTO(const struct inode *inode,
@@
-367,7
+367,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,
@@
-389,7
+389,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),
@@
-457,7
+457,7
@@
LTTNG_TRACEPOINT_EVENT_CLASS(btrfs__ordered_extent,
)
#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) || \
@@
-604,7
+604,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)
@@
-662,7
+662,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) || \
@@
-680,7
+680,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),
@@
-704,7
+704,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,
@@
-722,7
+722,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) || \
@@
-764,7
+764,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_TRACEPOINT_EVENT(btrfs_delayed_tree_ref,
TP_PROTO(const struct btrfs_fs_info *fs_info,
LTTNG_TRACEPOINT_EVENT(btrfs_delayed_tree_ref,
TP_PROTO(const struct btrfs_fs_info *fs_info,
@@
-785,7
+785,7
@@
LTTNG_TRACEPOINT_EVENT(btrfs_delayed_tree_ref,
ctf_integer(u64, seq, ref->seq)
)
)
ctf_integer(u64, seq, ref->seq)
)
)
-#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_delayed_tree_ref,
TP_PROTO(struct btrfs_fs_info *fs_info,
LTTNG_TRACEPOINT_EVENT(btrfs_delayed_tree_ref,
TP_PROTO(struct btrfs_fs_info *fs_info,
@@
-823,7
+823,7
@@
LTTNG_TRACEPOINT_EVENT(btrfs_delayed_tree_ref,
ctf_integer(u64, ref_root, full_ref->root)
ctf_integer(int, level, full_ref->level)
ctf_integer(int, type, ref->type)
ctf_integer(u64, ref_root, full_ref->root)
ctf_integer(int, level, full_ref->level)
ctf_integer(int, type, ref->type)
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(3,7,0))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(3,7,0))
ctf_integer(u64, seq, ref->seq)
#endif
)
ctf_integer(u64, seq, ref->seq)
#endif
)
@@
-847,13
+847,13
@@
LTTNG_TRACEPOINT_EVENT(btrfs_delayed_data_ref,
ctf_integer(u64, owner, full_ref->objectid)
ctf_integer(u64, offset, full_ref->offset)
ctf_integer(int, type, ref->type)
ctf_integer(u64, owner, full_ref->objectid)
ctf_integer(u64, offset, full_ref->offset)
ctf_integer(int, type, ref->type)
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(3,7,0))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(3,7,0))
ctf_integer(u64, seq, ref->seq)
#endif
)
)
ctf_integer(u64, seq, ref->seq)
#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,
@@
-896,7
+896,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) || \
@@
-950,7
+950,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,
@@
-1039,7
+1039,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,
@@
-1100,7
+1100,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,
@@
-1135,7
+1135,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,
@@
-1208,7
+1208,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,
@@
-1243,9
+1243,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) || \
@@
-1285,7
+1285,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,
@@
-1301,7
+1301,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) || \
@@
-1321,7
+1321,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,
@@
-1339,7
+1339,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,
@@
-1367,7
+1367,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,
@@
-1427,7
+1427,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,
@@
-1456,9
+1456,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,
@@
-1479,7
+1479,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,
@@
-1498,7
+1498,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,
@@
-1517,7
+1517,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,
@@
-1536,7
+1536,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,
@@
-1576,7
+1576,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,
@@
-1596,7
+1596,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,
@@
-1629,7
+1629,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,
@@
-1663,7
+1663,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,
@@
-1700,7
+1700,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,
@@
-1775,7
+1775,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,
@@
-1812,9
+1812,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,
@@
-1859,7
+1859,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) || \
@@
-1908,7
+1908,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,
@@
-1955,7
+1955,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) || \
@@
-1988,7
+1988,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 f4f234146f9f77a37b1ddcacde146b7c3c7bc746..9a1eae6551a4f917aa9089574e51b69fcc58c6f6 100644
(file)
--- a/
instrumentation/events/lttng-module/compaction.h
+++ b/
instrumentation/events/lttng-module/compaction.h
@@
-6,9
+6,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,
@@
-55,7
+55,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,
@@
-94,11
+94,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,
@@
-134,7
+134,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,
@@
-149,7
+149,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 4e45761ec0325f5dce7c69c3f9a0fb6aaca6b3b8..bce0eb2a3dbcd6c06c30cc009c469e869b8bc9b3 100644
(file)
--- a/
instrumentation/events/lttng-module/ext3.h
+++ b/
instrumentation/events/lttng-module/ext3.h
@@
-5,7
+5,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),
@@
-16,7
+16,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
@@
-189,7
+189,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 e140a5a4f076e3c3c75de70d045b5f350ed86b6f..40616ed26df4546a1f93fd263b983a5a6cdac11a 100644
(file)
--- a/
instrumentation/events/lttng-module/ext4.h
+++ b/
instrumentation/events/lttng-module/ext4.h
@@
-6,7
+6,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_
@@
-16,13
+16,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
@@
-36,7
+36,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
@@
-73,7
+73,7
@@
LTTNG_TRACEPOINT_EVENT(ext4_allocate_inode,
)
)
)
)
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(2,6,37))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(2,6,37))
LTTNG_TRACEPOINT_EVENT(ext4_evict_inode,
TP_PROTO(struct inode *inode),
LTTNG_TRACEPOINT_EVENT(ext4_evict_inode,
TP_PROTO(struct inode *inode),
@@
-202,7
+202,7
@@
LTTNG_TRACEPOINT_EVENT_INSTANCE(ext4__write_end, ext4_da_write_end,
TP_ARGS(inode, pos, len, copied)
)
TP_ARGS(inode, pos, len, copied)
)
-#if (L
INUX_VERSION_CODE <
KERNEL_VERSION(2,6,40))
+#if (L
TTNG_LINUX_VERSION_CODE < LTTNG_
KERNEL_VERSION(2,6,40))
LTTNG_TRACEPOINT_EVENT(ext4_writepage,
TP_PROTO(struct inode *inode, struct page *page),
LTTNG_TRACEPOINT_EVENT(ext4_writepage,
TP_PROTO(struct inode *inode, struct page *page),
@@
-229,21
+229,21
@@
LTTNG_TRACEPOINT_EVENT(ext4_da_writepages,
ctf_integer(loff_t, range_start, wbc->range_start)
ctf_integer(loff_t, range_end, wbc->range_end)
ctf_integer(pgoff_t, writeback_index, inode->i_mapping->writeback_index)
ctf_integer(loff_t, range_start, wbc->range_start)
ctf_integer(loff_t, range_end, wbc->range_end)
ctf_integer(pgoff_t, writeback_index, inode->i_mapping->writeback_index)
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(2,6,39))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(2,6,39))
ctf_integer(int, sync_mode, wbc->sync_mode)
#endif
ctf_integer(int, sync_mode, wbc->sync_mode)
#endif
-#if (L
INUX_VERSION_CODE <
KERNEL_VERSION(2,6,37))
+#if (L
TTNG_LINUX_VERSION_CODE < LTTNG_
KERNEL_VERSION(2,6,37))
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)
-#if (L
INUX_VERSION_CODE <
KERNEL_VERSION(2,6,39))
+#if (L
TTNG_LINUX_VERSION_CODE < LTTNG_
KERNEL_VERSION(2,6,39))
ctf_integer(char, for_reclaim, wbc->for_reclaim)
#endif
ctf_integer(char, range_cyclic, wbc->range_cyclic)
)
)
ctf_integer(char, for_reclaim, wbc->for_reclaim)
#endif
ctf_integer(char, range_cyclic, wbc->range_cyclic)
)
)
-#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,
@@
-276,7
+276,7
@@
LTTNG_TRACEPOINT_EVENT(ext4_da_write_pages,
ctf_integer(unsigned long, first_page, mpd->first_page)
ctf_integer(int, io_done, mpd->io_done)
ctf_integer(int, pages_written, mpd->pages_written)
ctf_integer(unsigned long, first_page, mpd->first_page)
ctf_integer(int, io_done, mpd->io_done)
ctf_integer(int, pages_written, mpd->pages_written)
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(2,6,39))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(2,6,39))
ctf_integer(int, sync_mode, mpd->wbc->sync_mode)
#endif
)
ctf_integer(int, sync_mode, mpd->wbc->sync_mode)
#endif
)
@@
-284,7
+284,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),
@@
-315,22
+315,22
@@
LTTNG_TRACEPOINT_EVENT(ext4_da_writepages_result,
ctf_integer(int, pages_written, pages_written)
ctf_integer(long, pages_skipped, wbc->pages_skipped)
ctf_integer(pgoff_t, writeback_index, inode->i_mapping->writeback_index)
ctf_integer(int, pages_written, pages_written)
ctf_integer(long, pages_skipped, wbc->pages_skipped)
ctf_integer(pgoff_t, writeback_index, inode->i_mapping->writeback_index)
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(2,6,39))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(2,6,39))
ctf_integer(int, sync_mode, wbc->sync_mode)
#endif
ctf_integer(int, sync_mode, wbc->sync_mode)
#endif
-#if (L
INUX_VERSION_CODE <
KERNEL_VERSION(2,6,33))
+#if (L
TTNG_LINUX_VERSION_CODE < LTTNG_
KERNEL_VERSION(2,6,33))
ctf_integer(char, encountered_congestion, wbc->encountered_congestion)
#endif
ctf_integer(char, encountered_congestion, wbc->encountered_congestion)
#endif
-#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, more_io, wbc->more_io)
#endif
ctf_integer(char, more_io, wbc->more_io)
#endif
-#if (L
INUX_VERSION_CODE <
KERNEL_VERSION(2,6,35))
+#if (L
TTNG_LINUX_VERSION_CODE < LTTNG_
KERNEL_VERSION(2,6,35))
ctf_integer(char, no_nrwrite_index_update, wbc->no_nrwrite_index_update)
#endif
)
)
ctf_integer(char, no_nrwrite_index_update, wbc->no_nrwrite_index_update)
#endif
)
)
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(2,6,39))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(2,6,39))
LTTNG_TRACEPOINT_EVENT_CLASS(ext4__page_op,
TP_PROTO(struct page *page),
LTTNG_TRACEPOINT_EVENT_CLASS(ext4__page_op,
TP_PROTO(struct page *page),
@@
-343,7
+343,7
@@
LTTNG_TRACEPOINT_EVENT_CLASS(ext4__page_op,
)
)
)
)
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(2,6,40))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(2,6,40))
LTTNG_TRACEPOINT_EVENT_INSTANCE(ext4__page_op, ext4_writepage,
TP_PROTO(struct page *page),
LTTNG_TRACEPOINT_EVENT_INSTANCE(ext4__page_op, ext4_writepage,
TP_PROTO(struct page *page),
@@
-366,7
+366,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),
@@
-460,11
+460,11
@@
LTTNG_TRACEPOINT_EVENT_INSTANCE(ext4__mb_new_pa, ext4_mb_new_group_pa,
LTTNG_TRACEPOINT_EVENT(ext4_mb_release_inode_pa,
TP_PROTO(
LTTNG_TRACEPOINT_EVENT(ext4_mb_release_inode_pa,
TP_PROTO(
-#if (L
INUX_VERSION_CODE <
KERNEL_VERSION(2,6,40))
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(2,6,37))
+#if (L
TTNG_LINUX_VERSION_CODE < LTTNG_
KERNEL_VERSION(2,6,40))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(2,6,37))
struct super_block *sb,
struct inode *inode,
struct super_block *sb,
struct inode *inode,
-#elif (L
INUX_VERSION_CODE >=
KERNEL_VERSION(2,6,36))
+#elif (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(2,6,36))
struct super_block *sb,
struct ext4_allocation_context *ac,
#else
struct super_block *sb,
struct ext4_allocation_context *ac,
#else
@@
-474,27
+474,27
@@
LTTNG_TRACEPOINT_EVENT(ext4_mb_release_inode_pa,
struct ext4_prealloc_space *pa,
unsigned long long block, unsigned int count),
struct ext4_prealloc_space *pa,
unsigned long long block, unsigned int count),
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(2,6,40))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(2,6,40))
TP_ARGS(pa, block, count),
TP_ARGS(pa, block, count),
-#elif (L
INUX_VERSION_CODE >=
KERNEL_VERSION(2,6,37))
+#elif (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(2,6,37))
TP_ARGS(sb, inode, pa, block, count),
TP_ARGS(sb, inode, pa, block, count),
-#elif (L
INUX_VERSION_CODE >=
KERNEL_VERSION(2,6,36))
+#elif (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(2,6,36))
TP_ARGS(sb, ac, pa, block, count),
#else
TP_ARGS(ac, pa, block, count),
#endif
TP_FIELDS(
TP_ARGS(sb, ac, pa, block, count),
#else
TP_ARGS(ac, pa, block, count),
#endif
TP_FIELDS(
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(2,6,40))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(2,6,40))
ctf_integer(dev_t, dev, pa->pa_inode->i_sb->s_dev)
ctf_integer(ino_t, ino, pa->pa_inode->i_ino)
#else
ctf_integer(dev_t, dev, pa->pa_inode->i_sb->s_dev)
ctf_integer(ino_t, ino, pa->pa_inode->i_ino)
#else
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(2,6,36))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(2,6,36))
ctf_integer(dev_t, dev, sb->s_dev)
#else
ctf_integer(dev_t, dev, ac->ac_sb->s_dev)
#endif
ctf_integer(dev_t, dev, sb->s_dev)
#else
ctf_integer(dev_t, dev, ac->ac_sb->s_dev)
#endif
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(2,6,37))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(2,6,37))
ctf_integer(ino_t, ino, inode->i_ino)
#else
ctf_integer(ino_t, ino,
ctf_integer(ino_t, ino, inode->i_ino)
#else
ctf_integer(ino_t, ino,
@@
-512,11
+512,11
@@
LTTNG_TRACEPOINT_EVENT(ext4_mb_release_group_pa,
TP_PROTO(struct ext4_prealloc_space *pa),
TP_ARGS(pa),
TP_PROTO(struct ext4_prealloc_space *pa),
TP_ARGS(pa),
-#elif (L
INUX_VERSION_CODE >=
KERNEL_VERSION(2,6,37))
+#elif (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(2,6,37))
TP_PROTO(struct super_block *sb, struct ext4_prealloc_space *pa),
TP_ARGS(sb, pa),
TP_PROTO(struct super_block *sb, struct ext4_prealloc_space *pa),
TP_ARGS(sb, pa),
-#elif (L
INUX_VERSION_CODE >=
KERNEL_VERSION(2,6,36))
+#elif (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(2,6,36))
TP_PROTO(struct super_block *sb,
struct ext4_allocation_context *ac,
struct ext4_prealloc_space *pa),
TP_PROTO(struct super_block *sb,
struct ext4_allocation_context *ac,
struct ext4_prealloc_space *pa),
@@
-532,12
+532,12
@@
LTTNG_TRACEPOINT_EVENT(ext4_mb_release_group_pa,
TP_FIELDS(
#if (LTTNG_KERNEL_RANGE(2,6,40, 3,3,0))
ctf_integer(dev_t, dev, pa->pa_inode->i_sb->s_dev)
TP_FIELDS(
#if (LTTNG_KERNEL_RANGE(2,6,40, 3,3,0))
ctf_integer(dev_t, dev, pa->pa_inode->i_sb->s_dev)
-#elif (L
INUX_VERSION_CODE >=
KERNEL_VERSION(2,6,36))
+#elif (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(2,6,36))
ctf_integer(dev_t, dev, sb->s_dev)
#else
ctf_integer(dev_t, dev, ac->ac_sb->s_dev)
#endif
ctf_integer(dev_t, dev, sb->s_dev)
#else
ctf_integer(dev_t, dev, ac->ac_sb->s_dev)
#endif
-#if (L
INUX_VERSION_CODE <
KERNEL_VERSION(2,6,37))
+#if (L
TTNG_LINUX_VERSION_CODE < LTTNG_
KERNEL_VERSION(2,6,37))
ctf_integer(ino_t, ino,
(ac && ac->ac_inode) ? ac->ac_inode->i_ino : 0)
#endif
ctf_integer(ino_t, ino,
(ac && ac->ac_inode) ? ac->ac_inode->i_ino : 0)
#endif
@@
-608,7
+608,7
@@
LTTNG_TRACEPOINT_EVENT(ext4_allocate_blocks,
)
LTTNG_TRACEPOINT_EVENT(ext4_free_blocks,
)
LTTNG_TRACEPOINT_EVENT(ext4_free_blocks,
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(2,6,33))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(2,6,33))
TP_PROTO(struct inode *inode, __u64 block, unsigned long count,
int flags),
TP_PROTO(struct inode *inode, __u64 block, unsigned long count,
int flags),
@@
-625,7
+625,7
@@
LTTNG_TRACEPOINT_EVENT(ext4_free_blocks,
ctf_integer(ino_t, ino, inode->i_ino)
ctf_integer(__u64, block, block)
ctf_integer(unsigned long, count, count)
ctf_integer(ino_t, ino, inode->i_ino)
ctf_integer(__u64, block, block)
ctf_integer(unsigned long, count, count)
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(2,6,33))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(2,6,33))
ctf_integer(int, flags, flags)
ctf_integer(TP_MODE_T, mode, inode->i_mode)
#else
ctf_integer(int, flags, flags)
ctf_integer(TP_MODE_T, mode, inode->i_mode)
#else
@@
-634,12
+634,12
@@
LTTNG_TRACEPOINT_EVENT(ext4_free_blocks,
)
)
)
)
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(2,6,39))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(2,6,39))
LTTNG_TRACEPOINT_EVENT(ext4_sync_file_enter,
#else
LTTNG_TRACEPOINT_EVENT(ext4_sync_file,
#endif
LTTNG_TRACEPOINT_EVENT(ext4_sync_file_enter,
#else
LTTNG_TRACEPOINT_EVENT(ext4_sync_file,
#endif
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(2,6,35))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(2,6,35))
TP_PROTO(struct file *file, int datasync),
TP_ARGS(file, datasync),
TP_PROTO(struct file *file, int datasync),
TP_ARGS(file, datasync),
@@
-650,7
+650,7
@@
LTTNG_TRACEPOINT_EVENT(ext4_sync_file,
#endif
TP_FIELDS(
#endif
TP_FIELDS(
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(2,6,35))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(2,6,35))
ctf_integer(dev_t, dev, file->f_path.dentry->d_inode->i_sb->s_dev)
ctf_integer(ino_t, ino, file->f_path.dentry->d_inode->i_ino)
ctf_integer(ino_t, parent, file->f_path.dentry->d_parent->d_inode->i_ino)
ctf_integer(dev_t, dev, file->f_path.dentry->d_inode->i_sb->s_dev)
ctf_integer(ino_t, ino, file->f_path.dentry->d_inode->i_ino)
ctf_integer(ino_t, parent, file->f_path.dentry->d_parent->d_inode->i_ino)
@@
-663,7
+663,7
@@
LTTNG_TRACEPOINT_EVENT(ext4_sync_file,
)
)
)
)
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(2,6,39))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(2,6,39))
LTTNG_TRACEPOINT_EVENT(ext4_sync_file_exit,
TP_PROTO(struct inode *inode, int ret),
LTTNG_TRACEPOINT_EVENT(ext4_sync_file_exit,
TP_PROTO(struct inode *inode, int ret),
@@
-689,7
+689,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),
@@
-765,7
+765,7
@@
LTTNG_TRACEPOINT_EVENT(ext4_mballoc_prealloc,
)
LTTNG_TRACEPOINT_EVENT_CLASS(ext4__mballoc,
)
LTTNG_TRACEPOINT_EVENT_CLASS(ext4__mballoc,
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(2,6,37))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(2,6,37))
TP_PROTO(struct super_block *sb,
struct inode *inode,
ext4_group_t group,
TP_PROTO(struct super_block *sb,
struct inode *inode,
ext4_group_t group,
@@
-780,7
+780,7
@@
LTTNG_TRACEPOINT_EVENT_CLASS(ext4__mballoc,
#endif
TP_FIELDS(
#endif
TP_FIELDS(
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(2,6,37))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(2,6,37))
ctf_integer(dev_t, dev, sb->s_dev)
ctf_integer(ino_t, ino, inode ? inode->i_ino : 0)
ctf_integer(int, result_start, start)
ctf_integer(dev_t, dev, sb->s_dev)
ctf_integer(ino_t, ino, inode ? inode->i_ino : 0)
ctf_integer(int, result_start, start)
@@
-799,7
+799,7
@@
LTTNG_TRACEPOINT_EVENT_CLASS(ext4__mballoc,
LTTNG_TRACEPOINT_EVENT_INSTANCE(ext4__mballoc, ext4_mballoc_discard,
LTTNG_TRACEPOINT_EVENT_INSTANCE(ext4__mballoc, ext4_mballoc_discard,
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(2,6,37))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(2,6,37))
TP_PROTO(struct super_block *sb,
struct inode *inode,
ext4_group_t group,
TP_PROTO(struct super_block *sb,
struct inode *inode,
ext4_group_t group,
@@
-816,7
+816,7
@@
LTTNG_TRACEPOINT_EVENT_INSTANCE(ext4__mballoc, ext4_mballoc_discard,
LTTNG_TRACEPOINT_EVENT_INSTANCE(ext4__mballoc, ext4_mballoc_free,
LTTNG_TRACEPOINT_EVENT_INSTANCE(ext4__mballoc, ext4_mballoc_free,
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(2,6,37))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(2,6,37))
TP_PROTO(struct super_block *sb,
struct inode *inode,
ext4_group_t group,
TP_PROTO(struct super_block *sb,
struct inode *inode,
ext4_group_t group,
@@
-831,7
+831,7
@@
LTTNG_TRACEPOINT_EVENT_INSTANCE(ext4__mballoc, ext4_mballoc_free,
#endif
)
#endif
)
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(2,6,33))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(2,6,33))
LTTNG_TRACEPOINT_EVENT(ext4_forget,
TP_PROTO(struct inode *inode, int is_metadata, __u64 block),
LTTNG_TRACEPOINT_EVENT(ext4_forget,
TP_PROTO(struct inode *inode, int is_metadata, __u64 block),
@@
-847,7
+847,7
@@
LTTNG_TRACEPOINT_EVENT(ext4_forget,
)
#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_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),
@@
-864,7
+864,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),
@@
-885,7
+885,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(2,6,34))
+#elif (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(2,6,34))
LTTNG_TRACEPOINT_EVENT(ext4_da_update_reserve_space,
TP_PROTO(struct inode *inode, int used_blocks),
LTTNG_TRACEPOINT_EVENT(ext4_da_update_reserve_space,
TP_PROTO(struct inode *inode, int used_blocks),
@@
-907,7
+907,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),
@@
-922,7
+922,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),
@@
-939,7
+939,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(2,6,34))
+#elif (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(2,6,34))
LTTNG_TRACEPOINT_EVENT(ext4_da_reserve_space,
TP_PROTO(struct inode *inode, int md_needed),
LTTNG_TRACEPOINT_EVENT(ext4_da_reserve_space,
TP_PROTO(struct inode *inode, int md_needed),
@@
-959,7
+959,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),
@@
-975,7
+975,7
@@
LTTNG_TRACEPOINT_EVENT(ext4_da_release_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(2,6,34))
+#elif (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(2,6,34))
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),
@@
-997,7
+997,7
@@
LTTNG_TRACEPOINT_EVENT(ext4_da_release_space,
)
#endif
)
#endif
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(2,6,35))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(2,6,35))
LTTNG_TRACEPOINT_EVENT_CLASS(ext4__bitmap_load,
TP_PROTO(struct super_block *sb, unsigned long group),
LTTNG_TRACEPOINT_EVENT_CLASS(ext4__bitmap_load,
TP_PROTO(struct super_block *sb, unsigned long group),
@@
-1024,7
+1024,7
@@
LTTNG_TRACEPOINT_EVENT_INSTANCE(ext4__bitmap_load, ext4_mb_buddy_bitmap_load,
)
#endif
)
#endif
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(2,6,39))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(2,6,39))
LTTNG_TRACEPOINT_EVENT_INSTANCE(ext4__bitmap_load, ext4_read_block_bitmap_load,
TP_PROTO(struct super_block *sb, unsigned long group),
LTTNG_TRACEPOINT_EVENT_INSTANCE(ext4__bitmap_load, ext4_read_block_bitmap_load,
TP_PROTO(struct super_block *sb, unsigned long group),
@@
-1084,7
+1084,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),
@@
-1121,7
+1121,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),
@@
-1137,7
+1137,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),
@@
-1152,9
+1152,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),
@@
-1207,7
+1207,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,
@@
-1280,7
+1280,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,
@@
-1314,7
+1314,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),
@@
-1344,7
+1344,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,
@@
-1376,7
+1376,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),
@@
-1403,7
+1403,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,
@@
-1432,7
+1432,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,
@@
-1460,7
+1460,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),
@@
-1512,29
+1512,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)
@@
-1631,7
+1631,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,
@@
-1655,7
+1655,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,
@@
-1699,7
+1699,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,
@@
-1722,7
+1722,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,
@@
-1775,7
+1775,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,
@@
-1809,7
+1809,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,
@@
-1831,7
+1831,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,
@@
-1872,7
+1872,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),
@@
-1901,7
+1901,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),
diff --git
a/instrumentation/events/lttng-module/irq.h
b/instrumentation/events/lttng-module/irq.h
index 502b08eb5dcc9abb9954f1a6718ed4d3641a42e1..6030790a132e72841fc7090c904105d3737ef71d 100644
(file)
--- a/
instrumentation/events/lttng-module/irq.h
+++ b/
instrumentation/events/lttng-module/irq.h
@@
-60,7
+60,7
@@
LTTNG_TRACEPOINT_EVENT(irq_handler_exit,
)
)
)
)
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(2,6,37))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(2,6,37))
LTTNG_TRACEPOINT_EVENT_CLASS(irq_softirq,
TP_PROTO(unsigned int vec_nr),
LTTNG_TRACEPOINT_EVENT_CLASS(irq_softirq,
TP_PROTO(unsigned int vec_nr),
@@
-119,7
+119,7
@@
LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP(irq_softirq, softirq_raise,
TP_ARGS(vec_nr)
)
TP_ARGS(vec_nr)
)
-#else /* #if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(2,6,37)) */
+#else /* #if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(2,6,37)) */
LTTNG_TRACEPOINT_EVENT_CLASS(irq_softirq,
TP_PROTO(struct softirq_action *h, struct softirq_action *vec),
LTTNG_TRACEPOINT_EVENT_CLASS(irq_softirq,
TP_PROTO(struct softirq_action *h, struct softirq_action *vec),
@@
-181,7
+181,7
@@
LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP(irq_softirq, softirq_raise,
TP_ARGS(h, vec)
)
TP_ARGS(h, vec)
)
-#endif /* #if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(2,6,37)) */
+#endif /* #if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(2,6,37)) */
#endif /* LTTNG_TRACE_IRQ_H */
#endif /* LTTNG_TRACE_IRQ_H */
diff --git
a/instrumentation/events/lttng-module/jbd.h
b/instrumentation/events/lttng-module/jbd.h
index b3c9a7a1eb17228f82c1e9e56f3ae9630dd17cb1..df070def4b9e7b788b9b0e9811ea0e087eefe586 100644
(file)
--- a/
instrumentation/events/lttng-module/jbd.h
+++ b/
instrumentation/events/lttng-module/jbd.h
@@
-6,7
+6,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,
@@
-28,7
+28,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)
@@
-71,7
+71,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)
@@
-85,7
+85,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)
@@
-100,7
+100,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)
@@
-123,7
+123,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 3ba79623428fd31963066b0dddc8610dcc1e06de..caaf63d69990faf8b9dc611d75a49078f39649f4 100644
(file)
--- a/
instrumentation/events/lttng-module/jbd2.h
+++ b/
instrumentation/events/lttng-module/jbd2.h
@@
-6,9
+6,9
@@
#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>
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(2,6,32))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(2,6,32))
#ifndef _TRACE_JBD2_DEF
#define _TRACE_JBD2_DEF
struct transaction_chp_stats_s;
#ifndef _TRACE_JBD2_DEF
#define _TRACE_JBD2_DEF
struct transaction_chp_stats_s;
@@
-69,7
+69,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),
@@
-102,7
+102,7
@@
LTTNG_TRACEPOINT_EVENT(jbd2_submit_inode_data,
)
)
)
)
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(2,6,32))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(2,6,32))
LTTNG_TRACEPOINT_EVENT(jbd2_run_stats,
TP_PROTO(dev_t dev, unsigned long tid,
struct transaction_run_stats_s *stats),
LTTNG_TRACEPOINT_EVENT(jbd2_run_stats,
TP_PROTO(dev_t dev, unsigned long tid,
struct transaction_run_stats_s *stats),
@@
-140,8
+140,8
@@
LTTNG_TRACEPOINT_EVENT(jbd2_checkpoint_stats,
)
#endif
)
#endif
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(2,6,34))
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(3,4,0))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(2,6,34))
+#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,
@@
-162,7
+162,7
@@
LTTNG_TRACEPOINT_EVENT(jbd2_cleanup_journal_tail,
)
#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(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 c3fa25a3a7e32de9079bd11272839f62249c849f..a18e54c464b9230607ed667a426dd450db9bdce2 100644
(file)
--- a/
instrumentation/events/lttng-module/kmem.h
+++ b/
instrumentation/events/lttng-module/kmem.h
@@
-6,7
+6,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,
@@
-114,8
+114,8
@@
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(2,6,32))
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(3,3,0))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(2,6,32))
+#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),
@@
-217,7
+217,7
@@
LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP(kmem_mm_page, mm_page_pcpu_drain,
kmem_mm_page_pcpu_drain,
kmem_mm_page_pcpu_drain,
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(2,6,33))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(2,6,33))
TP_PROTO(struct page *page, unsigned int order, int migratetype),
#else
TP_PROTO(struct page *page, int order, int migratetype),
TP_PROTO(struct page *page, unsigned int order, int migratetype),
#else
TP_PROTO(struct page *page, int order, int migratetype),
@@
-226,7
+226,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) \
@@
-258,7
+258,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,
@@
-283,7
+283,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,
@@
-310,7
+310,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,
@@
-334,7
+334,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
#endif
diff --git
a/instrumentation/events/lttng-module/kvm.h
b/instrumentation/events/lttng-module/kvm.h
index f4bee69b92cc56453878340439c9d9aadd65f75d..d916f6395f743216e10d516f6526758d1961c553 100644
(file)
--- a/
instrumentation/events/lttng-module/kvm.h
+++ b/
instrumentation/events/lttng-module/kvm.h
@@
-2,12
+2,12
@@
#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
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(2,6,38))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(2,6,38))
LTTNG_TRACEPOINT_EVENT(kvm_userspace_exit,
TP_PROTO(__u32 reason, int errno),
LTTNG_TRACEPOINT_EVENT(kvm_userspace_exit,
TP_PROTO(__u32 reason, int errno),
@@
-20,7
+20,7
@@
LTTNG_TRACEPOINT_EVENT(kvm_userspace_exit,
)
#endif
)
#endif
-#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
@@
-100,7
+100,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) \
@@
-141,7
+141,7
@@
LTTNG_TRACEPOINT_EVENT(kvm_mmio,
#endif
#endif
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(2,6,34))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(2,6,34))
#define kvm_fpu_load_symbol \
{0, "unload"}, \
#define kvm_fpu_load_symbol \
{0, "unload"}, \
@@
-156,7
+156,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,
@@
-188,7
+188,7
@@
LTTNG_TRACEPOINT_EVENT(kvm_age_page,
#endif
#endif
#endif
#endif
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(2,6,38))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(2,6,38))
#ifdef CONFIG_KVM_ASYNC_PF
LTTNG_TRACEPOINT_EVENT_CLASS(kvm_async_get_page_class,
#ifdef CONFIG_KVM_ASYNC_PF
LTTNG_TRACEPOINT_EVENT_CLASS(kvm_async_get_page_class,
@@
-243,7
+243,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(
@@
-257,7
+257,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,
@@
-271,7
+271,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/lock.h
b/instrumentation/events/lttng-module/lock.h
index ff7f7eeda99888b8b24555959a2fb9030061bb32..7f7991860dcb343d33b295013a90ed7efc75e09a 100644
(file)
--- a/
instrumentation/events/lttng-module/lock.h
+++ b/
instrumentation/events/lttng-module/lock.h
@@
-1,7
+1,7
@@
-#include <l
inux/
version.h>
+#include <l
ttng-kernel-
version.h>
#undef TRACE_SYSTEM
#undef TRACE_SYSTEM
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(2,6,33))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(2,6,33))
#define TRACE_SYSTEM lock
#else
#define TRACE_SYSTEM lockdep
#define TRACE_SYSTEM lock
#else
#define TRACE_SYSTEM lockdep
@@
-30,13
+30,13
@@
LTTNG_TRACEPOINT_EVENT(lock_acquire,
TP_FIELDS(
ctf_integer(unsigned int, flags, (trylock ? 1 : 0) | (read ? 2 : 0))
ctf_string(name, lock->name)
TP_FIELDS(
ctf_integer(unsigned int, flags, (trylock ? 1 : 0) | (read ? 2 : 0))
ctf_string(name, lock->name)
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(2,6,34))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(2,6,34))
ctf_integer_hex(void *, lockdep_addr, lock)
#endif
)
)
ctf_integer_hex(void *, lockdep_addr, lock)
#endif
)
)
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(2,6,35))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(2,6,35))
LTTNG_TRACEPOINT_EVENT_CLASS(lock,
LTTNG_TRACEPOINT_EVENT_CLASS(lock,
@@
-75,7
+75,7
@@
LTTNG_TRACEPOINT_EVENT_INSTANCE(lock, lock_acquired,
#endif
#endif
-#else /* #if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(2,6,35)) */
+#else /* #if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(2,6,35)) */
LTTNG_TRACEPOINT_EVENT(lock_release,
LTTNG_TRACEPOINT_EVENT(lock_release,
@@
-85,7
+85,7
@@
LTTNG_TRACEPOINT_EVENT(lock_release,
TP_FIELDS(
ctf_string(name, lock->name)
TP_FIELDS(
ctf_string(name, lock->name)
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(2,6,34))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(2,6,34))
ctf_integer_hex(void *, lockdep_addr, lock)
#endif
)
ctf_integer_hex(void *, lockdep_addr, lock)
#endif
)
@@
-101,7
+101,7
@@
LTTNG_TRACEPOINT_EVENT(lock_contended,
TP_FIELDS(
ctf_string(name, lock->name)
TP_FIELDS(
ctf_string(name, lock->name)
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(2,6,34))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(2,6,34))
ctf_integer_hex(void *, lockdep_addr, lock)
#endif
)
ctf_integer_hex(void *, lockdep_addr, lock)
#endif
)
@@
-115,7
+115,7
@@
LTTNG_TRACEPOINT_EVENT(lock_acquired,
TP_FIELDS(
ctf_string(name, lock->name)
TP_FIELDS(
ctf_string(name, lock->name)
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(2,6,34))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(2,6,34))
ctf_integer(s64, wait_nsec, wait_nsec)
ctf_integer_hex(void *, lockdep_addr, lock)
#else
ctf_integer(s64, wait_nsec, wait_nsec)
ctf_integer_hex(void *, lockdep_addr, lock)
#else
@@
-127,7
+127,7
@@
LTTNG_TRACEPOINT_EVENT(lock_acquired,
#endif
#endif
-#endif /* #if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(2,6,35)) */
+#endif /* #if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(2,6,35)) */
#endif
#endif
diff --git
a/instrumentation/events/lttng-module/lttng-statedump.h
b/instrumentation/events/lttng-module/lttng-statedump.h
index e7c528dacfb91e5fea8dbb443b7df9875bffe653..2d5334f820619ac217c2516413a55b28ed908e0b 100644
(file)
--- a/
instrumentation/events/lttng-module/lttng-statedump.h
+++ b/
instrumentation/events/lttng-module/lttng-statedump.h
@@
-8,10
+8,10
@@
#include <linux/nsproxy.h>
#include <linux/pid_namespace.h>
#include <linux/types.h>
#include <linux/nsproxy.h>
#include <linux/pid_namespace.h>
#include <linux/types.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_proc_inum ns.inum
#else
#define lttng_proc_inum proc_inum
#define lttng_proc_inum ns.inum
#else
#define lttng_proc_inum proc_inum
@@
-68,7
+68,7
@@
LTTNG_TRACEPOINT_EVENT(lttng_statedump_process_state,
ctf_integer(int, submode, submode)
ctf_integer(int, status, status)
ctf_integer(int, ns_level, pid_ns ? pid_ns->level : 0)
ctf_integer(int, submode, submode)
ctf_integer(int, status, status)
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_proc_inum : 0)
#endif
ctf_integer(unsigned int, cpu, task_cpu(p))
ctf_integer(unsigned int, ns_inum, pid_ns ? pid_ns->lttng_proc_inum : 0)
#endif
ctf_integer(unsigned int, cpu, task_cpu(p))
diff --git
a/instrumentation/events/lttng-module/lttng-test.h
b/instrumentation/events/lttng-module/lttng-test.h
index 05d028ca3952adc0bb10e1e8582438bc89381621..41ba4d5d72ca536c929c46d9dcfae8a4f37eebef 100644
(file)
--- a/
instrumentation/events/lttng-module/lttng-test.h
+++ b/
instrumentation/events/lttng-module/lttng-test.h
@@
-6,7
+6,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 ef768b1c20005dae5fe862d2e9956a65eb13298e..1cefa0aeb7e1deb2f8c2c4d37b49b7102c617c6d 100644
(file)
--- a/
instrumentation/events/lttng-module/mm_vmscan.h
+++ b/
instrumentation/events/lttng-module/mm_vmscan.h
@@
-8,7
+8,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
@@
-18,14
+18,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>
@@
-34,7
+34,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>
@@
-62,7
+62,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,
@@
-93,7
+93,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),
@@
-122,7
+122,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,
@@
-157,7
+157,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,
@@
-264,7
+264,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,
@@
-289,7
+289,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,
@@
-304,11
+304,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)
@@
-320,7
+320,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,
@@
-341,7
+341,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,
@@
-353,11
+353,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)
@@
-366,7
+366,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,
@@
-394,7
+394,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,
@@
-461,12
+461,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,
@@
-475,10
+475,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
@@
-491,13
+491,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
)
@@
-509,12
+509,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,
@@
-523,10
+523,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
@@
-541,12
+541,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,
@@
-555,10
+555,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
@@
-567,7
+567,7
@@
LTTNG_TRACEPOINT_EVENT_INSTANCE(mm_vmscan_lru_isolate_template, mm_vmscan_memcg_
)
#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_writepage,
TP_PROTO(struct page *page),
LTTNG_TRACEPOINT_EVENT(mm_vmscan_writepage,
TP_PROTO(struct page *page),
@@
-580,7
+580,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),
@@
-607,7
+607,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,
@@
-632,7
+632,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,
@@
-656,7
+656,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,
@@
-686,7
+686,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,
@@
-703,7
+703,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,
@@
-721,7
+721,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(2,6,37))
+#elif (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(2,6,37))
LTTNG_TRACEPOINT_EVENT(mm_vmscan_lru_shrink_inactive,
TP_PROTO(int nid, int zid,
LTTNG_TRACEPOINT_EVENT(mm_vmscan_lru_shrink_inactive,
TP_PROTO(int nid, int zid,
@@
-741,7
+741,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 f7b6056f1eec680dfa1ab968ce4eede09ee4e142..52f8091288ac088f6e4b69bee65f715c9dfdd0c5 100644
(file)
--- a/
instrumentation/events/lttng-module/module.h
+++ b/
instrumentation/events/lttng-module/module.h
@@
-15,7
+15,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
@@
-53,7
+53,7
@@
LTTNG_TRACEPOINT_EVENT(module_free,
LTTNG_TRACEPOINT_EVENT_CLASS(module_refcnt,
LTTNG_TRACEPOINT_EVENT_CLASS(module_refcnt,
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(2,6,35))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(2,6,35))
TP_PROTO(struct module *mod, unsigned long ip),
TP_ARGS(mod, ip),
TP_PROTO(struct module *mod, unsigned long ip),
TP_ARGS(mod, ip),
@@
-65,9
+65,9
@@
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))
ctf_integer(int, refcnt, atomic_read(&mod->refcnt))
-#elif (L
INUX_VERSION_CODE >=
KERNEL_VERSION(2,6,35))
+#elif (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(2,6,35))
ctf_integer(int, refcnt, __this_cpu_read(mod->refptr->incs) + __this_cpu_read(mod->refptr->decs))
#else
ctf_integer(int, refcnt, refcnt)
ctf_integer(int, refcnt, __this_cpu_read(mod->refptr->incs) + __this_cpu_read(mod->refptr->decs))
#else
ctf_integer(int, refcnt, refcnt)
@@
-78,7
+78,7
@@
LTTNG_TRACEPOINT_EVENT_CLASS(module_refcnt,
LTTNG_TRACEPOINT_EVENT_INSTANCE(module_refcnt, module_get,
LTTNG_TRACEPOINT_EVENT_INSTANCE(module_refcnt, module_get,
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(2,6,35))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(2,6,35))
TP_PROTO(struct module *mod, unsigned long ip),
TP_ARGS(mod, ip)
TP_PROTO(struct module *mod, unsigned long ip),
TP_ARGS(mod, ip)
@@
-91,7
+91,7
@@
LTTNG_TRACEPOINT_EVENT_INSTANCE(module_refcnt, module_get,
LTTNG_TRACEPOINT_EVENT_INSTANCE(module_refcnt, module_put,
LTTNG_TRACEPOINT_EVENT_INSTANCE(module_refcnt, module_put,
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(2,6,35))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(2,6,35))
TP_PROTO(struct module *mod, unsigned long ip),
TP_ARGS(mod, ip)
TP_PROTO(struct module *mod, unsigned long ip),
TP_ARGS(mod, ip)
diff --git
a/instrumentation/events/lttng-module/napi.h
b/instrumentation/events/lttng-module/napi.h
index 7b5ecfc468df2832c49f4456514529df8ad45490..46d7ee2cdfcad6a244c40211ae4720f4b93cdf88 100644
(file)
--- a/
instrumentation/events/lttng-module/napi.h
+++ b/
instrumentation/events/lttng-module/napi.h
@@
-10,7
+10,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 2085def5ee9445496e79f9e2c91f4689737d7515..81045a620d1579235fe9d1a7c498266790eae682 100644
(file)
--- a/
instrumentation/events/lttng-module/net.h
+++ b/
instrumentation/events/lttng-module/net.h
@@
-10,7
+10,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>
@@
-438,7
+438,7
@@
LTTNG_TRACEPOINT_ENUM(net_network_header,
LTTNG_TRACEPOINT_EVENT(net_dev_xmit,
LTTNG_TRACEPOINT_EVENT(net_dev_xmit,
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(2,6,40))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(2,6,40))
TP_PROTO(struct sk_buff *skb,
int rc,
struct net_device *dev,
TP_PROTO(struct sk_buff *skb,
int rc,
struct net_device *dev,
@@
-455,7
+455,7
@@
LTTNG_TRACEPOINT_EVENT(net_dev_xmit,
TP_FIELDS(
ctf_integer_hex(void *, skbaddr, skb)
ctf_integer(int, rc, rc)
TP_FIELDS(
ctf_integer_hex(void *, skbaddr, skb)
ctf_integer(int, rc, rc)
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(2,6,40))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(2,6,40))
ctf_integer(unsigned int, len, skb_len)
ctf_string(name, dev->name)
#else
ctf_integer(unsigned int, len, skb_len)
ctf_string(name, dev->name)
#else
diff --git
a/instrumentation/events/lttng-module/power.h
b/instrumentation/events/lttng-module/power.h
index 235991a599b6fb54105bbb46a22337548ab3a005..e2f0f801a2b5b5cf1518feeadcfdffc59003de90 100644
(file)
--- a/
instrumentation/events/lttng-module/power.h
+++ b/
instrumentation/events/lttng-module/power.h
@@
-6,9
+6,9
@@
#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>
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(2,6,38))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(2,6,38))
LTTNG_TRACEPOINT_EVENT_CLASS(power_cpu,
TP_PROTO(unsigned int state, unsigned int cpu_id),
LTTNG_TRACEPOINT_EVENT_CLASS(power_cpu,
TP_PROTO(unsigned int state, unsigned int cpu_id),
@@
-60,7
+60,7
@@
LTTNG_TRACEPOINT_EVENT_MAP(machine_suspend,
)
#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_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),
@@
-92,7
+92,7
@@
LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP(power_wakeup_source, wakeup_source_deactivat
)
#endif
)
#endif
-#if (L
INUX_VERSION_CODE <
KERNEL_VERSION(2,6,38))
+#if (L
TTNG_LINUX_VERSION_CODE < LTTNG_
KERNEL_VERSION(2,6,38))
#undef CONFIG_EVENT_POWER_TRACING_DEPRECATED
#define CONFIG_EVENT_POWER_TRACING_DEPRECATED
#define _PWR_EVENT_AVOID_DOUBLE_DEFINING_DEPRECATED
#undef CONFIG_EVENT_POWER_TRACING_DEPRECATED
#define CONFIG_EVENT_POWER_TRACING_DEPRECATED
#define _PWR_EVENT_AVOID_DOUBLE_DEFINING_DEPRECATED
@@
-106,7
+106,7
@@
LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP(power_wakeup_source, wakeup_source_deactivat
*/
LTTNG_TRACEPOINT_EVENT_CLASS(power,
*/
LTTNG_TRACEPOINT_EVENT_CLASS(power,
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(2,6,36))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(2,6,36))
TP_PROTO(unsigned int type, unsigned int state, unsigned int cpu_id),
TP_ARGS(type, state, cpu_id),
TP_PROTO(unsigned int type, unsigned int state, unsigned int cpu_id),
TP_ARGS(type, state, cpu_id),
@@
-119,7
+119,7
@@
LTTNG_TRACEPOINT_EVENT_CLASS(power,
TP_FIELDS(
ctf_integer(u64, type, type)
ctf_integer(u64, state, state)
TP_FIELDS(
ctf_integer(u64, type, type)
ctf_integer(u64, state, state)
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(2,6,36))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(2,6,36))
ctf_integer(u64, cpu_id, cpu_id)
#endif
)
ctf_integer(u64, cpu_id, cpu_id)
#endif
)
@@
-127,7
+127,7
@@
LTTNG_TRACEPOINT_EVENT_CLASS(power,
LTTNG_TRACEPOINT_EVENT_INSTANCE(power, power_start,
LTTNG_TRACEPOINT_EVENT_INSTANCE(power, power_start,
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(2,6,36))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(2,6,36))
TP_PROTO(unsigned int type, unsigned int state, unsigned int cpu_id),
TP_ARGS(type, state, cpu_id)
TP_PROTO(unsigned int type, unsigned int state, unsigned int cpu_id),
TP_ARGS(type, state, cpu_id)
@@
-140,7
+140,7
@@
LTTNG_TRACEPOINT_EVENT_INSTANCE(power, power_start,
LTTNG_TRACEPOINT_EVENT_INSTANCE(power, power_frequency,
LTTNG_TRACEPOINT_EVENT_INSTANCE(power, power_frequency,
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(2,6,36))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(2,6,36))
TP_PROTO(unsigned int type, unsigned int state, unsigned int cpu_id),
TP_ARGS(type, state, cpu_id)
TP_PROTO(unsigned int type, unsigned int state, unsigned int cpu_id),
TP_ARGS(type, state, cpu_id)
@@
-153,7
+153,7
@@
LTTNG_TRACEPOINT_EVENT_INSTANCE(power, power_frequency,
LTTNG_TRACEPOINT_EVENT(power_end,
LTTNG_TRACEPOINT_EVENT(power_end,
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(2,6,36))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(2,6,36))
TP_PROTO(unsigned int cpu_id),
TP_ARGS(cpu_id),
TP_PROTO(unsigned int cpu_id),
TP_ARGS(cpu_id),
@@
-164,7
+164,7
@@
LTTNG_TRACEPOINT_EVENT(power_end,
#endif
TP_FIELDS(
#endif
TP_FIELDS(
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(2,6,36))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(2,6,36))
ctf_integer(u64, cpu_id, cpu_id)
#else
ctf_integer(u64, dummy, 0xffff)
ctf_integer(u64, cpu_id, cpu_id)
#else
ctf_integer(u64, dummy, 0xffff)
@@
-197,7
+197,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
@@
-206,7
+206,7
@@
static inline void trace_power_frequency(u64 type, u64 state, u64 cpuid) {};
#endif /* CONFIG_EVENT_POWER_TRACING_DEPRECATED */
#endif /* CONFIG_EVENT_POWER_TRACING_DEPRECATED */
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(2,6,37))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(2,6,37))
/*
* The clock events are used for clock enable/disable and for
* clock rate change
/*
* The clock events are used for clock enable/disable and for
* clock rate change
diff --git
a/instrumentation/events/lttng-module/printk.h
b/instrumentation/events/lttng-module/printk.h
index 077fc45c0d614ba2f7ba70f8d0d40c8a4bebe01a..7af7acdbdf997487a0d134ad7cd81cc57e0a322a 100644
(file)
--- a/
instrumentation/events/lttng-module/printk.h
+++ b/
instrumentation/events/lttng-module/printk.h
@@
-5,9
+5,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,
@@
-22,7
+22,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,
@@
-39,7
+39,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 f2533585641d3c9c4a8dbc0ee435ebfd361e2753..43d419e433394177b724a1197dc467ea5a2819bb 100644
(file)
--- a/
instrumentation/events/lttng-module/random.h
+++ b/
instrumentation/events/lttng-module/random.h
@@
-37,7
+37,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 06eafe5e77e05229933fc62abc60ae7857c6fe5b..70ec8bc317d0d88a4d0d4fcdbd430c005f67a957 100644
(file)
--- a/
instrumentation/events/lttng-module/rcu.h
+++ b/
instrumentation/events/lttng-module/rcu.h
@@
-5,7
+5,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.
@@
-20,11
+20,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),
@@
-36,7
+36,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)
@@
-49,7
+49,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,
@@
-63,7
+63,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),
@@
-98,7
+98,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,
@@
-116,7
+116,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,
@@
-158,7
+158,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,
@@
-172,7
+172,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),
@@
-205,7
+205,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,
@@
-219,7
+219,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),
@@
-255,7
+255,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,
@@
-276,7
+276,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,
@@
-326,7
+326,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,
@@
-341,7
+341,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),
@@
-373,7
+373,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)
*/
@@
-391,7
+391,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)
@@
-409,7
+409,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),
@@
-424,7
+424,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),
@@
-437,7
+437,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),
@@
-464,7
+464,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
@@
-489,11
+489,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),
@@
-510,7
+510,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),
@@
-524,7
+524,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,
@@
-540,7
+540,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,
@@
-581,7
+581,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,
@@
-596,7
+596,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,
@@
-612,7
+612,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,
@@
-652,7
+652,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),
@@
-665,7
+665,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),
@@
-679,7
+679,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),
@@
-693,7
+693,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),
@@
-729,11
+729,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),
@@
-753,11
+753,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),
@@
-781,17
+781,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),
@@
-805,12
+805,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)
@@
-819,7
+819,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
@@
-827,12
+827,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),
@@
-846,7
+846,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)
@@
-855,7
+855,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:
@@
-875,11
+875,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),
@@
-895,7
+895,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, \
@@
-918,17
+918,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)
@@
-941,19
+941,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 cc42dcb70deb37572a3ccf08e30d5ccf7bf7fcdd..753db50d57b3de72d755c6cf2aea30229f68491c 100644
(file)
--- a/
instrumentation/events/lttng-module/regmap.h
+++ b/
instrumentation/events/lttng-module/regmap.h
@@
-6,7
+6,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 3a866a78b997d727b13932c33c24546580b6a219..951af397176bd65847f78a5c6c22617a9f2390f6 100644
(file)
--- a/
instrumentation/events/lttng-module/rpc.h
+++ b/
instrumentation/events/lttng-module/rpc.h
@@
-11,7
+11,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)
{
@@
-27,11
+27,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),
@@
-56,7
+56,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),
@@
-108,13
+108,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),
@@
-126,7
+126,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),
@@
-152,7
+152,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),
@@
-221,7
+221,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 4364d0a90c03cc720dd8edcfba136b29d18a598b..415e954b02ae3c64bf34acf3f980eb5e85a0d005 100644
(file)
--- a/
instrumentation/events/lttng-module/sched.h
+++ b/
instrumentation/events/lttng-module/sched.h
@@
-8,12
+8,12
@@
#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 <linux/sched/rt.h>
#endif
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(3,19,0))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(3,19,0))
#define lttng_proc_inum ns.inum
#else
#define lttng_proc_inum proc_inum
#define lttng_proc_inum ns.inum
#else
#define lttng_proc_inum proc_inum
@@
-24,7
+24,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)
{
@@
-52,7
+52,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)
{
@@
-80,7
+80,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)
{
@@
-94,7
+94,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)
{
@@
-114,7
+114,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)
{
@@
-131,7
+131,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)
{
@@
-148,7
+148,7
@@
static inline long __trace_sched_switch_state(struct task_struct *p)
return state;
}
return state;
}
-#elif (L
INUX_VERSION_CODE >=
KERNEL_VERSION(2,6,35))
+#elif (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(2,6,35))
static inline long __trace_sched_switch_state(struct task_struct *p)
{
static inline long __trace_sched_switch_state(struct task_struct *p)
{
@@
-201,7
+201,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) || \
@@
-222,10
+222,10
@@
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,
LTTNG_TRACEPOINT_EVENT_CLASS(sched_wakeup_template,
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(2,6,35))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(2,6,35))
TP_PROTO(struct task_struct *p, int success),
TP_ARGS(p, success),
TP_PROTO(struct task_struct *p, int success),
TP_ARGS(p, success),
@@
-240,14
+240,14
@@
LTTNG_TRACEPOINT_EVENT_CLASS(sched_wakeup_template,
ctf_integer(pid_t, tid, p->pid)
ctf_integer(int, prio, p->prio - MAX_RT_PRIO)
ctf_integer(int, success, success)
ctf_integer(pid_t, tid, p->pid)
ctf_integer(int, prio, p->prio - MAX_RT_PRIO)
ctf_integer(int, success, success)
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(2,6,32))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(2,6,32))
ctf_integer(int, target_cpu, task_cpu(p))
#endif
)
)
ctf_integer(int, target_cpu, task_cpu(p))
#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)) */
-#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) || \
@@
-279,7
+279,7
@@
LTTNG_TRACEPOINT_EVENT_INSTANCE(sched_wakeup_template, sched_wakeup_new,
TP_PROTO(struct task_struct *p),
TP_ARGS(p))
TP_PROTO(struct task_struct *p),
TP_ARGS(p))
-#elif (L
INUX_VERSION_CODE >=
KERNEL_VERSION(2,6,35))
+#elif (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(2,6,35))
LTTNG_TRACEPOINT_EVENT_INSTANCE(sched_wakeup_template, sched_wakeup,
TP_PROTO(struct task_struct *p, int success),
LTTNG_TRACEPOINT_EVENT_INSTANCE(sched_wakeup_template, sched_wakeup,
TP_PROTO(struct task_struct *p, int success),
@@
-292,7
+292,7
@@
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))
-#else /* #if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(2,6,35)) */
+#else /* #if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(2,6,35)) */
LTTNG_TRACEPOINT_EVENT_INSTANCE(sched_wakeup_template, sched_wakeup,
TP_PROTO(struct rq *rq, struct task_struct *p, int success),
LTTNG_TRACEPOINT_EVENT_INSTANCE(sched_wakeup_template, sched_wakeup,
TP_PROTO(struct rq *rq, struct task_struct *p, int success),
@@
-305,38
+305,38
@@
LTTNG_TRACEPOINT_EVENT_INSTANCE(sched_wakeup_template, sched_wakeup_new,
TP_PROTO(struct rq *rq, struct task_struct *p, int success),
TP_ARGS(rq, p, success))
TP_PROTO(struct rq *rq, struct task_struct *p, int success),
TP_ARGS(rq, p, success))
-#endif /* #if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(2,6,35)) */
+#endif /* #if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(2,6,35)) */
/*
* 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_ARGS(preempt, prev, next),
TP_PROTO(bool preempt,
struct task_struct *prev,
struct task_struct *next),
TP_ARGS(preempt, prev, next),
-#elif (L
INUX_VERSION_CODE >=
KERNEL_VERSION(2,6,35))
+#elif (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(2,6,35))
TP_PROTO(struct task_struct *prev,
struct task_struct *next),
TP_ARGS(prev, next),
TP_PROTO(struct task_struct *prev,
struct task_struct *next),
TP_ARGS(prev, next),
-#else /* #if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(2,6,35)) */
+#else /* #if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(2,6,35)) */
TP_PROTO(struct rq *rq, struct task_struct *prev,
struct task_struct *next),
TP_ARGS(rq, prev, next),
TP_PROTO(struct rq *rq, struct task_struct *prev,
struct task_struct *next),
TP_ARGS(rq, prev, next),
-#endif /* #if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(2,6,35)) */
+#endif /* #if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(2,6,35)) */
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_integer(long, prev_state, __trace_sched_switch_state(preempt, prev))
ctf_integer(long, prev_state, __trace_sched_switch_state(preempt, prev))
-#elif (L
INUX_VERSION_CODE >=
KERNEL_VERSION(2,6,35))
+#elif (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(2,6,35))
ctf_integer(long, prev_state, __trace_sched_switch_state(prev))
#else
ctf_integer(long, prev_state, prev->state)
ctf_integer(long, prev_state, __trace_sched_switch_state(prev))
#else
ctf_integer(long, prev_state, prev->state)
@@
-396,15
+396,15
@@
LTTNG_TRACEPOINT_EVENT_INSTANCE(sched_process_template, sched_process_exit,
/*
* Tracepoint for waiting on task to unschedule:
*/
/*
* Tracepoint for waiting on task to unschedule:
*/
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(2,6,35))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(2,6,35))
LTTNG_TRACEPOINT_EVENT_INSTANCE(sched_process_template, sched_wait_task,
TP_PROTO(struct task_struct *p),
TP_ARGS(p))
LTTNG_TRACEPOINT_EVENT_INSTANCE(sched_process_template, sched_wait_task,
TP_PROTO(struct task_struct *p),
TP_ARGS(p))
-#else /* #if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(2,6,35)) */
+#else /* #if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(2,6,35)) */
LTTNG_TRACEPOINT_EVENT_INSTANCE(sched_process_template, sched_wait_task,
TP_PROTO(struct rq *rq, struct task_struct *p),
TP_ARGS(rq, p))
LTTNG_TRACEPOINT_EVENT_INSTANCE(sched_process_template, sched_wait_task,
TP_PROTO(struct rq *rq, struct task_struct *p),
TP_ARGS(rq, p))
-#endif /* #if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(2,6,35)) */
+#endif /* #if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(2,6,35)) */
/*
* Tracepoint for a waiting task:
/*
* Tracepoint for a waiting task:
@@
-459,7
+459,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;
@@
-479,7
+479,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;
@@
-500,7
+500,7
@@
LTTNG_TRACEPOINT_EVENT_CODE(sched_process_fork,
TP_code_post()
)
TP_code_post()
)
-#if (L
INUX_VERSION_CODE <
KERNEL_VERSION(2,6,33))
+#if (L
TTNG_LINUX_VERSION_CODE < LTTNG_
KERNEL_VERSION(2,6,33))
/*
* Tracepoint for sending a signal:
*/
/*
* Tracepoint for sending a signal:
*/
@@
-518,7
+518,7
@@
LTTNG_TRACEPOINT_EVENT(sched_signal_send,
)
#endif
)
#endif
-#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:
*/
@@
-537,7
+537,7
@@
LTTNG_TRACEPOINT_EVENT(sched_process_exec,
)
#endif
)
#endif
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(2,6,32))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(2,6,32))
/*
* XXX the below sched_stat tracepoints only apply to SCHED_OTHER/BATCH/IDLE
* adding sched_stat support to SCHED_FIFO/RR would be welcome.
/*
* XXX the below sched_stat tracepoints only apply to SCHED_OTHER/BATCH/IDLE
* adding sched_stat support to SCHED_FIFO/RR would be welcome.
@@
-580,7
+580,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).
*/
@@
-608,7
+608,7
@@
LTTNG_TRACEPOINT_EVENT(sched_stat_runtime,
)
#endif
)
#endif
-#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))
/*
@@
-628,7
+628,7
@@
LTTNG_TRACEPOINT_EVENT(sched_pi_setprio,
ctf_integer(int, newprio, pi_task ? pi_task->prio - MAX_RT_PRIO : tsk->prio - MAX_RT_PRIO)
)
)
ctf_integer(int, newprio, pi_task ? pi_task->prio - MAX_RT_PRIO : tsk->prio - MAX_RT_PRIO)
)
)
-#elif (L
INUX_VERSION_CODE >=
KERNEL_VERSION(2,6,37))
+#elif (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(2,6,37))
/*
* Tracepoint for showing priority inheritance modifying a tasks
* priority.
/*
* Tracepoint for showing priority inheritance modifying a tasks
* priority.
diff --git
a/instrumentation/events/lttng-module/scsi.h
b/instrumentation/events/lttng-module/scsi.h
index adc7491e9e1bd5b84442ebe8d6152e07653a5857..64425f7909e7ec8c82e84f4bc0e4fdb12cba1872 100644
(file)
--- a/
instrumentation/events/lttng-module/scsi.h
+++ b/
instrumentation/events/lttng-module/scsi.h
@@
-8,14
+8,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) \
@@
-111,7
+111,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) \
@@
-209,7
+209,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, \
@@
-306,7
+306,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) \
@@
-387,7
+387,7
@@
scsi_statusbyte_name(SAM_STAT_ACA_ACTIVE), \
scsi_statusbyte_name(SAM_STAT_TASK_ABORTED))
scsi_statusbyte_name(SAM_STAT_ACA_ACTIVE), \
scsi_statusbyte_name(SAM_STAT_TASK_ABORTED))
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(2,6,39))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(2,6,39))
#define scsi_prot_op_name(result) { result, #result }
#define show_prot_op_name(val) \
__print_symbolic(val, \
#define scsi_prot_op_name(result) { result, #result }
#define show_prot_op_name(val) \
__print_symbolic(val, \
@@
-419,7
+419,7
@@
LTTNG_TRACEPOINT_EVENT(scsi_dispatch_cmd_start,
ctf_integer(unsigned int, cmd_len, cmd->cmd_len)
ctf_integer(unsigned int, data_sglen, scsi_sg_count(cmd))
ctf_integer(unsigned int, prot_sglen, scsi_prot_sg_count(cmd))
ctf_integer(unsigned int, cmd_len, cmd->cmd_len)
ctf_integer(unsigned int, data_sglen, scsi_sg_count(cmd))
ctf_integer(unsigned int, prot_sglen, scsi_prot_sg_count(cmd))
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(2,6,39))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(2,6,39))
ctf_integer(unsigned char, prot_op, scsi_get_prot_op(cmd))
#endif
ctf_sequence_hex(unsigned char, cmnd, cmd->cmnd, u32, cmd->cmd_len)
ctf_integer(unsigned char, prot_op, scsi_get_prot_op(cmd))
#endif
ctf_sequence_hex(unsigned char, cmnd, cmd->cmnd, u32, cmd->cmd_len)
@@
-442,7
+442,7
@@
LTTNG_TRACEPOINT_EVENT(scsi_dispatch_cmd_error,
ctf_integer(unsigned int, cmd_len, cmd->cmd_len)
ctf_integer(unsigned int, data_sglen, scsi_sg_count(cmd))
ctf_integer(unsigned int, prot_sglen, scsi_prot_sg_count(cmd))
ctf_integer(unsigned int, cmd_len, cmd->cmd_len)
ctf_integer(unsigned int, data_sglen, scsi_sg_count(cmd))
ctf_integer(unsigned int, prot_sglen, scsi_prot_sg_count(cmd))
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(2,6,39))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(2,6,39))
ctf_integer(unsigned char, prot_op, scsi_get_prot_op(cmd))
#endif
ctf_sequence_hex(unsigned char, cmnd, cmd->cmnd, u32, cmd->cmd_len)
ctf_integer(unsigned char, prot_op, scsi_get_prot_op(cmd))
#endif
ctf_sequence_hex(unsigned char, cmnd, cmd->cmnd, u32, cmd->cmd_len)
@@
-465,7
+465,7
@@
LTTNG_TRACEPOINT_EVENT_CLASS(scsi_cmd_done_timeout_template,
ctf_integer(unsigned int, cmd_len, cmd->cmd_len)
ctf_integer(unsigned int, data_sglen, scsi_sg_count(cmd))
ctf_integer(unsigned int, prot_sglen, scsi_prot_sg_count(cmd))
ctf_integer(unsigned int, cmd_len, cmd->cmd_len)
ctf_integer(unsigned int, data_sglen, scsi_sg_count(cmd))
ctf_integer(unsigned int, prot_sglen, scsi_prot_sg_count(cmd))
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(2,6,39))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(2,6,39))
ctf_integer(unsigned char, prot_op, scsi_get_prot_op(cmd))
#endif
ctf_sequence_hex(unsigned char, cmnd, cmd->cmnd, u32, cmd->cmd_len)
ctf_integer(unsigned char, prot_op, scsi_get_prot_op(cmd))
#endif
ctf_sequence_hex(unsigned char, cmnd, cmd->cmnd, u32, cmd->cmd_len)
diff --git
a/instrumentation/events/lttng-module/signal.h
b/instrumentation/events/lttng-module/signal.h
index ae6e3e13d1c76ce718d649c6f1f5418119055b80..bfc494da7288717428aa7f0c36c1046cdc852493 100644
(file)
--- a/
instrumentation/events/lttng-module/signal.h
+++ b/
instrumentation/events/lttng-module/signal.h
@@
-5,14
+5,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, \
@@
-23,7
+23,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) ? \
@@
-33,7
+33,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 */
/**
@@
-48,7
+48,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,
@@
-66,7
+66,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,
@@
-113,7
+113,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,
@@
-144,7
+144,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 77e1823a09129282e863aa98b6a58d20b90661a0..2d61de23c4beb2c53e975d949d70241ccde2c997 100644
(file)
--- a/
instrumentation/events/lttng-module/skb.h
+++ b/
instrumentation/events/lttng-module/skb.h
@@
-7,7
+7,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:
@@
-27,7
+27,7
@@
LTTNG_TRACEPOINT_EVENT_MAP(kfree_skb,
)
)
)
)
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(2,6,37))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(2,6,37))
LTTNG_TRACEPOINT_EVENT_MAP(consume_skb,
skb_consume,
LTTNG_TRACEPOINT_EVENT_MAP(consume_skb,
skb_consume,
@@
-42,7
+42,7
@@
LTTNG_TRACEPOINT_EVENT_MAP(consume_skb,
)
#endif
)
#endif
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(2,6,32))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(2,6,32))
LTTNG_TRACEPOINT_EVENT(skb_copy_datagram_iovec,
TP_PROTO(const struct sk_buff *skb, int len),
LTTNG_TRACEPOINT_EVENT(skb_copy_datagram_iovec,
TP_PROTO(const struct sk_buff *skb, int len),
diff --git
a/instrumentation/events/lttng-module/sock.h
b/instrumentation/events/lttng-module/sock.h
index cd0c92b79c985a5c7562dea99617d423772ebbb6..10e05dc207a7eca43073a0a5ad991d35174e4922 100644
(file)
--- a/
instrumentation/events/lttng-module/sock.h
+++ b/
instrumentation/events/lttng-module/sock.h
@@
-5,7
+5,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,
@@
-21,7
+21,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,
@@
-42,7
+42,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,
@@
-59,7
+59,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,
@@
-76,7
+76,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 cee4148c313756454352fe9a528b73eab199deb3..2dbcf4b505f46061852736992b96a64f8cdf9187 100644
(file)
--- a/
instrumentation/events/lttng-module/timer.h
+++ b/
instrumentation/events/lttng-module/timer.h
@@
-10,17
+10,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,
@@
-44,7
+44,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
@@
-67,7
+67,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
@@
-86,9
+86,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
@@
-183,7
+183,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,
@@
-293,7
+293,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,
@@
-312,7
+312,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,
@@
-331,7
+331,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,
@@
-350,7
+350,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
@@
-358,7
+358,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,
@@
-373,7
+373,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,
@@
-388,7
+388,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 95fe787e269ed821dfbb2c96512486c52f5d9b31..a2b5eb936342b96aa5f4b209e4e136d624ee2ea6 100644
(file)
--- a/
instrumentation/events/lttng-module/v4l2.h
+++ b/
instrumentation/events/lttng-module/v4l2.h
@@
-6,7
+6,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 c958600c0abf7fe243cf06eb939ec7591602b16a..f26d96b4bc29ce45fdc40a8e6f5491e0274435dc 100644
(file)
--- a/
instrumentation/events/lttng-module/workqueue.h
+++ b/
instrumentation/events/lttng-module/workqueue.h
@@
-6,9
+6,9
@@
#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>
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(2,6,36))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(2,6,36))
#ifndef _TRACE_WORKQUEUE_DEF_
#define _TRACE_WORKQUEUE_DEF_
#ifndef _TRACE_WORKQUEUE_DEF_
#define _TRACE_WORKQUEUE_DEF_
@@
-29,7
+29,7
@@
LTTNG_TRACEPOINT_EVENT_CLASS(workqueue_work,
)
)
)
)
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(2,6,37))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(2,6,37))
/**
* workqueue_queue_work - called when a work gets queued
* @req_cpu: the requested cpu
/**
* workqueue_queue_work - called when a work gets queued
* @req_cpu: the requested cpu
@@
-42,7
+42,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),
@@
-95,7
+95,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 353d58a84bf11640fa52e2730bd48800ff51a7b3..c846096517847dbae7461fcb187d15d4651c4ac6 100644
(file)
--- a/
instrumentation/events/lttng-module/writeback.h
+++ b/
instrumentation/events/lttng-module/writeback.h
@@
-8,7
+8,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_
@@
-21,7
+21,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;
@@
-41,11
+41,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(4,0,0))
+#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"}, \
@@
-60,7
+60,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"}, \
@@
-73,9
+73,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),
@@
-127,7
+127,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),
@@
-178,9
+178,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),
@@
-191,7
+191,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),
@@
-202,7
+202,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),
@@
-214,28
+214,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)
@@
-249,7
+249,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),
@@
-280,7
+280,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),
@@
-304,10
+304,10
@@
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_nowork)
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(2,6,38))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(2,6,38))
DEFINE_WRITEBACK_EVENT(writeback_wake_background)
#endif
DEFINE_WRITEBACK_EVENT(writeback_wake_thread)
DEFINE_WRITEBACK_EVENT(writeback_wake_background)
#endif
DEFINE_WRITEBACK_EVENT(writeback_wake_thread)
@@
-346,7
+346,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)
@@
-361,7
+361,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)
@@
-371,7
+371,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) || \
@@
-391,7
+391,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,
@@
-402,7
+402,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,
@@
-421,7
+421,7
@@
LTTNG_TRACEPOINT_EVENT(writeback_queue_io,
)
#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_MAP(global_dirty_state,
writeback_global_dirty_state,
LTTNG_TRACEPOINT_EVENT_MAP(global_dirty_state,
writeback_global_dirty_state,
@@
-445,7
+445,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,
@@
-471,11
+471,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,
@@
-499,7
+499,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,
@@
-523,7
+523,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,
@@
-547,9
+547,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,
@@
-601,7
+601,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,
@@
-616,7
+616,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,
@@
-624,7
+624,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
@@
-651,7
+651,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,
@@
-660,11
+660,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),
@@
-680,7
+680,7
@@
LTTNG_TRACEPOINT_EVENT(writeback_sb_inodes_requeue,
)
#endif
)
#endif
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(2,6,37))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(2,6,37))
LTTNG_TRACEPOINT_EVENT_CLASS(writeback_congest_waited_template,
TP_PROTO(unsigned int usec_timeout, unsigned int usec_delayed),
LTTNG_TRACEPOINT_EVENT_CLASS(writeback_congest_waited_template,
TP_PROTO(unsigned int usec_timeout, unsigned int usec_delayed),
@@
-708,7
+708,7
@@
LTTNG_TRACEPOINT_EVENT_INSTANCE(writeback_congest_waited_template, writeback_wai
)
#endif
)
#endif
-#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,
@@
-732,7
+732,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/bug.h
b/lib/bug.h
index 3de40ca906cc56ab7954395ad363ba5a0e1c4e25..e8bc61c9927e1572d6a8471fce2b78e09da48626 100644
(file)
--- a/
lib/bug.h
+++ b/
lib/bug.h
@@
-21,9
+21,9
@@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include <l
inux/
version.h>
+#include <l
ttng-kernel-
version.h>
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(2,6,38))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(2,6,38))
#define LTTNG_BUILD_BUG_ON(cond) BUILD_BUG_ON(cond)
#else
#define LTTNG_BUILD_BUG_ON(cond) MAYBE_BUILD_BUG_ON(cond)
#define LTTNG_BUILD_BUG_ON(cond) BUILD_BUG_ON(cond)
#else
#define LTTNG_BUILD_BUG_ON(cond) MAYBE_BUILD_BUG_ON(cond)
diff --git
a/lib/ringbuffer/backend_types.h
b/lib/ringbuffer/backend_types.h
index 01ed63b9349aac0a71f25d4912774c7f946e9854..7c474a0a8405b5cc13f8b7ea8bc53b55c5fa1db2 100644
(file)
--- a/
lib/ringbuffer/backend_types.h
+++ b/
lib/ringbuffer/backend_types.h
@@
-99,7
+99,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 ac3fa90273545312cd6f93bf5100ae48ca81afd8..008e5594d0c872505c708f345070d97a92daee2d 100644
(file)
--- a/
lib/ringbuffer/frontend_types.h
+++ b/
lib/ringbuffer/frontend_types.h
@@
-70,7
+70,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 d430f71cc837d578f3ec179d4a81759b4badf8d4..a24013fb0ab9c727680b358d80ca0c5dcb55d6ee 100644
(file)
--- a/
lib/ringbuffer/ring_buffer_backend.c
+++ b/
lib/ringbuffer/ring_buffer_backend.c
@@
-272,7
+272,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,
@@
-304,7
+304,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
@@
-354,7
+354,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
@@
-432,13
+432,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)) */
{
/*
{
/*
@@
-475,7
+475,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)
@@
-490,18
+490,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);
@@
-530,15
+530,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 1985b6a3d7df1c9fb35c3651d861a07c500ae4c9..74b77acc8ef2abde1984a53843f5ab4bebeff7fc 100644
(file)
--- a/
lib/ringbuffer/ring_buffer_frontend.c
+++ b/
lib/ringbuffer/ring_buffer_frontend.c
@@
-467,7
+467,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;
@@
-538,7
+538,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
@@
-600,7
+600,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)
/*
@@
-706,7
+706,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;
@@
-717,7
+717,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;
@@
-741,7
+741,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;
@@
-870,7
+870,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);
@@
-882,7
+882,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;
/*
@@
-918,7
+918,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. */
@@
-938,13
+938,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 96459469f242e696ffd3645ce97a237608cabd74..c5e6cfca0ce48ee56389a302b9063324114eb061 100644
(file)
--- a/
lib/ringbuffer/ring_buffer_iterator.c
+++ b/
lib/ringbuffer/ring_buffer_iterator.c
@@
-351,7
+351,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)
@@
-368,7
+368,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
@@
-400,7
+400,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)
{
@@
-417,13
+417,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;
@@
-452,7
+452,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);
@@
-465,7
+465,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;
@@
-473,10
+473,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 6592a824ff30151230acd41744a995a38b7a1914..7f2ba7411a7e011a766e58e1044a29fc92526d3f 100644
(file)
--- a/
lib/ringbuffer/ring_buffer_mmap.c
+++ b/
lib/ringbuffer/ring_buffer_mmap.c
@@
-32,7
+32,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)
@@
-69,24
+69,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 93cad295e0e9495ff3ec8fdad8efc98ecb11cdb4..2b153225361e24762c94635a58fd0d18213ccf0f 100644
(file)
--- a/
lib/ringbuffer/ring_buffer_splice.c
+++ b/
lib/ringbuffer/ring_buffer_splice.c
@@
-25,7
+25,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>
@@
-56,10
+56,10
@@
static void lib_ring_buffer_pipe_buf_release(struct pipe_inode_info *pipe,
}
static const struct pipe_buf_operations ring_buffer_pipe_buf_ops = {
}
static const struct pipe_buf_operations ring_buffer_pipe_buf_ops = {
-#if (L
INUX_VERSION_CODE <
KERNEL_VERSION(5,1,0))
+#if (L
TTNG_LINUX_VERSION_CODE < LTTNG_
KERNEL_VERSION(5,1,0))
.can_merge = 0,
#endif
.can_merge = 0,
#endif
-#if (L
INUX_VERSION_CODE <
KERNEL_VERSION(3,15,0))
+#if (L
TTNG_LINUX_VERSION_CODE < LTTNG_
KERNEL_VERSION(3,15,0))
.map = generic_pipe_buf_map,
.unmap = generic_pipe_buf_unmap,
#endif
.map = generic_pipe_buf_map,
.unmap = generic_pipe_buf_unmap,
#endif
@@
-97,7
+97,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 f57004e1fbb2c89789fed449209145a731d046ee..ecc040e5c96e5f727c8ab133e882dd94c4ce732e 100644
(file)
--- a/
lttng-abi.c
+++ b/
lttng-abi.c
@@
-66,7
+66,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;
@@
-370,7
+370,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-perf-counters.c
b/lttng-context-perf-counters.c
index 260e5d0d9a5873cef635b93bbc93548d70104a46..bc3121d88fe071751bfd9ac172ba159682d6eebd 100644
(file)
--- a/
lttng-context-perf-counters.c
+++ b/
lttng-context-perf-counters.c
@@
-72,7
+72,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,0,99))
+#if defined(CONFIG_PERF_EVENTS) && (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(3,0,99))
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,
@@
-93,7
+93,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;
@@
-104,7
+104,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;
@@
-116,14
+116,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)
@@
-164,7
+164,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
@@
-223,7
+223,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,
@@
-277,7
+277,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,
@@
-291,7
+291,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;
@@
-317,7
+317,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;
@@
-337,7
+337,7
@@
int lttng_add_perf_counter_to_ctx(uint32_t type,
wrapper_vmalloc_sync_all();
return 0;
wrapper_vmalloc_sync_all();
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;
@@
-347,7
+347,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:
{
@@
-362,7
+362,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-cpuhotplug.h
b/lttng-cpuhotplug.h
index 76a7cb80bd1ed98d5680b5fcb9db20bdee21e96b..96155eb9bb8d0397beb5ce9ae03075d35bda7cb6 100644
(file)
--- a/
lttng-cpuhotplug.h
+++ b/
lttng-cpuhotplug.h
@@
-23,7
+23,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 880507554eb3035498ba98f90d0c4c77a729d8a2..469316529515dd5dccb81f162c3bb9e8993d3e72 100644
(file)
--- a/
lttng-events.c
+++ b/
lttng-events.c
@@
-90,21
+90,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)
@@
-2637,7
+2637,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;
@@
-2753,7
+2753,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;
@@
-2761,7
+2761,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 e0b4358f4024e492c04720072d4ab1a96c5c64af..4a5cc4b87fcf285725fa74e1ef2ae425bef7c1e3 100644
(file)
--- a/
lttng-events.h
+++ b/
lttng-events.h
@@
-23,7
+23,7
@@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#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>
@@
-185,7
+185,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
@@
-699,7
+699,7
@@
int lttng_add_migratable_to_ctx(struct lttng_ctx **ctx)
return -ENOSYS;
}
#endif
return -ENOSYS;
}
#endif
-#if defined(CONFIG_PERF_EVENTS) && (L
INUX_VERSION_CODE >=
KERNEL_VERSION(2,6,33))
+#if defined(CONFIG_PERF_EVENTS) && (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(2,6,33))
int lttng_add_perf_counter_to_ctx(uint32_t type,
uint64_t config,
const char *name,
int lttng_add_perf_counter_to_ctx(uint32_t type,
uint64_t config,
const char *name,
@@
-812,7
+812,7
@@
int lttng_calibrate(struct lttng_kernel_calibrate *calibrate);
extern const struct file_operations lttng_tracepoint_list_fops;
extern const struct file_operations lttng_syscall_list_fops;
extern const struct file_operations lttng_tracepoint_list_fops;
extern const struct file_operations lttng_syscall_list_fops;
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(2,6,35))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(2,6,35))
#define TRACEPOINT_HAS_DATA_ARG
#endif
#define TRACEPOINT_HAS_DATA_ARG
#endif
diff --git
a/lttng-kernel-version.h
b/lttng-kernel-version.h
index 2b63a5d3048d66e424309fe10c4c005640076492..9e02cc6dd4deec73b6ca4f31db2bcd561f786b0f 100644
(file)
--- a/
lttng-kernel-version.h
+++ b/
lttng-kernel-version.h
@@
-25,28
+25,31
@@
#include <linux/version.h>
#include <linux/version.h>
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33))
+#define LTTNG_KERNEL_VERSION(a, b, c) KERNEL_VERSION(a, b, c)
+#define LTTNG_LINUX_VERSION_CODE LINUX_VERSION_CODE
+
+#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(2,6,33))
#include <generated/utsrelease.h>
#include <generated/utsrelease.h>
-#else /* #if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(2,6,33)) */
+#else /* #if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(2,6,33)) */
#include <linux/utsrelease.h>
#include <linux/utsrelease.h>
-#endif /* #else #if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(2,6,33)) */
+#endif /* #else #if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(2,6,33)) */
/*
* 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
@@
-61,11
+64,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
@@
-78,13
+81,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
@@
-99,11
+102,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
@@
-118,11
+121,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
@@
-137,11
+140,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 2828b1908d75d684aef7e6f9e7b10a1ea7987856..3db557327a97708a2dc5a399135a3819f9d14358 100644
(file)
--- a/
lttng-statedump-impl.c
+++ b/
lttng-statedump-impl.c
@@
-341,7
+341,7
@@
int lttng_enumerate_vm_maps(struct lttng_session *session)
#ifdef CONFIG_LTTNG_HAS_LIST_IRQ
#ifdef CONFIG_LTTNG_HAS_LIST_IRQ
-#if (L
INUX_VERSION_CODE <
KERNEL_VERSION(2,6,39))
+#if (L
TTNG_LINUX_VERSION_CODE < LTTNG_
KERNEL_VERSION(2,6,39))
#define irq_desc_get_chip(desc) get_irq_desc_chip(desc)
#endif
#define irq_desc_get_chip(desc) get_irq_desc_chip(desc)
#endif
diff --git
a/lttng-syscalls.c
b/lttng-syscalls.c
index b8a3eac4bcaecb349ba09ae5f0da447b7116df0b..b05970e7b6bf841c13c3d54ccf99d0567af84907 100644
(file)
--- a/
lttng-syscalls.c
+++ b/
lttng-syscalls.c
@@
-94,7
+94,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 52f8cfe4372250ea27fa3b6841047af7f6322dbd..7659eab421fe445d5ae9881a36375905d8fbca2b 100644
(file)
--- a/
probes/lttng-probe-btrfs.c
+++ b/
probes/lttng-probe-btrfs.c
@@
-23,11
+23,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 00518be8cd28e45eb740e3f1842674fb1def6b4e..466c75171b1c6a541b64f0200b66ca9fc2cb70cd 100644
(file)
--- a/
probes/lttng-probe-ext3.c
+++ b/
probes/lttng-probe-ext3.c
@@
-24,10
+24,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 ca5444ac33ff92c1fbdb3aefb6976ce09e7b8946..7f25b780650e46d35bd4dc515f983dffbc32d044 100644
(file)
--- a/
probes/lttng-probe-kvm-x86-mmu.c
+++ b/
probes/lttng-probe-kvm-x86-mmu.c
@@
-25,11
+25,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
diff --git
a/probes/lttng-probe-kvm-x86.c
b/probes/lttng-probe-kvm-x86.c
index fa3f9dccb08f345ac0e45bf70713e154415f438e..bd3e4e5148f57eee3b262e003b97206f1fae7e5b 100644
(file)
--- a/
probes/lttng-probe-kvm-x86.c
+++ b/
probes/lttng-probe-kvm-x86.c
@@
-25,11
+25,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
diff --git
a/probes/lttng-probe-lock.c
b/probes/lttng-probe-lock.c
index 4e59da851a69bb50dbc2f62d8331195dfd0975db..94ed167830b44a0c63e0973bc7e597affd88ef49 100644
(file)
--- a/
probes/lttng-probe-lock.c
+++ b/
probes/lttng-probe-lock.c
@@
-22,14
+22,14
@@
*/
#include <linux/module.h>
*/
#include <linux/module.h>
-#include <l
inux/
version.h>
+#include <l
ttng-kernel-
version.h>
#include <lttng-tracer.h>
/*
* Create the tracepoint static inlines from the kernel to validate that our
* trace event macros match the kernel we run on.
*/
#include <lttng-tracer.h>
/*
* Create the tracepoint static inlines from the kernel to validate that our
* trace event macros match the kernel we run on.
*/
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(2,6,33))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(2,6,33))
#include <trace/events/lock.h>
#else
#include <trace/events/lockdep.h>
#include <trace/events/lock.h>
#else
#include <trace/events/lockdep.h>
diff --git
a/probes/lttng.c
b/probes/lttng.c
index b63ffdf3e6fc9b2ecd12690652dd000099ea4b89..a5524394351b85201b35e5379d8ac2ca5de01828 100644
(file)
--- a/
probes/lttng.c
+++ b/
probes/lttng.c
@@
-109,7
+109,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 7d7982b3cc2782f75716ef7637555952de1be3d8..d35cb18bee916c1213ad741d5723b1de94791e2f 100644
(file)
--- a/
tests/probes/lttng-test.c
+++ b/
tests/probes/lttng-test.c
@@
-90,7
+90,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 f3a3dabf2612caeb3dfe93efa93e2849254376d2..224814fbc59e60d57d6ef98f73f582b866607df4 100644
(file)
--- a/
wrapper/atomic.h
+++ b/
wrapper/atomic.h
@@
-23,14
+23,14
@@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include <l
inux/
version.h>
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(2,6,37))
+#include <l
ttng-kernel-
version.h>
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(2,6,37))
#include <linux/atomic.h>
#else
#include <asm/atomic.h>
#endif
#include <linux/atomic.h>
#else
#include <asm/atomic.h>
#endif
-#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();
@@
-40,7
+40,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();
@@
-50,6
+50,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/fdtable.c
b/wrapper/fdtable.c
index ef39ba6320c9bd277d7fbf07907d5847eeb39b01..f6cf2ca153c665092cbcb0aec41765b1a54b25fe 100644
(file)
--- a/
wrapper/fdtable.c
+++ b/
wrapper/fdtable.c
@@
-18,11
+18,11
@@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#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 69ff4aa3fc316830c5b6b353e704dde6e6be96cf..c3a067305c2dbbfd833f8f7437fcea81eb5a6d0e 100644
(file)
--- a/
wrapper/fdtable.h
+++ b/
wrapper/fdtable.h
@@
-21,10
+21,10
@@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#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,
@@
-42,7
+42,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 37c8c9ba3518175afa53110ad303bcf2e8448728..0454753812ccc1e1c72aa0ac2812b1793bd7cb9b 100644
(file)
--- a/
wrapper/file.h
+++ b/
wrapper/file.h
@@
-23,10
+23,10
@@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#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)
@@
-36,7
+36,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)
@@
-46,6
+46,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/frame.h
b/wrapper/frame.h
index ac8f4967da37c93bd2cda8232312b9d2842c69b3..17821694bd273805bc0a09bd83459ff06bc92eac 100644
(file)
--- a/
wrapper/frame.h
+++ b/
wrapper/frame.h
@@
-21,9
+21,9
@@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include <l
inux/
version.h>
+#include <l
ttng-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))
#include <linux/frame.h>
#include <linux/frame.h>
diff --git
a/wrapper/irq.h
b/wrapper/irq.h
index b6feb0c57f6164f5125f81037b884ed7de575d1d..2e789fbfffad991de64a1265a7cf365d66dd8934 100644
(file)
--- a/
wrapper/irq.h
+++ b/
wrapper/irq.h
@@
-23,14
+23,14
@@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#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 47eda8995d5fb5095d87b832cbb13b38ac099ef2..cd506166717e4bd6a5b960c019196ba992d81cca 100644
(file)
--- a/
wrapper/irqdesc.c
+++ b/
wrapper/irqdesc.c
@@
-25,7
+25,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,4,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 d7a7a386ce11c1db048c15000b0de4fe7ea9eae6..4d3f47a58c98c5dbb9b9c28367305f296e4674ba 100644
(file)
--- a/
wrapper/irqflags.h
+++ b/
wrapper/irqflags.h
@@
-23,7
+23,7
@@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#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/kref.h
b/wrapper/kref.h
index 3f3be7a42d27c0445d7273fc771b5d55dd120248..84f340ca62af3ab270021bca4613dc0ad3f336c2 100644
(file)
--- a/
wrapper/kref.h
+++ b/
wrapper/kref.h
@@
-28,24
+28,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/kstrtox.h
b/wrapper/kstrtox.h
index 402662825369e829e7d2cffbdf9546f58d3c4559..e94f259e06cf6f4d9975589f67c5524103c070ef 100644
(file)
--- a/
wrapper/kstrtox.h
+++ b/
wrapper/kstrtox.h
@@
-21,9
+21,9
@@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include <l
inux/
version.h>
+#include <l
ttng-kernel-
version.h>
-#if (L
INUX_VERSION_CODE <
KERNEL_VERSION(3,0,0))
+#if (L
TTNG_LINUX_VERSION_CODE < LTTNG_
KERNEL_VERSION(3,0,0))
#include <linux/uaccess.h>
#include <linux/uaccess.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/page_alloc.c
b/wrapper/page_alloc.c
index dc1fbed225fd6aefce00661aa1c7581793246e0f..cd7ab2d13575d3ec7d656cccb30c589ed6d092d0 100644
(file)
--- a/
wrapper/page_alloc.c
+++ b/
wrapper/page_alloc.c
@@
-26,7
+26,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 3a522a9d3307e221a68e19af688c9879d3d3d485..b94178acbfade05829e11842b27867572c656dcb 100644
(file)
--- a/
wrapper/page_alloc.h
+++ b/
wrapper/page_alloc.h
@@
-32,7
+32,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 bba1bcea199907f1c17794f023cd60f099a8db7e..d7ed4abfe01fb2e2a9547161d54b02236ef1a842 100644
(file)
--- a/
wrapper/percpu-defs.h
+++ b/
wrapper/percpu-defs.h
@@
-23,20
+23,20
@@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#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 6bd2a5d59cfe026f7bf9476f730dd4d20743e4f2..e50e607b083cf008a220eb0ebf66fe9e534d7f57 100644
(file)
--- a/
wrapper/perf.h
+++ b/
wrapper/perf.h
@@
-25,7
+25,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,
@@
-34,9
+34,9
@@
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)) */
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(2,6,37))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(2,6,37))
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,
@@
-45,7
+45,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);
}
-#else /* (L
INUX_VERSION_CODE >=
KERNEL_VERSION(2,6,37)) */
+#else /* (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(2,6,37)) */
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,
@@
-62,13
+62,13
@@
wrapper_perf_event_create_kernel_counter(struct perf_event_attr *attr,
return perf_event_create_kernel_counter(attr, cpu, pid, callback);
}
return perf_event_create_kernel_counter(attr, cpu, pid, callback);
}
-#endif /* (L
INUX_VERSION_CODE >=
KERNEL_VERSION(2,6,37)) */
+#endif /* (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(2,6,37)) */
-#if (L
INUX_VERSION_CODE <
KERNEL_VERSION(2,6,36))
+#if (L
TTNG_LINUX_VERSION_CODE < LTTNG_
KERNEL_VERSION(2,6,36))
#define local64_read(l) atomic64_read(l)
#endif
#define local64_read(l) atomic64_read(l)
#endif
-#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 2fc60b137814e66dd08455a92cc06673bbaca1f3..c3f80ac88cba1f81299559ed05563dcdb5734642 100644
(file)
--- a/
wrapper/rcu.h
+++ b/
wrapper/rcu.h
@@
-23,7
+23,7
@@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#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/spinlock.h
b/wrapper/spinlock.h
index bc71b4f4b0df8320c43f4f8c79e3f81489130639..db46da38f9b41b4db1eb655740704335e79f0350 100644
(file)
--- a/
wrapper/spinlock.h
+++ b/
wrapper/spinlock.h
@@
-21,9
+21,9
@@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include <l
inux/
version.h>
+#include <l
ttng-kernel-
version.h>
-#if (L
INUX_VERSION_CODE <
KERNEL_VERSION(2,6,33))
+#if (L
TTNG_LINUX_VERSION_CODE < LTTNG_
KERNEL_VERSION(2,6,33))
#include <linux/string.h>
#include <linux/string.h>
diff --git
a/wrapper/splice.c
b/wrapper/splice.c
index 916ec95570a65d604f540ac30df2248e3ab5dca7..9baf2be30e2ebe6da2e92e41a89c87e53e624e7e 100644
(file)
--- a/
wrapper/splice.c
+++ b/
wrapper/splice.c
@@
-25,7
+25,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 4fc9828c4279fa2e25b78e553e80b208b110c2fb..b8b1ff4f916137c9ae1eaa3209240099c6e60055 100644
(file)
--- a/
wrapper/timer.h
+++ b/
wrapper/timer.h
@@
-23,7
+23,7
@@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#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>
@@
-39,7
+39,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 *
@@
-54,11
+54,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)
@@
-97,6
+97,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 08f99229225e6e870d5d78d13d0446f5cc357b0c..7d066b2be902aa4abfcd8f26efe97451f0deffad 100644
(file)
--- a/
wrapper/trace-clock.h
+++ b/
wrapper/trace-clock.h
@@
-33,7
+33,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>
@@
-68,7
+68,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 2ae92d8ea87a41d5af5796ce23f011f6b3896f3f..debfe43fb2372102d6128d9a468a6483e7a57730 100644
(file)
--- a/
wrapper/tracepoint.h
+++ b/
wrapper/tracepoint.h
@@
-23,11
+23,11
@@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#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(2,6,35))
+#if (L
TTNG_LINUX_VERSION_CODE < LTTNG_
KERNEL_VERSION(2,6,35))
#define DECLARE_EVENT_CLASS(name, proto, args, tstruct, assign, print)
#define DECLARE_EVENT_CLASS(name, proto, args, tstruct, assign, print)
@@
-40,14
+40,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
@@
-63,9
+63,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/uuid.h
b/wrapper/uuid.h
index 48b1a9fb7e63b4f6f07e12b8d87470ab643c23fd..72b2b30a65b9c8a6d18b7d56a793d5870d7bd515 100644
(file)
--- a/
wrapper/uuid.h
+++ b/
wrapper/uuid.h
@@
-21,9
+21,9
@@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include <l
inux/
version.h>
+#include <l
ttng-kernel-
version.h>
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(2,6,35))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(2,6,35))
#include <linux/uuid.h>
#else
#include <linux/uuid.h>
#else
diff --git
a/wrapper/vmalloc.h
b/wrapper/vmalloc.h
index b4d795404a2dfa454f9b1dae11a0f0d8963db6c9..c7abfca9d453b35651d111aecc1c1f9dc029a628 100644
(file)
--- a/
wrapper/vmalloc.h
+++ b/
wrapper/vmalloc.h
@@
-25,7
+25,7
@@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#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>
@@
-62,7
+62,7
@@
void wrapper_vmalloc_sync_all(void)
}
#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)
{
diff --git
a/wrapper/vzalloc.h
b/wrapper/vzalloc.h
index c052778bf67e7c4c80f95177221fbf3dcd9e6f2f..85ad25a4f92a0d1071156f0e3ddd1c7312617600 100644
(file)
--- a/
wrapper/vzalloc.h
+++ b/
wrapper/vzalloc.h
@@
-21,7
+21,7
@@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include <l
inux/
version.h>
+#include <l
ttng-kernel-
version.h>
#include <linux/vmalloc.h>
#if LTTNG_KERNEL_RANGE(2,6,36, 2,6,37)
#include <linux/vmalloc.h>
#if LTTNG_KERNEL_RANGE(2,6,36, 2,6,37)
diff --git
a/wrapper/writeback.h
b/wrapper/writeback.h
index 22b2c1608a5e5df3495fbdcc863859364813cf76..abe2c42f2283cd4315fb93269cd789fcdf1a6ed4 100644
(file)
--- a/
wrapper/writeback.h
+++ b/
wrapper/writeback.h
@@
-33,7
+33,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;
This page took
0.148963 seconds
and
4
git commands to generate.