[GNUnet-SVN] r30254 - gnunet/src/testbed

[gnunet]

Author: harsha
Date: 2013-10-17 15:44:57 +0200 (Thu, 17 Oct 2013)
New Revision: 30254

Modified:
   gnunet/src/testbed/gnunet-testbed-profiler.c
Log:
- interactive option to disable waiting on keystroke but wait instead for 
termination signal


Modified: gnunet/src/testbed/gnunet-testbed-profiler.c
===================================================================
--- gnunet/src/testbed/gnunet-testbed-profiler.c        2013-10-17 13:05:52 UTC 
(rev 30253)
+++ gnunet/src/testbed/gnunet-testbed-profiler.c        2013-10-17 13:44:57 UTC 
(rev 30254)
@@ -97,7 +97,12 @@
  */
 static int result;
 
+/**
+ * Are we running non interactively
+ */
+static int noninteractive;
 
+
 /**
  * Shutdown nicely
  *
@@ -225,7 +230,15 @@
   result = GNUNET_OK;
   fprintf (stdout, "\n");
   print_overlay_links_summary ();
-#if !ENABLE_SUPERMUC
+  if (noninteractive)    
+  {
+    GNUNET_SCHEDULER_cancel (abort_task);
+    abort_task = GNUNET_SCHEDULER_NO_TASK;
+    shutdown_task = GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL,
+                                                  &do_shutdown, NULL);
+    return;
+  }
+#if (!ENABLE_SUPERMUC)
   fprintf (stdout, "Testbed running, waiting for keystroke to shut down\n");
   fflush (stdout);
   (void) getc (stdin);
@@ -233,6 +246,7 @@
   fprintf (stdout, "Shutting down. Please wait\n");
   fflush (stdout);
   shutdown_task = GNUNET_SCHEDULER_add_now (&do_shutdown, NULL);
+  return;
 }
 
 
@@ -281,6 +295,12 @@
     {'e', "num-errors", "COUNT",
      gettext_noop ("tolerate COUNT number of continious timeout failures"),
      GNUNET_YES, &GNUNET_GETOPT_set_uint, &num_cont_fails},
+    {'n', "non-interactive", NULL,
+     gettext_noop ("run profiler in non-interactive mode where upon "
+                   "testbed setup the profiler does not wait for a "
+                   "keystroke but continues to run until a termination "
+                   "signal is received"),
+     GNUNET_NO, &GNUNET_GETOPT_set_one, &noninteractive},
 #if !ENABLE_SUPERMUC
     {'H', "hosts", "FILENAME",
      gettext_noop ("name of the file with the login information for the 
testbed"),