/*
This file is part of GNUnet
- (C) 2008--2012 Christian Grothoff (and other contributing authors)
+ (C) 2008--2013 Christian Grothoff (and other contributing authors)
GNUnet is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published
#include "platform.h"
#include "gnunet_util_lib.h"
#include "gnunet_testbed_service.h"
+#include "testbed_api.h"
#include "testbed_api_peers.h"
#include "testbed_api_hosts.h"
#include "testbed_api_topology.h"
LOG (GNUNET_ERROR_TYPE_DEBUG, __VA_ARGS__)
/**
- * DLL of operations
+ * The default setup timeout in seconds
*/
-struct DLLOperation
+#define DEFAULT_SETUP_TIMEOUT 300
+
+
+/**
+ * Configuration section for testbed
+ */
+#define TESTBED_CONFIG_SECTION "testbed"
+
+/**
+ * Option string for the maximum number of edges a peer is permitted to have
+ * while generating scale free topology
+ */
+#define SCALE_FREE_CAP "SCALE_FREE_TOPOLOGY_CAP"
+
+/**
+ * Option string for the number of edges to be established when adding a new
+ * node to the scale free network
+ */
+#define SCALE_FREE_M "SCALE_FREE_TOPOLOGY_M"
+
+/**
+ * Context information for the operation we start
+ */
+struct RunContextOperation
{
/**
* The testbed operation handle
/**
* Context information for GNUNET_TESTBED_run()
*/
- struct RunContext *rc;
+ struct GNUNET_TESTBED_RunHandle *rc;
/**
* Closure
*/
void *cls;
- /**
- * The next pointer for DLL
- */
- struct DLLOperation *next;
-
- /**
- * The prev pointer for DLL
- */
- struct DLLOperation *prev;
};
*/
RC_READY,
+ /* /\** */
+ /* * Peers are stopped */
+ /* *\/ */
+ /* RC_PEERS_STOPPED, */
+
+ /* /\** */
+ /* * Peers are destroyed */
+ /* *\/ */
+ /* RC_PEERS_DESTROYED */
+
/**
- * Peers are stopped
+ * All peers shutdown (stopped and destroyed)
*/
- RC_PEERS_STOPPED,
+ RC_PEERS_SHUTDOWN
+};
+
+
+/**
+ * Context for host compability checks
+ */
+struct CompatibilityCheckContext
+{
+ /**
+ * The run context
+ */
+ struct GNUNET_TESTBED_RunHandle *rc;
/**
- * Peers are destroyed
+ * Handle for the compability check
*/
- RC_PEERS_DESTROYED
+ struct GNUNET_TESTBED_HostHabitableCheckHandle *h;
+
+ /**
+ * Index of the host in the run context's hosts array
+ */
+ unsigned int index;
};
/**
* Testbed Run Handle
*/
-struct RunContext
+struct GNUNET_TESTBED_RunHandle
{
/**
* The controller handle
void *test_master_cls;
/**
- * The head element of DLL operations
- */
- struct DLLOperation *dll_op_head;
-
- /**
- * The tail element of DLL operations
+ * A hashmap for operations started by us
*/
- struct DLLOperation *dll_op_tail;
+ struct GNUNET_CONTAINER_MultiHashMap32 *rcop_map;
/**
* An array of hosts loaded from the hostkeys file
struct GNUNET_TESTBED_Host **hosts;
/**
- * The handle for whether a host is habitable or not
+ * Array of compatibility check contexts
*/
- struct GNUNET_TESTBED_HostHabitableCheckHandle **hc_handles;
+ struct CompatibilityCheckContext *hclist;
/**
* Array of peers which we create
GNUNET_SCHEDULER_TaskIdentifier register_hosts_task;
/**
- * Task to be run while shutting down
+ * Task to be run of a timeout
*/
- GNUNET_SCHEDULER_TaskIdentifier shutdown_run_task;
+ GNUNET_SCHEDULER_TaskIdentifier timeout_task;
+
+ /**
+ * Task run upon shutdown interrupts
+ */
+ GNUNET_SCHEDULER_TaskIdentifier interrupt_task;
/**
* The event mask for the controller
*/
unsigned int num_peers;
- /**
- * counter to count overlay connect attempts. This counter includes both
- * successful and failed overlay connects
- */
- unsigned int oc_count;
-
/**
* Expected overlay connects. Should be zero if no topology is relavant
*/
*/
unsigned int random_links;
+ /**
+ * the number of overlay link connection attempts that succeeded
+ */
+ unsigned int links_succeeded;
+
+ /**
+ * the number of overlay link connection attempts that failed
+ */
+ unsigned int links_failed;
+
};
/**
- * Function to return the string representation of the duration between current
- * time and `pstart_time' in `RunContext'
+ * Return a 32-bit key from a pointer
*
- * @param rc the RunContext
- * @return the representation string; this is NOT reentrant
+ * @param rcop the pointer
+ * @return 32-bit key
*/
-static const char *
-prof_time (struct RunContext *rc)
+static uint32_t
+rcop_key (void *rcop)
{
- struct GNUNET_TIME_Relative ptime;
-
- ptime = GNUNET_TIME_absolute_get_duration (rc->pstart_time);
- return GNUNET_STRINGS_relative_time_to_string (ptime, GNUNET_YES);
+ return * ((uint32_t *) &rcop);
}
/**
- * Task for starting peers
+ * Context information used for finding a pointer in the rcop_map
+ */
+struct SearchContext
+{
+ /**
+ * The operation pointer to look for
+ */
+ struct GNUNET_TESTBED_Operation *query;
+
+ /**
+ * The Run context operation which has the operation being queried
+ */
+ struct RunContextOperation *result;
+};
+
+
+/**
+ * Iterator for searching over the elements matching a given query
*
- * @param cls the RunHandle
- * @param tc the task context from scheduler
+ * @param cls the SearchContext
+ * @param key the 32-bit key
+ * @param value the RunContextOperation element
+ * @return GNUNET_YES to continue iteration; GNUNET_NO to cancel it
*/
-static void
-start_peers_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+static int
+search_iterator (void *cls, uint32_t key, void *value)
{
- struct RunContext *rc = cls;
- struct DLLOperation *dll_op;
- unsigned int peer;
+ struct RunContextOperation *rcop = value;
+ struct SearchContext *sc = cls;
- DEBUG ("Starting Peers\n");
- rc->pstart_time = GNUNET_TIME_absolute_get ();
- for (peer = 0; peer < rc->num_peers; peer++)
+ GNUNET_assert (NULL != rcop);
+ if (sc->query == rcop->op)
{
- dll_op = GNUNET_malloc (sizeof (struct DLLOperation));
- dll_op->op = GNUNET_TESTBED_peer_start (NULL, rc->peers[peer], NULL, NULL);
- dll_op->cls = rc->peers[peer];
- GNUNET_CONTAINER_DLL_insert_tail (rc->dll_op_head, rc->dll_op_tail, dll_op);
+ GNUNET_assert (NULL == sc->result);
+ sc->result = rcop;
+ return GNUNET_NO;
}
- rc->peer_count = 0;
+ return GNUNET_YES;
}
/**
- * Functions of this signature are called when a peer has been successfully
- * created
+ * Initiate a search for the given operation in the rcop_map
*
- * @param cls the closure from GNUNET_TESTBED_peer_create()
- * @param peer the handle for the created peer; NULL on any error during
- * creation
- * @param emsg NULL if peer is not NULL; else MAY contain the error description
+ * @param rc the RunContext whose rcop_map will be searched for the given
+ * operation
+ * @param op the given operation to search for
+ * @return the matching RunContextOperation if found; NULL if not
*/
-static void
-peer_create_cb (void *cls, struct GNUNET_TESTBED_Peer *peer, const char *emsg)
+static struct RunContextOperation *
+search_rcop (struct GNUNET_TESTBED_RunHandle *rc, struct GNUNET_TESTBED_Operation *op)
{
- struct DLLOperation *dll_op = cls;
- struct RunContext *rc;
-
- GNUNET_assert (NULL != dll_op);
- rc = dll_op->rc;
- GNUNET_assert (NULL != rc);
- GNUNET_CONTAINER_DLL_remove (rc->dll_op_head, rc->dll_op_tail, dll_op);
- GNUNET_TESTBED_operation_done (dll_op->op);
- GNUNET_free (dll_op);
- if (NULL == peer)
+ struct SearchContext sc;
+
+ sc.query = op;
+ sc.result = NULL;
+ if (GNUNET_SYSERR ==
+ GNUNET_CONTAINER_multihashmap32_get_multiple (rc->rcop_map,
+ rcop_key (op),
+ &search_iterator,
+ &sc))
{
- if (NULL != emsg)
- LOG (GNUNET_ERROR_TYPE_WARNING, "Error while creating a peer: %s\n",
- emsg);
- /* FIXME: GNUNET_TESTBED_shutdown_run()? */
- return;
+ GNUNET_assert (NULL != sc.result);
+ return sc.result;
}
- rc->peers[rc->peer_count] = peer;
- rc->peer_count++;
- if (rc->peer_count < rc->num_peers)
- return;
- DEBUG ("%u peers created in %s\n", rc->num_peers, prof_time (rc));
- rc->state = RC_PEERS_CREATED;
- GNUNET_SCHEDULER_add_now (&start_peers_task, rc);
+ return NULL;
}
+/**
+ * Insert an RunContextOperation into the rcop_map of the given RunContext
+ *
+ * @param rc the RunContext into whose map is to be used for insertion
+ * @param rcop the RunContextOperation to insert
+ */
+static void
+insert_rcop (struct GNUNET_TESTBED_RunHandle *rc, struct RunContextOperation *rcop)
+{
+ GNUNET_assert (GNUNET_OK ==
+ GNUNET_CONTAINER_multihashmap32_put (rc->rcop_map,
+ rcop_key (rcop->op), rcop,
+ GNUNET_CONTAINER_MULTIHASHMAPOPTION_MULTIPLE));
+}
+
+
+/**
+ * Remove a RunContextOperation from the rcop_map of the given RunContext
+ *
+ * @param rc the RunContext from whose map the given RunContextOperaton has to
+ * be removed
+ * @param rcop the RunContextOperation
+ */
+static void
+remove_rcop (struct GNUNET_TESTBED_RunHandle *rc, struct RunContextOperation *rcop)
+{
+ GNUNET_assert (GNUNET_YES ==
+ GNUNET_CONTAINER_multihashmap32_remove (rc->rcop_map,
+ rcop_key (rcop->op),
+ rcop));
+}
+
/**
* Assuming all peers have been destroyed cleanup run handle
*
- * @param cls the run handle
- * @param tc the task context from scheduler
+ * @param rc the run context
*/
static void
-cleanup_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+cleanup (struct GNUNET_TESTBED_RunHandle *rc)
{
- struct RunContext *rc = cls;
- struct DLLOperation *dll_op;
unsigned int hid;
GNUNET_assert (GNUNET_SCHEDULER_NO_TASK == rc->register_hosts_task);
GNUNET_assert (NULL == rc->reg_handle);
GNUNET_assert (NULL == rc->peers);
- GNUNET_assert (NULL == rc->hc_handles);
- GNUNET_assert (RC_PEERS_DESTROYED == rc->state);
- if (NULL != rc->dll_op_head)
- { /* cancel our pending operations */
- while (NULL != (dll_op = rc->dll_op_head))
- {
- GNUNET_TESTBED_operation_done (dll_op->op);
- GNUNET_CONTAINER_DLL_remove (rc->dll_op_head, rc->dll_op_tail, dll_op);
- GNUNET_free (dll_op);
- }
- }
+ GNUNET_assert (NULL == rc->hclist);
+ GNUNET_assert (RC_PEERS_SHUTDOWN == rc->state);
+ GNUNET_assert (0 == GNUNET_CONTAINER_multihashmap32_size (rc->rcop_map));
+ GNUNET_CONTAINER_multihashmap32_destroy (rc->rcop_map);
if (NULL != rc->c)
GNUNET_TESTBED_controller_disconnect (rc->c);
if (NULL != rc->cproc)
/**
- * Stops the testbed run and releases any used resources
+ * Iterator for cleaning up elements from rcop_map
*
- * @param cls the tesbed run handle
- * @param tc the task context from scheduler
- */
-static void
-shutdown_run (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc);
-
-
-/**
- * Function to shutdown now
- *
- * @param rc the RunContext
+ * @param cls the RunContext
+ * @param key the 32-bit key
+ * @param value the RunContextOperation element
+ * @return always GNUNET_YES
*/
-static void
-shutdown_now (struct RunContext *rc)
+static int
+rcop_cleanup_iterator (void *cls, uint32_t key, void *value)
{
- if (GNUNET_YES == rc->shutdown)
- return;
- if (GNUNET_SCHEDULER_NO_TASK != rc->shutdown_run_task)
- GNUNET_SCHEDULER_cancel (rc->shutdown_run_task);
- rc->shutdown_run_task = GNUNET_SCHEDULER_add_now (&shutdown_run, rc);
+ struct GNUNET_TESTBED_RunHandle *rc = cls;
+ struct RunContextOperation *rcop = value;
+
+ GNUNET_assert (rc == rcop->rc);
+ remove_rcop (rc, rcop);
+ GNUNET_TESTBED_operation_done (rcop->op);
+ GNUNET_free (rcop);
+ return GNUNET_YES;
}
/**
- * Stops the testbed run and releases any used resources
+ * Cancels operations and tasks which are assigned to the given run context
*
- * @param cls the tesbed run handle
- * @param tc the task context from scheduler
+ * @param rc the RunContext
*/
static void
-shutdown_run (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+rc_cleanup_operations (struct GNUNET_TESTBED_RunHandle *rc)
{
- struct RunContext *rc = cls;
- struct DLLOperation *dll_op;
- int all_peers_destroyed;
- unsigned int peer;
+ struct CompatibilityCheckContext *hc;
unsigned int nhost;
- GNUNET_assert (GNUNET_SCHEDULER_NO_TASK != rc->shutdown_run_task);
- rc->shutdown_run_task = GNUNET_SCHEDULER_NO_TASK;
- GNUNET_assert (GNUNET_NO == rc->shutdown);
- rc->shutdown = GNUNET_YES;
- if (NULL != rc->hc_handles)
+ if (NULL != rc->hclist)
{
for (nhost = 0; nhost < rc->num_hosts; nhost++)
- if (NULL != rc->hc_handles[nhost])
- GNUNET_TESTBED_is_host_habitable_cancel (rc->hc_handles[nhost]);
- GNUNET_free (rc->hc_handles);
- rc->hc_handles = NULL;
+ {
+ hc = &rc->hclist[nhost];
+ if (NULL != hc->h)
+ GNUNET_TESTBED_is_host_habitable_cancel (hc->h);
+ }
+ GNUNET_free (rc->hclist);
+ rc->hclist = NULL;
}
/* Stop register hosts task if it is running */
if (GNUNET_SCHEDULER_NO_TASK != rc->register_hosts_task)
GNUNET_SCHEDULER_cancel (rc->register_hosts_task);
rc->register_hosts_task = GNUNET_SCHEDULER_NO_TASK;
}
+ if (GNUNET_SCHEDULER_NO_TASK != rc->timeout_task)
+ {
+ GNUNET_SCHEDULER_cancel (rc->timeout_task);
+ rc->timeout_task = GNUNET_SCHEDULER_NO_TASK;
+ }
if (NULL != rc->reg_handle)
{
GNUNET_TESTBED_cancel_registration (rc->reg_handle);
rc->reg_handle = NULL;
}
- if (NULL != rc->c)
+ if (NULL != rc->topology_operation)
+ {
+ GNUNET_TESTBED_operation_done (rc->topology_operation);
+ rc->topology_operation = NULL;
+ }
+ /* cancel any exiting operations */
+ GNUNET_assert (GNUNET_SYSERR !=
+ GNUNET_CONTAINER_multihashmap32_iterate (rc->rcop_map,
+ &rcop_cleanup_iterator,
+ rc));
+}
+
+
+/**
+ * Cancels the scheduled interrupt task
+ *
+ * @param rc the run context
+ */
+static void
+cancel_interrupt_task (struct GNUNET_TESTBED_RunHandle *rc)
+{
+ GNUNET_SCHEDULER_cancel (rc->interrupt_task);
+ rc->interrupt_task = GNUNET_SCHEDULER_NO_TASK;
+}
+
+
+/**
+ * This callback will be called when all the operations are completed
+ * (done/cancelled)
+ *
+ * @param cls run context
+ */
+static void
+wait_op_completion (void *cls)
+{
+ struct GNUNET_TESTBED_RunHandle *rc = cls;
+ struct RunContextOperation *rcop;
+
+ if ( (NULL == rc->cproc)
+ || (NULL == rc->c)
+ || (GNUNET_YES == rc->shutdown) )
{
if (NULL != rc->peers)
{
- if (NULL != rc->topology_operation)
- {
- GNUNET_TESTBED_operation_done (rc->topology_operation);
- rc->topology_operation = NULL;
- }
- if (RC_INIT == rc->state)
- rc->state = RC_READY; /* Even though we haven't called the master callback */
- rc->peer_count = 0;
- /* Check if some peers are stopped */
- for (peer = 0; peer < rc->num_peers; peer++)
- {
- if (NULL == rc->peers[peer])
- continue;
- if (PS_STOPPED != rc->peers[peer]->state)
- break;
- }
- if (peer == rc->num_peers)
- {
- /* All peers are stopped */
- rc->state = RC_PEERS_STOPPED;
- all_peers_destroyed = GNUNET_YES;
- for (peer = 0; peer < rc->num_peers; peer++)
- {
- if (NULL == rc->peers[peer])
- continue;
- all_peers_destroyed = GNUNET_NO;
- dll_op = GNUNET_malloc (sizeof (struct DLLOperation));
- dll_op->op = GNUNET_TESTBED_peer_destroy (rc->peers[peer]);
- GNUNET_CONTAINER_DLL_insert_tail (rc->dll_op_head, rc->dll_op_tail,
- dll_op);
- }
- if (all_peers_destroyed == GNUNET_NO)
- {
- DEBUG ("Destroying peers\n");
- rc->pstart_time = GNUNET_TIME_absolute_get ();
- return;
- }
- }
- /* Some peers are stopped */
- DEBUG ("Stopping peers\n");
- rc->pstart_time = GNUNET_TIME_absolute_get ();
- for (peer = 0; peer < rc->num_peers; peer++)
- {
- if ((NULL == rc->peers[peer]) || (PS_STARTED != rc->peers[peer]->state))
- {
- rc->peer_count++;
- continue;
- }
- dll_op = GNUNET_malloc (sizeof (struct DLLOperation));
- dll_op->op = GNUNET_TESTBED_peer_stop (rc->peers[peer], NULL, NULL);
- dll_op->cls = rc->peers[peer];
- GNUNET_CONTAINER_DLL_insert_tail (rc->dll_op_head, rc->dll_op_tail,
- dll_op);
- }
- if (rc->peer_count != rc->num_peers)
- return;
GNUNET_free (rc->peers);
rc->peers = NULL;
}
+ goto cleanup_;
+ }
+ if (NULL == rc->peers)
+ goto cleanup_;
+ rc->shutdown = GNUNET_YES;
+ rcop = GNUNET_new (struct RunContextOperation);
+ rcop->rc = rc;
+ rcop->op = GNUNET_TESTBED_shutdown_peers (rc->c, rcop, NULL, NULL);
+ GNUNET_assert (NULL != rcop->op);
+ DEBUG ("Shutting down peers\n");
+ rc->pstart_time = GNUNET_TIME_absolute_get ();
+ insert_rcop (rc, rcop);
+ return;
+
+ cleanup_:
+ rc->state = RC_PEERS_SHUTDOWN;
+ cancel_interrupt_task (rc);
+ cleanup (rc);
+}
+
+
+/**
+ * Task run upon interrupts (SIGINT, SIGTERM) and upon scheduler shutdown.
+ *
+ * @param cls the RunContext which has to be acted upon
+ * @param tc the scheduler task context
+ */
+static void
+interrupt (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+{
+ struct GNUNET_TESTBED_RunHandle *rc = cls;
+ struct GNUNET_TESTBED_Controller *c = rc->c;
+ unsigned int size;
+
+ /* reschedule */
+ rc->interrupt_task = GNUNET_SCHEDULER_add_delayed
+ (GNUNET_TIME_UNIT_FOREVER_REL, &interrupt, rc);
+ rc_cleanup_operations (rc);
+ if ( (GNUNET_NO == rc->shutdown)
+ && (NULL != c)
+ && (0 != (size = GNUNET_CONTAINER_multihashmap32_size (c->opc_map))))
+ {
+ LOG (GNUNET_ERROR_TYPE_WARNING, "Shutdown postponed as there are "
+ "%u operations currently active\n", size);
+ c->opcq_empty_cb = &wait_op_completion;
+ c->opcq_empty_cls = rc;
+ return;
}
- rc->state = RC_PEERS_DESTROYED; /* No peers are present so we consider the
- * state where all peers are destroyed */
- GNUNET_SCHEDULER_add_now (&cleanup_task, rc);
+ wait_op_completion (rc);
}
/**
- * Task to call master task
+ * Function to return the string representation of the duration between current
+ * time and `pstart_time' in `RunContext'
*
- * @param cls the run context
- * @param tc the task context
+ * @param rc the RunContext
+ * @return the representation string; this is NOT reentrant
+ */
+static const char *
+prof_time (struct GNUNET_TESTBED_RunHandle *rc)
+{
+ struct GNUNET_TIME_Relative ptime;
+
+ ptime = GNUNET_TIME_absolute_get_duration (rc->pstart_time);
+ return GNUNET_STRINGS_relative_time_to_string (ptime, GNUNET_YES);
+}
+
+
+/**
+ * Task for starting peers
+ *
+ * @param cls the RunHandle
+ * @param tc the task context from scheduler
*/
static void
-call_master (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+start_peers_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
{
- struct RunContext *rc = cls;
+ struct GNUNET_TESTBED_RunHandle *rc = cls;
+ struct RunContextOperation *rcop;
+ unsigned int peer;
- if (NULL != rc->topology_operation)
+ DEBUG ("Starting Peers\n");
+ rc->pstart_time = GNUNET_TIME_absolute_get ();
+ for (peer = 0; peer < rc->num_peers; peer++)
{
- DEBUG ("Overlay topology generated in %s\n", prof_time (rc));
- GNUNET_TESTBED_operation_done (rc->topology_operation);
- rc->topology_operation = NULL;
+ rcop = GNUNET_new (struct RunContextOperation);
+ rcop->rc = rc;
+ rcop->op = GNUNET_TESTBED_peer_start (NULL, rc->peers[peer], NULL, NULL);
+ GNUNET_assert (NULL != rcop->op);
+ rcop->cls = rc->peers[peer];
+ insert_rcop (rc, rcop);
+ }
+ rc->peer_count = 0;
+}
+
+
+/**
+ * Functions of this signature are called when a peer has been successfully
+ * created
+ *
+ * @param cls the closure from GNUNET_TESTBED_peer_create()
+ * @param peer the handle for the created peer; NULL on any error during
+ * creation
+ * @param emsg NULL if peer is not NULL; else MAY contain the error description
+ */
+static void
+peer_create_cb (void *cls, struct GNUNET_TESTBED_Peer *peer, const char *emsg)
+{
+ struct RunContextOperation *rcop = cls;
+ struct GNUNET_TESTBED_RunHandle *rc;
+
+ GNUNET_assert (NULL != rcop);
+ GNUNET_assert (NULL != (rc = rcop->rc));
+ remove_rcop (rc, rcop);
+ GNUNET_TESTBED_operation_done (rcop->op);
+ GNUNET_free (rcop);
+ if (NULL == peer)
+ {
+ if (NULL != emsg)
+ LOG (GNUNET_ERROR_TYPE_ERROR, "Error while creating a peer: %s\n",
+ emsg);
+ GNUNET_SCHEDULER_shutdown ();
+ return;
}
+ rc->peers[rc->peer_count] = peer;
+ rc->peer_count++;
+ if (rc->peer_count < rc->num_peers)
+ return;
+ DEBUG ("%u peers created in %s\n", rc->num_peers, prof_time (rc));
+ rc->state = RC_PEERS_CREATED;
+ GNUNET_SCHEDULER_add_now (&start_peers_task, rc);
+}
+
+
+/**
+ * call test master callback
+ *
+ * @param rc the RunContext
+ */
+static void
+call_master (struct GNUNET_TESTBED_RunHandle *rc)
+{
+ GNUNET_SCHEDULER_cancel (rc->timeout_task);
+ rc->timeout_task = GNUNET_SCHEDULER_NO_TASK;
if (NULL != rc->test_master)
- rc->test_master (rc->test_master_cls, rc->num_peers, rc->peers);
+ rc->test_master (rc->test_master_cls, rc, rc->num_peers, rc->peers,
+ rc->links_succeeded, rc->links_failed);
+}
+
+
+/**
+ * Callbacks of this type are called when topology configuration is completed
+ *
+ * @param cls the operation closure given to
+ * GNUNET_TESTBED_overlay_configure_topology_va() and
+ * GNUNET_TESTBED_overlay_configure() calls
+ * @param nsuccess the number of successful overlay connects
+ * @param nfailures the number of overlay connects which failed
+ */
+static void
+topology_completion_callback (void *cls, unsigned int nsuccess,
+ unsigned int nfailures)
+{
+ struct GNUNET_TESTBED_RunHandle *rc = cls;
+
+ DEBUG ("Overlay topology generated in %s\n", prof_time (rc));
+ GNUNET_TESTBED_operation_done (rc->topology_operation);
+ rc->topology_operation = NULL;
+ rc->links_succeeded = nsuccess;
+ rc->links_failed = nfailures;
+ rc->state = RC_READY;
+ call_master (rc);
}
* @param rc the RunContext
*/
static void
-create_peers (struct RunContext *rc)
+create_peers (struct GNUNET_TESTBED_RunHandle *rc)
{
- struct DLLOperation *dll_op;
+ struct RunContextOperation *rcop;
unsigned int peer;
DEBUG ("Creating peers\n");
rc->peer_count = 0;
for (peer = 0; peer < rc->num_peers; peer++)
{
- dll_op = GNUNET_malloc (sizeof (struct DLLOperation));
- dll_op->rc = rc;
- dll_op->op =
+ rcop = GNUNET_new (struct RunContextOperation);
+ rcop->rc = rc;
+ rcop->op =
GNUNET_TESTBED_peer_create (rc->c,
(0 ==
rc->num_hosts) ? rc->h : rc->hosts[peer %
rc->num_hosts],
- rc->cfg, peer_create_cb, dll_op);
- GNUNET_CONTAINER_DLL_insert_tail (rc->dll_op_head, rc->dll_op_tail, dll_op);
+ rc->cfg, &peer_create_cb, rcop);
+ GNUNET_assert (NULL != rcop->op);
+ insert_rcop (rc, rcop);
}
}
static void
event_cb (void *cls, const struct GNUNET_TESTBED_EventInformation *event)
{
- struct RunContext *rc = cls;
- struct DLLOperation *dll_op;
- unsigned int peer_id;
+ struct GNUNET_TESTBED_RunHandle *rc = cls;
+ struct RunContextOperation *rcop;
if (RC_INIT == rc->state)
{
switch (event->type)
{
case GNUNET_TESTBED_ET_OPERATION_FINISHED:
- dll_op = event->details.operation_finished.op_cls;
+ rcop = event->op_cls;
if (NULL != event->details.operation_finished.emsg)
{
LOG (GNUNET_ERROR_TYPE_ERROR, _("Linking controllers failed. Exiting"));
- shutdown_now (rc);
+ GNUNET_SCHEDULER_shutdown ();
}
else
rc->reg_hosts++;
- GNUNET_assert (event->details.operation_finished.operation == dll_op->op);
- GNUNET_CONTAINER_DLL_remove (rc->dll_op_head, rc->dll_op_tail, dll_op);
- GNUNET_TESTBED_operation_done (dll_op->op);
- GNUNET_free (dll_op);
+ GNUNET_assert (event->op == rcop->op);
+ remove_rcop (rc, rcop);
+ GNUNET_TESTBED_operation_done (rcop->op);
+ GNUNET_free (rcop);
if (rc->reg_hosts == rc->num_hosts)
{
rc->state = RC_LINKED;
return;
default:
GNUNET_break (0);
- shutdown_now (rc);
+ GNUNET_SCHEDULER_shutdown ();
return;
}
}
- if (NULL != rc->topology_operation)
- {
- switch (event->type)
- {
- case GNUNET_TESTBED_ET_OPERATION_FINISHED:
- case GNUNET_TESTBED_ET_CONNECT:
- rc->oc_count++;
- break;
- default:
- GNUNET_break (0);
- shutdown_now (rc);
- return;
- }
- if (rc->oc_count == rc->num_oc)
- {
- rc->state = RC_READY;
- GNUNET_SCHEDULER_add_continuation (&call_master, rc,
- GNUNET_SCHEDULER_REASON_PREREQ_DONE);
- }
+ if (GNUNET_TESTBED_ET_OPERATION_FINISHED != event->type)
goto call_cc;
- }
- for (dll_op = rc->dll_op_head; NULL != dll_op; dll_op = dll_op->next)
- {
- if ((GNUNET_TESTBED_ET_OPERATION_FINISHED == event->type) &&
- (event->details.operation_finished.operation == dll_op->op))
- break;
- if ((GNUNET_TESTBED_ET_PEER_STOP == event->type) &&
- (event->details.peer_stop.peer == dll_op->cls))
- break;
- }
- if (NULL == dll_op)
+ if (NULL == (rcop = search_rcop (rc, event->op)))
goto call_cc;
- GNUNET_CONTAINER_DLL_remove (rc->dll_op_head, rc->dll_op_tail, dll_op);
- GNUNET_TESTBED_operation_done (dll_op->op);
- GNUNET_free (dll_op);
- rc->peer_count++;
- if (rc->peer_count < rc->num_peers)
+ remove_rcop (rc, rcop);
+ GNUNET_TESTBED_operation_done (rcop->op);
+ GNUNET_free (rcop);
+ if ( (GNUNET_NO == rc->shutdown)
+ && (NULL != event->details.operation_finished.emsg) )
+ {
+ LOG (GNUNET_ERROR_TYPE_ERROR, "A operation has failed with error: %s\n",
+ event->details.operation_finished.emsg);
+ GNUNET_SCHEDULER_shutdown ();
return;
+ }
+ GNUNET_assert (GNUNET_YES == rc->shutdown);
switch (rc->state)
{
+ case RC_LINKED:
case RC_PEERS_CREATED:
case RC_READY:
- rc->state = RC_PEERS_STOPPED;
- DEBUG ("Peers stopped in %s\n", prof_time (rc));
- DEBUG ("Destroying peers\n");
- rc->pstart_time = GNUNET_TIME_absolute_get ();
- rc->peer_count = 0;
- for (peer_id = 0; peer_id < rc->num_peers; peer_id++)
- {
- dll_op = GNUNET_malloc (sizeof (struct DLLOperation));
- dll_op->op = GNUNET_TESTBED_peer_destroy (rc->peers[peer_id]);
- GNUNET_CONTAINER_DLL_insert_tail (rc->dll_op_head, rc->dll_op_tail,
- dll_op);
- }
- break;
- case RC_PEERS_STOPPED:
- rc->state = RC_PEERS_DESTROYED;
- GNUNET_free (rc->peers);
+ rc->state = RC_PEERS_SHUTDOWN;
+ GNUNET_free_non_null (rc->peers);
rc->peers = NULL;
- DEBUG ("Peers destroyed in %s\n", prof_time (rc));
- GNUNET_SCHEDULER_add_now (&cleanup_task, rc);
+ DEBUG ("Peers shut down in %s\n", prof_time (rc));
+ GNUNET_SCHEDULER_shutdown ();
break;
default:
GNUNET_assert (0);
rc->cc (rc->cc_cls, event);
if (GNUNET_TESTBED_ET_PEER_START != event->type)
return;
- for (dll_op = rc->dll_op_head; NULL != dll_op; dll_op = dll_op->next)
- if ((NULL != dll_op->cls) &&
- (event->details.peer_start.peer == dll_op->cls))
- break;
- if (NULL == dll_op) /* Not our operation */
+ if (NULL == (rcop = search_rcop (rc, event->op))) /* Not our operation */
return;
- GNUNET_CONTAINER_DLL_remove (rc->dll_op_head, rc->dll_op_tail, dll_op);
- GNUNET_TESTBED_operation_done (dll_op->op);
- GNUNET_free (dll_op);
+ remove_rcop (rc, rcop);
+ GNUNET_TESTBED_operation_done (rcop->op);
+ GNUNET_free (rcop);
rc->peer_count++;
if (rc->peer_count < rc->num_peers)
return;
DEBUG ("%u peers started in %s\n", rc->num_peers, prof_time (rc));
if (GNUNET_TESTBED_TOPOLOGY_NONE != rc->topology)
{
- if ((GNUNET_TESTBED_TOPOLOGY_ERDOS_RENYI == rc->topology) ||
- (GNUNET_TESTBED_TOPOLOGY_SMALL_WORLD_RING == rc->topology) ||
- (GNUNET_TESTBED_TOPOLOGY_SMALL_WORLD == rc->topology))
+ switch (rc->topology)
{
+ case GNUNET_TESTBED_TOPOLOGY_NONE:
+ GNUNET_assert (0);
+ case GNUNET_TESTBED_TOPOLOGY_ERDOS_RENYI:
+ case GNUNET_TESTBED_TOPOLOGY_SMALL_WORLD_RING:
+ case GNUNET_TESTBED_TOPOLOGY_SMALL_WORLD:
rc->topology_operation =
GNUNET_TESTBED_overlay_configure_topology (NULL, rc->num_peers,
rc->peers, &rc->num_oc,
+ &topology_completion_callback,
+ rc,
rc->topology,
rc->random_links,
GNUNET_TESTBED_TOPOLOGY_OPTION_END);
- }
- else if (GNUNET_TESTBED_TOPOLOGY_FROM_FILE == rc->topology)
- {
+ break;
+ case GNUNET_TESTBED_TOPOLOGY_FROM_FILE:
GNUNET_assert (NULL != rc->topo_file);
rc->topology_operation =
GNUNET_TESTBED_overlay_configure_topology (NULL, rc->num_peers,
rc->peers, &rc->num_oc,
+ &topology_completion_callback,
+ rc,
rc->topology,
rc->topo_file,
GNUNET_TESTBED_TOPOLOGY_OPTION_END);
- }
- else
+ break;
+ case GNUNET_TESTBED_TOPOLOGY_SCALE_FREE:
+ {
+ unsigned long long number;
+ unsigned int cap;
+ GNUNET_assert (GNUNET_OK ==
+ GNUNET_CONFIGURATION_get_value_number (rc->cfg, TESTBED_CONFIG_SECTION,
+ SCALE_FREE_CAP,
+ &number));
+ cap = (unsigned int) number;
+ GNUNET_assert (GNUNET_OK ==
+ GNUNET_CONFIGURATION_get_value_number (rc->cfg, TESTBED_CONFIG_SECTION,
+ SCALE_FREE_M,
+ &number));
+ rc->topology_operation =
+ GNUNET_TESTBED_overlay_configure_topology (NULL, rc->num_peers,
+ rc->peers, &rc->num_oc,
+ &topology_completion_callback,
+ rc,
+ rc->topology,
+ cap, /* uint16_t */
+ (unsigned int) number, /* uint8_t */
+ GNUNET_TESTBED_TOPOLOGY_OPTION_END);
+ }
+ break;
+ default:
rc->topology_operation =
GNUNET_TESTBED_overlay_configure_topology (NULL, rc->num_peers,
rc->peers, &rc->num_oc,
+ &topology_completion_callback,
+ rc,
rc->topology,
GNUNET_TESTBED_TOPOLOGY_OPTION_END);
+ }
if (NULL == rc->topology_operation)
LOG (GNUNET_ERROR_TYPE_WARNING,
- "Not generating topology. Check number of peers\n");
+ "Not generating a topology. Check number of peers\n");
else
{
DEBUG ("Creating overlay topology\n");
}
}
rc->state = RC_READY;
- GNUNET_SCHEDULER_add_continuation (&call_master, rc,
- GNUNET_SCHEDULER_REASON_PREREQ_DONE);
+ call_master (rc);
}
static void
host_registration_completion (void *cls, const char *emsg)
{
- struct RunContext *rc = cls;
+ struct GNUNET_TESTBED_RunHandle *rc = cls;
rc->reg_handle = NULL;
if (NULL != emsg)
{
LOG (GNUNET_ERROR_TYPE_WARNING,
_("Host registration failed for a host. Error: %s\n"), emsg);
- shutdown_now (rc);
+ GNUNET_SCHEDULER_shutdown ();
return;
}
rc->register_hosts_task = GNUNET_SCHEDULER_add_now (®ister_hosts, rc);
static void
register_hosts (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
{
- struct RunContext *rc = cls;
- struct DLLOperation *dll_op;
+ struct GNUNET_TESTBED_RunHandle *rc = cls;
+ struct RunContextOperation *rcop;
unsigned int slave;
rc->register_hosts_task = GNUNET_SCHEDULER_NO_TASK;
/* Start slaves */
for (slave = 0; slave < rc->num_hosts; slave++)
{
- dll_op = GNUNET_malloc (sizeof (struct DLLOperation));
- dll_op->rc = rc;
- dll_op->op =
- GNUNET_TESTBED_controller_link (dll_op, rc->c, rc->hosts[slave],
- rc->h, rc->cfg, GNUNET_YES);
- GNUNET_CONTAINER_DLL_insert_tail (rc->dll_op_head, rc->dll_op_tail,
- dll_op);
+ rcop = GNUNET_new (struct RunContextOperation);
+ rcop->rc = rc;
+ rcop->op =
+ GNUNET_TESTBED_controller_link (rcop, rc->c, rc->hosts[slave],
+ rc->h, GNUNET_YES);
+ GNUNET_assert (NULL != rcop->op);
+ insert_rcop (rc, rcop);
}
rc->reg_hosts = 0;
return;
controller_status_cb (void *cls, const struct GNUNET_CONFIGURATION_Handle *cfg,
int status)
{
- struct RunContext *rc = cls;
+ struct GNUNET_TESTBED_RunHandle *rc = cls;
uint64_t event_mask;
if (status != GNUNET_OK)
{
- switch (rc->state)
- {
- case RC_INIT:
- GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "Testbed startup failed\n");
- return;
- default:
- GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
- "Controller crash detected. Shutting down.\n");
- rc->cproc = NULL;
- shutdown_now (rc);
- return;
- }
+ rc->cproc = NULL;
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ _("Controller crash detected. Shutting down.\n"));
+ GNUNET_SCHEDULER_shutdown ();
+ return;
}
GNUNET_CONFIGURATION_destroy (rc->cfg);
rc->cfg = GNUNET_CONFIGURATION_dup (cfg);
event_mask = rc->event_mask;
- event_mask |= (1LL << GNUNET_TESTBED_ET_PEER_STOP);
event_mask |= (1LL << GNUNET_TESTBED_ET_OPERATION_FINISHED);
event_mask |= (1LL << GNUNET_TESTBED_ET_PEER_START);
if (rc->topology < GNUNET_TESTBED_TOPOLOGY_NONE)
event_mask |= GNUNET_TESTBED_ET_CONNECT;
rc->c =
- GNUNET_TESTBED_controller_connect (rc->cfg, rc->h, event_mask, &event_cb,
- rc);
+ GNUNET_TESTBED_controller_connect (rc->h, event_mask, &event_cb, rc);
if (0 < rc->num_hosts)
{
rc->reg_hosts = 0;
const struct sockaddr *addr, const struct sockaddr *broadcast_addr,
const struct sockaddr *netmask, socklen_t addrlen)
{
- struct RunContext *rc = cls;
+ struct GNUNET_TESTBED_RunHandle *rc = cls;
char hostip[NI_MAXHOST];
char *buf;
host_habitable_cb (void *cls, const struct GNUNET_TESTBED_Host *host,
int status)
{
- struct RunContext *rc = cls;
+ struct CompatibilityCheckContext *hc = cls;
+ struct GNUNET_TESTBED_RunHandle *rc;
struct GNUNET_TESTBED_Host **old_hosts;
unsigned int nhost;
- for (nhost = 0; nhost < rc->num_hosts; nhost++)
- {
- if (host == rc->hosts[nhost])
- break;
- }
- GNUNET_assert (nhost != rc->num_hosts);
- rc->hc_handles[nhost] = NULL;
+ GNUNET_assert (NULL != (rc = hc->rc));
+ nhost = hc->index;
+ GNUNET_assert (nhost <= rc->num_hosts);
+ GNUNET_assert (host == rc->hosts[nhost]);
+ hc->h = NULL;
if (GNUNET_NO == status)
{
if ((NULL != host) && (NULL != GNUNET_TESTBED_host_get_hostname (host)))
else
LOG (GNUNET_ERROR_TYPE_ERROR,
_("Testbed cannot be started on localhost\n"));
- shutdown_now (rc);
+ GNUNET_SCHEDULER_shutdown ();
return;
}
rc->reg_hosts++;
if (rc->reg_hosts < rc->num_hosts)
return;
- GNUNET_free (rc->hc_handles);
- rc->hc_handles = NULL;
+ GNUNET_free (rc->hclist);
+ rc->hclist = NULL;
rc->h = rc->hosts[0];
rc->num_hosts--;
if (0 < rc->num_hosts)
GNUNET_free (rc->hosts);
rc->hosts = NULL;
}
+ GNUNET_TESTBED_host_resolve_ (rc->h);
+ for (nhost = 0; nhost < rc->num_hosts; nhost++)
+ GNUNET_TESTBED_host_resolve_ (rc->hosts[nhost]);
GNUNET_OS_network_interfaces_list (netint_proc, rc);
if (NULL == rc->trusted_ip)
rc->trusted_ip = GNUNET_strdup ("127.0.0.1");
rc->cproc =
- GNUNET_TESTBED_controller_start (rc->trusted_ip, rc->h, rc->cfg,
+ GNUNET_TESTBED_controller_start (rc->trusted_ip, rc->h,
&controller_status_cb, rc);
GNUNET_free (rc->trusted_ip);
rc->trusted_ip = NULL;
if (NULL == rc->cproc)
{
LOG (GNUNET_ERROR_TYPE_ERROR, _("Cannot start the master controller"));
- shutdown_now (rc);
+ GNUNET_SCHEDULER_shutdown ();
}
}
+/**
+ * Task run upon timeout while setting up the testbed
+ *
+ * @param cls the RunContext
+ * @param tc the task context
+ */
+static void
+timeout_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+{
+ struct GNUNET_TESTBED_RunHandle *rc = cls;
+
+ rc->timeout_task = GNUNET_SCHEDULER_NO_TASK;
+ LOG (GNUNET_ERROR_TYPE_ERROR, _("Shutting down testbed due to timeout while setup.\n"));
+ GNUNET_SCHEDULER_shutdown ();
+ if (NULL != rc->test_master)
+ rc->test_master (rc->test_master_cls, rc, 0, NULL, 0, 0);
+ rc->test_master = NULL;
+}
+
+
/**
* Convenience method for running a testbed with
* a single call. Underlay and overlay topology
GNUNET_TESTBED_TestMaster test_master,
void *test_master_cls)
{
- struct RunContext *rc;
+ struct GNUNET_TESTBED_RunHandle *rc;
char *topology;
- unsigned long long random_links;
+ struct CompatibilityCheckContext *hc;
+ struct GNUNET_TIME_Relative timeout;
+ unsigned long long number;
unsigned int hid;
unsigned int nhost;
GNUNET_assert (num_peers > 0);
- rc = GNUNET_malloc (sizeof (struct RunContext));
+ rc = GNUNET_new (struct GNUNET_TESTBED_RunHandle);
+ rc->cfg = GNUNET_CONFIGURATION_dup (cfg);
+#if ENABLE_SUPERMUC
+ rc->num_hosts = GNUNET_TESTBED_hosts_load_from_loadleveler (rc->cfg,
+ &rc->hosts);
+ if (0 == rc->num_hosts)
+ {
+ LOG (GNUNET_ERROR_TYPE_WARNING,
+ _("No hosts loaded from LoadLeveler. Need at least one host\n"));
+ goto error_cleanup;
+ }
+#else
if (NULL != host_filename)
{
rc->num_hosts =
- GNUNET_TESTBED_hosts_load_from_file (host_filename, &rc->hosts);
+ GNUNET_TESTBED_hosts_load_from_file (host_filename, rc->cfg,
+ &rc->hosts);
if (0 == rc->num_hosts)
{
LOG (GNUNET_ERROR_TYPE_WARNING,
}
}
else
- rc->h = GNUNET_TESTBED_host_create (NULL, NULL, 0);
- rc->cfg = GNUNET_CONFIGURATION_dup (cfg);
+ rc->h = GNUNET_TESTBED_host_create (NULL, NULL, rc->cfg, 0);
+#endif
rc->num_peers = num_peers;
rc->event_mask = event_mask;
rc->cc = cc;
rc->state = RC_INIT;
rc->topology = GNUNET_TESTBED_TOPOLOGY_NONE;
if (GNUNET_OK ==
- GNUNET_CONFIGURATION_get_value_string (rc->cfg, "testbed",
+ GNUNET_CONFIGURATION_get_value_string (rc->cfg, TESTBED_CONFIG_SECTION,
"OVERLAY_TOPOLOGY", &topology))
{
if (GNUNET_NO == GNUNET_TESTBED_topology_get_ (&rc->topology, topology))
{
- GNUNET_log_config_invalid (GNUNET_ERROR_TYPE_ERROR, "testbed",
+ GNUNET_log_config_invalid (GNUNET_ERROR_TYPE_ERROR, TESTBED_CONFIG_SECTION,
"OVERLAY_TOPLOGY",
_
("Specified topology must be supported by testbed"));
case GNUNET_TESTBED_TOPOLOGY_SMALL_WORLD_RING:
case GNUNET_TESTBED_TOPOLOGY_SMALL_WORLD:
if (GNUNET_OK !=
- GNUNET_CONFIGURATION_get_value_number (rc->cfg, "testbed",
+ GNUNET_CONFIGURATION_get_value_number (rc->cfg, TESTBED_CONFIG_SECTION,
"OVERLAY_RANDOM_LINKS",
- &random_links))
+ &number))
{
/* OVERLAY option RANDOM & SMALL_WORLD_RING requires OVERLAY_RANDOM_LINKS
* option to be set to the number of random links to be established */
- GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR, "testbed",
+ GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR, TESTBED_CONFIG_SECTION,
"OVERLAY_RANDOM_LINKS");
goto error_cleanup;
}
- if (random_links > UINT32_MAX)
+ if (number > UINT32_MAX)
{
GNUNET_break (0); /* Too big number */
goto error_cleanup;
}
- rc->random_links = (unsigned int) random_links;
+ rc->random_links = (unsigned int) number;
break;
case GNUNET_TESTBED_TOPOLOGY_FROM_FILE:
if (GNUNET_OK !=
- GNUNET_CONFIGURATION_get_value_string (rc->cfg, "testbed",
+ GNUNET_CONFIGURATION_get_value_filename (rc->cfg, TESTBED_CONFIG_SECTION,
"OVERLAY_TOPOLOGY_FILE",
&rc->topo_file))
{
- GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR, "testbed",
+ GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR, TESTBED_CONFIG_SECTION,
"OVERLAY_TOPOLOGY_FILE");
goto error_cleanup;
}
+ goto warn_ignore;
+ case GNUNET_TESTBED_TOPOLOGY_SCALE_FREE:
+ if (GNUNET_OK !=
+ GNUNET_CONFIGURATION_get_value_number (rc->cfg, TESTBED_CONFIG_SECTION,
+ SCALE_FREE_CAP, &number))
+ {
+ GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR, TESTBED_CONFIG_SECTION,
+ SCALE_FREE_CAP);
+ goto error_cleanup;
+ }
+ if (UINT16_MAX < number)
+ {
+ LOG (GNUNET_ERROR_TYPE_ERROR,
+ _("Maximum number of edges a peer can have in a scale free topology"
+ " cannot be more than %u. Given `%s = %llu'"), UINT16_MAX,
+ SCALE_FREE_CAP, number);
+ goto error_cleanup;
+ }
+ if (GNUNET_OK !=
+ GNUNET_CONFIGURATION_get_value_number (rc->cfg, TESTBED_CONFIG_SECTION,
+ SCALE_FREE_M, &number))
+ {
+ GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR, TESTBED_CONFIG_SECTION,
+ SCALE_FREE_M);
+ goto error_cleanup;
+ }
+ if (UINT8_MAX < number)
+ {
+ LOG (GNUNET_ERROR_TYPE_ERROR,
+ _("The number of edges that can established when adding a new node"
+ " to scale free topology cannot be more than %u. Given `%s = %llu'"),
+ UINT8_MAX, SCALE_FREE_M, number);
+ goto error_cleanup;
+ }
+ goto warn_ignore;
default:
+ warn_ignore:
/* Warn if OVERLAY_RANDOM_LINKS is present that it will be ignored */
if (GNUNET_YES ==
- GNUNET_CONFIGURATION_have_value (rc->cfg, "testbed",
+ GNUNET_CONFIGURATION_have_value (rc->cfg, TESTBED_CONFIG_SECTION,
"OVERLAY_RANDOM_LINKS"))
LOG (GNUNET_ERROR_TYPE_WARNING,
"Ignoring value of `OVERLAY_RANDOM_LINKS' in given configuration\n");
break;
}
- if (NULL != host_filename)
+ if (0 != rc->num_hosts)
{
- rc->hc_handles =
- GNUNET_malloc (sizeof (struct GNUNET_TESTBED_HostHabitableCheckHandle *)
- * rc->num_hosts);
+ rc->hclist = GNUNET_malloc (sizeof (struct CompatibilityCheckContext)
+ * rc->num_hosts);
for (nhost = 0; nhost < rc->num_hosts; nhost++)
{
- if (NULL ==
- (rc->hc_handles[nhost] =
- GNUNET_TESTBED_is_host_habitable (rc->hosts[nhost], rc->cfg,
- &host_habitable_cb, rc)))
+ hc = &rc->hclist[nhost];
+ hc->index = nhost;
+ hc->rc = rc;
+ hc->h = GNUNET_TESTBED_is_host_habitable (rc->hosts[nhost], rc->cfg,
+ &host_habitable_cb, hc);
+ if (NULL == hc->h)
{
GNUNET_break (0);
for (nhost = 0; nhost < rc->num_hosts; nhost++)
- if (NULL != rc->hc_handles[nhost])
- GNUNET_TESTBED_is_host_habitable_cancel (rc->hc_handles[nhost]);
- GNUNET_free (rc->hc_handles);
- rc->hc_handles = NULL;
+ {
+ hc = &rc->hclist[nhost];
+ if (NULL != hc->h)
+ GNUNET_TESTBED_is_host_habitable_cancel (hc->h);
+ }
+ GNUNET_free (rc->hclist);
+ rc->hclist = NULL;
goto error_cleanup;
}
}
}
else
rc->cproc =
- GNUNET_TESTBED_controller_start ("127.0.0.1", rc->h, rc->cfg,
+ GNUNET_TESTBED_controller_start ("127.0.0.1", rc->h,
&controller_status_cb, rc);
- rc->shutdown_run_task =
- GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL, &shutdown_run,
+ if (GNUNET_OK != GNUNET_CONFIGURATION_get_value_time (cfg, TESTBED_CONFIG_SECTION,
+ "SETUP_TIMEOUT",
+ &timeout))
+ {
+ timeout = GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS,
+ DEFAULT_SETUP_TIMEOUT);
+ }
+ rc->rcop_map = GNUNET_CONTAINER_multihashmap32_create (256);
+ rc->timeout_task =
+ GNUNET_SCHEDULER_add_delayed (timeout, &timeout_task, rc);
+ rc->interrupt_task =
+ GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL, &interrupt,
rc);
return;
GNUNET_TESTBED_host_destroy (rc->hosts[hid]);
GNUNET_free (rc->hosts);
}
+ if (NULL != rc->cfg)
+ GNUNET_CONFIGURATION_destroy (rc->cfg);
GNUNET_free (rc);
}
+/**
+ * Obtain handle to the master controller from a testbed run. The handle
+ * returned should not be disconnected.
+ *
+ * @param h the testbed run handle
+ * @return handle to the master controller
+ */
+struct GNUNET_TESTBED_Controller *
+GNUNET_TESTBED_run_get_controller_handle (struct GNUNET_TESTBED_RunHandle *h)
+{
+ return h->c;
+}
+
+
/* end of testbed_api_testbed.c */
projects / oweals / gnunet.git / blobdiff