.. | .. |
---|
113 | 113 | my $regex_kswapd_sleep_default = 'nid=([0-9]*)'; |
---|
114 | 114 | my $regex_wakeup_kswapd_default = 'nid=([0-9]*) zid=([0-9]*) order=([0-9]*) gfp_flags=([A-Z_|]*)'; |
---|
115 | 115 | my $regex_lru_isolate_default = 'isolate_mode=([0-9]*) classzone_idx=([0-9]*) order=([0-9]*) nr_requested=([0-9]*) nr_scanned=([0-9]*) nr_skipped=([0-9]*) nr_taken=([0-9]*) lru=([a-z_]*)'; |
---|
116 | | -my $regex_lru_shrink_inactive_default = 'nid=([0-9]*) nr_scanned=([0-9]*) nr_reclaimed=([0-9]*) nr_dirty=([0-9]*) nr_writeback=([0-9]*) nr_congested=([0-9]*) nr_immediate=([0-9]*) nr_activate=([0-9]*) nr_ref_keep=([0-9]*) nr_unmap_fail=([0-9]*) priority=([0-9]*) flags=([A-Z_|]*)'; |
---|
| 116 | +my $regex_lru_shrink_inactive_default = 'nid=([0-9]*) nr_scanned=([0-9]*) nr_reclaimed=([0-9]*) nr_dirty=([0-9]*) nr_writeback=([0-9]*) nr_congested=([0-9]*) nr_immediate=([0-9]*) nr_activate_anon=([0-9]*) nr_activate_file=([0-9]*) nr_ref_keep=([0-9]*) nr_unmap_fail=([0-9]*) priority=([0-9]*) flags=([A-Z_|]*)'; |
---|
117 | 117 | my $regex_lru_shrink_active_default = 'lru=([A-Z_]*) nr_scanned=([0-9]*) nr_rotated=([0-9]*) priority=([0-9]*)'; |
---|
118 | 118 | my $regex_writepage_default = 'page=([0-9a-f]*) pfn=([0-9]*) flags=([A-Z_|]*)'; |
---|
119 | 119 | |
---|
.. | .. |
---|
212 | 212 | "vmscan/mm_vmscan_lru_shrink_inactive", |
---|
213 | 213 | $regex_lru_shrink_inactive_default, |
---|
214 | 214 | "nid", "nr_scanned", "nr_reclaimed", "nr_dirty", "nr_writeback", |
---|
215 | | - "nr_congested", "nr_immediate", "nr_activate", "nr_ref_keep", |
---|
| 215 | + "nr_congested", "nr_immediate", "nr_activate_anon", |
---|
| 216 | + "nr_activate_file", "nr_ref_keep", |
---|
216 | 217 | "nr_unmap_fail", "priority", "flags"); |
---|
217 | 218 | $regex_lru_shrink_active = generate_traceevent_regex( |
---|
218 | 219 | "vmscan/mm_vmscan_lru_shrink_active", |
---|
.. | .. |
---|
407 | 408 | } |
---|
408 | 409 | |
---|
409 | 410 | my $nr_reclaimed = $3; |
---|
410 | | - my $flags = $12; |
---|
| 411 | + my $flags = $13; |
---|
411 | 412 | my $file = 0; |
---|
412 | 413 | if ($flags =~ /RECLAIM_WB_FILE/) { |
---|
413 | 414 | $file = 1; |
---|