PM / Hibernate: Print hibernation/thaw progress indicator one line at a time.
With the introduction of suspend to both into in-kernel hibernation code, dmesg was getting polluted with backspace characters printed as part of image saving progress indicator. This patch introduces printing of progress indicator on image save/load every 10% and one line at a time. As an additional benefit, all other messages emitted by the kernel during hibernation/thaw should now print cleanly as well. Signed-off-by: Bojan Smojver <bojan@rexursive.com> Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
This commit is contained in:
parent
b2df1d4f8b
commit
d8150d3504
|
@ -448,9 +448,9 @@ static int save_image(struct swap_map_handle *handle,
|
||||||
struct timeval start;
|
struct timeval start;
|
||||||
struct timeval stop;
|
struct timeval stop;
|
||||||
|
|
||||||
printk(KERN_INFO "PM: Saving image data pages (%u pages) ... ",
|
printk(KERN_INFO "PM: Saving image data pages (%u pages)...\n",
|
||||||
nr_to_write);
|
nr_to_write);
|
||||||
m = nr_to_write / 100;
|
m = nr_to_write / 10;
|
||||||
if (!m)
|
if (!m)
|
||||||
m = 1;
|
m = 1;
|
||||||
nr_pages = 0;
|
nr_pages = 0;
|
||||||
|
@ -464,7 +464,8 @@ static int save_image(struct swap_map_handle *handle,
|
||||||
if (ret)
|
if (ret)
|
||||||
break;
|
break;
|
||||||
if (!(nr_pages % m))
|
if (!(nr_pages % m))
|
||||||
printk(KERN_CONT "\b\b\b\b%3d%%", nr_pages / m);
|
printk(KERN_INFO "PM: Image saving progress: %3d%%\n",
|
||||||
|
nr_pages / m * 10);
|
||||||
nr_pages++;
|
nr_pages++;
|
||||||
}
|
}
|
||||||
err2 = hib_wait_on_bio_chain(&bio);
|
err2 = hib_wait_on_bio_chain(&bio);
|
||||||
|
@ -472,9 +473,7 @@ static int save_image(struct swap_map_handle *handle,
|
||||||
if (!ret)
|
if (!ret)
|
||||||
ret = err2;
|
ret = err2;
|
||||||
if (!ret)
|
if (!ret)
|
||||||
printk(KERN_CONT "\b\b\b\bdone\n");
|
printk(KERN_INFO "PM: Image saving done.\n");
|
||||||
else
|
|
||||||
printk(KERN_CONT "\n");
|
|
||||||
swsusp_show_speed(&start, &stop, nr_to_write, "Wrote");
|
swsusp_show_speed(&start, &stop, nr_to_write, "Wrote");
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
@ -668,9 +667,9 @@ static int save_image_lzo(struct swap_map_handle *handle,
|
||||||
|
|
||||||
printk(KERN_INFO
|
printk(KERN_INFO
|
||||||
"PM: Using %u thread(s) for compression.\n"
|
"PM: Using %u thread(s) for compression.\n"
|
||||||
"PM: Compressing and saving image data (%u pages) ... ",
|
"PM: Compressing and saving image data (%u pages)...\n",
|
||||||
nr_threads, nr_to_write);
|
nr_threads, nr_to_write);
|
||||||
m = nr_to_write / 100;
|
m = nr_to_write / 10;
|
||||||
if (!m)
|
if (!m)
|
||||||
m = 1;
|
m = 1;
|
||||||
nr_pages = 0;
|
nr_pages = 0;
|
||||||
|
@ -690,8 +689,10 @@ static int save_image_lzo(struct swap_map_handle *handle,
|
||||||
data_of(*snapshot), PAGE_SIZE);
|
data_of(*snapshot), PAGE_SIZE);
|
||||||
|
|
||||||
if (!(nr_pages % m))
|
if (!(nr_pages % m))
|
||||||
printk(KERN_CONT "\b\b\b\b%3d%%",
|
printk(KERN_INFO
|
||||||
nr_pages / m);
|
"PM: Image saving progress: "
|
||||||
|
"%3d%%\n",
|
||||||
|
nr_pages / m * 10);
|
||||||
nr_pages++;
|
nr_pages++;
|
||||||
}
|
}
|
||||||
if (!off)
|
if (!off)
|
||||||
|
@ -761,11 +762,8 @@ out_finish:
|
||||||
do_gettimeofday(&stop);
|
do_gettimeofday(&stop);
|
||||||
if (!ret)
|
if (!ret)
|
||||||
ret = err2;
|
ret = err2;
|
||||||
if (!ret) {
|
if (!ret)
|
||||||
printk(KERN_CONT "\b\b\b\bdone\n");
|
printk(KERN_INFO "PM: Image saving done.\n");
|
||||||
} else {
|
|
||||||
printk(KERN_CONT "\n");
|
|
||||||
}
|
|
||||||
swsusp_show_speed(&start, &stop, nr_to_write, "Wrote");
|
swsusp_show_speed(&start, &stop, nr_to_write, "Wrote");
|
||||||
out_clean:
|
out_clean:
|
||||||
if (crc) {
|
if (crc) {
|
||||||
|
@ -973,9 +971,9 @@ static int load_image(struct swap_map_handle *handle,
|
||||||
int err2;
|
int err2;
|
||||||
unsigned nr_pages;
|
unsigned nr_pages;
|
||||||
|
|
||||||
printk(KERN_INFO "PM: Loading image data pages (%u pages) ... ",
|
printk(KERN_INFO "PM: Loading image data pages (%u pages)...\n",
|
||||||
nr_to_read);
|
nr_to_read);
|
||||||
m = nr_to_read / 100;
|
m = nr_to_read / 10;
|
||||||
if (!m)
|
if (!m)
|
||||||
m = 1;
|
m = 1;
|
||||||
nr_pages = 0;
|
nr_pages = 0;
|
||||||
|
@ -993,7 +991,8 @@ static int load_image(struct swap_map_handle *handle,
|
||||||
if (ret)
|
if (ret)
|
||||||
break;
|
break;
|
||||||
if (!(nr_pages % m))
|
if (!(nr_pages % m))
|
||||||
printk("\b\b\b\b%3d%%", nr_pages / m);
|
printk(KERN_INFO "PM: Image loading progress: %3d%%\n",
|
||||||
|
nr_pages / m * 10);
|
||||||
nr_pages++;
|
nr_pages++;
|
||||||
}
|
}
|
||||||
err2 = hib_wait_on_bio_chain(&bio);
|
err2 = hib_wait_on_bio_chain(&bio);
|
||||||
|
@ -1001,12 +1000,11 @@ static int load_image(struct swap_map_handle *handle,
|
||||||
if (!ret)
|
if (!ret)
|
||||||
ret = err2;
|
ret = err2;
|
||||||
if (!ret) {
|
if (!ret) {
|
||||||
printk("\b\b\b\bdone\n");
|
printk(KERN_INFO "PM: Image loading done.\n");
|
||||||
snapshot_write_finalize(snapshot);
|
snapshot_write_finalize(snapshot);
|
||||||
if (!snapshot_image_loaded(snapshot))
|
if (!snapshot_image_loaded(snapshot))
|
||||||
ret = -ENODATA;
|
ret = -ENODATA;
|
||||||
} else
|
}
|
||||||
printk("\n");
|
|
||||||
swsusp_show_speed(&start, &stop, nr_to_read, "Read");
|
swsusp_show_speed(&start, &stop, nr_to_read, "Read");
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
@ -1185,9 +1183,9 @@ static int load_image_lzo(struct swap_map_handle *handle,
|
||||||
|
|
||||||
printk(KERN_INFO
|
printk(KERN_INFO
|
||||||
"PM: Using %u thread(s) for decompression.\n"
|
"PM: Using %u thread(s) for decompression.\n"
|
||||||
"PM: Loading and decompressing image data (%u pages) ... ",
|
"PM: Loading and decompressing image data (%u pages)...\n",
|
||||||
nr_threads, nr_to_read);
|
nr_threads, nr_to_read);
|
||||||
m = nr_to_read / 100;
|
m = nr_to_read / 10;
|
||||||
if (!m)
|
if (!m)
|
||||||
m = 1;
|
m = 1;
|
||||||
nr_pages = 0;
|
nr_pages = 0;
|
||||||
|
@ -1319,7 +1317,10 @@ static int load_image_lzo(struct swap_map_handle *handle,
|
||||||
data[thr].unc + off, PAGE_SIZE);
|
data[thr].unc + off, PAGE_SIZE);
|
||||||
|
|
||||||
if (!(nr_pages % m))
|
if (!(nr_pages % m))
|
||||||
printk("\b\b\b\b%3d%%", nr_pages / m);
|
printk(KERN_INFO
|
||||||
|
"PM: Image loading progress: "
|
||||||
|
"%3d%%\n",
|
||||||
|
nr_pages / m * 10);
|
||||||
nr_pages++;
|
nr_pages++;
|
||||||
|
|
||||||
ret = snapshot_write_next(snapshot);
|
ret = snapshot_write_next(snapshot);
|
||||||
|
@ -1344,7 +1345,7 @@ out_finish:
|
||||||
}
|
}
|
||||||
do_gettimeofday(&stop);
|
do_gettimeofday(&stop);
|
||||||
if (!ret) {
|
if (!ret) {
|
||||||
printk("\b\b\b\bdone\n");
|
printk(KERN_INFO "PM: Image loading done.\n");
|
||||||
snapshot_write_finalize(snapshot);
|
snapshot_write_finalize(snapshot);
|
||||||
if (!snapshot_image_loaded(snapshot))
|
if (!snapshot_image_loaded(snapshot))
|
||||||
ret = -ENODATA;
|
ret = -ENODATA;
|
||||||
|
@ -1357,8 +1358,7 @@ out_finish:
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} else
|
}
|
||||||
printk("\n");
|
|
||||||
swsusp_show_speed(&start, &stop, nr_to_read, "Read");
|
swsusp_show_speed(&start, &stop, nr_to_read, "Read");
|
||||||
out_clean:
|
out_clean:
|
||||||
for (i = 0; i < ring_size; i++)
|
for (i = 0; i < ring_size; i++)
|
||||||
|
|
Reference in New Issue