Merge branch 'master' of git+ssh://192.168.122.1/home/rjones/d/libguestfs

1 files changed, 21 insertions, 0 deletions

diff --git a/daemon/proto.c b/daemon/proto.c
index ffb4a4e8..3ca4316a 100644
--- a/daemon/proto.c
+++ b/daemon/proto.c
@@ -47,6 +47,8 @@ main_loop (int _sock)
   char lenbuf[4];
   unsigned len;
   struct guestfs_message_header hdr;
+  struct timeval start_t, end_t;
+  int64_t start_us, end_us, elapsed_us;
 
   sock = _sock;
 
@@ -102,6 +104,10 @@ main_loop (int _sock)
     }
 #endif
 
+    /* In verbose mode, display the time taken to run each command. */
+    if (verbose)
+      gettimeofday (&start_t, NULL);
+
     /* Decode the message header. */
     xdrmem_create (&xdr, buf, len, XDR_DECODE);
     if (!xdr_guestfs_message_header (&xdr, &hdr)) {
@@ -133,6 +139,21 @@ main_loop (int _sock)
     dispatch_incoming_message (&xdr);
     /* Note that dispatch_incoming_message will also send a reply. */
 
+    /* In verbose mode, display the time taken to run each command. */
+    if (verbose) {
+      gettimeofday (&end_t, NULL);
+
+      start_us = (int64_t) start_t.tv_sec * 1000000 + start_t.tv_usec;
+      end_us = (int64_t) end_t.tv_sec * 1000000 + end_t.tv_usec;
+      elapsed_us = end_us - start_us;
+      fprintf (stderr, "proc %d (%s) took %d.%02d seconds\n",
+	       proc_nr,
+	       proc_nr >= 0 && proc_nr < GUESTFS_PROC_NR_PROCS
+	       ? function_names[proc_nr] : "UNKNOWN PROCEDURE",
+	       (int) (elapsed_us / 1000000),
+	       (int) ((elapsed_us / 10000) % 100));
+    }
+
   cont:
     xdr_destroy (&xdr);
     free (buf);