From c1c25fdc36cd6634aa0e54e7f7560b7391498478 Mon Sep 17 00:00:00 2001 From: KOSAKI Motohiro Date: Mon, 9 Aug 2010 17:19:55 -0700 Subject: [PATCH] --- yaml --- r: 207273 b: refs/heads/master c: cf4dcc3e9b374e1b61a7c22faf868707ce78d6a9 h: refs/heads/master i: 207271: 5d8e89e6f209220402e9d5d232051b838e34f4ae v: v3 --- [refs] | 2 +- trunk/include/trace/events/vmscan.h | 19 +++++++++++++++++-- 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 63a15a4405bb..66058d63634b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4dc4b3d971b23e12d483ba9f3b93b648c54b298a +refs/heads/master: cf4dcc3e9b374e1b61a7c22faf868707ce78d6a9 diff --git a/trunk/include/trace/events/vmscan.h b/trunk/include/trace/events/vmscan.h index 69789dc72100..f9f2747bc1c1 100644 --- a/trunk/include/trace/events/vmscan.h +++ b/trunk/include/trace/events/vmscan.h @@ -86,7 +86,7 @@ TRACE_EVENT(mm_vmscan_wakeup_kswapd, __entry->order) ); -TRACE_EVENT(mm_vmscan_direct_reclaim_begin, +DECLARE_EVENT_CLASS(mm_vmscan_direct_reclaim_begin_template, TP_PROTO(int order, int may_writepage, gfp_t gfp_flags), @@ -110,7 +110,15 @@ TRACE_EVENT(mm_vmscan_direct_reclaim_begin, show_gfp_flags(__entry->gfp_flags)) ); -TRACE_EVENT(mm_vmscan_direct_reclaim_end, +DEFINE_EVENT(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) +); + + +DECLARE_EVENT_CLASS(mm_vmscan_direct_reclaim_end_template, TP_PROTO(unsigned long nr_reclaimed), @@ -127,6 +135,13 @@ TRACE_EVENT(mm_vmscan_direct_reclaim_end, TP_printk("nr_reclaimed=%lu", __entry->nr_reclaimed) ); +DEFINE_EVENT(mm_vmscan_direct_reclaim_end_template, mm_vmscan_direct_reclaim_end, + + TP_PROTO(unsigned long nr_reclaimed), + + TP_ARGS(nr_reclaimed) +); + TRACE_EVENT(mm_vmscan_lru_isolate, TP_PROTO(int order,