/**
* Number of peers we want to start
*/
-#define NUM_PEERS 50
+#define NUM_PEERS 13
/**
* The array of peers; we fill this as the peers are given to us by the testbed
* @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)
{
if (GNUNET_SCHEDULER_NO_TASK != abort_task)
GNUNET_SCHEDULER_cancel (abort_task);
- GNUNET_SCHEDULER_shutdown ();
+ GNUNET_SCHEDULER_shutdown (); /* Stop scheduler to shutdown testbed run */
}
GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "Test timedout -- Aborting\n");
abort_task = GNUNET_SCHEDULER_NO_TASK;
GNUNET_SCHEDULER_add_now (&do_shutdown, NULL);
- GNUNET_SCHEDULER_shutdown (); /* Stop the scheduler */
}
{
result = GNUNET_OK;
GNUNET_assert (NULL != peers[0]);
- op = GNUNET_TESTBED_peer_stop (peers[0]);
+ op = GNUNET_TESTBED_peer_stop (peers[0], NULL, NULL);
GNUNET_assert (NULL != op);
}
event_mask |= (1LL << GNUNET_TESTBED_ET_PEER_STOP);
event_mask |= (1LL << GNUNET_TESTBED_ET_CONNECT);
event_mask |= (1LL << GNUNET_TESTBED_ET_DISCONNECT);
- event_mask |= (1LL << GNUNET_TESTBED_ET_OPERATION_FINISHED);
GNUNET_TESTBED_run (NULL, config, NUM_PEERS, event_mask, &controller_event_cb,
NULL, &master_task, NULL);
abort_task =