diff options
Diffstat (limited to 'tools/vm/slabinfo.c')
| -rw-r--r-- | tools/vm/slabinfo.c | 25 |
1 files changed, 21 insertions, 4 deletions
diff --git a/tools/vm/slabinfo.c b/tools/vm/slabinfo.c index 2ef7f0ca0168..2e154f13c60e 100644 --- a/tools/vm/slabinfo.c +++ b/tools/vm/slabinfo.c @@ -80,6 +80,7 @@ int set_debug = 0; int show_ops = 0; int show_activity = 0; int output_lines = -1; +int sort_loss; /* Debug options */ int sanity = 0; @@ -126,6 +127,7 @@ static void usage(void) "-z|--zero Include empty slabs\n" "-1|--1ref Single reference\n" "-N|--lines=K Show the first K slabs\n" + "-L|--Loss Sort by loss\n" "\nValid debug options (FZPUT may be combined)\n" "a / A Switch on all debug options (=FZUP)\n" "- Switch off all debug options\n" @@ -301,8 +303,9 @@ static void first_line(void) if (show_activity) printf("Name Objects Alloc Free %%Fast Fallb O CmpX UL\n"); else - printf("Name Objects Objsize Space " - "Slabs/Part/Cpu O/S O %%Fr %%Ef Flg\n"); + printf("Name Objects Objsize %s " + "Slabs/Part/Cpu O/S O %%Fr %%Ef Flg\n", + sort_loss ? "Loss" : "Space"); } /* @@ -335,6 +338,11 @@ static unsigned long slab_activity(struct slabinfo *s) s->alloc_slowpath + s->free_slowpath; } +static unsigned long slab_waste(struct slabinfo *s) +{ + return slab_size(s) - s->objects * s->object_size; +} + static void slab_numa(struct slabinfo *s, int mode) { int node; @@ -563,7 +571,10 @@ static void slabcache(struct slabinfo *s) if (show_empty && s->slabs) return; - store_size(size_str, slab_size(s)); + if (sort_loss == 0) + store_size(size_str, slab_size(s)); + else + store_size(size_str, slab_waste(s)); snprintf(dist_str, 40, "%lu/%lu/%d", s->slabs - s->cpu_slabs, s->partial, s->cpu_slabs); @@ -1013,6 +1024,8 @@ static void sort_slabs(void) result = slab_size(s1) < slab_size(s2); else if (sort_active) result = slab_activity(s1) < slab_activity(s2); + else if (sort_loss) + result = slab_waste(s1) < slab_waste(s2); else result = strcasecmp(s1->name, s2->name); @@ -1291,6 +1304,7 @@ struct option opts[] = { { "zero", no_argument, NULL, 'z' }, { "1ref", no_argument, NULL, '1'}, { "lines", required_argument, NULL, 'N'}, + { "Loss", no_argument, NULL, 'L'}, { NULL, 0, NULL, 0 } }; @@ -1302,7 +1316,7 @@ int main(int argc, char *argv[]) page_size = getpagesize(); - while ((c = getopt_long(argc, argv, "aAd::Defhil1noprstvzTSN:", + while ((c = getopt_long(argc, argv, "aAd::Defhil1noprstvzTSN:L", opts, NULL)) != -1) switch (c) { case '1': @@ -1371,6 +1385,9 @@ int main(int argc, char *argv[]) output_lines = 1; } break; + case 'L': + sort_loss = 1; + break; default: fatal("%s: Invalid option '%c'\n", argv[0], optopt); |