leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

SLUB: slabinfo fixes

Browse Source 
Align the output of % with K/M/G of sizes.

Check for empty NUMA information to avoid segfault on !NUMA.

-r should work directly not only if we match a single slab
   without additional options.

Signed-off-by: Christoph Lameter <clameter@sgi.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Christoph Lameter 2007-05-16 22:10:55 -07:00 committed by Linus Torvalds
parent ade3aff25f
commit eefaca9c32
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Documentation/vm/slabinfo.c
View File

@ -242,6 +242,9 @@ void decode_numa_list(int *numa, char *t)
memset(numa, 0, MAX_NODES * sizeof(int)); memset(numa, 0, MAX_NODES * sizeof(int));
if (!t)
return;
while (*t == 'N') { while (*t == 'N') {
t++; t++;
node = strtoul(t, &t, 10); node = strtoul(t, &t, 10);
@ -386,7 +389,9 @@ void report(struct slabinfo *s)
{ {
if (strcmp(s->name, "*") == 0) if (strcmp(s->name, "*") == 0)
return; return;
printf("\nSlabcache: %-20s Aliases: %2d Order : %2d\n", s->name, s->aliases, s->order);
printf("\nSlabcache: %-20s Aliases: %2d Order : %2d Objects: %d\n",
s->name, s->aliases, s->order, s->objects);
if (s->hwcache_align) if (s->hwcache_align)
printf("** Hardware cacheline aligned\n"); printf("** Hardware cacheline aligned\n");
if (s->cache_dma) if (s->cache_dma)
@ -791,11 +796,11 @@ void totals(void)
store_size(b1, total_size);store_size(b2, total_waste); store_size(b1, total_size);store_size(b2, total_waste);
store_size(b3, total_waste * 100 / total_used); store_size(b3, total_waste * 100 / total_used);
printf("Memory used: %6s # Loss : %6s MRatio: %6s%%\n", b1, b2, b3); printf("Memory used: %6s # Loss : %6s MRatio:%6s%%\n", b1, b2, b3);
store_size(b1, total_objects);store_size(b2, total_partobj); store_size(b1, total_objects);store_size(b2, total_partobj);
store_size(b3, total_partobj * 100 / total_objects); store_size(b3, total_partobj * 100 / total_objects);
printf("# Objects : %6s # PartObj: %6s ORatio: %6s%%\n", b1, b2, b3); printf("# Objects : %6s # PartObj: %6s ORatio:%6s%%\n", b1, b2, b3);
printf("\n"); printf("\n");
printf("Per Cache Average Min Max Total\n"); printf("Per Cache Average Min Max Total\n");
@ -818,7 +823,7 @@ void totals(void)
store_size(b1, avg_ppart);store_size(b2, min_ppart); store_size(b1, avg_ppart);store_size(b2, min_ppart);
store_size(b3, max_ppart); store_size(b3, max_ppart);
store_size(b4, total_partial * 100 / total_slabs); store_size(b4, total_partial * 100 / total_slabs);
printf("%%PartSlab %10s%% %10s%% %10s%% %10s%%\n", printf("%%PartSlab%10s%% %10s%% %10s%% %10s%%\n",
b1, b2, b3, b4); b1, b2, b3, b4);
store_size(b1, avg_partobj);store_size(b2, min_partobj); store_size(b1, avg_partobj);store_size(b2, min_partobj);
@ -830,7 +835,7 @@ void totals(void)
store_size(b1, avg_ppartobj);store_size(b2, min_ppartobj); store_size(b1, avg_ppartobj);store_size(b2, min_ppartobj);
store_size(b3, max_ppartobj); store_size(b3, max_ppartobj);
store_size(b4, total_partobj * 100 / total_objects); store_size(b4, total_partobj * 100 / total_objects);
printf("%% PartObj %10s%% %10s%% %10s%% %10s%%\n", printf("%% PartObj%10s%% %10s%% %10s%% %10s%%\n",
b1, b2, b3, b4); b1, b2, b3, b4);
store_size(b1, avg_size);store_size(b2, min_size); store_size(b1, avg_size);store_size(b2, min_size);
@ -1100,6 +1105,8 @@ void output_slabs(void)
ops(slab); ops(slab);
else if (show_slab) else if (show_slab)
slabcache(slab); slabcache(slab);
else if (show_report)
report(slab);
} }
} }