[PATCH] swsusp: add read-speed instrumentation

Add some instrumentation to the swsusp readin code to show what bandwidth
we're achieving.

Cc: Pavel Machek <pavel@ucw.cz>
Cc: "Rafael J. Wysocki" <rjw@sisk.pl>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

diff --git a/kernel/power/swap.c b/kernel/power/swap.c
index 2dc883d361d520419ea3e638634b2cb9b783572b..9ab9895721647382b6b6c492a0debf9967e3ea73 100644 (file)
--- a/kernel/power/swap.c
+++ b/kernel/power/swap.c
@@ -522,12 +522,15 @@ static int load_image(struct swap_map_handle *handle,
        unsigned int m;
        int ret;
        int error = 0;
+       struct timeval start;
+       struct timeval stop;
 
        printk("Loading image data pages (%u pages) ...     ", nr_pages);
        m = nr_pages / 100;
        if (!m)
                m = 1;
        nr_pages = 0;
+       do_gettimeofday(&start);
        do {
                ret = snapshot_write_next(snapshot, PAGE_SIZE);
                if (ret > 0) {
@@ -539,11 +542,13 @@ static int load_image(struct swap_map_handle *handle,
                        nr_pages++;
                }
        } while (ret > 0);
+       do_gettimeofday(&stop);
        if (!error) {
                printk("\b\b\b\bdone\n");
                if (!snapshot_image_loaded(snapshot))
                        error = -ENODATA;
        }
+       show_speed(&start, &stop, nr_pages, "Read");
        return error;
 }