* 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 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);
}
+
+
+
/**
* Functions of this signature are called when a peer has been successfully
* started or stopped.
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"));
+ /* GNUNET_SCHEDULER_cancel (abort_task); */
+ /* abort_task = GNUNET_SCHEDULER_add_now (&do_abort, NULL); */
+ printf ("F");
+ fflush (stdout);
}
break;
case GNUNET_TESTBED_ET_CONNECT:
static unsigned int established_links;
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",
+ printf ("\n%u links established in %.2f seconds\n",
num_links, ((double) prof_time.rel_value) / 1000.00);
result = GNUNET_OK;
GNUNET_SCHEDULER_add_now (&do_shutdown, NULL);