/**
* Number of peers we want to start
*/
-#define NUM_PEERS 5
+#define NUM_PEERS 50
/**
* Array of peers
*/
static struct GNUNET_TESTBED_Operation *op;
+/**
+ * Shutdown task
+ */
+static GNUNET_SCHEDULER_TaskIdentifier shutdown_task;
+
/**
* Testing result
*/
* @param tc the task context
*/
static void
-do_shutdown (void *cls, const const struct GNUNET_SCHEDULER_TaskContext *tc)
+do_shutdown (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
{
+ shutdown_task = GNUNET_SCHEDULER_NO_TASK;
if (NULL != op)
{
GNUNET_TESTBED_operation_done (op);
{
case GNUNET_TESTBED_ET_CONNECT:
overlay_connects++;
- if ((NUM_PEERS - 1) == overlay_connects)
+ if ((NUM_PEERS) == overlay_connects)
{
result = GNUNET_OK;
GNUNET_SCHEDULER_add_now (&do_shutdown, NULL);
}
break;
+ case GNUNET_TESTBED_ET_OPERATION_FINISHED:
+ GNUNET_assert (NULL != event->details.operation_finished.emsg);
+ break;
default:
- GNUNET_assert (0);
+ GNUNET_break (0);
+ if ((GNUNET_TESTBED_ET_OPERATION_FINISHED == event->type) &&
+ (NULL != event->details.operation_finished.emsg))
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ "An operation failed with error: %s\n",
+ event->details.operation_finished.emsg);
+ result = GNUNET_SYSERR;
+ GNUNET_SCHEDULER_cancel (shutdown_task);
+ shutdown_task = GNUNET_SCHEDULER_add_now (&do_shutdown, NULL);
}
}
peers = peers_;
overlay_connects = 0;
op = GNUNET_TESTBED_overlay_configure_topology (NULL, NUM_PEERS, peers,
- GNUNET_TESTBED_TOPOLOGY_LINE);
+ GNUNET_TESTBED_TOPOLOGY_ERDOS_RENYI,
+ NUM_PEERS, GNUNET_TESTBED_TOPOLOGY_OPTION_END);
GNUNET_assert (NULL != op);
+ shutdown_task = GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply
+ (GNUNET_TIME_UNIT_SECONDS, 120),
+ do_shutdown, NULL);
}