* @file testing/testing_group.c
* @brief convenience API for writing testcases for GNUnet
* @author Christian Grothoff
+ *
+ * FIXME: have connection processor functions take a cls argument
+ * which specifies where to write the connection information
+ * instead of assuming it's certain peergroup places. (maybe?)
+ * FIXME: create static struct which contains the TOPOLOGY enum, the
+ * associated string, and the function used to create it.
+ * Then replace the create_X calls with topology_struct[i][2]
+ * or something. (Store function pointers instead of using
+ * switch statements)
*/
#include "platform.h"
#include "gnunet_arm_service.h"
#define VERBOSE_TESTING GNUNET_NO
+#define VERBOSE_TOPOLOGY GNUNET_NO
+
+#define DEBUG_CHURN GNUNET_NO
+
/**
* Lowest port used for GNUnet testing. Should be high enough to not
* conflict with other applications running on the hosts but be low
typedef int (*GNUNET_TESTING_ConnectionProcessor)
(struct GNUNET_TESTING_PeerGroup *pg, unsigned int first, unsigned int second);
+/**
+ * Strings representing topologies in enum
+ */
+static char * GNUNET_TESTING_TopologyStrings[] =
+{
+ /**
+ * A clique (everyone connected to everyone else).
+ */
+ "CLIQUE",
+
+ /**
+ * Small-world network (2d torus plus random links).
+ */
+ "SMALL_WORLD",
+
+ /**
+ * Small-world network (ring plus random links).
+ */
+ "SMALL_WORLD_RING",
+
+ /**
+ * Ring topology.
+ */
+ "RING",
+
+ /**
+ * 2-d torus.
+ */
+ "2D_TORUS",
+
+ /**
+ * Random graph.
+ */
+ "ERDOS_RENYI",
+
+ /**
+ * Certain percentage of peers are unable to communicate directly
+ * replicating NAT conditions
+ */
+ "INTERNAT",
+
+ /**
+ * Scale free topology.
+ */
+ "SCALE_FREE",
+
+ /**
+ * Straight line topology.
+ */
+ "LINE",
+
+ /**
+ * All peers are disconnected.
+ */
+ "NONE"
+};
+
+/**
+ * Options for connecting a topology as strings.
+ */
+static char * GNUNET_TESTING_TopologyOptionStrings[] =
+{
+ /**
+ * Try to connect all peers specified in the topology.
+ */
+ "CONNECT_ALL",
+
+ /**
+ * Choose a random subset of connections to create.
+ */
+ "CONNECT_RANDOM_SUBSET",
+
+ /**
+ * Create at least X connections for each peer.
+ */
+ "CONNECT_MINIMUM",
+
+ /**
+ * Using a depth first search, create one connection
+ * per peer. If any are missed (graph disconnected)
+ * start over at those peers until all have at least one
+ * connection.
+ */
+ "CONNECT_DFS",
+
+ /**
+ * No options specified.
+ */
+ "CONNECT_NONE"
+};
+
/**
* Context for handling churning a peer group
*/
struct UpdateContext
{
struct GNUNET_CONFIGURATION_Handle *ret;
- unsigned int nport;
const char *hostname;
+ unsigned int nport;
+ unsigned int upnum;
};
*/
static int outstanding_connects;
+/**
+ * Get a topology from a string input.
+ *
+ * @param topology where to write the retrieved topology
+ * @param topology_string The string to attempt to
+ * get a configuration value from
+ * @return GNUNET_YES if topology string matched a
+ * known topology, GNUNET_NO if not
+ */
+int
+GNUNET_TESTING_topology_get(enum GNUNET_TESTING_Topology *topology, char * topology_string)
+{
+ int found = 0;
+ int curr = 0;
+
+ if (topology_string == NULL)
+ return GNUNET_NO;
+
+ do
+ {
+ if (strcmp(GNUNET_TESTING_TopologyStrings[curr], topology_string) == 0)
+ {
+ found = GNUNET_YES;
+ break;
+ }
+ curr++;
+ } while (strcmp(GNUNET_TESTING_TopologyStrings[curr], "NONE") != 0);
+ *topology = curr;
+ if (found)
+ return GNUNET_YES;
+ else
+ return GNUNET_NO;
+}
+
+/**
+ * Get connect topology option from string input.
+ *
+ * @param topology where to write the retrieved topology
+ * @param topology_string The string to attempt to
+ * get a configuration value from
+ * @return GNUNET_YES if string matched a known
+ * topology option, GNUNET_NO if not
+ */
+int
+GNUNET_TESTING_topology_option_get(enum GNUNET_TESTING_TopologyOption *topology, char * topology_string)
+{
+ int found = 0;
+ int curr = 0;
+
+ if (topology_string == NULL)
+ return GNUNET_NO;
+
+ do
+ {
+ if (strcmp(GNUNET_TESTING_TopologyOptionStrings[curr], topology_string) == 0)
+ {
+ found = GNUNET_YES;
+ break;
+ }
+ curr++;
+ } while (strcmp(GNUNET_TESTING_TopologyOptionStrings[curr], "CONNECT_NONE") != 0);
+ *topology = curr;
+ if (found)
+ return GNUNET_YES;
+ else
+ return GNUNET_NO;
+}
/**
* Function to iterate over options. Copies
struct UpdateContext *ctx = cls;
unsigned int ival;
char cval[12];
+ char uval[128];
if ((0 == strcmp (option, "PORT")) && (1 == sscanf (value, "%u", &ival)))
{
- GNUNET_snprintf (cval, sizeof (cval), "%u", ctx->nport++);
- value = cval;
+ if (ival != 0)
+ {
+ GNUNET_snprintf (cval, sizeof (cval), "%u", ctx->nport++);
+ value = cval;
+ }
+ }
+
+ if (0 == strcmp (option, "UNIXPATH"))
+ {
+ GNUNET_snprintf (uval,
+ sizeof (uval),
+ "/tmp/test-service-%s-%u",
+ section,
+ ctx->upnum++);
+ value = uval;
}
if ((0 == strcmp (option, "HOSTNAME")) && (ctx->hostname != NULL))
* @param cfg template configuration
* @param port port numbers to use, update to reflect
* port numbers that were used
+ * @param upnum number to make unix domain socket names unique
* @param hostname hostname of the controlling host, to allow control connections from
*
* @return new configuration, NULL on error
*/
static struct GNUNET_CONFIGURATION_Handle *
-make_config (const struct GNUNET_CONFIGURATION_Handle *cfg, uint16_t * port, const char *hostname)
+make_config (const struct GNUNET_CONFIGURATION_Handle *cfg,
+ uint16_t * port,
+ uint32_t * upnum,
+ const char *hostname)
{
struct UpdateContext uc;
uint16_t orig;
orig = *port;
uc.nport = *port;
+ uc.upnum = *upnum;
uc.ret = GNUNET_CONFIGURATION_create ();
uc.hostname = hostname;
}
*port = (uint16_t) uc.nport;
+ *upnum = uc.upnum;
return uc.ret;
}
{
probability = pg->peers[i].num_connections / (double)previous_total_connections;
random = ((double) GNUNET_CRYPTO_random_u64(GNUNET_CRYPTO_QUALITY_WEAK,
- (uint64_t)-1LL)) / ( (double) (uint64_t) -1LL);
+ UINT64_MAX)) / ( (double) UINT64_MAX);
#if VERBOSE_TESTING
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Considering connecting peer %d to peer %d\n",
return total_connections;
}
+/**
+ * Create a topology given a peer group (set of running peers)
+ * and a connection processor.
+ *
+ * @param pg the peergroup to create the topology on
+ * @param proc the connection processor to call to actually set
+ * up connections between two peers
+ *
+ * @return the number of connections that were set up
+ *
+ */
int
create_small_world_ring(struct GNUNET_TESTING_PeerGroup *pg, GNUNET_TESTING_ConnectionProcessor proc)
{
for (j = 0; j < connsPerPeer / 2; j++)
{
random = ((double) GNUNET_CRYPTO_random_u64(GNUNET_CRYPTO_QUALITY_WEAK,
- (uint64_t)-1LL)) / ( (double) (uint64_t) -1LL);
+ UINT64_MAX) / ( (double) UINT64_MAX));
if (random < percentage)
{
/* Connect to uniformly selected random peer */
return connect_attempts;
}
-
+/**
+ * Create a topology given a peer group (set of running peers)
+ * and a connection processor.
+ *
+ * @param pg the peergroup to create the topology on
+ * @param proc the connection processor to call to actually set
+ * up connections between two peers
+ *
+ * @return the number of connections that were set up
+ *
+ */
static int
create_nated_internet (struct GNUNET_TESTING_PeerGroup *pg, GNUNET_TESTING_ConnectionProcessor proc)
{
}
-
-
+/**
+ * Create a topology given a peer group (set of running peers)
+ * and a connection processor.
+ *
+ * @param pg the peergroup to create the topology on
+ * @param proc the connection processor to call to actually set
+ * up connections between two peers
+ *
+ * @return the number of connections that were set up
+ *
+ */
static int
create_small_world (struct GNUNET_TESTING_PeerGroup *pg, GNUNET_TESTING_ConnectionProcessor proc)
{
probability = 1.0 / (distance * distance);
/* Choose a random value between 0 and 1 */
random = ((double) GNUNET_CRYPTO_random_u64(GNUNET_CRYPTO_QUALITY_WEAK,
- (uint64_t)-1LL)) / ( (double) (uint64_t) -1LL);
+ UINT64_MAX)) / ( (double) UINT64_MAX);
/* If random < probability, then connect the two nodes */
if (random < probability)
smallWorldConnections += proc (pg, j, k);
return connect_attempts;
}
-
-
+/**
+ * Create a topology given a peer group (set of running peers)
+ * and a connection processor.
+ *
+ * @param pg the peergroup to create the topology on
+ * @param proc the connection processor to call to actually set
+ * up connections between two peers
+ *
+ * @return the number of connections that were set up
+ *
+ */
static int
create_erdos_renyi (struct GNUNET_TESTING_PeerGroup *pg, GNUNET_TESTING_ConnectionProcessor proc)
{
inner_count++)
{
temp_rand = ((double) GNUNET_CRYPTO_random_u64(GNUNET_CRYPTO_QUALITY_WEAK,
- (uint64_t)-1LL)) / ( (double) (uint64_t) -1LL);
+ UINT64_MAX)) / ( (double) UINT64_MAX);
#if VERBOSE_TESTING
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
_("rand is %f probability is %f\n"), temp_rand,
return connect_attempts;
}
+/**
+ * Create a topology given a peer group (set of running peers)
+ * and a connection processor.
+ *
+ * @param pg the peergroup to create the topology on
+ * @param proc the connection processor to call to actually set
+ * up connections between two peers
+ *
+ * @return the number of connections that were set up
+ *
+ */
static int
create_2d_torus (struct GNUNET_TESTING_PeerGroup *pg, GNUNET_TESTING_ConnectionProcessor proc)
{
}
-
+/**
+ * Create a topology given a peer group (set of running peers)
+ * and a connection processor.
+ *
+ * @param pg the peergroup to create the topology on
+ * @param proc the connection processor to call to actually set
+ * up connections between two peers
+ *
+ * @return the number of connections that were set up
+ *
+ */
static int
create_clique (struct GNUNET_TESTING_PeerGroup *pg, GNUNET_TESTING_ConnectionProcessor proc)
{
return connect_attempts;
}
+/**
+ * Create a topology given a peer group (set of running peers)
+ * and a connection processor.
+ *
+ * @param pg the peergroup to create the topology on
+ * @param proc the connection processor to call to actually set
+ * up connections between two peers
+ *
+ * @return the number of connections that were set up
+ *
+ */
+static int
+create_line (struct GNUNET_TESTING_PeerGroup *pg, GNUNET_TESTING_ConnectionProcessor proc)
+{
+ unsigned int count;
+ int connect_attempts;
+
+ connect_attempts = 0;
+ /* Connect each peer to the next highest numbered peer */
+ for (count = 0; count < pg->total - 1; count++)
+ {
+#if VERBOSE_TESTING
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Connecting peer %d to peer %d\n",
+ count, count + 1);
+#endif
+ connect_attempts += proc(pg, count, count + 1);
+ }
+
+ return connect_attempts;
+}
+
+/**
+ * Create a topology given a peer group (set of running peers)
+ * and a connection processor.
+ *
+ * @param pg the peergroup to create the topology on
+ * @param proc the connection processor to call to actually set
+ * up connections between two peers
+ *
+ * @return the number of connections that were set up
+ *
+ */
static int
create_ring (struct GNUNET_TESTING_PeerGroup *pg, GNUNET_TESTING_ConnectionProcessor proc)
{
count++;
if (ret == GNUNET_SYSERR)
{
+ /* FIXME: why sleep here? -CG */
sleep(1);
}
}
}
}
- GNUNET_free_non_null(temp_transports);
+ GNUNET_free (temp_transports);
fclose(temp_file_handle);
if (GNUNET_OK !=
count++;
if (ret == GNUNET_SYSERR)
{
+ /* FIXME: why sleep here? -CG */
sleep(1);
}
}
static void internal_connect_notify (void *cls,
const struct GNUNET_PeerIdentity *first,
const struct GNUNET_PeerIdentity *second,
+ uint32_t distance,
const struct GNUNET_CONFIGURATION_Handle *first_cfg,
const struct GNUNET_CONFIGURATION_Handle *second_cfg,
struct GNUNET_TESTING_Daemon *first_daemon,
struct GNUNET_TESTING_PeerGroup *pg = cls;
outstanding_connects--;
- pg->notify_connection(pg->notify_connection_cls, first, second, first_cfg, second_cfg, first_daemon, second_daemon, emsg);
+<<<<<<< .mine
+ pg->notify_connection(pg->notify_connection_cls, first, second, distance, first_cfg, second_cfg, first_daemon, second_daemon, emsg);
+=======
+ pg->notify_connection(pg->notify_connection_cls,
+ first,
+ second,
+ first_cfg, second_cfg,
+ first_daemon, second_daemon,
+ emsg);
+>>>>>>> .r11782
}
+
static void schedule_connect(void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
{
struct ConnectContext *connect_context = cls;
}
}
+
/**
* Iterator for actually scheduling connections to be created
* between two peers.
return GNUNET_YES;
}
+
/**
* Iterator for copying all entries in the allowed hashmap to the
* connect hashmap.
}
-/*
+/**
* Connect the topology as specified by the PeerConnection's
* of each peer in the peer group
*
* @param pg the peer group we are dealing with
- *
* @return the number of connections that will be attempted
*/
static int
}
-/*
+/**
* Takes a peer group and creates a topology based on the
* one specified. Creates a topology means generates friend
* files for the peers so they can only connect to those allowed
switch (topology)
{
case GNUNET_TESTING_TOPOLOGY_CLIQUE:
-#if VERBOSE_TESTING
+#if VERBOSE_TOPOLOGY
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
_("Creating clique topology\n"));
#endif
num_connections = create_clique (pg, &add_allowed_connections);
break;
case GNUNET_TESTING_TOPOLOGY_SMALL_WORLD_RING:
-#if VERBOSE_TESTING
+#if VERBOSE_TOPOLOGY
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
_("Creating small world (ring) topology\n"));
#endif
num_connections = create_small_world_ring (pg, &add_allowed_connections);
break;
case GNUNET_TESTING_TOPOLOGY_SMALL_WORLD:
-#if VERBOSE_TESTING
+#if VERBOSE_TOPOLOGY
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
_("Creating small world (2d-torus) topology\n"));
#endif
num_connections = create_small_world (pg, &add_allowed_connections);
break;
case GNUNET_TESTING_TOPOLOGY_RING:
-#if VERBOSE_TESTING
+#if VERBOSE_TOPOLOGY
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
_("Creating ring topology\n"));
#endif
num_connections = create_ring (pg, &add_allowed_connections);
break;
case GNUNET_TESTING_TOPOLOGY_2D_TORUS:
-#if VERBOSE_TESTING
+#if VERBOSE_TOPOLOGY
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
_("Creating 2d torus topology\n"));
#endif
num_connections = create_2d_torus (pg, &add_allowed_connections);
break;
case GNUNET_TESTING_TOPOLOGY_ERDOS_RENYI:
-#if VERBOSE_TESTING
+#if VERBOSE_TOPOLOGY
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
_("Creating Erdos-Renyi topology\n"));
#endif
num_connections = create_erdos_renyi (pg, &add_allowed_connections);
break;
case GNUNET_TESTING_TOPOLOGY_INTERNAT:
-#if VERBOSE_TESTING
+#if VERBOSE_TOPOLOGY
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
_("Creating InterNAT topology\n"));
#endif
#endif
num_connections = create_scale_free (pg, &add_allowed_connections);
break;
+ case GNUNET_TESTING_TOPOLOGY_LINE:
+#if VERBOSE_TESTING
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ _("Creating straight line topology\n"));
+#endif
+ num_connections = create_line (pg, &add_allowed_connections);
+ break;
case GNUNET_TESTING_TOPOLOGY_NONE:
num_connections = 0;
break;
#endif
}
- /**
- * Use the create clique method to initially set all connections
- * as blacklisted.
- */
+ /* Use the create clique method to initially set all connections as blacklisted. */
create_clique (pg, &blacklist_connections);
unblacklisted_connections = 0;
- /**
- * Un-blacklist connections as per the topology specified
- */
+ /* Un-blacklist connections as per the topology specified */
switch (restrict_topology)
{
case GNUNET_TESTING_TOPOLOGY_CLIQUE:
#endif
unblacklisted_connections = create_scale_free (pg, &unblacklist_connections);
break;
+ case GNUNET_TESTING_TOPOLOGY_LINE:
+#if VERBOSE_TESTING
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ _("Blacklisting all but straight line topology\n"));
+#endif
+ unblacklisted_connections = create_line (pg, &unblacklist_connections);
+ break;
case GNUNET_TESTING_TOPOLOGY_NONE:
/* Fall through */
default:
#endif
}
}
-
-
return num_connections;
}
uint32_t second_pos;
GNUNET_HashCode first_hash;
random_number = ((double) GNUNET_CRYPTO_random_u64(GNUNET_CRYPTO_QUALITY_WEAK,
- (uint64_t)-1LL)) / ( (double) (uint64_t) -1LL);
+ UINT64_MAX)) / ( (double) UINT64_MAX);
if (random_number < random_ctx->percentage)
{
GNUNET_assert(GNUNET_OK == GNUNET_CONTAINER_multihashmap_put(random_ctx->first->connect_peers_working_set, key, value, GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY));
* @param pg the peergroup we are dealing with
* @param num how many connections at least should each peer have (if possible)?
*/
-void
+static void
choose_minimum(struct GNUNET_TESTING_PeerGroup *pg, unsigned int num)
{
struct MinimumContext minimum_ctx;
uint32_t pg_iter;
for (pg_iter = 0; pg_iter < pg->total; pg_iter++)
- {
- pg->peers[pg_iter].connect_peers_working_set = GNUNET_CONTAINER_multihashmap_create(num);
- }
+ {
+ pg->peers[pg_iter].connect_peers_working_set = GNUNET_CONTAINER_multihashmap_create(num);
+ }
for (pg_iter = 0; pg_iter < pg->total; pg_iter++)
{
minimum_ctx.first_uid = pg_iter;
- minimum_ctx.pg_array = GNUNET_CRYPTO_random_permute(GNUNET_CRYPTO_QUALITY_WEAK, GNUNET_CONTAINER_multihashmap_size(pg->peers[pg_iter].connect_peers));
+ minimum_ctx.pg_array = GNUNET_CRYPTO_random_permute(GNUNET_CRYPTO_QUALITY_WEAK,
+ GNUNET_CONTAINER_multihashmap_size(pg->peers[pg_iter].connect_peers));
minimum_ctx.first = &pg->peers[pg_iter];
minimum_ctx.pg = pg;
minimum_ctx.num_to_add = num;
minimum_ctx.current = 0;
- pg->peers[pg_iter].connect_peers_working_set = GNUNET_CONTAINER_multihashmap_create(pg->total);
- GNUNET_CONTAINER_multihashmap_iterate(pg->peers[pg_iter].connect_peers, &minimum_connect_iterator, &minimum_ctx);
+ GNUNET_CONTAINER_multihashmap_iterate(pg->peers[pg_iter].connect_peers,
+ &minimum_connect_iterator,
+ &minimum_ctx);
}
for (pg_iter = 0; pg_iter < pg->total; pg_iter++)
GNUNET_CONTAINER_multihashmap_destroy(pg->peers[pg_iter].connect_peers);
/* And replace with the working set */
pg->peers[pg_iter].connect_peers = pg->peers[pg_iter].connect_peers_working_set;
- fprintf(stderr, "Finished! Hashmap size %u\n", GNUNET_CONTAINER_multihashmap_size(pg->peers[pg_iter].connect_peers));
}
}
-static unsigned int count_workingset_connections(struct GNUNET_TESTING_PeerGroup *pg)
+static unsigned int
+count_workingset_connections(struct GNUNET_TESTING_PeerGroup *pg)
{
unsigned int count;
unsigned int pg_iter;
starting_peer = dfs_ctx.second_uid;
}
- for (pg_iter = 0; pg_iter < pg->total; pg_iter++)
- {
-
- }
-
for (pg_iter = 0; pg_iter < pg->total; pg_iter++)
{
/* Remove the "old" connections */
GNUNET_CONTAINER_multihashmap_destroy(pg->peers[pg_iter].connect_peers);
/* And replace with the working set */
pg->peers[pg_iter].connect_peers = pg->peers[pg_iter].connect_peers_working_set;
- fprintf(stderr, "Finished! Hashmap size %u\n", GNUNET_CONTAINER_multihashmap_size(pg->peers[pg_iter].connect_peers));
}
-
}
-/*
- * @param pg the peer group struct representing the running peers
- * @param topology which topology to connect the peers in
- * @param options options for connecting the topology
- * @param option_modifier modifier for options that take a parameter
- *
+/**
* There are many ways to connect peers that are supported by this function.
* To connect peers in the same topology that was created via the
* GNUNET_TESTING_create_topology, the topology variable must be set to
* connected. This could result in some connections being impossible,
* because some topologies are non-deterministic.
*
+ * @param pg the peer group struct representing the running peers
+ * @param topology which topology to connect the peers in
+ * @param options options for connecting the topology
+ * @param option_modifier modifier for options that take a parameter
+ * @return the number of connections that will be attempted, GNUNET_SYSERR on error
*/
int
GNUNET_TESTING_connect_topology (struct GNUNET_TESTING_PeerGroup *pg,
enum GNUNET_TESTING_TopologyOption options,
double option_modifier)
{
- int num_connections;
-
switch (topology)
{
case GNUNET_TESTING_TOPOLOGY_CLIQUE:
- #if VERBOSE_TESTING
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- _("Creating clique topology\n"));
- #endif
- num_connections = create_clique (pg, &add_actual_connections);
+#if VERBOSE_TOPOLOGY
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ _("Creating clique CONNECT topology\n"));
+#endif
+ create_clique (pg, &add_actual_connections);
break;
case GNUNET_TESTING_TOPOLOGY_SMALL_WORLD_RING:
- #if VERBOSE_TESTING
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- _("Creating small world (ring) topology\n"));
- #endif
- num_connections = create_small_world_ring (pg, &add_actual_connections);
+#if VERBOSE_TOPOLOGY
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ _("Creating small world (ring) CONNECT topology\n"));
+#endif
+ create_small_world_ring (pg, &add_actual_connections);
break;
case GNUNET_TESTING_TOPOLOGY_SMALL_WORLD:
- #if VERBOSE_TESTING
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- _("Creating small world (2d-torus) topology\n"));
- #endif
- num_connections = create_small_world (pg, &add_actual_connections);
+#if VERBOSE_TOPOLOGY
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ _("Creating small world (2d-torus) CONNECT topology\n"));
+#endif
+ create_small_world (pg, &add_actual_connections);
break;
case GNUNET_TESTING_TOPOLOGY_RING:
- #if VERBOSE_TESTING
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- _("Creating ring topology\n"));
- #endif
- num_connections = create_ring (pg, &add_actual_connections);
+#if VERBOSE_TOPOLOGY
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ _("Creating ring CONNECT topology\n"));
+#endif
+ create_ring (pg, &add_actual_connections);
break;
case GNUNET_TESTING_TOPOLOGY_2D_TORUS:
- #if VERBOSE_TESTING
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- _("Creating 2d torus topology\n"));
- #endif
- num_connections = create_2d_torus (pg, &add_actual_connections);
+#if VERBOSE_TOPOLOGY
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ _("Creating 2d torus CONNECT topology\n"));
+#endif
+ create_2d_torus (pg, &add_actual_connections);
break;
case GNUNET_TESTING_TOPOLOGY_ERDOS_RENYI:
- #if VERBOSE_TESTING
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- _("Creating Erdos-Renyi topology\n"));
- #endif
- num_connections = create_erdos_renyi (pg, &add_actual_connections);
+#if VERBOSE_TOPOLOGY
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ _("Creating Erdos-Renyi CONNECT topology\n"));
+#endif
+ create_erdos_renyi (pg, &add_actual_connections);
break;
case GNUNET_TESTING_TOPOLOGY_INTERNAT:
- #if VERBOSE_TESTING
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- _("Creating InterNAT topology\n"));
- #endif
- num_connections = create_nated_internet (pg, &add_actual_connections);
+#if VERBOSE_TOPOLOGY
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ _("Creating InterNAT CONNECT topology\n"));
+#endif
+ create_nated_internet (pg, &add_actual_connections);
break;
case GNUNET_TESTING_TOPOLOGY_SCALE_FREE:
- #if VERBOSE_TESTING
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- _("Creating Scale Free topology\n"));
- #endif
- num_connections = create_scale_free (pg, &add_actual_connections);
+#if VERBOSE_TOPOLOGY
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ _("Creating Scale Free CONNECT topology\n"));
+#endif
+ create_scale_free (pg, &add_actual_connections);
+ break;
+ case GNUNET_TESTING_TOPOLOGY_LINE:
+#if VERBOSE_TOPOLOGY
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ _("Creating straight line CONNECT topology\n"));
+#endif
+ create_line (pg, &add_actual_connections);
break;
case GNUNET_TESTING_TOPOLOGY_NONE:
- num_connections = copy_allowed_topology(pg);
+#if VERBOSE_TOPOLOGY
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ _("Creating no CONNECT topology\n"));
+#endif
+ copy_allowed_topology(pg);
break;
default:
- GNUNET_log(GNUNET_ERROR_TYPE_WARNING, "Unknown topology specification, can't connect peers!\n");
+ GNUNET_log(GNUNET_ERROR_TYPE_WARNING,
+ _("Unknown topology specification, can't connect peers!\n"));
return GNUNET_SYSERR;
}
switch (options)
{
- case GNUNET_TESTING_TOPOLOGY_OPTION_RANDOM: /* Create a random subset of total connections based on parameter */
+ case GNUNET_TESTING_TOPOLOGY_OPTION_RANDOM:
+#if VERBOSE_TOPOLOGY
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ _("Connecting random subset (%'.2f percent) of possible peers\n"), 100 * option_modifier);
+#endif
choose_random_connections(pg, option_modifier);
break;
- case GNUNET_TESTING_TOPOLOGY_OPTION_MINIMUM: /* Create at least X connections per peer (if possible!) */
+ case GNUNET_TESTING_TOPOLOGY_OPTION_MINIMUM:
+#if VERBOSE_TOPOLOGY
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ _("Connecting a minimum of %u peers each (if possible)\n"), (unsigned int)option_modifier);
+#endif
choose_minimum(pg, (unsigned int)option_modifier);
break;
- case GNUNET_TESTING_TOPOLOGY_OPTION_DFS: /* Choose a random starting point, randomly walk graph, try to get each peer X connections */
+ case GNUNET_TESTING_TOPOLOGY_OPTION_DFS:
+#if VERBOSE_TOPOLOGY
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ _("Using DFS to connect a minimum of %u peers each (if possible)\n"), (unsigned int)option_modifier);
+#endif
perform_dfs(pg, (int)option_modifier);
break;
case GNUNET_TESTING_TOPOLOGY_OPTION_NONE:
- /* Fall through */
+ break;
case GNUNET_TESTING_TOPOLOGY_OPTION_ALL:
- /* Fall through */
+ break;
default:
break;
}
unsigned int off;
unsigned int hostcnt;
uint16_t minport;
+ uint32_t upnum;
if (0 == total)
{
GNUNET_break (0);
return NULL;
}
-
+ upnum = 0;
pg = GNUNET_malloc (sizeof (struct GNUNET_TESTING_PeerGroup));
pg->sched = sched;
pg->cfg = cfg;
{
off = 2;
/* skip leading spaces */
- while ((0 != *hostnames) && (isspace (*hostnames)))
+ while ((0 != *hostnames) && (isspace ( (unsigned char) *hostnames)))
hostnames++;
rpos = hostnames;
while ('\0' != *rpos)
{
- if (isspace (*rpos))
+ if (isspace ( (unsigned char) *rpos))
off++;
rpos++;
}
pos = start;
while ('\0' != *pos)
{
- if (isspace (*pos))
+ if (isspace ( (unsigned char) *pos))
{
*pos = '\0';
if (strlen (start) > 0)
if (hostcnt > 0)
{
hostname = pg->hosts[off % hostcnt].hostname;
- pcfg = make_config (cfg, &pg->hosts[off % hostcnt].minport, hostname);
+ pcfg = make_config (cfg,
+ &pg->hosts[off % hostcnt].minport,
+ &upnum,
+ hostname);
}
else
{
hostname = NULL;
- pcfg = make_config (cfg, &minport, hostname);
+ pcfg = make_config (cfg,
+ &minport,
+ &upnum,
+ hostname);
}
if (NULL == pcfg)
* Prototype of a function that will be called when a
* particular operation was completed the testing library.
*
+ * @param cls closure (a struct RestartContext)
* @param id id of the peer that was restarted
* @param cfg handle to the configuration of the peer
* @param d handle to the daemon that was restarted
error_message = NULL;
if (emsg != NULL)
- {
- GNUNET_log(GNUNET_ERROR_TYPE_WARNING, "Churn stop callback failed with error `%s'\n", emsg);
- churn_ctx->num_failed_stop++;
- }
+ {
+ GNUNET_log(GNUNET_ERROR_TYPE_WARNING,
+ "Churn stop callback failed with error `%s'\n", emsg);
+ churn_ctx->num_failed_stop++;
+ }
else
- {
- churn_ctx->num_to_stop--;
- }
+ {
+ churn_ctx->num_to_stop--;
+ }
+#if DEBUG_CHURN
+ GNUNET_log(GNUNET_ERROR_TYPE_WARNING,
+ "Stopped peer, %d left.\n",
+ churn_ctx->num_to_stop);
+#endif
total_left = (churn_ctx->num_to_stop - churn_ctx->num_failed_stop) + (churn_ctx->num_to_start - churn_ctx->num_failed_start);
if (total_left == 0)
{
if ((churn_ctx->num_failed_stop > 0) || (churn_ctx->num_failed_start > 0))
- GNUNET_asprintf(&error_message, "Churn didn't complete successfully, %u peers failed to start %u peers failed to be stopped!", churn_ctx->num_failed_start, churn_ctx->num_failed_stop);
+ {
+ GNUNET_asprintf(&error_message,
+ "Churn didn't complete successfully, %u peers failed to start %u peers failed to be stopped!",
+ churn_ctx->num_failed_start,
+ churn_ctx->num_failed_stop);
+ }
churn_ctx->cb(churn_ctx->cb_cls, error_message);
GNUNET_free_non_null(error_message);
GNUNET_free(churn_ctx);
error_message = NULL;
if (emsg != NULL)
- {
- GNUNET_log(GNUNET_ERROR_TYPE_WARNING, "Churn stop callback failed with error `%s'\n", emsg);
- churn_ctx->num_failed_start++;
- }
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+ "Churn stop callback failed with error `%s'\n",
+ emsg);
+ churn_ctx->num_failed_start++;
+ }
else
- {
- churn_ctx->num_to_start--;
- }
+ {
+ churn_ctx->num_to_start--;
+ }
+
+#if DEBUG_CHURN
+ GNUNET_log(GNUNET_ERROR_TYPE_WARNING,
+ "Started peer, %d left.\n",
+ churn_ctx->num_to_start);
+#endif
total_left = (churn_ctx->num_to_stop - churn_ctx->num_failed_stop) + (churn_ctx->num_to_start - churn_ctx->num_failed_start);
if (total_left == 0)
{
if ((churn_ctx->num_failed_stop > 0) || (churn_ctx->num_failed_start > 0))
- GNUNET_asprintf(&error_message, "Churn didn't complete successfully, %u peers failed to start %u peers failed to be stopped!", churn_ctx->num_failed_start, churn_ctx->num_failed_stop);
+ GNUNET_asprintf(&error_message,
+ "Churn didn't complete successfully, %u peers failed to start %u peers failed to be stopped!",
+ churn_ctx->num_failed_start,
+ churn_ctx->num_failed_stop);
churn_ctx->cb(churn_ctx->cb_cls, error_message);
GNUNET_free_non_null(error_message);
GNUNET_free(churn_ctx);
}
-
}
+
/**
* Simulate churn by stopping some peers (and possibly
* re-starting others if churn is called multiple times). This
running = 0;
stopped = 0;
+ if ((von == 0) && (voff == 0)) /* No peers at all? */
+ {
+ cb(cb_cls, NULL);
+ return;
+ }
+
for (i = 0; i < pg->total; i++)
{
if (pg->peers[i].daemon->running == GNUNET_YES)
{
+ GNUNET_assert(running != -1);
running++;
}
else
{
+ GNUNET_assert(stopped != -1);
stopped++;
}
}
churn_ctx = GNUNET_malloc(sizeof(struct ChurnContext));
running_arr = GNUNET_malloc(running * sizeof(unsigned int));
stopped_arr = GNUNET_malloc(stopped * sizeof(unsigned int));
- running_permute = GNUNET_CRYPTO_random_permute(GNUNET_CRYPTO_QUALITY_WEAK, running);
- stopped_permute = GNUNET_CRYPTO_random_permute(GNUNET_CRYPTO_QUALITY_WEAK, stopped);
+
+ running_permute = NULL;
+ stopped_permute = NULL;
+
+ if (running > 0)
+ running_permute = GNUNET_CRYPTO_random_permute(GNUNET_CRYPTO_QUALITY_WEAK, running);
+ if (stopped > 0)
+ stopped_permute = GNUNET_CRYPTO_random_permute(GNUNET_CRYPTO_QUALITY_WEAK, stopped);
running = 0;
stopped = 0;
for (i = 0; i < voff; i++)
{
- GNUNET_TESTING_daemon_stop(pg->peers[running_arr[running_permute[i]]].daemon, timeout, &churn_stop_callback, churn_ctx, GNUNET_NO, GNUNET_YES);
+#if DEBUG_CHURN
+ GNUNET_log(GNUNET_ERROR_TYPE_WARNING, "Stopping peer %d!\n", running_permute[i]);
+#endif
+ GNUNET_TESTING_daemon_stop (pg->peers[running_arr[running_permute[i]]].daemon,
+ timeout,
+ &churn_stop_callback, churn_ctx,
+ GNUNET_NO, GNUNET_YES);
}
for (i = 0; i < von; i++)
- {
- GNUNET_TESTING_daemon_start_stopped(pg->peers[stopped_arr[stopped_permute[i]]].daemon, timeout, &churn_start_callback, churn_ctx);
+ {
+#if DEBUG_CHURN
+ GNUNET_log(GNUNET_ERROR_TYPE_WARNING, "Starting up peer %d!\n", stopped_permute[i]);
+#endif
+ GNUNET_TESTING_daemon_start_stopped(pg->peers[stopped_arr[stopped_permute[i]]].daemon,
+ timeout, &churn_start_callback, churn_ctx);
}
+
+ GNUNET_free(running_arr);
+ GNUNET_free(stopped_arr);
+ GNUNET_free_non_null(running_permute);
+ GNUNET_free_non_null(stopped_permute);
}
* Restart all peers in the given group.
*
* @param pg the handle to the peer group
- * @param timeout how long to wait on failure
* @param callback function to call on completion (or failure)
* @param callback_cls closure for the callback function
*/
}
/**
- * Shutdown all peers started in the given group.
+ * Start or stop an individual peer from the given group.
*
* @param pg handle to the peer group
+ * @param offset which peer to start or stop
+ * @param desired_status GNUNET_YES to have it running, GNUNET_NO to stop it
* @param timeout how long to wait for shutdown
+ * @param cb function to call at the end
+ * @param cb_cls closure for cb
+ */
+void
+GNUNET_TESTING_daemons_vary (struct GNUNET_TESTING_PeerGroup *pg,
+ unsigned int offset,
+ int desired_status,
+ struct GNUNET_TIME_Relative timeout,
+ GNUNET_TESTING_NotifyCompletion cb,
+ void *cb_cls)
+{
+ struct ChurnContext *churn_ctx;
+
+ if (GNUNET_NO == desired_status)
+ {
+ if (NULL != pg->peers[offset].daemon)
+ {
+ churn_ctx = GNUNET_malloc(sizeof(struct ChurnContext));
+ churn_ctx->num_to_start = 0;
+ churn_ctx->num_to_stop = 1;
+ churn_ctx->cb = cb;
+ churn_ctx->cb_cls = cb_cls;
+ GNUNET_TESTING_daemon_stop(pg->peers[offset].daemon,
+ timeout, &churn_stop_callback, churn_ctx,
+ GNUNET_NO, GNUNET_YES);
+ }
+ }
+ else if (GNUNET_YES == desired_status)
+ {
+ if (NULL == pg->peers[offset].daemon)
+ {
+ churn_ctx = GNUNET_malloc(sizeof(struct ChurnContext));
+ churn_ctx->num_to_start = 1;
+ churn_ctx->num_to_stop = 0;
+ churn_ctx->cb = cb;
+ churn_ctx->cb_cls = cb_cls;
+ GNUNET_TESTING_daemon_start_stopped(pg->peers[offset].daemon,
+ timeout, &churn_start_callback, churn_ctx);
+ }
+ }
+ else
+ GNUNET_break (0);
+}
+
+
+/**
+ * Shutdown all peers started in the given group.
*
+ * @param pg handle to the peer group
+ * @param timeout how long to wait for shutdown
*/
void
-GNUNET_TESTING_daemons_stop (struct GNUNET_TESTING_PeerGroup *pg, struct GNUNET_TIME_Relative timeout)
+GNUNET_TESTING_daemons_stop (struct GNUNET_TESTING_PeerGroup *pg,
+ struct GNUNET_TIME_Relative timeout)
{
unsigned int off;
for (off = 0; off < pg->total; off++)
{
- /* FIXME: should we wait for our
- continuations to be called here? This
- would require us to take a continuation
- as well... */
+ /* FIXME: should we wait for our continuations to be called
+ here? This would require us to take a continuation as
+ well... */
if (NULL != pg->peers[off].daemon)
GNUNET_TESTING_daemon_stop (pg->peers[off].daemon, timeout, NULL, NULL, GNUNET_YES, GNUNET_NO);
if (NULL != pg->peers[off].cfg)
GNUNET_CONFIGURATION_destroy (pg->peers[off].cfg);
-
if (pg->peers[off].allowed_peers != NULL)
GNUNET_CONTAINER_multihashmap_destroy(pg->peers[off].allowed_peers);
if (pg->peers[off].connect_peers != NULL)
GNUNET_CONTAINER_multihashmap_destroy(pg->peers[off].connect_peers);
if (pg->peers[off].blacklisted_peers != NULL)
GNUNET_CONTAINER_multihashmap_destroy(pg->peers[off].blacklisted_peers);
-
}
GNUNET_free (pg->peers);
if (NULL != pg->hosts)
projects / oweals / gnunet.git / blobdiff