@@ -112,8 +112,8 @@ sub sigint_handler {
112
112
my $regex_kswapd_wake_default = ' nid=([0-9]*) order=([0-9]*)' ;
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]*)' ;
115
- my $regex_lru_isolate_default = ' isolate_mode=([0-9]*) order=([0-9]*) nr_requested=([0-9]*) nr_scanned=([0-9]*) nr_taken =([0-9]*) file =([0-9]*)' ;
116
- my $regex_lru_shrink_inactive_default = ' nid=([0-9]*) zid =([0-9]*) nr_scanned =([0-9]*) nr_reclaimed =([0-9]*) priority=([0-9]*) flags=([A-Z_|]*)' ;
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_|]*)' ;
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
@@ -205,15 +205,15 @@ sub generate_traceevent_regex {
205
205
$regex_lru_isolate = generate_traceevent_regex(
206
206
" vmscan/mm_vmscan_lru_isolate" ,
207
207
$regex_lru_isolate_default ,
208
- " isolate_mode" , " order" ,
209
- " nr_requested" , " nr_scanned" , " nr_taken" ,
210
- " file " );
208
+ " isolate_mode" , " classzone_idx " , " order" ,
209
+ " nr_requested" , " nr_scanned" , " nr_skipped " , " nr_taken" ,
210
+ " lru " );
211
211
$regex_lru_shrink_inactive = generate_traceevent_regex(
212
212
" vmscan/mm_vmscan_lru_shrink_inactive" ,
213
213
$regex_lru_shrink_inactive_default ,
214
- " nid" , " zid " ,
215
- " nr_scanned " , " nr_reclaimed " , " priority " ,
216
- " flags" );
214
+ " nid" , " nr_scanned " , " nr_reclaimed " , " nr_dirty " , " nr_writeback " ,
215
+ " nr_congested " , " nr_immediate " , " nr_activate " , " nr_ref_keep " ,
216
+ " nr_unmap_fail " , " priority " , " flags" );
217
217
$regex_lru_shrink_active = generate_traceevent_regex(
218
218
" vmscan/mm_vmscan_lru_shrink_active" ,
219
219
$regex_lru_shrink_active_default ,
@@ -381,8 +381,8 @@ sub process_events {
381
381
next ;
382
382
}
383
383
my $isolate_mode = $1 ;
384
- my $nr_scanned = $4 ;
385
- my $file = $6 ;
384
+ my $nr_scanned = $5 ;
385
+ my $file = $8 ;
386
386
387
387
# To closer match vmstat scanning statistics, only count isolate_both
388
388
# and isolate_inactive as scanning. isolate_active is rotation
@@ -391,7 +391,7 @@ sub process_events {
391
391
# isolate_both == 3
392
392
if ($isolate_mode != 2) {
393
393
$perprocesspid {$process_pid }-> {HIGH_NR_SCANNED } += $nr_scanned ;
394
- if ($file == 1 ) {
394
+ if ($file =~ / _file / ) {
395
395
$perprocesspid {$process_pid }-> {HIGH_NR_FILE_SCANNED } += $nr_scanned ;
396
396
} else {
397
397
$perprocesspid {$process_pid }-> {HIGH_NR_ANON_SCANNED } += $nr_scanned ;
@@ -406,8 +406,8 @@ sub process_events {
406
406
next ;
407
407
}
408
408
409
- my $nr_reclaimed = $4 ;
410
- my $flags = $6 ;
409
+ my $nr_reclaimed = $3 ;
410
+ my $flags = $12 ;
411
411
my $file = 0;
412
412
if ($flags =~ / RECLAIM_WB_FILE/ ) {
413
413
$file = 1;
0 commit comments