swsusp: progress in percent
Subsystems (2)
Hi!
swsusp currently has very poor progress indication. Thanks to Erik Rigtorp <[email protected]>, we have percentages there, so people know how long wait to expect. Please apply,
[I'd prefer this to be start of "next batch" of changes to linus. It would be nice if linus could pull previous version from power tree...]
From: Erik Rigtorp <[email protected]>
Pavel
kernel/power/disk.c +14 -4
@@ -91,10 +91,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); }
kernel/power/swsusp.c +17 -9
@@ -296,15 +292,19 @@ {int error =0 ;int i; - -printk ("Writing data to swap (%d pages): " , nr_copy_pages ); +unsigned int mod = nr_copy_pages /100 ; + +if (!mod) + mod =1 ; + +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; }
@@ -1153,14 +1120,18 @@struct pbe * p;int error;int i; - +int mod = nr_copy_pages /100 ; + +if (!mod) + mod =1 ; +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); }
Salut,
Quoted 8 lines · Pavel Machek
kernel/power/disk.c +0
-2@@ -91,10 +91,20 @@static void free_some_memory (void ) { -printk ("Freeing memory: " ); -while (shrink_all_memory (10000 ))
kernel/power/disk.c line 101
Quoted 10 lines
kernel/power/disk.c +8
-2-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++)%4]); ?Quoted 19 lines
kernel/power/disk.c +2
-0+ } +printk ("\bdone (%li pages freed)\n" , pages); }kernel/power/swsusp.c +6
-2@@ -296,15 +292,19 @@ {int error =0 ;int i; - -printk ("Writing data to swap (%d pages): " , nr_copy_pages ); +unsigned int mod = nr_copy_pages /100 ; + +if (!mod) + mod =1 ; + +printk ("Writing data to swap (%d pages)... " , nr_copy_pages );
kernel/power/swsusp.c line 307
Quoted 10 lines
kernel/power/swsusp.c +3
-3for (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" );
Didn't we say we want the page count here?
Quoted 18 lines
kernel/power/swsusp.c +5
-1return error; }@@ -1153,14 +1120,18 @@struct pbe * p;int error;int i; - +int mod = nr_copy_pages /100 ; + +if (!mod) + mod =1 ; +if ((error =swsusp_pagedir_relocate ()))return error;
kernel/power/swsusp.c line 1137
Quoted 10 lines
kernel/power/swsusp.c +3
-3-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); }
Thanks for enlightenment.
Tonnerre
Quoted 4 lines · Tonnerre
kernel/power/swsusp.c line 307
Quoted 2 lines
kernel/power/swsusp.c +1
-1-printk (" %d Pages done.\n" ,i); +printk ("\b\b\b\bdone\n" );Didn't we say we want the page count here?
well, you usually won't see it anyway since after writing the pages to swap the machine should power off pretty soon :-)
Changing it to
printk("\b\b\b%d Pages done.\n",i);is no big deal though.
Stefan