/*
This file is part of GNUnet.
- (C) 2008--2013 Christian Grothoff (and other contributing authors)
+ Copyright (C) 2008--2013 Christian Grothoff (and other contributing authors)
GNUnet is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published
/**
* Abort task identifier
*/
-static GNUNET_SCHEDULER_TaskIdentifier abort_task;
+static struct GNUNET_SCHEDULER_Task * abort_task;
/**
* Shutdown task identifier
*/
-static GNUNET_SCHEDULER_TaskIdentifier shutdown_task;
+static struct GNUNET_SCHEDULER_Task * shutdown_task;
/**
* Global event mask for all testbed events
*/
static int result;
+/**
+ * Are we running non interactively
+ */
+static int noninteractive;
+
/**
* Shutdown nicely
static void
do_shutdown (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
{
- shutdown_task = GNUNET_SCHEDULER_NO_TASK;
- if (GNUNET_SCHEDULER_NO_TASK != abort_task)
+ shutdown_task = NULL;
+ if (NULL != abort_task)
{
GNUNET_SCHEDULER_cancel (abort_task);
- abort_task = GNUNET_SCHEDULER_NO_TASK;
+ abort_task = NULL;
}
if (NULL != cfg)
{
do_abort (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
{
LOG (GNUNET_ERROR_TYPE_WARNING, "Aborting\n");
- abort_task = GNUNET_SCHEDULER_NO_TASK;
+ abort_task = NULL;
result = GNUNET_SYSERR;
- if (GNUNET_SCHEDULER_NO_TASK != shutdown_task)
+ if (NULL != shutdown_task)
GNUNET_SCHEDULER_cancel (shutdown_task);
shutdown_task = GNUNET_SCHEDULER_add_now (&do_shutdown, NULL);
}
{
printf ("\nAborting due to very high failure rate\n");
print_overlay_links_summary ();
- if (GNUNET_SCHEDULER_NO_TASK != abort_task)
+ if (NULL != abort_task)
GNUNET_SCHEDULER_cancel (abort_task);
abort_task = GNUNET_SCHEDULER_add_now (&do_abort, NULL);
return;
result = GNUNET_OK;
fprintf (stdout, "\n");
print_overlay_links_summary ();
-#if !ENABLE_LL
+ if (noninteractive)
+ {
+ GNUNET_SCHEDULER_cancel (abort_task);
+ abort_task = NULL;
+ 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},