Skip to contentSkip to conversation

trim output of show_mem()

PATCH In review Jes Sorensen 2 participants 3 messages Sep 13, 2006 – Sep 14, 2006

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 trim output of show_mem()

Hi,

This patch goes on top of the patch I posted earlier today. It trims the number of lines of memory information output per node down from 5 lines to one line per node. Kinda helps if you have 1024 live nodes in a system and you are dumping to the console :)

Cheers,
Jes

Cut the number of lines of memory info output per node from five to one line.

---
 arch/ia64/mm/discontig.c |    9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

Index: linux-2.6/arch/ia64/mm/discontig.c =================================--- linux-2.6.orig/arch/ia64/mm/discontig.c +++ linux-2.6/arch/ia64/mm/discontig.c
@@ -551,12 +551,13 @@ void show_mem(void)
show_free_areas();
printk(KERN_INFO "Free swap: %6ldkB\n",
nr_swap_pages<<(PAGE_SHIFT-10));
+ printk(KERN_INFO "Node memory in pages:\n");
for_each_online_pgdat(pgdat) {
unsigned long present;
unsigned long flags;
int shared = 0, cached = 0, reserved = 0;

- printk(KERN_INFO "Node ID: %d\n", pgdat->node_id);
+ printk(KERN_INFO "Node %d:", pgdat->node_id);
pgdat_resize_lock(pgdat, &flags); present = pgdat->node_present_pages; for(i = 0; i < pgdat->node_spanned_pages; i++) {
@@ -580,10 +581,8 @@ void show_mem(void)
total_reserved += reserved; total_cached += cached;
total_shared += shared;
- printk(KERN_INFO "\t%ld pages of RAM\n", present);
- printk(KERN_INFO "\t%d reserved pages\n", reserved);
- printk(KERN_INFO "\t%d pages shared\n", shared);
- printk(KERN_INFO "\t%d pages swap cached\n", cached);
+ printk("\tRAM: %ld, reserved: %d, shared: %d, "
+ "swap cached: %d\n", present, reserved, shared, cached);
}
printk(KERN_INFO "%ld pages of RAM\n", total_present); printk(KERN_INFO "%d reserved pages\n", total_reserved);

#1 lore raw
Quoted 3 lines

This patch goes on top of the patch I posted earlier today. It trims the number of lines of memory information output per node down from 5 lines to one line per node. Kinda helps if you have 1024 live nodes in

That is a great improvement!

Quoted 1 line
(quoted diff) +1 -0
+		printk(KERN_INFO "Node %d:", pgdat->node_id);

...

Review

Quoted 2 lines
(quoted diff) +2 -0
+		printk("\tRAM: %ld, reserved: %d, shared: %d, "
+		       "swap cached: %d\n", present, reserved, shared, cached);

What about making these fixed width fields.

Quoted 1 line
(quoted diff) +1 -0
+		printk(KERN_INFO "Node %4d: ", pgdat->node_id);

...

Review

Quoted 2 lines
(quoted diff) +2 -0
+		printk("RAM: %11ld, rsvd: %8d, shrd: %10d, swpd: %10d\n",
+				present, reserved, shared, cached);

Note, I changed the one tab to a space and abbreviated. This puts things into an 80 column display. How would you feel about putting the two printks together?

Thanks,
Robin

#2 lore raw
In reply to Jes Sorensen
Quoted 6 lines
Quoted 6 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Robin" = Robin Holt <[email protected]> writes:

This patch goes on top of the patch I posted earlier today. It trims the number of lines of memory information output per node down from 5 lines to one line per node. Kinda helps if you have 1024 live nodes in

Robin> That is a great improvement!

:-)

Robin> Note, I changed the one tab to a space and abbreviated. This Robin> puts things into an 80 column display. How would you feel Robin> about putting the two printks together?

Looks good to me, Tony will you take this one instead?

Tested and all ;)

Cheers,
Jes

Cut the number of lines of memory info output per node from five to one line.

---
 arch/ia64/mm/discontig.c |    9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

Index: linux-2.6/arch/ia64/mm/discontig.c =================================--- linux-2.6.orig/arch/ia64/mm/discontig.c +++ linux-2.6/arch/ia64/mm/discontig.c
@@ -551,12 +551,12 @@ void show_mem(void)
show_free_areas();
printk(KERN_INFO "Free swap: %6ldkB\n",
nr_swap_pages<<(PAGE_SHIFT-10));
+ printk(KERN_INFO "Node memory in pages:\n");
for_each_online_pgdat(pgdat) {
unsigned long present;
unsigned long flags;
int shared = 0, cached = 0, reserved = 0;

- printk(KERN_INFO "Node ID: %d\n", pgdat->node_id);
pgdat_resize_lock(pgdat, &flags); present = pgdat->node_present_pages; for(i = 0; i < pgdat->node_spanned_pages; i++) {
@@ -580,10 +580,9 @@ void show_mem(void)
total_reserved += reserved; total_cached += cached;
total_shared += shared;
- printk(KERN_INFO "\t%ld pages of RAM\n", present);
- printk(KERN_INFO "\t%d reserved pages\n", reserved);
- printk(KERN_INFO "\t%d pages shared\n", shared);
- printk(KERN_INFO "\t%d pages swap cached\n", cached);
+ printk(KERN_INFO "Node %4d: RAM: %11ld, rsvd: %8d, "
+ "shrd: %10d, swpd: %10d\n", pgdat->node_id,
+ present, reserved, shared, cached);
}
printk(KERN_INFO "%ld pages of RAM\n", total_present); printk(KERN_INFO "%d reserved pages\n", total_reserved);