Patchwork Add dd-style SIGUSR1 progress reporting

login
register
mail settings
Submitter Jes Sorensen
Date April 12, 2011, 9:34 a.m.
Message ID <1302600859-12853-1-git-send-email-Jes.Sorensen@redhat.com>
Download mbox | patch
Permalink /patch/90761/
State New
Headers show

Comments

Jes Sorensen - April 12, 2011, 9:34 a.m.
From: Jes Sorensen <Jes.Sorensen@redhat.com>

This introduces support for dd-style progress reporting, 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>
---
 qemu-progress.c |   49 ++++++++++++++++++++++++++++++++++++++++++++-----
 1 files changed, 44 insertions(+), 5 deletions(-)
Kevin Wolf - April 15, 2011, 10:34 a.m.
Am 12.04.2011 11:34, schrieb Jes.Sorensen@redhat.com:
> From: Jes Sorensen <Jes.Sorensen@redhat.com>
> 
> This introduces support for dd-style progress reporting, 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>

Thanks, applied to the block branch.

Kevin
Kevin Wolf - April 27, 2011, 10:14 a.m.
Am 12.04.2011 11:34, schrieb Jes.Sorensen@redhat.com:
> From: Jes Sorensen <Jes.Sorensen@redhat.com>
> 
> This introduces support for dd-style progress reporting, 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>

This one seems to break the mingw32 build:

qemu-progress.c: In function 'progress_dummy_init':
qemu-progress.c:78: error: storage size of 'action' isn't known
qemu-progress.c:81: warning: implicit declaration of function 'sigfillset'
qemu-progress.c:81: warning: nested extern declaration of 'sigfillset'
qemu-progress.c:84: warning: implicit declaration of function 'sigaction'
qemu-progress.c:84: warning: nested extern declaration of 'sigaction'
qemu-progress.c:84: error: 'SIGUSR1' undeclared (first use in this function)
qemu-progress.c:84: error: (Each undeclared identifier is reported only once
qemu-progress.c:84: error: for each function it appears in.)
qemu-progress.c:78: warning: unused variable 'action'

Kevin

Patch

diff --git a/qemu-progress.c b/qemu-progress.c
index 656e065..6498161 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,56 @@  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;
+}
+
+static void sigusr_print(int signal)
+{
+    printf("    (%3.2f/100%%)\n", state.current);
+}
+
+static void progress_dummy_print(void)
+{
+}
+
+static void progress_dummy_end(void)
+{
+}
+
+static void progress_dummy_init(void)
+{
+    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);
+
+    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 +123,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();
     }
 }