From 9bbf98da13bbaf289ac5787a80325d2e1dd81d0d Mon Sep 17 00:00:00 2001 From: Mathieu Desnoyers Date: Mon, 3 Nov 2014 15:54:13 -0500 Subject: [PATCH] Namespace all tracepoints Signed-off-by: Mathieu Desnoyers --- .../lttng-module/arch/x86/kvm/mmutrace.h | 23 +++++++++----- instrumentation/events/lttng-module/btrfs.h | 6 +++- .../events/lttng-module/compaction.h | 29 +++++++++++++----- instrumentation/events/lttng-module/irq.h | 28 ++++++++++++----- instrumentation/events/lttng-module/kmem.h | 28 ++++++++++------- .../lttng-module/{vmscan.h => mm_vmscan.h} | 23 +++++++++----- instrumentation/events/lttng-module/printk.h | 15 ++++++++-- instrumentation/events/lttng-module/regmap.h | 4 ++- .../events/lttng-module/{sunrpc.h => rpc.h} | 8 ++--- instrumentation/events/lttng-module/timer.h | 30 ++++++++++++++----- probes/lttng-probe-sunrpc.c | 2 +- probes/lttng-probe-vmscan.c | 2 +- 12 files changed, 139 insertions(+), 59 deletions(-) rename instrumentation/events/lttng-module/{vmscan.h => mm_vmscan.h} (97%) rename instrumentation/events/lttng-module/{sunrpc.h => rpc.h} (96%) diff --git a/instrumentation/events/lttng-module/arch/x86/kvm/mmutrace.h b/instrumentation/events/lttng-module/arch/x86/kvm/mmutrace.h index 2b71d441..a76f059c 100644 --- a/instrumentation/events/lttng-module/arch/x86/kvm/mmutrace.h +++ b/instrumentation/events/lttng-module/arch/x86/kvm/mmutrace.h @@ -1,11 +1,11 @@ -#if !defined(LTTNG_TRACE_KVMMMU_H) || defined(TRACE_HEADER_MULTI_READ) -#define LTTNG_TRACE_KVMMMU_H +#if !defined(LTTNG_TRACE_KVM_MMU_H) || defined(TRACE_HEADER_MULTI_READ) +#define LTTNG_TRACE_KVM_MMU_H #include "../../../../../../probes/lttng-tracepoint-event.h" #include #undef TRACE_SYSTEM -#define TRACE_SYSTEM kvmmmu +#define TRACE_SYSTEM kvm_mmu #define KVM_MMU_PAGE_FIELDS \ __field(__u64, gfn) \ @@ -195,8 +195,11 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE(kvm_mmu_page_class, kvm_mmu_prepare_zap_page, TP_ARGS(sp) ) -LTTNG_TRACEPOINT_EVENT( +LTTNG_TRACEPOINT_EVENT_MAP( mark_mmio_spte, + + kvm_mmu_mark_mmio_spte, + TP_PROTO(u64 *sptep, gfn_t gfn, unsigned access), TP_ARGS(sptep, gfn, access), @@ -216,8 +219,11 @@ LTTNG_TRACEPOINT_EVENT( __entry->access) ) -LTTNG_TRACEPOINT_EVENT( +LTTNG_TRACEPOINT_EVENT_MAP( handle_mmio_page_fault, + + kvm_mmu_handle_mmio_page_fault, + TP_PROTO(u64 addr, gfn_t gfn, unsigned access), TP_ARGS(addr, gfn, access), @@ -240,8 +246,11 @@ LTTNG_TRACEPOINT_EVENT( #define __spte_satisfied(__spte) \ (__entry->retry && is_writable_pte(__entry->__spte)) -LTTNG_TRACEPOINT_EVENT( +LTTNG_TRACEPOINT_EVENT_MAP( fast_page_fault, + + kvm_mmu_fast_page_fault, + TP_PROTO(struct kvm_vcpu *vcpu, gva_t gva, u32 error_code, u64 *sptep, u64 old_spte, bool retry), TP_ARGS(vcpu, gva, error_code, sptep, old_spte, retry), @@ -274,7 +283,7 @@ LTTNG_TRACEPOINT_EVENT( __spte_satisfied(old_spte), __spte_satisfied(new_spte) ) ) -#endif /* LTTNG_TRACE_KVMMMU_H */ +#endif /* LTTNG_TRACE_KVM_MMU_H */ #undef TRACE_INCLUDE_PATH #define TRACE_INCLUDE_PATH ../instrumentation/events/lttng-module/arch/x86/kvm diff --git a/instrumentation/events/lttng-module/btrfs.h b/instrumentation/events/lttng-module/btrfs.h index 24be3619..3aee30be 100644 --- a/instrumentation/events/lttng-module/btrfs.h +++ b/instrumentation/events/lttng-module/btrfs.h @@ -505,7 +505,11 @@ LTTNG_TRACEPOINT_EVENT_CLASS(btrfs__writepage, #endif ) -LTTNG_TRACEPOINT_EVENT_INSTANCE(btrfs__writepage, __extent_writepage, +LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP(btrfs__writepage, + + __extent_writepage, + + btrfs__extent_writepage, TP_PROTO(struct page *page, struct inode *inode, struct writeback_control *wbc), diff --git a/instrumentation/events/lttng-module/compaction.h b/instrumentation/events/lttng-module/compaction.h index 7914e234..992b5be5 100644 --- a/instrumentation/events/lttng-module/compaction.h +++ b/instrumentation/events/lttng-module/compaction.h @@ -11,7 +11,7 @@ #if LINUX_VERSION_CODE >= KERNEL_VERSION(4,0,0) -LTTNG_TRACEPOINT_EVENT_CLASS(mm_compaction_isolate_template, +LTTNG_TRACEPOINT_EVENT_CLASS(compaction_isolate_template, TP_PROTO(unsigned long start_pfn, unsigned long end_pfn, @@ -41,7 +41,7 @@ LTTNG_TRACEPOINT_EVENT_CLASS(mm_compaction_isolate_template, __entry->nr_taken) ) -LTTNG_TRACEPOINT_EVENT_INSTANCE(mm_compaction_isolate_template, mm_compaction_isolate_migratepages, +LTTNG_TRACEPOINT_EVENT_INSTANCE(compaction_isolate_template, mm_compaction_isolate_migratepages, TP_PROTO(unsigned long start_pfn, unsigned long end_pfn, @@ -51,7 +51,7 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE(mm_compaction_isolate_template, mm_compaction_is TP_ARGS(start_pfn, end_pfn, nr_scanned, nr_taken) ) -LTTNG_TRACEPOINT_EVENT_INSTANCE(mm_compaction_isolate_template, mm_compaction_isolate_freepages, +LTTNG_TRACEPOINT_EVENT_INSTANCE(compaction_isolate_template, mm_compaction_isolate_freepages, TP_PROTO(unsigned long start_pfn, unsigned long end_pfn, @@ -63,7 +63,7 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE(mm_compaction_isolate_template, mm_compaction_is #else /* #if LINUX_VERSION_CODE >= KERNEL_VERSION(4,0,0) */ -LTTNG_TRACEPOINT_EVENT_CLASS(mm_compaction_isolate_template, +LTTNG_TRACEPOINT_EVENT_CLASS(compaction_isolate_template, TP_PROTO(unsigned long nr_scanned, unsigned long nr_taken), @@ -85,7 +85,11 @@ LTTNG_TRACEPOINT_EVENT_CLASS(mm_compaction_isolate_template, __entry->nr_taken) ) -LTTNG_TRACEPOINT_EVENT_INSTANCE(mm_compaction_isolate_template, mm_compaction_isolate_migratepages, +LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP(compaction_isolate_template, + + mm_compaction_isolate_migratepages, + + compaction_isolate_migratepages, TP_PROTO(unsigned long nr_scanned, unsigned long nr_taken), @@ -93,7 +97,12 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE(mm_compaction_isolate_template, mm_compaction_is TP_ARGS(nr_scanned, nr_taken) ) -LTTNG_TRACEPOINT_EVENT_INSTANCE(mm_compaction_isolate_template, mm_compaction_isolate_freepages, +LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP(compaction_isolate_template, + + mm_compaction_isolate_freepages, + + compaction_isolate_freepages, + TP_PROTO(unsigned long nr_scanned, unsigned long nr_taken), @@ -105,7 +114,9 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE(mm_compaction_isolate_template, mm_compaction_is #if LTTNG_KERNEL_RANGE(3,12,30, 3,13,0) || \ LTTNG_KERNEL_RANGE(3,14,25, 3,15,0) || \ (LINUX_VERSION_CODE >= KERNEL_VERSION(3,16,0)) -LTTNG_TRACEPOINT_EVENT(mm_compaction_migratepages, +LTTNG_TRACEPOINT_EVENT_MAP(mm_compaction_migratepages, + + compaction_migratepages, TP_PROTO(unsigned long nr_all, int migrate_rc, @@ -146,7 +157,9 @@ LTTNG_TRACEPOINT_EVENT(mm_compaction_migratepages, __entry->nr_failed) ) #else /* #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,16,0)) */ -LTTNG_TRACEPOINT_EVENT(mm_compaction_migratepages, +LTTNG_TRACEPOINT_EVENT_MAP(mm_compaction_migratepages, + + compaction_migratepages, TP_PROTO(unsigned long nr_migrated, unsigned long nr_failed), diff --git a/instrumentation/events/lttng-module/irq.h b/instrumentation/events/lttng-module/irq.h index 8517414b..3b3a8ce7 100644 --- a/instrumentation/events/lttng-module/irq.h +++ b/instrumentation/events/lttng-module/irq.h @@ -90,7 +90,7 @@ LTTNG_TRACEPOINT_EVENT(irq_handler_exit, ) #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,37)) -LTTNG_TRACEPOINT_EVENT_CLASS(softirq, +LTTNG_TRACEPOINT_EVENT_CLASS(irq_softirq, TP_PROTO(unsigned int vec_nr), @@ -115,7 +115,9 @@ LTTNG_TRACEPOINT_EVENT_CLASS(softirq, * When used in combination with the softirq_exit tracepoint * we can determine the softirq handler runtine. */ -LTTNG_TRACEPOINT_EVENT_INSTANCE(softirq, softirq_entry, +LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP(irq_softirq, softirq_entry, + + irq_softirq_entry, TP_PROTO(unsigned int vec_nr), @@ -129,7 +131,9 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE(softirq, softirq_entry, * When used in combination with the softirq_entry tracepoint * we can determine the softirq handler runtine. */ -LTTNG_TRACEPOINT_EVENT_INSTANCE(softirq, softirq_exit, +LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP(irq_softirq, softirq_exit, + + irq_softirq_exit, TP_PROTO(unsigned int vec_nr), @@ -143,14 +147,16 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE(softirq, softirq_exit, * When used in combination with the softirq_entry tracepoint * we can determine the softirq raise to run latency. */ -LTTNG_TRACEPOINT_EVENT_INSTANCE(softirq, softirq_raise, +LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP(irq_softirq, softirq_raise, + + irq_softirq_raise, TP_PROTO(unsigned int vec_nr), TP_ARGS(vec_nr) ) #else /* #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,37)) */ -LTTNG_TRACEPOINT_EVENT_CLASS(softirq, +LTTNG_TRACEPOINT_EVENT_CLASS(irq_softirq, TP_PROTO(struct softirq_action *h, struct softirq_action *vec), @@ -176,7 +182,9 @@ LTTNG_TRACEPOINT_EVENT_CLASS(softirq, * When used in combination with the softirq_exit tracepoint * we can determine the softirq handler runtine. */ -LTTNG_TRACEPOINT_EVENT_INSTANCE(softirq, softirq_entry, +LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP(irq_softirq, softirq_entry, + + irq_softirq_entry, TP_PROTO(struct softirq_action *h, struct softirq_action *vec), @@ -191,7 +199,9 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE(softirq, softirq_entry, * When used in combination with the softirq_entry tracepoint * we can determine the softirq handler runtine. */ -LTTNG_TRACEPOINT_EVENT_INSTANCE(softirq, softirq_exit, +LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP(irq_softirq, softirq_exit, + + irq_softirq_exit, TP_PROTO(struct softirq_action *h, struct softirq_action *vec), @@ -206,7 +216,9 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE(softirq, softirq_exit, * When used in combination with the softirq_entry tracepoint * we can determine the softirq raise to run latency. */ -LTTNG_TRACEPOINT_EVENT_INSTANCE(softirq, softirq_raise, +LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP(irq_softirq, softirq_raise, + + irq_softirq_raise, TP_PROTO(struct softirq_action *h, struct softirq_action *vec), diff --git a/instrumentation/events/lttng-module/kmem.h b/instrumentation/events/lttng-module/kmem.h index 710c9fa5..c7869f12 100644 --- a/instrumentation/events/lttng-module/kmem.h +++ b/instrumentation/events/lttng-module/kmem.h @@ -158,9 +158,9 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE(kmem_free, kmem_cache_free, #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,32)) #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,3,0)) -LTTNG_TRACEPOINT_EVENT(mm_page_free, +LTTNG_TRACEPOINT_EVENT_MAP(mm_page_free, kmem_mm_page_free, #else -LTTNG_TRACEPOINT_EVENT(mm_page_free_direct, +LTTNG_TRACEPOINT_EVENT_MAP(mm_page_free_direct, kmem_mm_page_free_direct, #endif TP_PROTO(struct page *page, unsigned int order), @@ -184,9 +184,9 @@ LTTNG_TRACEPOINT_EVENT(mm_page_free_direct, ) #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,3,0)) -LTTNG_TRACEPOINT_EVENT(mm_page_free_batched, +LTTNG_TRACEPOINT_EVENT_MAP(mm_page_free_batched, kmem_mm_page_free_batched, #else -LTTNG_TRACEPOINT_EVENT(mm_pagevec_free, +LTTNG_TRACEPOINT_EVENT_MAP(mm_pagevec_free, kmem_pagevec_free, #endif TP_PROTO(struct page *page, int cold), @@ -209,7 +209,7 @@ LTTNG_TRACEPOINT_EVENT(mm_pagevec_free, __entry->cold) ) -LTTNG_TRACEPOINT_EVENT(mm_page_alloc, +LTTNG_TRACEPOINT_EVENT_MAP(mm_page_alloc, kmem_mm_page_alloc, TP_PROTO(struct page *page, unsigned int order, gfp_t gfp_flags, int migratetype), @@ -238,7 +238,7 @@ LTTNG_TRACEPOINT_EVENT(mm_page_alloc, show_gfp_flags(__entry->gfp_flags)) ) -LTTNG_TRACEPOINT_EVENT_CLASS(mm_page, +LTTNG_TRACEPOINT_EVENT_CLASS(kmem_mm_page, TP_PROTO(struct page *page, unsigned int order, int migratetype), @@ -264,14 +264,18 @@ LTTNG_TRACEPOINT_EVENT_CLASS(mm_page, __entry->order == 0) ) -LTTNG_TRACEPOINT_EVENT_INSTANCE(mm_page, mm_page_alloc_zone_locked, +LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP(kmem_mm_page, mm_page_alloc_zone_locked, + + kmem_mm_page_alloc_zone_locked, TP_PROTO(struct page *page, unsigned int order, int migratetype), TP_ARGS(page, order, migratetype) ) -LTTNG_TRACEPOINT_EVENT_INSTANCE_PRINT(mm_page, mm_page_pcpu_drain, +LTTNG_TRACEPOINT_EVENT_INSTANCE_PRINT_MAP(kmem_mm_page, mm_page_pcpu_drain, + + kmem_mm_page_pcpu_drain, #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33)) TP_PROTO(struct page *page, unsigned int order, int migratetype), @@ -374,7 +378,9 @@ LTTNG_TRACEPOINT_EVENT(mm_page_alloc_extfrag, #elif (LINUX_VERSION_CODE >= KERNEL_VERSION(3,12,0)) -LTTNG_TRACEPOINT_EVENT(mm_page_alloc_extfrag, +LTTNG_TRACEPOINT_EVENT_MAP(mm_page_alloc_extfrag, + + kmem_mm_page_alloc_extfrag, TP_PROTO(struct page *page, int alloc_order, int fallback_order, @@ -418,7 +424,9 @@ LTTNG_TRACEPOINT_EVENT(mm_page_alloc_extfrag, #else /* #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,12,0)) */ -LTTNG_TRACEPOINT_EVENT(mm_page_alloc_extfrag, +LTTNG_TRACEPOINT_EVENT_MAP(mm_page_alloc_extfrag, + + kmem_mm_page_alloc_extfrag, TP_PROTO(struct page *page, int alloc_order, int fallback_order, diff --git a/instrumentation/events/lttng-module/vmscan.h b/instrumentation/events/lttng-module/mm_vmscan.h similarity index 97% rename from instrumentation/events/lttng-module/vmscan.h rename to instrumentation/events/lttng-module/mm_vmscan.h index 4eadc634..870c0264 100644 --- a/instrumentation/events/lttng-module/vmscan.h +++ b/instrumentation/events/lttng-module/mm_vmscan.h @@ -1,8 +1,8 @@ #undef TRACE_SYSTEM -#define TRACE_SYSTEM vmscan +#define TRACE_SYSTEM mm_vmscan -#if !defined(LTTNG_TRACE_VMSCAN_H) || defined(TRACE_HEADER_MULTI_READ) -#define LTTNG_TRACE_VMSCAN_H +#if !defined(LTTNG_TRACE_MM_VMSCAN_H) || defined(TRACE_HEADER_MULTI_READ) +#define LTTNG_TRACE_MM_VMSCAN_H #include "../../../probes/lttng-tracepoint-event.h" #include @@ -189,7 +189,10 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE(mm_vmscan_direct_reclaim_end_template, mm_vmscan ) #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,1,0)) -LTTNG_TRACEPOINT_EVENT(mm_shrink_slab_start, +LTTNG_TRACEPOINT_EVENT_MAP(mm_shrink_slab_start, + + mm_vmscan_shrink_slab_start, + TP_PROTO(struct shrinker *shr, struct shrink_control *sc, long nr_objects_to_shrink, unsigned long pgs_scanned, unsigned long lru_pgs, unsigned long cache_items, @@ -239,7 +242,10 @@ LTTNG_TRACEPOINT_EVENT(mm_shrink_slab_start, ) #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,16,0)) -LTTNG_TRACEPOINT_EVENT(mm_shrink_slab_end, +LTTNG_TRACEPOINT_EVENT_MAP(mm_shrink_slab_end, + + mm_vmscan_shrink_slab_end, + TP_PROTO(struct shrinker *shr, int nid, int shrinker_retval, long unused_scan_cnt, long new_scan_cnt, long total_scan), @@ -276,7 +282,10 @@ LTTNG_TRACEPOINT_EVENT(mm_shrink_slab_end, __entry->retval) ) #else /* #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,16,0)) */ -LTTNG_TRACEPOINT_EVENT(mm_shrink_slab_end, +LTTNG_TRACEPOINT_EVENT_MAP(mm_shrink_slab_end, + + mm_vmscan_shrink_slab_end, + TP_PROTO(struct shrinker *shr, int shrinker_retval, long unused_scan_cnt, long new_scan_cnt), @@ -627,7 +636,7 @@ LTTNG_TRACEPOINT_EVENT_CONDITION_MAP(update_swap_token_priority, ) #endif -#endif /* LTTNG_TRACE_VMSCAN_H */ +#endif /* LTTNG_TRACE_MM_VMSCAN_H */ /* This part must be outside protection */ #include "../../../probes/define_trace.h" diff --git a/instrumentation/events/lttng-module/printk.h b/instrumentation/events/lttng-module/printk.h index 16949c4d..fd7cccc3 100644 --- a/instrumentation/events/lttng-module/printk.h +++ b/instrumentation/events/lttng-module/printk.h @@ -9,7 +9,10 @@ #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,10,0)) -LTTNG_TRACEPOINT_EVENT(console, +LTTNG_TRACEPOINT_EVENT_MAP(console, + + printk_console, + TP_PROTO(const char *text, size_t len), TP_ARGS(text, len), @@ -27,7 +30,10 @@ LTTNG_TRACEPOINT_EVENT(console, #elif (LINUX_VERSION_CODE >= KERNEL_VERSION(3,5,0)) -LTTNG_TRACEPOINT_EVENT_CONDITION(console, +LTTNG_TRACEPOINT_EVENT_CONDITION_MAP(console, + + printk_console, + TP_PROTO(const char *log_buf, unsigned start, unsigned end, unsigned log_buf_len), @@ -48,7 +54,10 @@ LTTNG_TRACEPOINT_EVENT_CONDITION(console, #else /* (LINUX_VERSION_CODE < KERNEL_VERSION(3,5,0)) */ -LTTNG_TRACEPOINT_EVENT_CONDITION(console, +LTTNG_TRACEPOINT_EVENT_CONDITION_MAP(console, + + printk_console, + TP_PROTO(const char *log_buf, unsigned start, unsigned end, unsigned log_buf_len), diff --git a/instrumentation/events/lttng-module/regmap.h b/instrumentation/events/lttng-module/regmap.h index 87df6a6d..69e42161 100644 --- a/instrumentation/events/lttng-module/regmap.h +++ b/instrumentation/events/lttng-module/regmap.h @@ -121,7 +121,9 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE(regmap_block, regmap_hw_write_done, TP_ARGS(dev, reg, count) ) -LTTNG_TRACEPOINT_EVENT(regcache_sync, +LTTNG_TRACEPOINT_EVENT_MAP(regcache_sync, + + regmap_regcache_sync, TP_PROTO(struct device *dev, const char *type, const char *status), diff --git a/instrumentation/events/lttng-module/sunrpc.h b/instrumentation/events/lttng-module/rpc.h similarity index 96% rename from instrumentation/events/lttng-module/sunrpc.h rename to instrumentation/events/lttng-module/rpc.h index af9358cf..bcaafbc1 100644 --- a/instrumentation/events/lttng-module/sunrpc.h +++ b/instrumentation/events/lttng-module/rpc.h @@ -1,8 +1,8 @@ #undef TRACE_SYSTEM -#define TRACE_SYSTEM sunrpc +#define TRACE_SYSTEM rpc -#if !defined(LTTNG_TRACE_SUNRPC_H) || defined(TRACE_HEADER_MULTI_READ) -#define LTTNG_TRACE_SUNRPC_H +#if !defined(LTTNG_TRACE_RPC_H) || defined(TRACE_HEADER_MULTI_READ) +#define LTTNG_TRACE_RPC_H #include "../../../probes/lttng-tracepoint-event.h" #include @@ -172,6 +172,6 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE(rpc_task_queued, rpc_task_wakeup, ) -#endif /* LTTNG_TRACE_SUNRPC_H */ +#endif /* LTTNG_TRACE_RPC_H */ #include "../../../probes/define_trace.h" diff --git a/instrumentation/events/lttng-module/timer.h b/instrumentation/events/lttng-module/timer.h index 8bd67e50..5e409a0b 100644 --- a/instrumentation/events/lttng-module/timer.h +++ b/instrumentation/events/lttng-module/timer.h @@ -134,7 +134,9 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE(timer_class, timer_cancel, * @clockid: the hrtimers clock * @mode: the hrtimers mode */ -LTTNG_TRACEPOINT_EVENT(hrtimer_init, +LTTNG_TRACEPOINT_EVENT_MAP(hrtimer_init, + + timer_hrtimer_init, TP_PROTO(struct hrtimer *hrtimer, clockid_t clockid, enum hrtimer_mode mode), @@ -164,7 +166,9 @@ LTTNG_TRACEPOINT_EVENT(hrtimer_init, * hrtimer_start - called when the hrtimer is started * @timer: pointer to struct hrtimer */ -LTTNG_TRACEPOINT_EVENT(hrtimer_start, +LTTNG_TRACEPOINT_EVENT_MAP(hrtimer_start, + + timer_hrtimer_start, TP_PROTO(struct hrtimer *hrtimer), @@ -200,7 +204,9 @@ LTTNG_TRACEPOINT_EVENT(hrtimer_start, * * Allows to determine the timer latency. */ -LTTNG_TRACEPOINT_EVENT(hrtimer_expire_entry, +LTTNG_TRACEPOINT_EVENT_MAP(hrtimer_expire_entry, + + timer_hrtimer_expire_entry, TP_PROTO(struct hrtimer *hrtimer, ktime_t *now), @@ -222,7 +228,7 @@ LTTNG_TRACEPOINT_EVENT(hrtimer_expire_entry, (unsigned long long)ktime_to_ns((ktime_t) { .tv64 = __entry->now })) ) -LTTNG_TRACEPOINT_EVENT_CLASS(hrtimer_class, +LTTNG_TRACEPOINT_EVENT_CLASS(timer_hrtimer_class, TP_PROTO(struct hrtimer *hrtimer), @@ -246,7 +252,9 @@ LTTNG_TRACEPOINT_EVENT_CLASS(hrtimer_class, * When used in combination with the hrtimer_expire_entry tracepoint we can * determine the runtime of the callback function. */ -LTTNG_TRACEPOINT_EVENT_INSTANCE(hrtimer_class, hrtimer_expire_exit, +LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP(timer_hrtimer_class, hrtimer_expire_exit, + + timer_hrtimer_expire_exit, TP_PROTO(struct hrtimer *hrtimer), @@ -257,7 +265,9 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE(hrtimer_class, hrtimer_expire_exit, * hrtimer_cancel - called when the hrtimer is canceled * @hrtimer: pointer to struct hrtimer */ -LTTNG_TRACEPOINT_EVENT_INSTANCE(hrtimer_class, hrtimer_cancel, +LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP(timer_hrtimer_class, hrtimer_cancel, + + timer_hrtimer_cancel, TP_PROTO(struct hrtimer *hrtimer), @@ -271,7 +281,9 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE(hrtimer_class, hrtimer_cancel, * zero, otherwise it is started * @expires: the itimers expiry time */ -LTTNG_TRACEPOINT_EVENT(itimer_state, +LTTNG_TRACEPOINT_EVENT_MAP(itimer_state, + + timer_itimer_state, TP_PROTO(int which, const struct itimerval *const value, cputime_t expires), @@ -308,7 +320,9 @@ LTTNG_TRACEPOINT_EVENT(itimer_state, * @pid: pid of the process which owns the timer * @now: current time, used to calculate the latency of itimer */ -LTTNG_TRACEPOINT_EVENT(itimer_expire, +LTTNG_TRACEPOINT_EVENT_MAP(itimer_expire, + + timer_itimer_expire, TP_PROTO(int which, struct pid *pid, cputime_t now), diff --git a/probes/lttng-probe-sunrpc.c b/probes/lttng-probe-sunrpc.c index d990c1bc..258dbc18 100644 --- a/probes/lttng-probe-sunrpc.c +++ b/probes/lttng-probe-sunrpc.c @@ -37,7 +37,7 @@ #define CREATE_TRACE_POINTS #define TRACE_INCLUDE_PATH ../instrumentation/events/lttng-module -#include "../instrumentation/events/lttng-module/sunrpc.h" +#include "../instrumentation/events/lttng-module/rpc.h" MODULE_LICENSE("GPL and additional rights"); MODULE_AUTHOR("Andrew Gabbasov "); diff --git a/probes/lttng-probe-vmscan.c b/probes/lttng-probe-vmscan.c index 994e5145..c1e84a77 100644 --- a/probes/lttng-probe-vmscan.c +++ b/probes/lttng-probe-vmscan.c @@ -39,7 +39,7 @@ #define CREATE_TRACE_POINTS #define TRACE_INCLUDE_PATH ../instrumentation/events/lttng-module -#include "../instrumentation/events/lttng-module/vmscan.h" +#include "../instrumentation/events/lttng-module/mm_vmscan.h" MODULE_LICENSE("GPL and additional rights"); MODULE_AUTHOR("Wade Farnsworth , Paul Woegerer , and Andrew Gabbasov "); -- 2.34.1