make swsusp produce nicer screen output

Hi!

I made a small patch that makes swsusp produce a bit nicer screen output, it's still a little rough though.

diff -Nru linux-2.6.8.1-mm2/kernel/power/swsusp.c linux-2.6.8.1-mm2-erkki/kernel/power/swsusp.c

kernel/power/swsusp.c +0 -0

@@ -296,15 +296,16 @@
 {
 	int error = 0;
 	int i;

kernel/power/swsusp.c +3 -2

 		error = write_page((pagedir_nosave+i)->address,
 					  &((pagedir_nosave+i)->swap_address));
 	}
-	printk(" %d Pages done.\n",i);
+	printk("\b\b\b\bdone\n");
 	return error;
 }
 

@@ -1150,14 +1151,15 @@
 	struct pbe * p;
 	int error;
 	int i;
-
+	int mod = nr_copy_pages / 100;
+	

I made a small patch that makes swsusp produce a bit nicer screen output, it's still a little rough though.

kernel/power/disk.c +2 -4

@@ -85,10 +85,17 @@
 
 static void free_some_memory(void)
 {
-	printk("Freeing memory: ");
-	while (shrink_all_memory(10000))
-		printk(".");
-	printk("|\n");
+	int i = 0;
+	char *p = "-\|/";

Well, it looks nice, be sure to submit smooth version :-).

Quoted 14 lines

kernel/power/disk.c +6 -4

@@ -85,10 +85,17 @@
 
 static void free_some_memory(void)
 {
-	printk("Freeing memory: ");
-	while (shrink_all_memory(10000))
-		printk(".");
-	printk("|\n");
+	int i = 0;
+	char *p = "-\|/";
+	
+	printk("Freeing memory:  ");
+	while (shrink_all_memory(10000)) {
+		printk("\b%c", p[i]);

kernel/power/disk.c line 99

Quoted 6 lines

kernel/power/disk.c +5 -0

+		i++;
+		if (i > 3)
+			i = 0;
+	}
+	printk("\bdone\n");
 }

I'd leave dots here. Its usefull to see if it done something or not.

Quoted 1 line

Well, it looks nice, be sure to submit smooth version :-).

I'm working on it :).

Quoted 1 line

I'd leave dots here. Its usefull to see if it done something or not.

Well, it will display a spinning thingy that is updated every time shrink_all_memory(10000) returns. Maybe you want to see how much memory was freed?

And do we need to handle the case when nr_copy_pages < 100?

Hi!

Quoted 2 lines

And do we need to handle the case when nr_copy_pages < 100?

It really should not crash. 100 pages is 4MB. Thats little low but seems possible.

Pavel

Hi!

Quoted 2 lines

Quoted 1 line

Well, it looks nice, be sure to submit smooth version :-).

I'm working on it :).

Quoted 5 lines

Quoted 1 line

I'd leave dots here. Its usefull to see if it done something or not.

Well, it will display a spinning thingy that is updated every time shrink_all_memory(10000) returns. Maybe you want to see how much memory was freed?

Yes, it is quite important to see how many pages were freed even after freeing stopped. "done (1234 pages freed)" would solve it...

Quoted 2 lines

And do we need to handle the case when nr_copy_pages < 100?

It really should not crash. 100 pages is 4MB. Thats little low but seems possible.

Quoted 2 lines · Pavel Machek

It really should not crash. 100 pages is 4MB. Thats little low but seems possible.

Well it's probably best to handle this case, to be on the safe side.

Here's a new version of the patch.

Quoted 11 lines

Quoted 8 lines

Quoted 1 line

Well, it looks nice, be sure to submit smooth version :-).

I'm working on it :).

Quoted 1 line

I'd leave dots here. Its usefull to see if it done something or not.

Well, it will display a spinning thingy that is updated every time shrink_all_memory(10000) returns. Maybe you want to see how much memory was freed?

Yes, it is quite important to see how many pages were freed even after freeing stopped. "done (1234 pages freed)" would solve it...

Added code for this in the new patch

Quoted 1 line

Quoted 4 lines

Quoted 1 line

And do we need to handle the case when nr_copy_pages < 100?

It really should not crash. 100 pages is 4MB. Thats little low but seems possible.

Well it's probably best to handle this case, to be on the safe side.

Here's a new version of the patch.

diff -Nru linux-2.6.8.1-mm2/kernel/power/disk.c linux-2.6.8.1-mm2-erkki/kernel/power/disk.c

kernel/power/disk.c +14 -4

@@ -85,10 +85,20 @@
 
 static void free_some_memory(void)
 {
-	printk("Freeing memory: ");
-	while (shrink_all_memory(10000))
-		printk(".");
-	printk("|\n");
+	unsigned int i = 0;
+	unsigned int tmp;
+	unsigned long pages = 0;
+	char *p = "-\\|/";
+	
+	printk("Freeing memory...  ");
+	while (tmp = shrink_all_memory(10000)) {
+		pages += tmp;
+		printk("\b%c", p[i]);
+		i++;
+		if (i > 3)
+			i = 0;
+	}
+	printk("\bdone (%li pages freed)\n", pages);
 }
 
 

diff -Nru linux-2.6.8.1-mm2/kernel/power/swsusp.c linux-2.6.8.1-mm2-erkki/kernel/power/swsusp.c

kernel/power/swsusp.c +49 -13

@@ -296,15 +296,21 @@
 {
 	int error = 0;
 	int i;
-
-	printk( "Writing data to swap (%d pages): ", nr_copy_pages );
+	unsigned int mod;
+	
+	if (nr_copy_pages < 100)
+		mod = 1;
+	else
+		mod = nr_copy_pages / 100;
+	
+	printk( "Writing data to swap (%d pages)...     ", nr_copy_pages );
 	for (i = 0; i < nr_copy_pages && !error; i++) {
-		if (!(i%100))
-			printk( "." );
+		if (!(i%mod))
+			printk( "\b\b\b\b%3d%%", i / mod );
 		error = write_page((pagedir_nosave+i)->address,
 					  &((pagedir_nosave+i)->swap_address));
 	}
-	printk(" %d Pages done.\n",i);
+	printk("\b\b\b\bdone\n");
 	return error;
 }
 

@@ -534,8 +540,6 @@
 	if (!pfn_valid(pfn))
 		return 0;
 
-	if (!(pfn%1000))
-		printk(".");
 	page = pfn_to_page(pfn);
 	BUG_ON(PageReserved(page) && PageNosave(page));
 	if (PageNosave(page))

@@ -556,15 +560,28 @@
 {
 	struct zone *zone;
 	unsigned long zone_pfn;
+	unsigned long mod;
+	
+	printk("Counting pages...     ");
 
 	nr_copy_pages = 0;
 
 	for_each_zone(zone) {
 		if (!is_highmem(zone)) {
-			for (zone_pfn = 0; zone_pfn < zone->spanned_pages; ++zone_pfn)
+			if (zone->spanned_pages < 100)
+				mod = 1;
+			else
+				mod = zone->spanned_pages / 100;
+			
+			for (zone_pfn = 0; zone_pfn < zone->spanned_pages; ++zone_pfn) {
 				nr_copy_pages += saveable(zone, &zone_pfn);
+				if (!(zone_pfn % mod))
+					printk("\b\b\b\b%3ld%%", zone_pfn / mod);
+			}
 		}
 	}
+	
+	printk("\b\b\b\bdone\n");
 }
 
 

@@ -573,9 +590,17 @@
 	struct zone *zone;
 	unsigned long zone_pfn;
 	struct pbe * pbe = pagedir_nosave;
+	unsigned long mod;
 
+	printk("Copying pages...     ");
+
 	for_each_zone(zone) {
-		if (!is_highmem(zone))
+		if (!is_highmem(zone)) {
+			if (zone->spanned_pages < 100)
+				mod = 1;
+			else
+				mod = zone->spanned_pages / 100;
+			
 			for (zone_pfn = 0; zone_pfn < zone->spanned_pages; ++zone_pfn) {
 				if (saveable(zone, &zone_pfn)) {
 					struct page * page;

@@ -584,9 +609,14 @@
 					/* copy_page is no usable for copying task structs. */
 					memcpy((void *)pbe->address, (void *)pbe->orig_address, PAGE_SIZE);
 					pbe++;
+					if (!(zone_pfn % mod))
+						printk("\b\b\b\b%3ld%%", zone_pfn / mod);
 				}
 			}
+		}
 	}
+	
+	printk("\b\b\b\bdone\n");
 }
 
 

@@ -1150,14 +1180,20 @@
 	struct pbe * p;
 	int error;
 	int i;
-
+	int mod;
+	
+	if (nr_copy_pages < 100)
+		mod = 1;
+	else
+		mod = nr_copy_pages / 100;
+	
 	if ((error = swsusp_pagedir_relocate()))
 		return error;
 
-	printk( "Reading image data (%d pages): ", nr_copy_pages );
+	printk( "Reading image data (%d pages):     ", nr_copy_pages );
 	for(i = 0, p = pagedir_nosave; i < nr_copy_pages && !error; i++, p++) {
-		if (!(i%100))
-			printk( "." );
+		if (!(i%mod))
+			printk( "\b\b\b\b%3d%%", i / mod );
 		error = bio_read_page(swp_offset(p->swap_address),
 				  (void *)p->address);
 	}

Quoted 5 lines

Quoted 5 lines

Quoted 1 line

Well, it looks nice, be sure to submit smooth version :-).

I'm working on it :).

Quoted 1 line

I'd leave dots here. Its usefull to see if it done something or not.

Quoted 6 lines

Quoted 3 lines

Well, it will display a spinning thingy that is updated every time shrink_all_memory(10000) returns. Maybe you want to see how much memory was freed?

Yes, it is quite important to see how many pages were freed even after freeing stopped. "done (1234 pages freed)" would solve it...

Added code for this in the new patch

Quoted 4 lines

Quoted 2 lines

And do we need to handle the case when nr_copy_pages < 100?

It really should not crash. 100 pages is 4MB. Thats little low but seems possible.

400k IIUC :-), and although it seems impossible, we still should not crash if we counted it wrong for some strange reason.