Update vmscan instrumentation to 3.16 kernel

[lttng-modules.git] / instrumentation / events / lttng-module / vmscan.h

diff --git a/instrumentation/events/lttng-module/vmscan.h b/instrumentation/events/lttng-module/vmscan.h
index c137310a96a576cab8667a814817b1ccafd798f3..0b4aa56761dc3db9f461412c35fc7b105f3189d7 100644 (file)
--- a/instrumentation/events/lttng-module/vmscan.h
+++ b/instrumentation/events/lttng-module/vmscan.h
@@ -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,6 +238,44 @@ TRACE_EVENT(mm_shrink_slab_start,
                __entry->total_scan)
 )
 
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,16,0))
+TRACE_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)) */
 TRACE_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,6 +312,7 @@ 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,
@@ -485,7 +532,10 @@ TRACE_EVENT(mm_vmscan_lru_shrink_inactive,
 #endif
 
 #if (LINUX_VERSION_CODE < KERNEL_VERSION(3,5,0))
-TRACE_EVENT(replace_swap_token,
+TRACE_EVENT_MAP(replace_swap_token,
+
+       mm_vmscan_replace_swap_token,
+
        TP_PROTO(struct mm_struct *old_mm,
                 struct mm_struct *new_mm),
 
@@ -510,7 +560,7 @@ TRACE_EVENT(replace_swap_token,
                  __entry->new_mm, __entry->new_prio)
 )
 
-DECLARE_EVENT_CLASS(put_swap_token_template,
+DECLARE_EVENT_CLASS(mm_vmscan_put_swap_token_template,
        TP_PROTO(struct mm_struct *swap_token_mm),
 
        TP_ARGS(swap_token_mm),
@@ -526,18 +576,27 @@ DECLARE_EVENT_CLASS(put_swap_token_template,
        TP_printk("token_mm=%p", __entry->swap_token_mm)
 )
 
-DEFINE_EVENT(put_swap_token_template, put_swap_token,
+DEFINE_EVENT_MAP(mm_vmscan_put_swap_token_template, put_swap_token,
+
+       mm_vmscan_put_swap_token,
+
        TP_PROTO(struct mm_struct *swap_token_mm),
        TP_ARGS(swap_token_mm)
 )
 
-DEFINE_EVENT_CONDITION(put_swap_token_template, disable_swap_token,
+DEFINE_EVENT_CONDITION_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)
 )
 
-TRACE_EVENT_CONDITION(update_swap_token_priority,
+TRACE_EVENT_CONDITION_MAP(update_swap_token_priority,
+
+       mm_vmscan_update_swap_token_priority,
+
        TP_PROTO(struct mm_struct *mm,
                 unsigned int old_prio,
                 struct mm_struct *swap_token_mm),