* Generic loggins shorthand
*/
#define LOG(kind,...) \
- GNUNET_log_from (kind, "testbed-api-testbed", __VA_ARGS__)
+ GNUNET_log (kind, __VA_ARGS__)
/**
* DLL of operations
/**
* Creating peers
*/
- STATE_PEERS_CREATING
+ STATE_PEERS_CREATING,
+
+ /**
+ * Starting peers
+ */
+ STATE_PEERS_STARTING,
+
+ /**
+ * Linking peers
+ */
+ STATE_PEERS_LINKING
};
*/
struct DLLOperation *dll_op_tail;
+/**
+ * Peer linking - topology operation
+ */
+struct GNUNET_TESTBED_Operation *topology_op;
+
/**
* Abort task identifier
*/
*/
static unsigned int num_hosts;
+/**
+ * Number of random links to be established between peers
+ */
+static unsigned int num_links;
+
/**
* Global testing status
*/
{
struct DLLOperation *dll_op;
unsigned int nhost;
- unsigned int peer_cnt;
if (GNUNET_SCHEDULER_NO_TASK != abort_task)
GNUNET_SCHEDULER_cancel (abort_task);
if (GNUNET_SCHEDULER_NO_TASK != register_hosts_task)
GNUNET_SCHEDULER_cancel (register_hosts_task);
- if (NULL != peers)
- {
- for (peer_cnt = 0; peer_cnt < num_peers; peer_cnt++)
- if (NULL != peers[peer_cnt])
- GNUNET_TESTBED_peer_destroy (peers[peer_cnt]);
- GNUNET_free (peers);
- }
if (NULL != reg_handle)
GNUNET_TESTBED_cancel_registration (reg_handle);
+ if (NULL != topology_op)
+ GNUNET_TESTBED_operation_cancel (topology_op);
for (nhost = 0; nhost < num_hosts; nhost++)
if (NULL != hosts[nhost])
GNUNET_TESTBED_host_destroy (hosts[nhost]);
while (NULL != (dll_op = dll_op_head))
{
GNUNET_TESTBED_operation_cancel (dll_op->op);
- GNUNET_free_non_null (dll_op->cls);
GNUNET_CONTAINER_DLL_remove (dll_op_head, dll_op_tail, dll_op);
GNUNET_free (dll_op);
}
GNUNET_TESTBED_controller_stop (mc_proc);
if (NULL != cfg)
GNUNET_CONFIGURATION_destroy (cfg);
- GNUNET_SCHEDULER_shutdown (); /* Stop scheduler to shutdown testbed run */
+ GNUNET_SCHEDULER_shutdown (); /* Stop scheduler to shutdown testbed run */
}
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.
+ *
+ * @param cls the closure from GNUNET_TESTBED_peer_start/stop()
+ * @param emsg NULL on success; otherwise an error description
+ */
+static void
+peer_churn_cb (void *cls, const char *emsg)
+{
+ struct DLLOperation *dll_op = cls;
+ struct GNUNET_TESTBED_Operation *op;
+ static unsigned int started_peers;
+
+ op = dll_op->op;
+ GNUNET_CONTAINER_DLL_remove (dll_op_head, dll_op_tail, dll_op);
+ GNUNET_free (dll_op);
+ if (NULL != emsg)
+ {
+ LOG (GNUNET_ERROR_TYPE_WARNING,
+ _("An operation has failed while starting peers\n"));
+ GNUNET_TESTBED_operation_done (op);
+ GNUNET_SCHEDULER_cancel (abort_task);
+ abort_task = GNUNET_SCHEDULER_add_now (&do_abort, NULL);
+ return;
+ }
+ GNUNET_TESTBED_operation_done (op);
+ 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);
+ result = GNUNET_OK;
+ if (0 == num_links)
+ {
+ GNUNET_SCHEDULER_add_now (&do_shutdown, NULL);
+ return;
+ }
+ state = STATE_PEERS_LINKING;
+ /* Do overlay connect */
+ prof_start_time = GNUNET_TIME_absolute_get ();
+ topology_op =
+ GNUNET_TESTBED_overlay_configure_topology (NULL, num_peers, peers,
+ GNUNET_TESTBED_TOPOLOGY_ERDOS_RENYI,
+ num_links);
+ }
+}
+
+
/**
* Functions of this signature are called when a peer has been successfully
* created
struct DLLOperation *dll_op = cls;
struct GNUNET_TESTBED_Peer **peer_ptr;
static unsigned int created_peers;
+ unsigned int peer_cnt;
if (NULL != emsg)
{
printf ("All peers created successfully in %.2f seconds\n",
((double) prof_time.rel_value) / 1000.00);
/* Now peers are to be started */
+ state = STATE_PEERS_STARTING;
+ prof_start_time = GNUNET_TIME_absolute_get ();
+ for (peer_cnt = 0; peer_cnt < num_peers; peer_cnt++)
+ {
+ dll_op = GNUNET_malloc (sizeof (struct DLLOperation));
+ dll_op->op = GNUNET_TESTBED_peer_start (dll_op, peers[peer_cnt],
+ &peer_churn_cb, dll_op);
+ GNUNET_CONTAINER_DLL_insert_tail (dll_op_head, dll_op_tail, dll_op);
+ }
}
}
{
static unsigned int slaves_started;
unsigned int peer_cnt;
-
+
dll_op = event->details.operation_finished.op_cls;
GNUNET_CONTAINER_DLL_remove (dll_op_head, dll_op_tail, dll_op);
GNUNET_free (dll_op);
- op = event->details.operation_finished.operation;
+ op = event->details.operation_finished.operation;
if (NULL != event->details.operation_finished.emsg)
{
LOG (GNUNET_ERROR_TYPE_WARNING,
dll_op->cls = &peers[peer_cnt];
dll_op->op = GNUNET_TESTBED_peer_create (mc,
hosts
- [peer_cnt % num_peers],
+ [peer_cnt % num_hosts],
cfg,
&peer_create_cb,
dll_op);
GNUNET_assert (0);
}
break;
+ case STATE_PEERS_STARTING:
+ switch (event->type)
+ {
+ case GNUNET_TESTBED_ET_OPERATION_FINISHED:
+ /* Control reaches here when peer start fails */
+ case GNUNET_TESTBED_ET_PEER_START:
+ /* we handle peer starts in peer_churn_cb */
+ break;
+ default:
+ GNUNET_assert (0);
+ }
+ break;
+ case STATE_PEERS_LINKING:
+ switch (event->type)
+ {
+ case GNUNET_TESTBED_ET_OPERATION_FINISHED:
+ /* Control reaches here when a peer linking operation fails */
+ if (NULL != event->details.operation_finished.emsg)
+ {
+ LOG (GNUNET_ERROR_TYPE_WARNING,
+ _("An operation has failed while linking\n"));
+ 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 == established_links)
+ printf ("Establishing links\n");
+ else
+ printf (".");
+ 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);
+ result = GNUNET_OK;
+ GNUNET_SCHEDULER_add_now (&do_shutdown, NULL);
+ }
+ }
+ break;
+ default:
+ GNUNET_assert (0);
+ }
+ break;
default:
GNUNET_assert (0);
}
* @param cls closure
* @param args remaining command-line arguments
* @param cfgfile name of the configuration file used (for saving, can be NULL!)
- * @param cfg configuration
+ * @param config configuration
*/
static void
run (void *cls, char *const *args, const char *cfgfile,
main (int argc, char *const *argv)
{
static const struct GNUNET_GETOPT_CommandLineOption options[] = {
- { 'n', "num-peers", "COUNT",
- gettext_noop ("create COUNT number of peers"),
- GNUNET_YES, &GNUNET_GETOPT_set_uint, &num_peers },
- { 'n', "num-peers", "COUNT",
+ { 'p', "num-peers", "COUNT",
gettext_noop ("create COUNT number of peers"),
GNUNET_YES, &GNUNET_GETOPT_set_uint, &num_peers },
+ { 'n', "num-links", "COUNT",
+ gettext_noop ("create COUNT number of random links"),
+ GNUNET_YES, &GNUNET_GETOPT_set_uint, &num_links },
GNUNET_GETOPT_OPTION_END
};
int ret;