*/
#include "platform.h"
-#include "gnunet_common.h"
#include "gnunet_util_lib.h"
#include "gnunet_testbed_service.h"
#include "testbed_api_hosts.h"
/**
* Name of the file with the hosts to run the test over (configuration option).
* It will be NULL if ENABLE_LL is set
- */
+ */
static char *hosts_file;
/**
*/
static int result;
+/**
+ * Are we running non interactively
+ */
+static int noninteractive;
+
/**
* Shutdown nicely
* Signature of a main function for a testcase.
*
* @param cls closure
+ * @param h the run handle
* @param num_peers number of peers in 'peers'
* @param peers handle to peers run in the testbed
* @param links_succeeded the number of overlay link connection attempts that
* @param links_failed the number of overlay link
*/
static void
-test_run (void *cls, unsigned int num_peers, struct GNUNET_TESTBED_Peer **peers,
+test_run (void *cls,
+ struct GNUNET_TESTBED_RunHandle *h,
+ unsigned int num_peers, struct GNUNET_TESTBED_Peer **peers,
unsigned int links_succeeded,
unsigned int links_failed)
{
result = GNUNET_OK;
fprintf (stdout, "\n");
print_overlay_links_summary ();
-#if !ENABLE_LL
+ 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);
fprintf (stdout, "Shutting down. Please wait\n");
fflush (stdout);
shutdown_task = GNUNET_SCHEDULER_add_now (&do_shutdown, NULL);
+ return;
}
{'e', "num-errors", "COUNT",
gettext_noop ("tolerate COUNT number of continious timeout failures"),
GNUNET_YES, &GNUNET_GETOPT_set_uint, &num_cont_fails},
-#if !ENABLE_LL
+ {'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"),
GNUNET_YES, &GNUNET_GETOPT_set_string, &hosts_file},