X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=instrumentation%2Fevents%2Flttng-module%2Fmm_vmscan.h;h=a6d7fbf23560e2be8c6757923e8e826434caade1;hb=f127e61ee231d002fb9a7803643a157e06f6d2e2;hp=870c0264b5a53835f8c9bacda9bf347329d13a7c;hpb=07dfc1d0e4b093ad02682499a702dc11e54e8302;p=lttng-modules.git

diff --git a/instrumentation/events/lttng-module/mm_vmscan.h b/instrumentation/events/lttng-module/mm_vmscan.h
index 870c0264..a6d7fbf2 100644
--- a/instrumentation/events/lttng-module/mm_vmscan.h
+++ b/instrumentation/events/lttng-module/mm_vmscan.h
@@ -19,25 +19,6 @@
 #define RECLAIM_WB_SYNC		0x0004u /* Unused, all reclaim async */
 #define RECLAIM_WB_ASYNC	0x0008u
 
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,37))
-#define show_reclaim_flags(flags)				\
-	(flags) ? __print_flags(flags, "|",			\
-		{RECLAIM_WB_ANON,	"RECLAIM_WB_ANON"},	\
-		{RECLAIM_WB_FILE,	"RECLAIM_WB_FILE"},	\
-		{RECLAIM_WB_MIXED,	"RECLAIM_WB_MIXED"},	\
-		{RECLAIM_WB_SYNC,	"RECLAIM_WB_SYNC"},	\
-		{RECLAIM_WB_ASYNC,	"RECLAIM_WB_ASYNC"}	\
-		) : "RECLAIM_WB_NONE"
-#else
-#define show_reclaim_flags(flags)				\
-	(flags) ? __print_flags(flags, "|",			\
-		{RECLAIM_WB_ANON,	"RECLAIM_WB_ANON"},	\
-		{RECLAIM_WB_FILE,	"RECLAIM_WB_FILE"},	\
-		{RECLAIM_WB_SYNC,	"RECLAIM_WB_SYNC"},	\
-		{RECLAIM_WB_ASYNC,	"RECLAIM_WB_ASYNC"}	\
-		) : "RECLAIM_WB_NONE"
-#endif
-
 #if ((LINUX_VERSION_CODE <= KERNEL_VERSION(3,0,38)) || \
 	LTTNG_KERNEL_RANGE(3,1,0, 3,2,0))
 typedef int isolate_mode_t;
@@ -51,15 +32,9 @@ LTTNG_TRACEPOINT_EVENT(mm_vmscan_kswapd_sleep,
 
 	TP_ARGS(nid),
 
-	TP_STRUCT__entry(
-		__field(	int,	nid	)
-	),
-
-	TP_fast_assign(
-		tp_assign(nid, nid)
-	),
-
-	TP_printk("nid=%d", __entry->nid)
+	TP_FIELDS(
+		ctf_integer(int, nid, nid)
+	)
 )
 
 LTTNG_TRACEPOINT_EVENT(mm_vmscan_kswapd_wake,
@@ -68,17 +43,10 @@ LTTNG_TRACEPOINT_EVENT(mm_vmscan_kswapd_wake,
 
 	TP_ARGS(nid, order),
 
-	TP_STRUCT__entry(
-		__field(	int,	nid	)
-		__field(	int,	order	)
-	),
-
-	TP_fast_assign(
-		tp_assign(nid, nid)
-		tp_assign(order, order)
-	),
-
-	TP_printk("nid=%d order=%d", __entry->nid, __entry->order)
+	TP_FIELDS(
+		ctf_integer(int, nid, nid)
+		ctf_integer(int, order, order)
+	)
 )
 
 LTTNG_TRACEPOINT_EVENT(mm_vmscan_wakeup_kswapd,
@@ -87,22 +55,11 @@ LTTNG_TRACEPOINT_EVENT(mm_vmscan_wakeup_kswapd,
 
 	TP_ARGS(nid, zid, order),
 
-	TP_STRUCT__entry(
-		__field(	int,		nid	)
-		__field(	int,		zid	)
-		__field(	int,		order	)
-	),
-
-	TP_fast_assign(
-		tp_assign(nid, nid)
-		tp_assign(zid, zid)
-		tp_assign(order, order)
-	),
-
-	TP_printk("nid=%d zid=%d order=%d",
-		__entry->nid,
-		__entry->zid,
-		__entry->order)
+	TP_FIELDS(
+		ctf_integer(int, nid, nid)
+		ctf_integer(int, zid, zid)
+		ctf_integer(int, order, order)
+	)
 )
 
 LTTNG_TRACEPOINT_EVENT_CLASS(mm_vmscan_direct_reclaim_begin_template,
@@ -111,22 +68,11 @@ LTTNG_TRACEPOINT_EVENT_CLASS(mm_vmscan_direct_reclaim_begin_template,
 
 	TP_ARGS(order, may_writepage, gfp_flags),
 
-	TP_STRUCT__entry(
-		__field(	int,	order		)
-		__field(	int,	may_writepage	)
-		__field(	gfp_t,	gfp_flags	)
-	),
-
-	TP_fast_assign(
-		tp_assign(order, order)
-		tp_assign(may_writepage, may_writepage)
-		tp_assign(gfp_flags, gfp_flags)
-	),
-
-	TP_printk("order=%d may_writepage=%d gfp_flags=%s",
-		__entry->order,
-		__entry->may_writepage,
-		show_gfp_flags(__entry->gfp_flags))
+	TP_FIELDS(
+		ctf_integer(int, order, order)
+		ctf_integer(int, may_writepage, may_writepage)
+		ctf_integer(gfp_t, gfp_flags, gfp_flags)
+	)
 )
 
 LTTNG_TRACEPOINT_EVENT_INSTANCE(mm_vmscan_direct_reclaim_begin_template, mm_vmscan_direct_reclaim_begin,
@@ -156,15 +102,9 @@ LTTNG_TRACEPOINT_EVENT_CLASS(mm_vmscan_direct_reclaim_end_template,
 
 	TP_ARGS(nr_reclaimed),
 
-	TP_STRUCT__entry(
-		__field(	unsigned long,	nr_reclaimed	)
-	),
-
-	TP_fast_assign(
-		tp_assign(nr_reclaimed, nr_reclaimed)
-	),
-
-	TP_printk("nr_reclaimed=%lu", __entry->nr_reclaimed)
+	TP_FIELDS(
+		ctf_integer(unsigned long, nr_reclaimed, nr_reclaimed)
+	)
 )
 
 LTTNG_TRACEPOINT_EVENT_INSTANCE(mm_vmscan_direct_reclaim_end_template, mm_vmscan_direct_reclaim_end,
@@ -201,44 +141,21 @@ LTTNG_TRACEPOINT_EVENT_MAP(mm_shrink_slab_start,
 	TP_ARGS(shr, sc, nr_objects_to_shrink, pgs_scanned, lru_pgs,
 		cache_items, delta, total_scan),
 
-	TP_STRUCT__entry(
-		__field(struct shrinker *, shr)
-		__field(void *, shrink)
-		__field(long, nr_objects_to_shrink)
-		__field(gfp_t, gfp_flags)
-		__field(unsigned long, pgs_scanned)
-		__field(unsigned long, lru_pgs)
-		__field(unsigned long, cache_items)
-		__field(unsigned long long, delta)
-		__field(unsigned long, total_scan)
-	),
-
-	TP_fast_assign(
-		tp_assign(shr,shr)
+	TP_FIELDS(
+		ctf_integer(struct shrinker *, shr, shr)
 #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,12,0))
-		tp_assign(shrink, shr->scan_objects)
+		ctf_integer(void *, shrink, shr->scan_objects)
 #else /* #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,12,0)) */
-		tp_assign(shrink, shr->shrink)
+		ctf_integer(void *, shrink, shr->shrink)
 #endif /* #else #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,12,0)) */
-		tp_assign(nr_objects_to_shrink, nr_objects_to_shrink)
-		tp_assign(gfp_flags, sc->gfp_mask)
-		tp_assign(pgs_scanned, pgs_scanned)
-		tp_assign(lru_pgs, lru_pgs)
-		tp_assign(cache_items, cache_items)
-		tp_assign(delta, delta)
-		tp_assign(total_scan, total_scan)
-	),
-
-	TP_printk("%pF %p: objects to shrink %ld gfp_flags %s pgs_scanned %ld lru_pgs %ld cache items %ld delta %lld total_scan %ld",
-		__entry->shrink,
-		__entry->shr,
-		__entry->nr_objects_to_shrink,
-		show_gfp_flags(__entry->gfp_flags),
-		__entry->pgs_scanned,
-		__entry->lru_pgs,
-		__entry->cache_items,
-		__entry->delta,
-		__entry->total_scan)
+		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(unsigned long, lru_pgs, lru_pgs)
+		ctf_integer(unsigned long, cache_items, cache_items)
+		ctf_integer(unsigned long long, delta, delta)
+		ctf_integer(unsigned long, total_scan, total_scan)
+	)
 )
 
 #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,16,0))
@@ -252,34 +169,15 @@ LTTNG_TRACEPOINT_EVENT_MAP(mm_shrink_slab_end,
 	TP_ARGS(shr, nid, shrinker_retval, unused_scan_cnt, new_scan_cnt,
 		total_scan),
 
-	TP_STRUCT__entry(
-		__field(struct shrinker *, shr)
-		__field(int, nid)
-		__field(void *, shrink)
-		__field(long, unused_scan)
-		__field(long, new_scan)
-		__field(int, retval)
-		__field(long, total_scan)
-	),
-
-	TP_fast_assign(
-		tp_assign(shr, shr)
-		tp_assign(nid, nid)
-		tp_assign(shrink, shr->scan_objects)
-		tp_assign(unused_scan, unused_scan_cnt)
-		tp_assign(new_scan, new_scan_cnt)
-		tp_assign(retval, shrinker_retval)
-		tp_assign(total_scan, total_scan)
-	),
-
-	TP_printk("%pF %p: nid %d unused scan count %ld new scan count %ld total_scan %ld last shrinker return val %d",
-		__entry->shrink,
-		__entry->shr,
-		__entry->nid,
-		__entry->unused_scan,
-		__entry->new_scan,
-		__entry->total_scan,
-		__entry->retval)
+	TP_FIELDS(
+		ctf_integer(struct shrinker *, shr, shr)
+		ctf_integer(int, nid, nid)
+		ctf_integer(void *, shrink, shr->scan_objects)
+		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, total_scan, total_scan)
+	)
 )
 #else /* #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,16,0)) */
 LTTNG_TRACEPOINT_EVENT_MAP(mm_shrink_slab_end,
@@ -291,35 +189,18 @@ LTTNG_TRACEPOINT_EVENT_MAP(mm_shrink_slab_end,
 
 	TP_ARGS(shr, shrinker_retval, unused_scan_cnt, new_scan_cnt),
 
-	TP_STRUCT__entry(
-		__field(struct shrinker *, shr)
-		__field(void *, shrink)
-		__field(long, unused_scan)
-		__field(long, new_scan)
-		__field(int, retval)
-		__field(long, total_scan)
-	),
-
-	TP_fast_assign(
-		tp_assign(shr, shr)
+	TP_FIELDS(
+		ctf_integer(struct shrinker *, shr, shr)
 #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,12,0))
-		tp_assign(shrink, shr->scan_objects)
+		ctf_integer(void *, shrink, shr->scan_objects)
 #else /* #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,12,0)) */
-		tp_assign(shrink, shr->shrink)
+		ctf_integer(void *, shrink, shr->shrink)
 #endif /* #else #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,12,0)) */
-		tp_assign(unused_scan, unused_scan_cnt)
-		tp_assign(new_scan, new_scan_cnt)
-		tp_assign(retval, shrinker_retval)
-		tp_assign(total_scan, new_scan_cnt - unused_scan_cnt)
-	),
-
-	TP_printk("%pF %p: unused scan count %ld new scan count %ld total_scan %ld last shrinker return val %d",
-		__entry->shrink,
-		__entry->shr,
-		__entry->unused_scan,
-		__entry->new_scan,
-		__entry->total_scan,
-		__entry->retval)
+		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, total_scan, new_scan_cnt - unused_scan_cnt)
+	)
 )
 #endif /* #else #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,16,0)) */
 #endif
@@ -355,68 +236,21 @@ LTTNG_TRACEPOINT_EVENT_CLASS(mm_vmscan_lru_isolate_template,
 	),
 
 
-	TP_STRUCT__entry(
-		__field(int, order)
-		__field(unsigned long, nr_requested)
-		__field(unsigned long, nr_scanned)
-		__field(unsigned long, nr_taken)
+	TP_FIELDS(
+		ctf_integer(int, order, order)
+		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 (LINUX_VERSION_CODE < KERNEL_VERSION(3,5,0))
-		__field(unsigned long, nr_lumpy_taken)
-		__field(unsigned long, nr_lumpy_dirty)
-		__field(unsigned long, nr_lumpy_failed)
+		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
-		__field(isolate_mode_t, isolate_mode)
+		ctf_integer(isolate_mode_t, isolate_mode, isolate_mode)
 #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,3,0))
-		__field(int, file)
-#endif
-	),
-
-	TP_fast_assign(
-		tp_assign(order, order)
-		tp_assign(nr_requested, nr_requested)
-		tp_assign(nr_scanned, nr_scanned)
-		tp_assign(nr_taken, nr_taken)
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(3,5,0))
-		tp_assign(nr_lumpy_taken, nr_lumpy_taken)
-		tp_assign(nr_lumpy_dirty, nr_lumpy_dirty)
-		tp_assign(nr_lumpy_failed, nr_lumpy_failed)
-#endif
-		tp_assign(isolate_mode, isolate_mode)
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,3,0))
-		tp_assign(file, file)
-#endif
-	),
-
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(3,3,0))
-	TP_printk("isolate_mode=%d order=%d nr_requested=%lu nr_scanned=%lu nr_taken=%lu contig_taken=%lu contig_dirty=%lu contig_failed=%lu",
-		__entry->isolate_mode,
-		__entry->order,
-		__entry->nr_requested,
-		__entry->nr_scanned,
-		__entry->nr_taken,
-		__entry->nr_lumpy_taken,
-		__entry->nr_lumpy_dirty,
-		__entry->nr_lumpy_failed)
-#elif (LINUX_VERSION_CODE < KERNEL_VERSION(3,5,0))
-	TP_printk("isolate_mode=%d order=%d nr_requested=%lu nr_scanned=%lu nr_taken=%lu contig_taken=%lu contig_dirty=%lu contig_failed=%lu file=%d",
-		__entry->isolate_mode,
-		__entry->order,
-		__entry->nr_requested,
-		__entry->nr_scanned,
-		__entry->nr_taken,
-		__entry->nr_lumpy_taken,
-		__entry->nr_lumpy_dirty,
-		__entry->nr_lumpy_failed,
-		__entry->file)
-#else
-	TP_printk("isolate_mode=%d order=%d nr_requested=%lu nr_scanned=%lu nr_taken=%lu file=%d",
-		__entry->isolate_mode,
-		__entry->order,
-		__entry->nr_requested,
-		__entry->nr_scanned,
-		__entry->nr_taken,
-		__entry->file)
+		ctf_integer(int, file, file)
 #endif
+	)
 )
 
 LTTNG_TRACEPOINT_EVENT_INSTANCE(mm_vmscan_lru_isolate_template, mm_vmscan_lru_isolate,
@@ -489,20 +323,10 @@ LTTNG_TRACEPOINT_EVENT(mm_vmscan_writepage,
 
 	TP_ARGS(page, reclaim_flags),
 
-	TP_STRUCT__entry(
-		__field(struct page *, page)
-		__field(int, reclaim_flags)
-	),
-
-	TP_fast_assign(
-		tp_assign(page, page)
-		tp_assign(reclaim_flags, reclaim_flags)
-	),
-
-	TP_printk("page=%p pfn=%lu flags=%s",
-		__entry->page,
-		page_to_pfn(__entry->page),
-		show_reclaim_flags(__entry->reclaim_flags))
+	TP_FIELDS(
+		ctf_integer(struct page *, page, page)
+		ctf_integer(int, reclaim_flags, reclaim_flags)
+	)
 )
 
 #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,37))
@@ -514,29 +338,14 @@ LTTNG_TRACEPOINT_EVENT(mm_vmscan_lru_shrink_inactive,
 
 	TP_ARGS(nid, zid, nr_scanned, nr_reclaimed, priority, reclaim_flags),
 
-	TP_STRUCT__entry(
-		__field(int, nid)
-		__field(int, zid)
-		__field(unsigned long, nr_scanned)
-		__field(unsigned long, nr_reclaimed)
-		__field(int, priority)
-		__field(int, reclaim_flags)
-	),
-
-	TP_fast_assign(
-		tp_assign(nid, nid)
-		tp_assign(zid, zid)
-		tp_assign(nr_scanned, nr_scanned)
-		tp_assign(nr_reclaimed, nr_reclaimed)
-		tp_assign(priority, priority)
-		tp_assign(reclaim_flags, reclaim_flags)
-	),
-
-	TP_printk("nid=%d zid=%d nr_scanned=%ld nr_reclaimed=%ld priority=%d flags=%s",
-		__entry->nid, __entry->zid,
-		__entry->nr_scanned, __entry->nr_reclaimed,
-		__entry->priority,
-		show_reclaim_flags(__entry->reclaim_flags))
+	TP_FIELDS(
+		ctf_integer(int, nid, nid)
+		ctf_integer(int, zid, zid)
+		ctf_integer(unsigned long, nr_scanned, nr_scanned)
+		ctf_integer(unsigned long, nr_reclaimed, nr_reclaimed)
+		ctf_integer(int, priority, priority)
+		ctf_integer(int, reclaim_flags, reclaim_flags)
+	)
 )
 #endif
 
@@ -550,23 +359,12 @@ LTTNG_TRACEPOINT_EVENT_MAP(replace_swap_token,
 
 	TP_ARGS(old_mm, new_mm),
 
-	TP_STRUCT__entry(
-		__field(struct mm_struct*,	old_mm)
-		__field(unsigned int,		old_prio)
-		__field(struct mm_struct*,	new_mm)
-		__field(unsigned int,		new_prio)
-	),
-
-	TP_fast_assign(
-		tp_assign(old_mm, old_mm)
-		tp_assign(old_prio, old_mm ? old_mm->token_priority : 0)
-		tp_assign(new_mm, new_mm)
-		tp_assign(new_prio, new_mm->token_priority)
-	),
-
-	TP_printk("old_token_mm=%p old_prio=%u new_token_mm=%p new_prio=%u",
-		  __entry->old_mm, __entry->old_prio,
-		  __entry->new_mm, __entry->new_prio)
+	TP_FIELDS(
+		ctf_integer(struct mm_struct *, old_mm, old_mm)
+		ctf_integer(unsigned int, old_prio, old_mm ? old_mm->token_priority : 0)
+		ctf_integer(struct mm_struct *, new_mm, new_mm)
+		ctf_integer(unsigned int, new_prio, new_mm->token_priority)
+	)
 )
 
 LTTNG_TRACEPOINT_EVENT_CLASS(mm_vmscan_put_swap_token_template,
@@ -574,15 +372,9 @@ LTTNG_TRACEPOINT_EVENT_CLASS(mm_vmscan_put_swap_token_template,
 
 	TP_ARGS(swap_token_mm),
 
-	TP_STRUCT__entry(
-		__field(struct mm_struct*, swap_token_mm)
-	),
-
-	TP_fast_assign(
-		tp_assign(swap_token_mm, swap_token_mm)
-	),
-
-	TP_printk("token_mm=%p", __entry->swap_token_mm)
+	TP_FIELDS(
+		ctf_integer(struct mm_struct*, swap_token_mm, swap_token_mm)
+	)
 )
 
 LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP(mm_vmscan_put_swap_token_template, put_swap_token,
@@ -593,16 +385,15 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP(mm_vmscan_put_swap_token_template, put_swap_
 	TP_ARGS(swap_token_mm)
 )
 
-LTTNG_TRACEPOINT_EVENT_INSTANCE_CONDITION_MAP(mm_vmscan_put_swap_token_template, disable_swap_token,
+LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP(mm_vmscan_put_swap_token_template, disable_swap_token,
 
 	mm_vmscan_disable_swap_token,
 
 	TP_PROTO(struct mm_struct *swap_token_mm),
-	TP_ARGS(swap_token_mm),
-	TP_CONDITION(swap_token_mm != NULL)
+	TP_ARGS(swap_token_mm)
 )
 
-LTTNG_TRACEPOINT_EVENT_CONDITION_MAP(update_swap_token_priority,
+LTTNG_TRACEPOINT_EVENT_MAP(update_swap_token_priority,
 
 	mm_vmscan_update_swap_token_priority,
 
@@ -612,27 +403,13 @@ LTTNG_TRACEPOINT_EVENT_CONDITION_MAP(update_swap_token_priority,
 
 	TP_ARGS(mm, old_prio, swap_token_mm),
 
-	TP_CONDITION(mm->token_priority != old_prio),
-
-	TP_STRUCT__entry(
-		__field(struct mm_struct*, mm)
-		__field(unsigned int, old_prio)
-		__field(unsigned int, new_prio)
-		__field(struct mm_struct*, swap_token_mm)
-		__field(unsigned int, swap_token_prio)
-	),
-
-	TP_fast_assign(
-		tp_assign(mm, mm)
-		tp_assign(old_prio, old_prio)
-		tp_assign(new_prio, mm->token_priority)
-		tp_assign(swap_token_mm, swap_token_mm)
-		tp_assign(swap_token_prio, swap_token_mm ? swap_token_mm->token_priority : 0)
-	),
-
-	TP_printk("mm=%p old_prio=%u new_prio=%u swap_token_mm=%p token_prio=%u",
-		  __entry->mm, __entry->old_prio, __entry->new_prio,
-		  __entry->swap_token_mm, __entry->swap_token_prio)
+	TP_FIELDS(
+		ctf_integer(struct mm_struct*, mm, mm)
+		ctf_integer(unsigned int, old_prio, old_prio)
+		ctf_integer(unsigned int, new_prio, mm->token_priority)
+		ctf_integer(struct mm_struct*, swap_token_mm, swap_token_mm)
+		ctf_integer(unsigned int, swap_token_prio, swap_token_mm ? swap_token_mm->token_priority : 0)
+	)
 )
 #endif