From c94b360dc7071538862b58761c8850c52814dfa6 Mon Sep 17 00:00:00 2001 From: Mathieu Desnoyers Date: Fri, 20 Mar 2015 17:20:32 -0400 Subject: [PATCH] Fix: update instrumentation after wildcard rebase Signed-off-by: Mathieu Desnoyers --- instrumentation/events/lttng-module/jbd.h | 11 +--- instrumentation/events/lttng-module/kmem.h | 72 +++++----------------- instrumentation/events/lttng-module/kvm.h | 18 +++--- 3 files changed, 24 insertions(+), 77 deletions(-) diff --git a/instrumentation/events/lttng-module/jbd.h b/instrumentation/events/lttng-module/jbd.h index 335be5cb..a4abcfc7 100644 --- a/instrumentation/events/lttng-module/jbd.h +++ b/instrumentation/events/lttng-module/jbd.h @@ -146,16 +146,7 @@ LTTNG_TRACEPOINT_EVENT(jbd_update_superblock_end, TP_FIELDS( ctf_integer(dev_t, dev, journal->j_fs_dev->bd_dev) ctf_integer(int, wait, wait) - ), - - TP_fast_assign( - tp_assign(dev, journal->j_fs_dev->bd_dev) - tp_assign(wait, wait) - ), - - TP_printk("dev %d,%d wait %d", - MAJOR(__entry->dev), MINOR(__entry->dev), - __entry->wait) + ) ) #endif diff --git a/instrumentation/events/lttng-module/kmem.h b/instrumentation/events/lttng-module/kmem.h index c94f8af9..b8dc524e 100644 --- a/instrumentation/events/lttng-module/kmem.h +++ b/instrumentation/events/lttng-module/kmem.h @@ -213,35 +213,15 @@ LTTNG_TRACEPOINT_EVENT(mm_page_alloc_extfrag, alloc_order, fallback_order, alloc_migratetype, fallback_migratetype), - TP_STRUCT__entry( - __field_hex( struct page *, page ) - __field( int, alloc_order ) - __field( int, fallback_order ) - __field( int, alloc_migratetype ) - __field( int, fallback_migratetype ) - __field( int, change_ownership ) - ), - - TP_fast_assign( - tp_assign(page, page) - tp_assign(alloc_order, alloc_order) - tp_assign(fallback_order, fallback_order) - tp_assign(alloc_migratetype, alloc_migratetype) - tp_assign(fallback_migratetype, fallback_migratetype) - tp_assign(change_ownership, + TP_FIELDS( + ctf_integer_hex(struct page *, page, page) + ctf_integer(int, alloc_order, alloc_order) + ctf_integer(int, fallback_order, fallback_order) + ctf_integer(int, alloc_migratetype, alloc_migratetype) + ctf_integer(int, fallback_migratetype, fallback_migratetype) + ctf_integer(int, change_ownership, (alloc_migratetype == get_pageblock_migratetype(page))) - ), - - TP_printk("page=%p pfn=%lu alloc_order=%d fallback_order=%d pageblock_order=%d alloc_migratetype=%d fallback_migratetype=%d fragmenting=%d change_ownership=%d", - __entry->page, - page_to_pfn(__entry->page), - __entry->alloc_order, - __entry->fallback_order, - pageblock_order, - __entry->alloc_migratetype, - __entry->fallback_migratetype, - __entry->fallback_order < pageblock_order, - __entry->change_ownership) + ) ) #elif (LINUX_VERSION_CODE >= KERNEL_VERSION(3,12,30)) @@ -256,34 +236,14 @@ LTTNG_TRACEPOINT_EVENT(mm_page_alloc_extfrag, alloc_order, fallback_order, alloc_migratetype, fallback_migratetype, new_migratetype), - TP_STRUCT__entry( - __field_hex( struct page *, page ) - __field( int, alloc_order ) - __field( int, fallback_order ) - __field( int, alloc_migratetype ) - __field( int, fallback_migratetype ) - __field( int, change_ownership ) - ), - - TP_fast_assign( - tp_assign(page, page) - tp_assign(alloc_order, alloc_order) - tp_assign(fallback_order, fallback_order) - tp_assign(alloc_migratetype, alloc_migratetype) - tp_assign(fallback_migratetype, fallback_migratetype) - tp_assign(change_ownership, (new_migratetype == alloc_migratetype)) - ), - - TP_printk("page=%p pfn=%lu alloc_order=%d fallback_order=%d pageblock_order=%d alloc_migratetype=%d fallback_migratetype=%d fragmenting=%d change_ownership=%d", - __entry->page, - page_to_pfn(__entry->page), - __entry->alloc_order, - __entry->fallback_order, - pageblock_order, - __entry->alloc_migratetype, - __entry->fallback_migratetype, - __entry->fallback_order < pageblock_order, - __entry->change_ownership) + TP_FIELDS( + ctf_integer_hex(struct page *, page, page) + ctf_integer(int, alloc_order, alloc_order) + ctf_integer(int, fallback_order, fallback_order) + ctf_integer(int, alloc_migratetype, alloc_migratetype) + ctf_integer(int, fallback_migratetype, fallback_migratetype) + ctf_integer(int, change_ownership, (new_migratetype == alloc_migratetype)) + ) ) #elif (LINUX_VERSION_CODE >= KERNEL_VERSION(3,12,0)) diff --git a/instrumentation/events/lttng-module/kvm.h b/instrumentation/events/lttng-module/kvm.h index 3a6585fb..4547c6d8 100755 --- a/instrumentation/events/lttng-module/kvm.h +++ b/instrumentation/events/lttng-module/kvm.h @@ -124,17 +124,13 @@ LTTNG_TRACEPOINT_EVENT(kvm_age_page, __field( u8, referenced ) ), - TP_fast_assign( - tp_assign(gfn, gfn) - tp_assign(level, level) - tp_assign(hva, ((gfn - slot->base_gfn) << - PAGE_SHIFT) + slot->userspace_addr) - tp_assign(referenced, ref) - ), - - TP_printk("hva %llx gfn %llx level %u %s", - __entry->hva, __entry->gfn, __entry->level, - __entry->referenced ? "YOUNG" : "OLD") + TP_FIELDS( + ctf_integer(u64, hva, + ((gfn - slot->base_gfn) << PAGE_SHIFT) + slot->userspace_addr) + ctf_integer(u64, gfn, gfn) + ctf_integer(u8, level, level) + ctf_integer(u8, referenced, ref) + ) ) #else -- 2.34.1