X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=instrumentation%2Fevents%2Flttng-module%2Fvmscan.h;h=4eadc634310e27d2992db66f4af73cd359753d21;hb=12318fb8ab85115216ef4355032320fae4d7941a;hp=e7a1074280fb593888b637eefb39936d218a3398;hpb=9cf29d3eaffa56199259919c90108de84724b4fb;p=lttng-modules.git diff --git a/instrumentation/events/lttng-module/vmscan.h b/instrumentation/events/lttng-module/vmscan.h index e7a10742..4eadc634 100644 --- a/instrumentation/events/lttng-module/vmscan.h +++ b/instrumentation/events/lttng-module/vmscan.h @@ -1,11 +1,11 @@ #undef TRACE_SYSTEM #define TRACE_SYSTEM vmscan -#if !defined(_TRACE_VMSCAN_H) || defined(TRACE_HEADER_MULTI_READ) -#define _TRACE_VMSCAN_H +#if !defined(LTTNG_TRACE_VMSCAN_H) || defined(TRACE_HEADER_MULTI_READ) +#define LTTNG_TRACE_VMSCAN_H +#include "../../../probes/lttng-tracepoint-event.h" #include -#include #include #include #include @@ -45,7 +45,7 @@ typedef int isolate_mode_t; #endif -TRACE_EVENT(mm_vmscan_kswapd_sleep, +LTTNG_TRACEPOINT_EVENT(mm_vmscan_kswapd_sleep, TP_PROTO(int nid), @@ -62,7 +62,7 @@ TRACE_EVENT(mm_vmscan_kswapd_sleep, TP_printk("nid=%d", __entry->nid) ) -TRACE_EVENT(mm_vmscan_kswapd_wake, +LTTNG_TRACEPOINT_EVENT(mm_vmscan_kswapd_wake, TP_PROTO(int nid, int order), @@ -81,7 +81,7 @@ TRACE_EVENT(mm_vmscan_kswapd_wake, TP_printk("nid=%d order=%d", __entry->nid, __entry->order) ) -TRACE_EVENT(mm_vmscan_wakeup_kswapd, +LTTNG_TRACEPOINT_EVENT(mm_vmscan_wakeup_kswapd, TP_PROTO(int nid, int zid, int order), @@ -105,7 +105,7 @@ TRACE_EVENT(mm_vmscan_wakeup_kswapd, __entry->order) ) -DECLARE_EVENT_CLASS(mm_vmscan_direct_reclaim_begin_template, +LTTNG_TRACEPOINT_EVENT_CLASS(mm_vmscan_direct_reclaim_begin_template, TP_PROTO(int order, int may_writepage, gfp_t gfp_flags), @@ -129,28 +129,28 @@ DECLARE_EVENT_CLASS(mm_vmscan_direct_reclaim_begin_template, show_gfp_flags(__entry->gfp_flags)) ) -DEFINE_EVENT(mm_vmscan_direct_reclaim_begin_template, mm_vmscan_direct_reclaim_begin, +LTTNG_TRACEPOINT_EVENT_INSTANCE(mm_vmscan_direct_reclaim_begin_template, mm_vmscan_direct_reclaim_begin, TP_PROTO(int order, int may_writepage, gfp_t gfp_flags), TP_ARGS(order, may_writepage, gfp_flags) ) -DEFINE_EVENT(mm_vmscan_direct_reclaim_begin_template, mm_vmscan_memcg_reclaim_begin, +LTTNG_TRACEPOINT_EVENT_INSTANCE(mm_vmscan_direct_reclaim_begin_template, mm_vmscan_memcg_reclaim_begin, TP_PROTO(int order, int may_writepage, gfp_t gfp_flags), TP_ARGS(order, may_writepage, gfp_flags) ) -DEFINE_EVENT(mm_vmscan_direct_reclaim_begin_template, mm_vmscan_memcg_softlimit_reclaim_begin, +LTTNG_TRACEPOINT_EVENT_INSTANCE(mm_vmscan_direct_reclaim_begin_template, mm_vmscan_memcg_softlimit_reclaim_begin, TP_PROTO(int order, int may_writepage, gfp_t gfp_flags), TP_ARGS(order, may_writepage, gfp_flags) ) -DECLARE_EVENT_CLASS(mm_vmscan_direct_reclaim_end_template, +LTTNG_TRACEPOINT_EVENT_CLASS(mm_vmscan_direct_reclaim_end_template, TP_PROTO(unsigned long nr_reclaimed), @@ -167,21 +167,21 @@ DECLARE_EVENT_CLASS(mm_vmscan_direct_reclaim_end_template, TP_printk("nr_reclaimed=%lu", __entry->nr_reclaimed) ) -DEFINE_EVENT(mm_vmscan_direct_reclaim_end_template, mm_vmscan_direct_reclaim_end, +LTTNG_TRACEPOINT_EVENT_INSTANCE(mm_vmscan_direct_reclaim_end_template, mm_vmscan_direct_reclaim_end, TP_PROTO(unsigned long nr_reclaimed), TP_ARGS(nr_reclaimed) ) -DEFINE_EVENT(mm_vmscan_direct_reclaim_end_template, mm_vmscan_memcg_reclaim_end, +LTTNG_TRACEPOINT_EVENT_INSTANCE(mm_vmscan_direct_reclaim_end_template, mm_vmscan_memcg_reclaim_end, TP_PROTO(unsigned long nr_reclaimed), TP_ARGS(nr_reclaimed) ) -DEFINE_EVENT(mm_vmscan_direct_reclaim_end_template, mm_vmscan_memcg_softlimit_reclaim_end, +LTTNG_TRACEPOINT_EVENT_INSTANCE(mm_vmscan_direct_reclaim_end_template, mm_vmscan_memcg_softlimit_reclaim_end, TP_PROTO(unsigned long nr_reclaimed), @@ -189,7 +189,7 @@ DEFINE_EVENT(mm_vmscan_direct_reclaim_end_template, mm_vmscan_memcg_softlimit_re ) #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,1,0)) -TRACE_EVENT(mm_shrink_slab_start, +LTTNG_TRACEPOINT_EVENT(mm_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, @@ -212,7 +212,11 @@ TRACE_EVENT(mm_shrink_slab_start, TP_fast_assign( tp_assign(shr,shr) +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,12,0)) + tp_assign(shrink, shr->scan_objects) +#else /* #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,12,0)) */ tp_assign(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) @@ -234,7 +238,45 @@ TRACE_EVENT(mm_shrink_slab_start, __entry->total_scan) ) -TRACE_EVENT(mm_shrink_slab_end, +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,16,0)) +LTTNG_TRACEPOINT_EVENT(mm_shrink_slab_end, + TP_PROTO(struct shrinker *shr, int nid, int shrinker_retval, + long unused_scan_cnt, long new_scan_cnt, long total_scan), + + 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) +) +#else /* #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,16,0)) */ +LTTNG_TRACEPOINT_EVENT(mm_shrink_slab_end, TP_PROTO(struct shrinker *shr, int shrinker_retval, long unused_scan_cnt, long new_scan_cnt), @@ -251,7 +293,11 @@ TRACE_EVENT(mm_shrink_slab_end, TP_fast_assign( tp_assign(shr, shr) +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,12,0)) + tp_assign(shrink, shr->scan_objects) +#else /* #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,12,0)) */ tp_assign(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) @@ -266,9 +312,10 @@ TRACE_EVENT(mm_shrink_slab_end, __entry->total_scan, __entry->retval) ) +#endif /* #else #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,16,0)) */ #endif -DECLARE_EVENT_CLASS(mm_vmscan_lru_isolate_template, +LTTNG_TRACEPOINT_EVENT_CLASS(mm_vmscan_lru_isolate_template, TP_PROTO(int order, unsigned long nr_requested, @@ -363,7 +410,7 @@ DECLARE_EVENT_CLASS(mm_vmscan_lru_isolate_template, #endif ) -DEFINE_EVENT(mm_vmscan_lru_isolate_template, mm_vmscan_lru_isolate, +LTTNG_TRACEPOINT_EVENT_INSTANCE(mm_vmscan_lru_isolate_template, mm_vmscan_lru_isolate, TP_PROTO(int order, unsigned long nr_requested, @@ -395,7 +442,7 @@ DEFINE_EVENT(mm_vmscan_lru_isolate_template, mm_vmscan_lru_isolate, ) -DEFINE_EVENT(mm_vmscan_lru_isolate_template, mm_vmscan_memcg_isolate, +LTTNG_TRACEPOINT_EVENT_INSTANCE(mm_vmscan_lru_isolate_template, mm_vmscan_memcg_isolate, TP_PROTO(int order, unsigned long nr_requested, @@ -426,7 +473,7 @@ DEFINE_EVENT(mm_vmscan_lru_isolate_template, mm_vmscan_memcg_isolate, ) ) -TRACE_EVENT(mm_vmscan_writepage, +LTTNG_TRACEPOINT_EVENT(mm_vmscan_writepage, TP_PROTO(struct page *page, int reclaim_flags), @@ -450,7 +497,7 @@ TRACE_EVENT(mm_vmscan_writepage, ) #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,37)) -TRACE_EVENT(mm_vmscan_lru_shrink_inactive, +LTTNG_TRACEPOINT_EVENT(mm_vmscan_lru_shrink_inactive, TP_PROTO(int nid, int zid, unsigned long nr_scanned, unsigned long nr_reclaimed, @@ -485,7 +532,7 @@ TRACE_EVENT(mm_vmscan_lru_shrink_inactive, #endif #if (LINUX_VERSION_CODE < KERNEL_VERSION(3,5,0)) -TRACE_EVENT_MAP(replace_swap_token, +LTTNG_TRACEPOINT_EVENT_MAP(replace_swap_token, mm_vmscan_replace_swap_token, @@ -513,7 +560,7 @@ TRACE_EVENT_MAP(replace_swap_token, __entry->new_mm, __entry->new_prio) ) -DECLARE_EVENT_CLASS(mm_vmscan_put_swap_token_template, +LTTNG_TRACEPOINT_EVENT_CLASS(mm_vmscan_put_swap_token_template, TP_PROTO(struct mm_struct *swap_token_mm), TP_ARGS(swap_token_mm), @@ -529,7 +576,7 @@ DECLARE_EVENT_CLASS(mm_vmscan_put_swap_token_template, TP_printk("token_mm=%p", __entry->swap_token_mm) ) -DEFINE_EVENT_MAP(put_swap_token_template, put_swap_token, +LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP(mm_vmscan_put_swap_token_template, put_swap_token, mm_vmscan_put_swap_token, @@ -537,7 +584,7 @@ DEFINE_EVENT_MAP(put_swap_token_template, put_swap_token, TP_ARGS(swap_token_mm) ) -DEFINE_EVENT_CONDITION_MAP(put_swap_token_template, disable_swap_token, +LTTNG_TRACEPOINT_EVENT_INSTANCE_CONDITION_MAP(mm_vmscan_put_swap_token_template, disable_swap_token, mm_vmscan_disable_swap_token, @@ -546,7 +593,7 @@ DEFINE_EVENT_CONDITION_MAP(put_swap_token_template, disable_swap_token, TP_CONDITION(swap_token_mm != NULL) ) -TRACE_EVENT_CONDITION_MAP(update_swap_token_priority, +LTTNG_TRACEPOINT_EVENT_CONDITION_MAP(update_swap_token_priority, mm_vmscan_update_swap_token_priority, @@ -580,7 +627,7 @@ TRACE_EVENT_CONDITION_MAP(update_swap_token_priority, ) #endif -#endif /* _TRACE_VMSCAN_H */ +#endif /* LTTNG_TRACE_VMSCAN_H */ /* This part must be outside protection */ #include "../../../probes/define_trace.h"