X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=src%2Flaunch.c;h=ecc0464a88edfa09d20a3b6cc964d6c727d9bdd4;hb=7065a453cb09caa216924fd3d8cc913a48e0f942;hp=8074d1319bd33692ace2c07a9368d1ee8ba9a082;hpb=110bfe1fcc9964b82acf7df6d4d60774471f9157;p=libguestfs.git

diff --git a/src/launch.c b/src/launch.c
index 8074d13..ecc0464 100644
--- a/src/launch.c
+++ b/src/launch.c
@@ -1,5 +1,5 @@
 /* libguestfs
- * Copyright (C) 2009-2010 Red Hat Inc.
+ * Copyright (C) 2009-2011 Red Hat Inc.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -71,6 +71,7 @@
 #include "guestfs_protocol.h"
 
 static int launch_appliance (guestfs_h *g);
+static int64_t timeval_diff (const struct timeval *x, const struct timeval *y);
 static int connect_unix_socket (guestfs_h *g, const char *sock);
 static int qemu_supports (guestfs_h *g, const char *option);
 
@@ -103,20 +104,20 @@ add_cmdline (guestfs_h *g, const char *str)
   return 0;
 }
 
-int
+size_t
 guestfs___checkpoint_cmdline (guestfs_h *g)
 {
   return g->cmdline_size;
 }
 
 void
-guestfs___rollback_cmdline (guestfs_h *g, int pos)
+guestfs___rollback_cmdline (guestfs_h *g, size_t pos)
 {
-  int i;
+  size_t i;
 
   assert (g->cmdline_size >= pos);
 
-  for (i = g->cmdline_size - 1; i >= pos; --i)
+  for (i = pos; i < g->cmdline_size; ++i)
     free (g->cmdline[i]);
 
   g->cmdline_size = pos;
@@ -126,7 +127,7 @@ guestfs___rollback_cmdline (guestfs_h *g, int pos)
 char **
 guestfs__debug_cmdline (guestfs_h *g)
 {
-  int i;
+  size_t i;
   char **r;
 
   if (g->cmdline == NULL) {
@@ -406,12 +407,15 @@ launch_appliance (guestfs_h *g)
 
   /* Start the clock ... */
   gettimeofday (&g->launch_t, NULL);
+  guestfs___launch_send_progress (g, 0);
 
   /* Locate and/or build the appliance. */
   char *kernel = NULL, *initrd = NULL, *appliance = NULL;
   if (guestfs___build_appliance (g, &kernel, &initrd, &appliance) == -1)
     return -1;
 
+  guestfs___launch_send_progress (g, 3);
+
   if (g->verbose)
     guestfs___print_timestamped_message (g, "begin testing qemu features");
 
@@ -760,6 +764,8 @@ launch_appliance (guestfs_h *g)
     goto cleanup1;
   }
 
+  guestfs___launch_send_progress (g, 12);
+
   return 0;
 
  cleanup1:
@@ -861,6 +867,36 @@ connect_unix_socket (guestfs_h *g, const char *sockpath)
   return -1;
 }
 
+/* launch (of the ordinary appliance) generates approximate progress
+ * messages.  Currently these are defined as follows:
+ *
+ *    0 / 12: launch clock starts
+ *    3 / 12: appliance created
+ *    6 / 12: detected that guest kernel started
+ *    9 / 12: detected that /init script is running
+ *   12 / 12: launch completed successfully
+ *
+ * Notes:
+ * (1) This is not a documented ABI and the behaviour may be changed
+ * or removed in future.
+ * (2) Messages are only sent if more than 5 seconds has elapsed
+ * since the launch clock started.
+ * (3) There is a gross hack in proto.c to make this work.
+ */
+void
+guestfs___launch_send_progress (guestfs_h *g, int perdozen)
+{
+  struct timeval tv;
+
+  gettimeofday (&tv, NULL);
+  if (timeval_diff (&g->launch_t, &tv) >= 5000) {
+    guestfs_progress progress_message =
+      { .proc = 0, .serial = 0, .position = perdozen, .total = 12 };
+
+    guestfs___progress_message_callback (g, &progress_message);
+  }
+}
+
 /* Return the location of the tmpdir (eg. "/tmp") and allow users
  * to override it at runtime using $TMPDIR.
  * http://www.pathname.com/fhs/pub/fhs-2.3.html#TMPTEMPORARYFILES