diff options
author | Jes Sorensen <Jes.Sorensen@redhat.com> | 2011-04-27 14:31:50 +0200 |
---|---|---|
committer | Kevin Wolf <kwolf@redhat.com> | 2011-04-27 16:21:00 +0200 |
commit | a55c73ba3fb3f5700788933c519c193c5e85c878 (patch) | |
tree | 60a2f8140e3d432efb239e1cee75a189439d5c30 /qemu-progress.c | |
parent | 19dfc44a94f759848a0f7de7378b2f8b9af6b5d0 (diff) | |
download | qemu-a55c73ba3fb3f5700788933c519c193c5e85c878.zip qemu-a55c73ba3fb3f5700788933c519c193c5e85c878.tar.gz qemu-a55c73ba3fb3f5700788933c519c193c5e85c878.tar.bz2 |
Add dd-style SIGUSR1 progress reporting
This introduces support for dd-style progress reporting on POSIX
systems, if the user hasn't specified -p to report progress. If sent a
SIGUSR1, qemu-img will report current progress for commands that
support progress reporting.
Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Diffstat (limited to 'qemu-progress.c')
-rw-r--r-- | qemu-progress.c | 53 |
1 files changed, 48 insertions, 5 deletions
diff --git a/qemu-progress.c b/qemu-progress.c index 656e065..b4b751c 100644 --- a/qemu-progress.c +++ b/qemu-progress.c @@ -26,12 +26,15 @@ #include "osdep.h" #include "sysemu.h" #include <stdio.h> +#include <signal.h> struct progress_state { int enabled; float current; float last_print; float min_skip; + void (*print)(void); + void (*end)(void); }; static struct progress_state state; @@ -51,20 +54,60 @@ static void progress_simple_print(void) static void progress_simple_end(void) { - if (state.enabled) { - printf("\n"); - } + printf("\n"); +} + +static void progress_simple_init(void) +{ + state.print = progress_simple_print; + state.end = progress_simple_end; +} + +#ifdef CONFIG_POSIX +static void sigusr_print(int signal) +{ + printf(" (%3.2f/100%%)\n", state.current); +} +#endif + +static void progress_dummy_print(void) +{ +} + +static void progress_dummy_end(void) +{ +} + +static void progress_dummy_init(void) +{ +#ifdef CONFIG_POSIX + struct sigaction action; + + memset(&action, 0, sizeof(action)); + sigfillset(&action.sa_mask); + action.sa_handler = sigusr_print; + action.sa_flags = 0; + sigaction(SIGUSR1, &action, NULL); +#endif + + state.print = progress_dummy_print; + state.end = progress_dummy_end; } void qemu_progress_init(int enabled, float min_skip) { state.enabled = enabled; state.min_skip = min_skip; + if (enabled) { + progress_simple_init(); + } else { + progress_dummy_init(); + } } void qemu_progress_end(void) { - progress_simple_end(); + state.end(); } void qemu_progress_print(float percent, int max) @@ -84,6 +127,6 @@ void qemu_progress_print(float percent, int max) if (current > (state.last_print + state.min_skip) || (current == 100) || (current == 0)) { state.last_print = state.current; - progress_simple_print(); + state.print(); } } |