* Generic loggins shorthand
*/
#define LOG(kind,...) \
- GNUNET_log_from (kind, "testbed-api-testbed", __VA_ARGS__)
+ GNUNET_log (kind, __VA_ARGS__)
+
/**
* DLL of operations
/**
* Linking peers
*/
- STATE_PEERS_LINKING
+ STATE_PEERS_LINKING,
+
+ /**
+ * Destroying peers; we can do this as the controller takes care of stopping a
+ * peer if it is running
+ */
+ STATE_PEERS_DESTROYING
};
*/
static GNUNET_SCHEDULER_TaskIdentifier abort_task;
+/**
+ * Shutdown task identifier
+ */
+static GNUNET_SCHEDULER_TaskIdentifier shutdown_task;
+
/**
* Host registration task identifier
*/
*/
static unsigned int num_links;
+/**
+ * Number of timeout failures to tolerate
+ */
+static unsigned int num_cont_fails;
+
+/**
+ * Number of times we try overlay connect operations
+ */
+static unsigned int retry_links;
+
+/**
+ * Continuous failures during overlay connect operations
+ */
+static unsigned int cont_fails;
+
/**
* Global testing status
*/
struct DLLOperation *dll_op;
unsigned int nhost;
+ shutdown_task = GNUNET_SCHEDULER_NO_TASK;
if (GNUNET_SCHEDULER_NO_TASK != abort_task)
GNUNET_SCHEDULER_cancel (abort_task);
if (GNUNET_SCHEDULER_NO_TASK != register_hosts_task)
static void
do_abort (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
{
- GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "Aborting\n");
+ LOG (GNUNET_ERROR_TYPE_WARNING, "Aborting\n");
abort_task = GNUNET_SCHEDULER_NO_TASK;
result = GNUNET_SYSERR;
- GNUNET_SCHEDULER_add_now (&do_shutdown, NULL);
+ if (GNUNET_SCHEDULER_NO_TASK != shutdown_task)
+ GNUNET_SCHEDULER_cancel (shutdown_task);
+ shutdown_task = GNUNET_SCHEDULER_add_now (&do_shutdown, NULL);
}
+
+
+
/**
* Functions of this signature are called when a peer has been successfully
* started or stopped.
if (++started_peers == num_peers)
{
prof_time = GNUNET_TIME_absolute_get_duration (prof_start_time);
- printf ("All peers started successfully in %.2f seconds\n",
- ((double) prof_time.rel_value) / 1000.00);
+ printf ("%u peers started successfully in %.2f seconds\n",
+ num_peers, ((double) prof_time.rel_value) / 1000.00);
+ fflush (stdout);
result = GNUNET_OK;
if (0 == num_links)
- {
- GNUNET_SCHEDULER_add_now (&do_shutdown, NULL);
+ {
+ shutdown_task = GNUNET_SCHEDULER_add_now (&do_shutdown, NULL);
return;
}
state = STATE_PEERS_LINKING;
topology_op =
GNUNET_TESTBED_overlay_configure_topology (NULL, num_peers, peers,
GNUNET_TESTBED_TOPOLOGY_ERDOS_RENYI,
+
num_links);
}
}
if (++created_peers == num_peers)
{
prof_time = GNUNET_TIME_absolute_get_duration (prof_start_time);
- printf ("All peers created successfully in %.2f seconds\n",
- ((double) prof_time.rel_value) / 1000.00);
+ printf ("%u peers created successfully in %.2f seconds\n",
+ num_peers, ((double) prof_time.rel_value) / 1000.00);
+ fflush (stdout);
/* Now peers are to be started */
state = STATE_PEERS_STARTING;
prof_start_time = GNUNET_TIME_absolute_get ();
}
+/**
+ * Function to print summary about how many overlay links we have made and how
+ * many failed
+ */
+static void
+print_overlay_links_summary ()
+{
+ prof_time = GNUNET_TIME_absolute_get_duration (prof_start_time);
+ printf ("\n%u links established in %.2f seconds\n",
+ num_links, ((double) prof_time.rel_value) / 1000.00);
+ printf ("Overlay link operations have been retried %u times upon timeouts\n",
+ retry_links);
+}
+
+
/**
* Controller event callback
*
/* Proceed to start peers */
if (++slaves_started == num_hosts - 1)
{
- printf ("All slaves started successfully\n");
+ printf ("%u controllers started successfully\n", num_hosts);
+ fflush (stdout);
state = STATE_PEERS_CREATING;
prof_start_time = GNUNET_TIME_absolute_get ();
peers = GNUNET_malloc (sizeof (struct GNUNET_TESTBED_Peer *)
if (NULL != event->details.operation_finished.emsg)
{
LOG (GNUNET_ERROR_TYPE_WARNING,
- _("An operation has failed while starting slaves\n"));
- GNUNET_SCHEDULER_cancel (abort_task);
- abort_task = GNUNET_SCHEDULER_add_now (&do_abort, NULL);
+ _("An operation has failed while linking\n"));
+ printf ("F");
+ fflush (stdout);
+ retry_links++;
+ if (++cont_fails > num_cont_fails)
+ {
+ printf ("\nAborting due to very high failure rate");
+ print_overlay_links_summary ();
+ GNUNET_SCHEDULER_cancel (abort_task);
+ abort_task = GNUNET_SCHEDULER_add_now (&do_abort, NULL);
+ }
}
break;
case GNUNET_TESTBED_ET_CONNECT:
{
static unsigned int established_links;
+ if (0 != cont_fails)
+ cont_fails--;
if (0 == established_links)
- printf ("Establishing links\n");
- else
- printf (".");
+ printf ("Establishing links. Please wait\n");
+ printf (".");
+ fflush (stdout);
if (++established_links == num_links)
{
- prof_time = GNUNET_TIME_absolute_get_duration (prof_start_time);
- printf ("%u links established in %.2f seconds\n",
- num_links, ((double) prof_time.rel_value) / 1000.00);
+ print_overlay_links_summary ();
result = GNUNET_OK;
- GNUNET_SCHEDULER_add_now (&do_shutdown, NULL);
+ shutdown_task = GNUNET_SCHEDULER_add_now (&do_shutdown, NULL);
}
}
break;
* Callback to signal successfull startup of the controller process
*
* @param cls the closure from GNUNET_TESTBED_controller_start()
- * @param cfg the configuration with which the controller has been started;
+ * @param config the configuration with which the controller has been started;
* NULL if status is not GNUNET_OK
* @param status GNUNET_OK if the startup is successfull; GNUNET_SYSERR if not,
* GNUNET_TESTBED_controller_stop() shouldn't be called in this case
if (GNUNET_YES != GNUNET_TESTBED_is_host_habitable (hosts[nhost]))
{
fprintf (stderr, _("Host %s cannot start testbed\n"),
- GNUNET_TESTBED_host_get_hostname_ (hosts[nhost]));
+ GNUNET_TESTBED_host_get_hostname_ (hosts[nhost]));
break;
}
}
if (num_hosts != nhost)
{
fprintf (stderr, _("Exiting\n"));
- GNUNET_SCHEDULER_add_now (&do_shutdown, NULL);
+ shutdown_task = GNUNET_SCHEDULER_add_now (&do_shutdown, NULL);
return;
}
cfg = GNUNET_CONFIGURATION_dup (config);
{ 'n', "num-links", "COUNT",
gettext_noop ("create COUNT number of random links"),
GNUNET_YES, &GNUNET_GETOPT_set_uint, &num_links },
+ { 'e', "num-errors", "COUNT",
+ gettext_noop ("tolerate COUNT number of continious timeout failures"),
+ GNUNET_YES, &GNUNET_GETOPT_set_uint, &num_cont_fails },
GNUNET_GETOPT_OPTION_END
};
int ret;
projects / oweals / gnunet.git / blobdiff