From 902c7f2601d78a47e4318b6da7a1964c4851d8cc Mon Sep 17 00:00:00 2001 From: KOSAKI Motohiro Date: Mon, 9 Aug 2010 17:19:57 -0700 Subject: [PATCH] --- yaml --- r: 207276 b: refs/heads/master c: cc8e970c3ce4d98afa8eb02dbd2526ce57f7611a h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/include/trace/events/vmscan.h | 15 +++++++++++++++ trunk/mm/memcontrol.c | 6 ++++++ 3 files changed, 22 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 496b9c18ba91..c6d8fa695463 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e17613c39b8894c164df782d0508c27ca559c24b +refs/heads/master: cc8e970c3ce4d98afa8eb02dbd2526ce57f7611a diff --git a/trunk/include/trace/events/vmscan.h b/trunk/include/trace/events/vmscan.h index d9656444a7ca..370aa5a87322 100644 --- a/trunk/include/trace/events/vmscan.h +++ b/trunk/include/trace/events/vmscan.h @@ -231,6 +231,21 @@ DEFINE_EVENT(mm_vmscan_lru_isolate_template, mm_vmscan_lru_isolate, ); +DEFINE_EVENT(mm_vmscan_lru_isolate_template, mm_vmscan_memcg_isolate, + + TP_PROTO(int order, + unsigned long nr_requested, + unsigned long nr_scanned, + unsigned long nr_taken, + unsigned long nr_lumpy_taken, + unsigned long nr_lumpy_dirty, + unsigned long nr_lumpy_failed, + int isolate_mode), + + TP_ARGS(order, nr_requested, nr_scanned, nr_taken, nr_lumpy_taken, nr_lumpy_dirty, nr_lumpy_failed, isolate_mode) + +); + TRACE_EVENT(mm_vmscan_writepage, TP_PROTO(struct page *page, diff --git a/trunk/mm/memcontrol.c b/trunk/mm/memcontrol.c index de54ea0094a1..0576e9e64586 100644 --- a/trunk/mm/memcontrol.c +++ b/trunk/mm/memcontrol.c @@ -51,6 +51,8 @@ #include +#include + struct cgroup_subsys mem_cgroup_subsys __read_mostly; #define MEM_CGROUP_RECLAIM_RETRIES 5 struct mem_cgroup *root_mem_cgroup __read_mostly; @@ -1007,6 +1009,10 @@ unsigned long mem_cgroup_isolate_pages(unsigned long nr_to_scan, } *scanned = scan; + + trace_mm_vmscan_memcg_isolate(0, nr_to_scan, scan, nr_taken, + 0, 0, 0, mode); + return nr_taken; }