mg-allocate: Support --progress-fd

Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com>

diff --git a/mg-allocate b/mg-allocate
index 87a4e71fb793111af52e045f1e13b366d29fde3d..2dfbdb14aaf4df0cff6a005c80e26f61099411db 100755 (executable)
--- a/mg-allocate
+++ b/mg-allocate
@@ -57,6 +57,8 @@
 #
 #   --info-base=<info>  Replaces `manual' at start of info put into plan.
 #
+#   --progress-fd=<fd>  Print some brief progress messages to <fd>.
+#
 # <task-spec> must exist (and be in a format valid for OSSTEST_TASK).
 
 # This is part of "osstest", an automated testing framework for Xen.
@@ -83,6 +85,7 @@ unshift @INC, qw(.);
 use Osstest;
 use Osstest::TestSupport;
 use Osstest::Executive;
+use IO::Handle;
 
 csreadconfig();
 
@@ -450,6 +453,12 @@ sub plan () {
        logm("best at $planned->{Start} is ".showposs(\@reqlist));
        die unless $planned;
 
+        printf MGA_PROGRESS "%s %s @%d %s\n",
+            (show_abs_time time),
+            ($mayalloc && !$planned->{Start} ? "allocating" : "planned"),
+            $planned->{Start},
+            showposs(\@reqlist);
+
         my $worstok=0;
         if ($mayalloc && !$planned->{Start}) {
             $worstok=1;
@@ -501,6 +510,8 @@ sub plan () {
     loggot(@got);
 }
 
+open MGA_PROGRESS, ">/dev/null" or die $!;
+
 while (@ARGV && $ARGV[0] =~ m/^[-0-9]/) {
     $_= shift @ARGV;
     last if m/^\-\-?$/;
@@ -528,6 +539,9 @@ while (@ARGV && $ARGV[0] =~ m/^[-0-9]/) {
            $allocinfo_base = $1;
        } elsif (s/^--stdout-output$/-/) {
            $stdout_output = 1;
+       } elsif (s/^--progress-fd=(\d+)$/-/) {
+            open MGA_PROGRESS, ">&$1" or die $!;
+            MGA_PROGRESS->autoflush(1);
         } else {
             die "bad option \`$_'";
         }