#include "gnunet_core_service.h"
#include "gnunet_dht_service.h"
-/* DEFINES */
-#define VERBOSE GNUNET_YES
-
/* Timeout for entire testcase */
-#define TIMEOUT GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_MINUTES, 5)
+#define TIMEOUT GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_MINUTES, 30)
/* Timeout for waiting for replies to get requests */
-#define GET_TIMEOUT GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_SECONDS, 90)
+#define GET_TIMEOUT GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_SECONDS, 300)
+
+/* */
+#define START_DELAY GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_SECONDS, 30)
/* Timeout for waiting for gets to complete */
-#define GET_DELAY GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_SECONDS, 1)
+#define GET_DELAY GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_MILLISECONDS, 50)
/* Timeout for waiting for puts to complete */
-#define PUT_DELAY GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_SECONDS, 1)
-
-#define SECONDS_PER_PEER_START 45
+#define PUT_DELAY GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_MILLISECONDS, 50)
/* If number of peers not in config file, use this number */
-#define DEFAULT_NUM_PEERS 5
+#define DEFAULT_NUM_PEERS 10
#define TEST_DATA_SIZE 8
-#define MAX_OUTSTANDING_PUTS 10
+#define MAX_OUTSTANDING_PUTS 100
+
+#define MAX_OUTSTANDING_GETS 100
+
+#define PATH_TRACKING GNUNET_NO
-#define MAX_OUTSTANDING_GETS 10
-/* Structs */
struct TestPutContext
{
- /* This is a linked list */
+ /**
+ * This is a linked list
+ */
struct TestPutContext *next;
+ /**
+ * This is a linked list
+ */
+ struct TestPutContext *prev;
+
/**
* Handle to the first peers DHT service (via the API)
*/
uint32_t uid;
/**
- * Task for disconnecting DHT handles
+ * Task handle for processing of the put.
*/
- GNUNET_SCHEDULER_TaskIdentifier disconnect_task;
+ GNUNET_SCHEDULER_TaskIdentifier task;
};
+
struct TestGetContext
{
- /* This is a linked list */
+ /**
+ * This is a linked list
+ */
struct TestGetContext *next;
+ /**
+ * This is a linked list
+ */
+ struct TestGetContext *prev;
+
/**
* Handle to the first peers DHT service (via the API)
*/
/**
* Task for disconnecting DHT handles (and stopping GET)
*/
- GNUNET_SCHEDULER_TaskIdentifier disconnect_task;
+ GNUNET_SCHEDULER_TaskIdentifier task;
/**
* Whether or not this request has been fulfilled already.
int succeeded;
};
-/* Globals */
/**
* List of GETS to perform
*/
-struct TestGetContext *all_gets;
+static struct TestGetContext *all_gets_head;
/**
- * List of PUTS to perform
- */
-struct TestPutContext *all_puts;
-
-/**
- * Directory to store temp data in, defined in config file
+ * List of GETS to perform
*/
-static char *test_directory;
+static struct TestGetContext *all_gets_tail;
/**
- * Variable used to store the number of connections we should wait for.
+ * List of PUTS to perform
*/
-static unsigned int expected_connections;
+static struct TestPutContext *all_puts_head;
/**
- * Variable used to keep track of how many peers aren't yet started.
+ * List of PUTS to perform
*/
-static unsigned long long peers_left;
+static struct TestPutContext *all_puts_tail;
/**
* Handle to the set of all peers run for this test.
*/
static struct GNUNET_TESTING_PeerGroup *pg;
-
-/**
- * Global scheduler, used for all GNUNET_SCHEDULER_* functions.
- */
-static struct GNUNET_SCHEDULER_Handle *sched;
-
/**
* Total number of peers to run, set based on config file.
*/
static unsigned long long num_peers;
-/**
- * Total number of items to insert.
- */
-static unsigned long long num_puts;
-
-/**
- * Total number of items to attempt to get.
- */
-static unsigned long long num_gets;
-
/**
* How many puts do we currently have in flight?
*/
static unsigned long long gets_failed;
/**
- * Global used to count how many connections we have currently
- * been notified about (how many times has topology_callback been called
- * with success?)
+ * Directory to remove on shutdown.
*/
-static unsigned int total_connections;
+static char *test_directory;
/**
- * Global used to count how many failed connections we have
- * been notified about (how many times has topology_callback
- * been called with failure?)
+ * Option to use when routing.
*/
-static unsigned int failed_connections;
+static enum GNUNET_DHT_RouteOption route_option;
-/* Task handle to use to schedule test failure */
-GNUNET_SCHEDULER_TaskIdentifier die_task;
-
-static char *blacklist_transports;
-
-static enum GNUNET_TESTING_Topology topology;
-
-static enum GNUNET_TESTING_Topology blacklist_topology = GNUNET_TESTING_TOPOLOGY_NONE; /* Don't do any blacklisting */
-
-static enum GNUNET_TESTING_Topology connection_topology = GNUNET_TESTING_TOPOLOGY_NONE; /* NONE actually means connect all allowed peers */
-
-static enum GNUNET_TESTING_TopologyOption connect_topology_option = GNUNET_TESTING_TOPOLOGY_OPTION_ALL;
+/**
+ * Task handle to use to schedule test failure / success.
+ */
+static GNUNET_SCHEDULER_TaskIdentifier die_task;
-static double connect_topology_option_modifier = 0.0;
+/**
+ * Task handle to use to schedule test shutdown
+ */
+GNUNET_SCHEDULER_TaskIdentifier shutdown_task;
-/* Global return value (0 for success, anything else for failure) */
+/**
+ * Global return value (0 for success, anything else for failure)
+ */
static int ok;
/**
* Check whether peers successfully shut down.
*/
-void shutdown_callback (void *cls,
- const char *emsg)
+static void
+shutdown_callback (void *cls, const char *emsg)
{
if (emsg != NULL)
+ {
+ FPRINTF (stderr, "Failed to shutdown testing topology: %s\n", emsg);
+ if (ok == 0)
+ ok = 2;
+ }
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Shutdown callback completed.\n");
+}
+
+static void
+do_stop (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+{
+ if ((tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN) == 0)
+ {
+ if (GNUNET_SCHEDULER_NO_TASK != shutdown_task)
{
- if (ok == 0)
- ok = 2;
+ GNUNET_SCHEDULER_cancel(shutdown_task);
+ shutdown_task = GNUNET_SCHEDULER_NO_TASK;
}
+ }
+ else
+ {
+ shutdown_task = GNUNET_SCHEDULER_NO_TASK ;
+ }
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Shutdown requested.\n");
+ if (NULL != pg)
+ GNUNET_TESTING_daemons_stop (pg, TIMEOUT, &shutdown_callback, NULL);
+ pg = NULL;
}
+
/**
- * Task to release DHT handles for PUT
+ * Master context for 'stat_run'.
*/
-static void
-put_disconnect_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext * tc)
+struct StatMaster
{
- struct TestPutContext *test_put = cls;
- test_put->disconnect_task = GNUNET_SCHEDULER_NO_TASK;
- GNUNET_DHT_disconnect(test_put->dht_handle);
- test_put->dht_handle = NULL;
-}
+ struct GNUNET_STATISTICS_Handle *stat;
+ unsigned int daemon;
+ unsigned int value;
+};
+
+struct StatValues
+{
+ const char *subsystem;
+ const char *name;
+ unsigned long long total;
+};
/**
- * Function scheduled to be run on the successful completion of this
- * testcase.
+ * Statistics we print out.
+ */
+static struct StatValues stats[] = {
+ {"core", "# bytes decrypted", 0},
+ {"core", "# bytes encrypted", 0},
+ {"core", "# type maps received", 0},
+ {"core", "# session keys confirmed via PONG", 0},
+ {"core", "# peers connected", 0},
+ {"core", "# key exchanges initiated", 0},
+ {"core", "# send requests dropped (disconnected)", 0},
+ {"core", "# transmissions delayed due to corking", 0},
+ {"core", "# messages discarded (expired prior to transmission)", 0},
+ {"core", "# messages discarded (disconnected)", 0},
+ {"core", "# discarded CORE_SEND requests", 0},
+ {"core", "# discarded lower priority CORE_SEND requests", 0},
+ {"transport", "# bytes received via TCP", 0},
+ {"transport", "# bytes transmitted via TCP", 0},
+ {"dht", "# PUT messages queued for transmission", 0},
+ {"dht", "# P2P PUT requests received", 0},
+ {"dht", "# GET messages queued for transmission", 0},
+ {"dht", "# P2P GET requests received", 0},
+ {"dht", "# RESULT messages queued for transmission", 0},
+ {"dht", "# P2P RESULTS received", 0},
+ {"dht", "# Queued messages discarded (peer disconnected)", 0},
+ {"dht", "# Peers excluded from routing due to Bloomfilter", 0},
+ {"dht", "# Peer selection failed", 0},
+ {"dht", "# FIND PEER requests ignored due to Bloomfilter", 0},
+ {"dht", "# FIND PEER requests ignored due to lack of HELLO", 0},
+ {"dht", "# P2P FIND PEER requests processed", 0},
+ {"dht", "# P2P GET requests ONLY routed", 0},
+ {"dht", "# Preference updates given to core", 0},
+ {"dht", "# REPLIES ignored for CLIENTS (no match)", 0},
+ {"dht", "# GET requests from clients injected", 0},
+ {"dht", "# GET requests received from clients", 0},
+ {"dht", "# GET STOP requests received from clients", 0},
+ {"dht", "# ITEMS stored in datacache", 0},
+ {"dht", "# Good RESULTS found in datacache", 0},
+ {"dht", "# GET requests given to datacache", 0},
+ {NULL, NULL, 0}
+};
+
+
+/**
+ * Callback function to process statistic values.
+ *
+ * @param cls closure
+ * @param subsystem name of subsystem that created the statistic
+ * @param name the name of the datum
+ * @param value the current value
+ * @param is_persistent GNUNET_YES if the value is persistent, GNUNET_NO if not
+ * @return GNUNET_OK to continue, GNUNET_SYSERR to abort iteration
*/
-static void
-finish_testing (void *cls, const struct GNUNET_SCHEDULER_TaskContext * tc)
+static int
+print_stat (void *cls, const char *subsystem, const char *name, uint64_t value,
+ int is_persistent)
{
- GNUNET_assert (pg != NULL);
- struct TestPutContext *test_put = all_puts;
- struct TestGetContext *test_get = all_gets;
+ struct StatMaster *sm = cls;
- while (test_put != NULL)
- {
- if (test_put->disconnect_task != GNUNET_SCHEDULER_NO_TASK)
- GNUNET_SCHEDULER_cancel(sched, test_put->disconnect_task);
- if (test_put->dht_handle != NULL)
- GNUNET_DHT_disconnect(test_put->dht_handle);
- test_put = test_put->next;
- }
+ stats[sm->value].total += value;
+ FPRINTF (stderr, "Peer %2u: %12s/%50s = %12llu\n", sm->daemon, subsystem,
+ name, (unsigned long long) value);
+ return GNUNET_OK;
+}
- while (test_get != NULL)
- {
- if (test_get->disconnect_task != GNUNET_SCHEDULER_NO_TASK)
- GNUNET_SCHEDULER_cancel(sched, test_get->disconnect_task);
- if (test_get->get_handle != NULL)
- GNUNET_DHT_get_stop(test_get->get_handle, NULL, NULL);
- if (test_get->dht_handle != NULL)
- GNUNET_DHT_disconnect(test_get->dht_handle);
- test_get = test_get->next;
- }
- GNUNET_TESTING_daemons_stop (pg, TIMEOUT, &shutdown_callback, NULL);
- ok = 0;
-}
+/**
+ * Function that gathers stats from all daemons.
+ */
+static void
+stat_run (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc);
/**
- * Check if the get_handle is being used, if so stop the request. Either
- * way, schedule the end_badly_cont function which actually shuts down the
- * test.
+ * Function called when GET operation on stats is done.
*/
static void
-end_badly (void *cls, const struct GNUNET_SCHEDULER_TaskContext * tc)
+get_done (void *cls, int success)
{
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Failing test with error: `%s'!\n", (char *)cls);
+ struct StatMaster *sm = cls;
- struct TestPutContext *test_put = all_puts;
- struct TestGetContext *test_get = all_gets;
+ GNUNET_break (GNUNET_OK == success);
+ sm->value++;
+ GNUNET_SCHEDULER_add_now (&stat_run, sm);
+}
- while (test_put != NULL)
- {
- if (test_put->disconnect_task != GNUNET_SCHEDULER_NO_TASK)
- GNUNET_SCHEDULER_cancel(sched, test_put->disconnect_task);
- if (test_put->dht_handle != NULL)
- GNUNET_DHT_disconnect(test_put->dht_handle);
- test_put = test_put->next;
- }
- while (test_get != NULL)
- {
- if (test_get->disconnect_task != GNUNET_SCHEDULER_NO_TASK)
- GNUNET_SCHEDULER_cancel(sched, test_get->disconnect_task);
- if (test_get->get_handle != NULL)
- GNUNET_DHT_get_stop(test_get->get_handle, NULL, NULL);
- if (test_get->dht_handle != NULL)
- GNUNET_DHT_disconnect(test_get->dht_handle);
- test_get = test_get->next;
- }
+/**
+ * Function that gathers stats from all daemons.
+ */
+static void
+stat_run (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+{
+ struct StatMaster *sm = cls;
+ unsigned int i;
+
+ die_task = GNUNET_SCHEDULER_NO_TASK;
+ if (stats[sm->value].name != NULL)
+ {
+ GNUNET_STATISTICS_get (sm->stat,
+#if 0
+ NULL, NULL,
+#else
+ stats[sm->value].subsystem, stats[sm->value].name,
+#endif
+ GNUNET_TIME_UNIT_FOREVER_REL, &get_done, &print_stat,
+ sm);
+ return;
+ }
+ GNUNET_STATISTICS_destroy (sm->stat, GNUNET_NO);
+ sm->value = 0;
+ sm->daemon++;
+ if (sm->daemon == num_peers)
+ {
+ GNUNET_free (sm);
+ i = 0;
+ while (stats[i].name != NULL)
+ {
+ FPRINTF (stderr, "Total : %12s/%50s = %12llu\n", stats[i].subsystem,
+ stats[i].name, (unsigned long long) stats[i].total);
+ i++;
+ }
+ die_task = GNUNET_SCHEDULER_add_now (&do_stop, NULL);
+ return;
+ }
+ sm->stat =
+ GNUNET_STATISTICS_create ("<driver>",
+ GNUNET_TESTING_daemon_get (pg,
+ sm->daemon)->cfg);
+ die_task = GNUNET_SCHEDULER_add_now (&stat_run, sm);
+}
- GNUNET_TESTING_daemons_stop (pg, TIMEOUT, &shutdown_callback, NULL);
- ok = 1;
+
+/**
+ * Function scheduled to be run on the successful completion of this
+ * testcase.
+ */
+static void
+finish_testing (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+{
+ struct TestPutContext *test_put;
+ struct TestGetContext *test_get;
+ struct StatMaster *sm;
+
+ die_task = GNUNET_SCHEDULER_NO_TASK;
+ while (NULL != (test_put = all_puts_head))
+ {
+ if (test_put->task != GNUNET_SCHEDULER_NO_TASK)
+ GNUNET_SCHEDULER_cancel (test_put->task);
+ if (test_put->dht_handle != NULL)
+ GNUNET_DHT_disconnect (test_put->dht_handle);
+ GNUNET_CONTAINER_DLL_remove (all_puts_head, all_puts_tail, test_put);
+ GNUNET_free (test_put);
+ }
+
+ while (NULL != (test_get = all_gets_head))
+ {
+ if (test_get->task != GNUNET_SCHEDULER_NO_TASK)
+ GNUNET_SCHEDULER_cancel (test_get->task);
+ if (test_get->get_handle != NULL)
+ GNUNET_DHT_get_stop (test_get->get_handle);
+ if (test_get->dht_handle != NULL)
+ GNUNET_DHT_disconnect (test_get->dht_handle);
+ GNUNET_CONTAINER_DLL_remove (all_gets_head, all_gets_tail, test_get);
+ GNUNET_free (test_get);
+ }
+ sm = GNUNET_malloc (sizeof (struct StatMaster));
+ sm->stat =
+ GNUNET_STATISTICS_create ("<driver>",
+ GNUNET_TESTING_daemon_get (pg,
+ sm->daemon)->cfg);
+ die_task = GNUNET_SCHEDULER_add_now (&stat_run, sm);
}
+
/**
- * Task to release DHT handle associated with GET request.
+ * Check if the get_handle is being used, if so stop the request. Either
+ * way, schedule the end_badly_cont function which actually shuts down the
+ * test.
*/
static void
-get_stop_finished (void *cls, const struct GNUNET_SCHEDULER_TaskContext * tc)
+end_badly (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
{
- struct TestGetContext *test_get = cls;
- outstanding_gets--; /* GET is really finished */
- GNUNET_DHT_disconnect(test_get->dht_handle);
- test_get->dht_handle = NULL;
+ const char *emsg = cls;
+ struct TestPutContext *test_put;
+ struct TestGetContext *test_get;
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "%d gets succeeded, %d gets failed!\n", gets_completed, gets_failed);
- if ((gets_completed == num_gets) && (outstanding_gets == 0))/* All gets successful */
- {
- GNUNET_SCHEDULER_cancel(sched, die_task);
- GNUNET_SCHEDULER_add_now(sched, &finish_testing, NULL);
- }
- else if ((gets_completed + gets_failed == num_gets) && (outstanding_gets == 0)) /* Had some failures */
- {
- GNUNET_SCHEDULER_cancel(sched, die_task);
- GNUNET_SCHEDULER_add_now(sched, &end_badly, "not all gets succeeded!\n");
- }
+ die_task = GNUNET_SCHEDULER_NO_TASK;
+ FPRINTF (stderr, "Failing test with error: `%s'!\n", emsg);
+ while (NULL != (test_put = all_puts_head))
+ {
+ if (test_put->task != GNUNET_SCHEDULER_NO_TASK)
+ GNUNET_SCHEDULER_cancel (test_put->task);
+ if (test_put->dht_handle != NULL)
+ GNUNET_DHT_disconnect (test_put->dht_handle);
+ GNUNET_CONTAINER_DLL_remove (all_puts_head, all_puts_tail, test_put);
+ GNUNET_free (test_put);
+ }
+
+ while (NULL != (test_get = all_gets_head))
+ {
+ if (test_get->task != GNUNET_SCHEDULER_NO_TASK)
+ GNUNET_SCHEDULER_cancel (test_get->task);
+ if (test_get->get_handle != NULL)
+ GNUNET_DHT_get_stop (test_get->get_handle);
+ if (test_get->dht_handle != NULL)
+ GNUNET_DHT_disconnect (test_get->dht_handle);
+ GNUNET_CONTAINER_DLL_remove (all_gets_head, all_gets_tail, test_get);
+ GNUNET_free (test_get);
+ }
+ ok = 1;
+ /* testing_peergroup will do that in its own end_badly() handler */
+ /*GNUNET_TESTING_daemons_stop (pg, TIMEOUT, &shutdown_callback, NULL); */
+ pg = NULL;
}
+
/**
* Task to release get handle.
*/
static void
-get_stop_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext * tc)
+get_stop_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
{
struct TestGetContext *test_get = cls;
- GNUNET_HashCode search_key; /* Key stored under */
- char original_data[TEST_DATA_SIZE]; /* Made up data to store */
+ struct GNUNET_HashCode search_key; /* Key stored under */
+ char original_data[TEST_DATA_SIZE]; /* Made up data to store */
+
+ test_get->task = GNUNET_SCHEDULER_NO_TASK;
+ memset (original_data, test_get->uid, sizeof (original_data));
+ GNUNET_CRYPTO_hash (original_data, TEST_DATA_SIZE, &search_key);
+ if (test_get->succeeded != GNUNET_YES)
+ {
+ gets_failed++;
+ FPRINTF (stderr, "Get from peer %s for key %s failed!\n",
+ GNUNET_i2s (&test_get->daemon->id), GNUNET_h2s (&search_key));
+ }
+ GNUNET_assert (test_get->get_handle != NULL);
+ GNUNET_DHT_get_stop (test_get->get_handle);
+ test_get->get_handle = NULL;
- memset(original_data, test_get->uid, sizeof(original_data));
- GNUNET_CRYPTO_hash(original_data, TEST_DATA_SIZE, &search_key);
+ outstanding_gets--; /* GET is really finished */
+ GNUNET_DHT_disconnect (test_get->dht_handle);
+ test_get->dht_handle = NULL;
- if (tc->reason == GNUNET_SCHEDULER_REASON_TIMEOUT)
- {
- gets_failed++;
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Get from peer %s for key %s failed!\n", test_get->daemon->shortname, GNUNET_h2s(&search_key));
- }
- GNUNET_assert(test_get->get_handle != NULL);
- GNUNET_DHT_get_stop(test_get->get_handle, &get_stop_finished, test_get);
- test_get->get_handle = NULL;
- test_get->disconnect_task = GNUNET_SCHEDULER_NO_TASK;
+ GNUNET_CONTAINER_DLL_remove (all_gets_head, all_gets_tail, test_get);
+ GNUNET_free (test_get);
+ if ((gets_failed > 10) && (outstanding_gets == 0))
+ {
+ /* Had more than 10% failures */
+ FPRINTF (stderr, "%llu gets succeeded, %llu gets failed!\n", gets_completed,
+ gets_failed);
+ GNUNET_SCHEDULER_cancel (die_task);
+ ok = 1;
+ die_task =
+ GNUNET_SCHEDULER_add_now (&finish_testing, "not all gets succeeded");
+ return;
+ }
+ if ((gets_completed + gets_failed == num_peers * num_peers) && (outstanding_gets == 0)) /* All gets successful */
+ {
+ FPRINTF (stderr, "%llu gets succeeded, %llu gets failed!\n", gets_completed,
+ gets_failed);
+ GNUNET_SCHEDULER_cancel (die_task);
+ ok = 0;
+ die_task = GNUNET_SCHEDULER_add_now (&finish_testing, NULL);
+ }
}
+
/**
* Iterator called if the GET request initiated returns a response.
*
* @param size number of bytes in data
* @param data pointer to the result data
*/
-void get_result_iterator (void *cls,
- struct GNUNET_TIME_Absolute exp,
- const GNUNET_HashCode * key,
- uint32_t type,
- uint32_t size,
- const void *data)
+static void
+get_result_iterator (void *cls, struct GNUNET_TIME_Absolute exp,
+ const struct GNUNET_HashCode * key,
+ const struct GNUNET_PeerIdentity *get_path,
+ unsigned int get_path_length,
+ const struct GNUNET_PeerIdentity *put_path,
+ unsigned int put_path_length, enum GNUNET_BLOCK_Type type,
+ size_t size, const void *data)
{
struct TestGetContext *test_get = cls;
- GNUNET_HashCode search_key; /* Key stored under */
- char original_data[TEST_DATA_SIZE]; /* Made up data to store */
-
- memset(original_data, test_get->uid, sizeof(original_data));
- GNUNET_CRYPTO_hash(original_data, TEST_DATA_SIZE, &search_key);
+ struct GNUNET_HashCode search_key; /* Key stored under */
+ char original_data[TEST_DATA_SIZE]; /* Made up data to store */
+ memset (original_data, test_get->uid, sizeof (original_data));
+ GNUNET_CRYPTO_hash (original_data, TEST_DATA_SIZE, &search_key);
if (test_get->succeeded == GNUNET_YES)
- return; /* Get has already been successful, probably ending now */
-
- if ((0 != memcmp(&search_key, key, sizeof (GNUNET_HashCode))) || (0 != memcmp(original_data, data, sizeof(original_data))))
- {
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Key or data is not the same as was inserted!\n");
- }
- else
- {
- gets_completed++;
- test_get->succeeded = GNUNET_YES;
- }
-
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Received correct GET response!\n");
- GNUNET_SCHEDULER_cancel(sched, test_get->disconnect_task);
- GNUNET_SCHEDULER_add_continuation(sched, &get_stop_task, test_get, GNUNET_SCHEDULER_REASON_PREREQ_DONE);
-}
+ return; /* Get has already been successful, probably ending now */
+
+#if PATH_TRACKING
+ if (put_path != NULL)
+ {
+ unsigned int i;
+
+ FPRINTF (stderr, "PUT (%u) Path: ", test_get->uid);
+ for (i = 0; i < put_path_length; i++)
+ FPRINTF (stderr, "%s%s", i == 0 ? "" : "->", GNUNET_i2s (&put_path[i]));
+ FPRINTF (stderr, "%s", "\n");
+ }
+ if (get_path != NULL)
+ {
+ unsigned int i;
+
+ FPRINTF (stderr, "GET (%u) Path: ", test_get->uid);
+ for (i = 0; i < get_path_length; i++)
+ FPRINTF (stderr, "%s%s", i == 0 ? "" : "->", GNUNET_i2s (&get_path[i]));
+ FPRINTF (stderr, "%s%s\n", get_path_length > 0 ? "->" : "",
+ GNUNET_i2s (&test_get->daemon->id));
+ }
+#endif
-/**
- * Continuation telling us GET request was sent.
- */
-static void
-get_continuation (void *cls, const struct GNUNET_SCHEDULER_TaskContext * tc)
-{
- // Is there something to be done here?
- if (tc->reason != GNUNET_SCHEDULER_REASON_PREREQ_DONE)
+ if ((0 != memcmp (&search_key, key, sizeof (struct GNUNET_HashCode))) ||
+ (0 != memcmp (original_data, data, sizeof (original_data))))
+ {
+ FPRINTF (stderr, "%s", "Key or data is not the same as was inserted!\n");
return;
+ }
+ gets_completed++;
+ test_get->succeeded = GNUNET_YES;
+ GNUNET_SCHEDULER_cancel (test_get->task);
+ test_get->task = GNUNET_SCHEDULER_add_now (&get_stop_task, test_get);
}
+
/**
* Set up some data, and call API PUT function
*/
static void
-do_get (void *cls, const struct GNUNET_SCHEDULER_TaskContext * tc)
+do_get (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
{
struct TestGetContext *test_get = cls;
- GNUNET_HashCode key; /* Made up key to store data under */
- char data[TEST_DATA_SIZE]; /* Made up data to store */
-
- if (test_get == NULL)
- return; /* End of the list */
- memset(data, test_get->uid, sizeof(data));
- GNUNET_CRYPTO_hash(data, TEST_DATA_SIZE, &key);
+ struct GNUNET_HashCode key; /* Made up key to store data under */
+ char data[TEST_DATA_SIZE]; /* Made up data to store */
if (outstanding_gets > MAX_OUTSTANDING_GETS)
- {
- GNUNET_SCHEDULER_add_delayed (sched, GET_DELAY, &do_get, test_get);
- return;
- }
-
- test_get->dht_handle = GNUNET_DHT_connect(sched, test_get->daemon->cfg, 10);
- /* Insert the data at the first peer */
- GNUNET_assert(test_get->dht_handle != NULL);
+ {
+ test_get->task =
+ GNUNET_SCHEDULER_add_delayed (GET_DELAY, &do_get, test_get);
+ return;
+ }
+ memset (data, test_get->uid, sizeof (data));
+ GNUNET_CRYPTO_hash (data, TEST_DATA_SIZE, &key);
+ test_get->dht_handle = GNUNET_DHT_connect (test_get->daemon->cfg, 10);
+ GNUNET_assert (test_get->dht_handle != NULL);
outstanding_gets++;
- test_get->get_handle = GNUNET_DHT_get_start(test_get->dht_handle,
- GNUNET_TIME_relative_get_forever(),
- 1,
- &key,
- &get_result_iterator,
- test_get,
- &get_continuation,
- test_get);
-#if VERBOSE
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Starting get for uid %u from peer %s\n",
- test_get->uid,
- test_get->daemon->shortname);
-#endif
- test_get->disconnect_task = GNUNET_SCHEDULER_add_delayed(sched, GET_TIMEOUT, &get_stop_task, test_get);
- GNUNET_SCHEDULER_add_now (sched, &do_get, test_get->next);
+ test_get->get_handle =
+ GNUNET_DHT_get_start (test_get->dht_handle,
+ GNUNET_BLOCK_TYPE_TEST, &key, 1, route_option, NULL,
+ 0, &get_result_iterator, test_get);
+ test_get->task =
+ GNUNET_SCHEDULER_add_delayed (GET_TIMEOUT, &get_stop_task, test_get);
}
+
/**
- * Called when the PUT request has been transmitted to the DHT service.
- * Schedule the GET request for some time in the future.
+ * Task to release DHT handles for PUT
*/
static void
-put_finished (void *cls, const struct GNUNET_SCHEDULER_TaskContext * tc)
+put_disconnect_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
{
struct TestPutContext *test_put = cls;
- outstanding_puts--;
- puts_completed++;
- GNUNET_SCHEDULER_cancel(sched, test_put->disconnect_task);
- test_put->disconnect_task = GNUNET_SCHEDULER_add_now(sched, &put_disconnect_task, test_put);
- if (puts_completed == num_puts)
- {
- GNUNET_assert(outstanding_puts == 0);
- GNUNET_SCHEDULER_add_delayed(sched, GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_SECONDS, 10), &do_get, all_gets);
- return;
- }
+ test_put->task = GNUNET_SCHEDULER_NO_TASK;
+ GNUNET_DHT_disconnect (test_put->dht_handle);
+ test_put->dht_handle = NULL;
+ GNUNET_CONTAINER_DLL_remove (all_puts_head, all_puts_tail, test_put);
+ GNUNET_free (test_put);
}
+
/**
- * Set up some data, and call API PUT function
+ * Schedule the GET requests
*/
static void
-do_put (void *cls, const struct GNUNET_SCHEDULER_TaskContext * tc)
+start_gets (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
{
- struct TestPutContext *test_put = cls;
- GNUNET_HashCode key; /* Made up key to store data under */
- char data[TEST_DATA_SIZE]; /* Made up data to store */
-
- if (test_put == NULL)
- return; /* End of list */
-
- memset(data, test_put->uid, sizeof(data));
- GNUNET_CRYPTO_hash(data, TEST_DATA_SIZE, &key);
+ unsigned long long i;
+ unsigned long long j;
+ struct TestGetContext *test_get;
- if (outstanding_puts > MAX_OUTSTANDING_PUTS)
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Issuing %llu GETs\n",
+ (unsigned long long) (num_peers * num_peers));
+ for (i = 0; i < num_peers; i++)
+ for (j = 0; j < num_peers; j++)
{
- GNUNET_SCHEDULER_add_delayed (sched, PUT_DELAY, &do_put, test_put);
- return;
+ test_get = GNUNET_malloc (sizeof (struct TestGetContext));
+ test_get->uid = i + j * num_peers;
+ test_get->daemon = GNUNET_TESTING_daemon_get (pg, j);
+ GNUNET_CONTAINER_DLL_insert (all_gets_head, all_gets_tail, test_get);
+ test_get->task = GNUNET_SCHEDULER_add_now (&do_get, test_get);
}
-
-#if VERBOSE
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Starting put for uid %u from peer %s\n",
- test_put->uid,
- test_put->daemon->shortname);
-#endif
- test_put->dht_handle = GNUNET_DHT_connect(sched, test_put->daemon->cfg, 10);
-
- GNUNET_assert(test_put->dht_handle != NULL);
- outstanding_puts++;
- GNUNET_DHT_put(test_put->dht_handle,
- &key,
- 1,
- sizeof(data), data,
- GNUNET_TIME_absolute_get_forever(),
- GNUNET_TIME_relative_get_forever(),
- &put_finished, test_put);
- test_put->disconnect_task = GNUNET_SCHEDULER_add_delayed(sched, GNUNET_TIME_relative_get_forever(), &put_disconnect_task, test_put);
- GNUNET_SCHEDULER_add_now(sched, &do_put, test_put->next);
}
/**
- * Set up some all of the put and get operations we want
- * to do. Allocate data structure for each, add to list,
- * then call actual insert functions.
+ * Called when the PUT request has been transmitted to the DHT service.
*/
static void
-setup_puts_and_gets (void *cls, const struct GNUNET_SCHEDULER_TaskContext * tc)
+put_finished (void *cls, int success)
{
- int i;
- uint32_t temp_daemon;
- struct TestPutContext *test_put;
- struct TestGetContext *test_get;
- int remember[num_puts][num_peers];
-
- for (i = 0; i < num_puts; i++)
- {
- test_put = GNUNET_malloc(sizeof(struct TestPutContext));
- test_put->uid = i;
- temp_daemon = GNUNET_CRYPTO_random_u32(GNUNET_CRYPTO_QUALITY_WEAK, num_peers);
- test_put->daemon = GNUNET_TESTING_daemon_get(pg, temp_daemon);
- test_put->next = all_puts;
- all_puts = test_put;
- }
+ struct TestPutContext *test_put = cls;
- for (i = 0; i < num_gets; i++)
- {
- test_get = GNUNET_malloc(sizeof(struct TestGetContext));
- test_get->uid = GNUNET_CRYPTO_random_u32(GNUNET_CRYPTO_QUALITY_WEAK, num_puts);
- temp_daemon = GNUNET_CRYPTO_random_u32(GNUNET_CRYPTO_QUALITY_WEAK, num_peers);
- while (remember[test_get->uid][temp_daemon] == 1)
- temp_daemon = GNUNET_CRYPTO_random_u32(GNUNET_CRYPTO_QUALITY_WEAK, num_peers);
- test_get->daemon = GNUNET_TESTING_daemon_get(pg, temp_daemon);
- remember[test_get->uid][temp_daemon] = 1;
- test_get->next = all_gets;
- all_gets = test_get;
- }
+ outstanding_puts--;
+ puts_completed++;
+ if (GNUNET_SCHEDULER_NO_TASK != test_put->task)
+ {
+ GNUNET_SCHEDULER_cancel (test_put->task);
+ }
+ test_put->task = GNUNET_SCHEDULER_add_now (&put_disconnect_task, test_put);
+ if (puts_completed != num_peers * num_peers)
+ return;
- GNUNET_SCHEDULER_add_now (sched, &do_put, all_puts);
+ GNUNET_assert (outstanding_puts == 0);
+ GNUNET_SCHEDULER_add_delayed (START_DELAY, &start_gets, NULL);
}
+
+
/**
- * This function is called whenever a connection attempt is finished between two of
- * the started peers (started with GNUNET_TESTING_daemons_start). The total
- * number of times this function is called should equal the number returned
- * from the GNUNET_TESTING_connect_topology call.
- *
- * The emsg variable is NULL on success (peers connected), and non-NULL on
- * failure (peers failed to connect).
+ * Set up some data, and call API PUT function
*/
-void
-topology_callback (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_Daemon *second_daemon,
- const char *emsg)
+static void
+do_put (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
{
- if (emsg == NULL)
- {
- total_connections++;
-#if VERBOSE > 1
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "connected peer %s to peer %s, distance %u\n",
- first_daemon->shortname,
- second_daemon->shortname,
- distance);
-#endif
- }
-#if VERBOSE
- else
- {
- failed_connections++;
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Failed to connect peer %s to peer %s with error :\n%s\n",
- first_daemon->shortname,
- second_daemon->shortname, emsg);
- }
-#endif
-
- if (total_connections == expected_connections)
- {
-#if VERBOSE
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Created %d total connections, which is our target number! Starting next phase of testing.\n",
- total_connections);
-#endif
- GNUNET_SCHEDULER_cancel (sched, die_task);
- die_task = GNUNET_SCHEDULER_add_delayed (sched, TIMEOUT,
- &end_badly, "from setup puts/gets");
+ struct TestPutContext *test_put = cls;
+ struct GNUNET_HashCode key; /* Made up key to store data under */
+ char data[TEST_DATA_SIZE]; /* Made up data to store */
- GNUNET_SCHEDULER_add_delayed (sched, GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_SECONDS, 2), &setup_puts_and_gets, NULL);
- }
- else if (total_connections + failed_connections == expected_connections)
- {
- GNUNET_SCHEDULER_cancel (sched, die_task);
- die_task = GNUNET_SCHEDULER_add_now (sched,
- &end_badly, "from topology_callback (too many failed connections)");
- }
+ test_put->task = GNUNET_SCHEDULER_NO_TASK;
+ if (outstanding_puts > MAX_OUTSTANDING_PUTS)
+ {
+ test_put->task =
+ GNUNET_SCHEDULER_add_delayed (PUT_DELAY, &do_put, test_put);
+ return;
+ }
+ memset (data, test_put->uid, sizeof (data));
+ GNUNET_CRYPTO_hash (data, TEST_DATA_SIZE, &key);
+ test_put->dht_handle = GNUNET_DHT_connect (test_put->daemon->cfg, 10);
+ GNUNET_assert (test_put->dht_handle != NULL);
+ outstanding_puts++;
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "PUT %u at `%s'\n", test_put->uid,
+ GNUNET_i2s (&test_put->daemon->id));
+ GNUNET_DHT_put (test_put->dht_handle, &key, 1, route_option,
+ GNUNET_BLOCK_TYPE_TEST, sizeof (data), data,
+ GNUNET_TIME_UNIT_FOREVER_ABS, GNUNET_TIME_UNIT_FOREVER_REL,
+ &put_finished, test_put);
+ test_put->task =
+ GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL,
+ &put_disconnect_task, test_put);
}
+
static void
-peers_started_callback (void *cls,
- const struct GNUNET_PeerIdentity *id,
- const struct GNUNET_CONFIGURATION_Handle *cfg,
- struct GNUNET_TESTING_Daemon *d, const char *emsg)
+run_dht_test (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
{
- if (emsg != NULL)
- {
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Failed to start daemon with error: `%s'\n",
- emsg);
- return;
- }
- GNUNET_assert (id != NULL);
-
-#if VERBOSE
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Started daemon %llu out of %llu\n",
- (num_peers - peers_left) + 1, num_peers);
-#endif
-
- peers_left--;
- if (peers_left == 0)
- {
+ unsigned long long i;
+ struct TestPutContext *test_put;
-#if VERBOSE
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "All %d daemons started, now connecting peers!\n",
- num_peers);
-#endif
- GNUNET_SCHEDULER_cancel (sched, die_task);
-
- expected_connections = -1;
- if ((pg != NULL) && (peers_left == 0))
- {
- expected_connections = GNUNET_TESTING_connect_topology (pg, connection_topology, connect_topology_option, connect_topology_option_modifier);
-#if VERBOSE
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Have %d expected connections\n", expected_connections);
+ if ((tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN) != 0)
+ {
+ ok = 1;
+ return;
+ }
+#if PATH_TRACKING
+ route_option =
+ GNUNET_DHT_RO_RECORD_ROUTE | GNUNET_DHT_RO_DEMULTIPLEX_EVERYWHERE;
+#else
+ route_option = GNUNET_DHT_RO_DEMULTIPLEX_EVERYWHERE;
#endif
- }
-
- if (expected_connections == GNUNET_SYSERR)
- {
- die_task = GNUNET_SCHEDULER_add_now (sched,
- &end_badly, "from connect topology (bad return)");
- }
-
- die_task = GNUNET_SCHEDULER_add_delayed (sched,
- TIMEOUT,
- &end_badly, "from connect topology (timeout)");
-
- ok = 0;
- }
+ die_task =
+ GNUNET_SCHEDULER_add_delayed (TIMEOUT, &end_badly,
+ "from setup puts/gets");
+ FPRINTF (stderr, "Issuing %llu PUTs (one per peer)\n",
+ (unsigned long long) (num_peers * num_peers));
+ for (i = 0; i < num_peers * num_peers; i++)
+ {
+ test_put = GNUNET_malloc (sizeof (struct TestPutContext));
+ test_put->uid = i;
+ test_put->daemon = GNUNET_TESTING_daemon_get (pg, i % num_peers);
+ test_put->task = GNUNET_SCHEDULER_add_now (&do_put, test_put);
+ GNUNET_CONTAINER_DLL_insert (all_puts_head, all_puts_tail, test_put);
+ }
}
-static void
-create_topology ()
-{
- peers_left = num_peers; /* Reset counter */
- if (GNUNET_TESTING_create_topology (pg, topology, blacklist_topology, blacklist_transports) != GNUNET_SYSERR)
- {
-#if VERBOSE
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Topology set up, now starting peers!\n");
-#endif
- GNUNET_TESTING_daemons_continue_startup(pg);
- }
- else
- {
- GNUNET_SCHEDULER_cancel (sched, die_task);
- die_task = GNUNET_SCHEDULER_add_now (sched,
- &end_badly, "from create topology (bad return)");
- }
- GNUNET_SCHEDULER_cancel (sched, die_task);
- die_task = GNUNET_SCHEDULER_add_delayed (sched,
- TIMEOUT,
- &end_badly, "from continue startup (timeout)");
-}
/**
- * Callback indicating that the hostkey was created for a peer.
+ * This function is called once testing has finished setting up the topology.
*
- * @param cls NULL
- * @param id the peer identity
- * @param d the daemon handle (pretty useless at this point, remove?)
- * @param emsg non-null on failure
- */
-void hostkey_callback (void *cls,
- const struct GNUNET_PeerIdentity *id,
- struct GNUNET_TESTING_Daemon *d,
- const char *emsg)
+ * @param cls unused
+ * @param emsg variable is NULL on success (peers connected), and non-NULL on
+ * failure (peers failed to connect).
+ */
+static void
+startup_done (void *cls, const char *emsg)
{
if (emsg != NULL)
- {
- GNUNET_log(GNUNET_ERROR_TYPE_WARNING, "Hostkey callback received error: %s\n", emsg);
- }
-
-#if VERBOSE > 1
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Hostkey (%d/%d) created for peer `%s'\n",
- num_peers - peers_left, num_peers, GNUNET_i2s(id));
-#endif
-
-
- peers_left--;
- if (peers_left == 0)
- {
-#if VERBOSE
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "All %d hostkeys created, now creating topology!\n",
- num_peers);
-#endif
- GNUNET_SCHEDULER_cancel (sched, die_task);
- /* Set up task in case topology creation doesn't finish
- * within a reasonable amount of time */
- die_task = GNUNET_SCHEDULER_add_delayed (sched,
- TIMEOUT,
- &end_badly, "from create_topology");
- GNUNET_SCHEDULER_add_now(sched, &create_topology, NULL);
- ok = 0;
- }
+ {
+ FPRINTF (stderr, "Failed to setup topology: %s\n", emsg);
+ die_task = GNUNET_SCHEDULER_add_now (&end_badly, "topology setup failed");
+ return;
+ }
+ die_task =
+ GNUNET_SCHEDULER_add_delayed (START_DELAY, &run_dht_test,
+ "from setup puts/gets");
}
static void
-run (void *cls,
- struct GNUNET_SCHEDULER_Handle *s,
- char *const *args,
- const char *cfgfile, const struct GNUNET_CONFIGURATION_Handle *cfg)
+run (void *cls, char *const *args, const char *cfgfile,
+ const struct GNUNET_CONFIGURATION_Handle *cfg)
{
- char * topology_str;
- char * connect_topology_str;
- char * blacklist_topology_str;
- char * connect_topology_option_str;
- char * connect_topology_option_modifier_string;
- sched = s;
-
/* Get path from configuration file */
- if (GNUNET_YES != GNUNET_CONFIGURATION_get_value_string(cfg, "paths", "servicehome", &test_directory))
- {
- ok = 404;
- return;
- }
-
- if ((GNUNET_YES ==
- GNUNET_CONFIGURATION_get_value_string(cfg, "testing", "topology",
- &topology_str)) && (GNUNET_NO == GNUNET_TESTING_topology_get(&topology, topology_str)))
- {
- GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
- "Invalid topology `%s' given for section %s option %s\n", topology_str, "TESTING", "TOPOLOGY");
- topology = GNUNET_TESTING_TOPOLOGY_CLIQUE; /* Defaults to NONE, so set better default here */
- }
-
- if ((GNUNET_YES ==
- GNUNET_CONFIGURATION_get_value_string(cfg, "testing", "connect_topology",
- &connect_topology_str)) && (GNUNET_NO == GNUNET_TESTING_topology_get(&connection_topology, connect_topology_str)))
- {
- GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
- "Invalid connect topology `%s' given for section %s option %s\n", connect_topology_str, "TESTING", "CONNECT_TOPOLOGY");
- }
- GNUNET_free_non_null(connect_topology_str);
- if ((GNUNET_YES ==
- GNUNET_CONFIGURATION_get_value_string(cfg, "testing", "connect_topology_option",
- &connect_topology_option_str)) && (GNUNET_NO == GNUNET_TESTING_topology_option_get(&connect_topology_option, connect_topology_option_str)))
- {
- GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
- "Invalid connect topology option `%s' given for section %s option %s\n", connect_topology_option_str, "TESTING", "CONNECT_TOPOLOGY_OPTION");
- connect_topology_option = GNUNET_TESTING_TOPOLOGY_OPTION_ALL; /* Defaults to NONE, set to ALL */
- }
- GNUNET_free_non_null(connect_topology_option_str);
- if (GNUNET_YES ==
- GNUNET_CONFIGURATION_get_value_string (cfg, "testing", "connect_topology_option_modifier",
- &connect_topology_option_modifier_string))
- {
- if (sscanf(connect_topology_option_modifier_string, "%lf", &connect_topology_option_modifier) != 1)
- {
- GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
- _("Invalid value `%s' for option `%s' in section `%s': expected float\n"),
- connect_topology_option_modifier_string,
- "connect_topology_option_modifier",
- "TESTING");
- }
- GNUNET_free (connect_topology_option_modifier_string);
- }
-
- if (GNUNET_YES != GNUNET_CONFIGURATION_get_value_string (cfg, "testing", "blacklist_transports",
- &blacklist_transports))
- blacklist_transports = NULL;
-
- if ((GNUNET_YES ==
- GNUNET_CONFIGURATION_get_value_string(cfg, "testing", "blacklist_topology",
- &blacklist_topology_str)) && (GNUNET_NO == GNUNET_TESTING_topology_get(&blacklist_topology, blacklist_topology_str)))
- {
- GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
- "Invalid topology `%s' given for section %s option %s\n", topology_str, "TESTING", "BLACKLIST_TOPOLOGY");
- }
- GNUNET_free_non_null(topology_str);
- GNUNET_free_non_null(blacklist_topology_str);
-
- /* Get number of peers to start from configuration */
+ if (GNUNET_YES !=
+ GNUNET_CONFIGURATION_get_value_string (cfg, "paths", "servicehome",
+ &test_directory))
+ {
+ GNUNET_break (0);
+ ok = 404;
+ return;
+ }
if (GNUNET_SYSERR ==
- GNUNET_CONFIGURATION_get_value_number (cfg, "testing", "num_peers",
+ GNUNET_CONFIGURATION_get_value_number (cfg, "testing_old", "num_peers",
&num_peers))
num_peers = DEFAULT_NUM_PEERS;
-
- if (GNUNET_SYSERR ==
- GNUNET_CONFIGURATION_get_value_number (cfg, "dht_testing", "num_puts",
- &num_puts))
- num_puts = DEFAULT_NUM_PEERS;
-
- if (GNUNET_SYSERR ==
- GNUNET_CONFIGURATION_get_value_number (cfg, "dht_testing", "num_gets",
- &num_gets))
- num_gets = DEFAULT_NUM_PEERS;
-
- /* Set peers_left so we know when all peers started */
- peers_left = num_peers;
-
- /* Set up a task to end testing if peer start fails */
- die_task = GNUNET_SCHEDULER_add_delayed (sched,
- GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_SECONDS, SECONDS_PER_PEER_START * num_peers),
- &end_badly, "didn't generate all hostkeys within a reasonable amount of time!!!");
-
- pg = GNUNET_TESTING_daemons_start (sched, cfg,
- peers_left, GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_SECONDS, SECONDS_PER_PEER_START * num_peers), &hostkey_callback, NULL, &peers_started_callback, NULL,
- &topology_callback, NULL, NULL);
-
+ pg = GNUNET_TESTING_peergroup_start (cfg, num_peers, TIMEOUT, NULL,
+ &startup_done, NULL, NULL);
+ GNUNET_assert (NULL != pg);
+ shutdown_task = GNUNET_SCHEDULER_add_delayed(GNUNET_TIME_UNIT_FOREVER_REL,
+ &do_stop, NULL);
}
+
static int
check ()
{
int ret;
+
/* Arguments for GNUNET_PROGRAM_run */
- char *const argv[] = {"test-dht-multipeer", /* Name to give running binary */
+ char *const argv[] = { "test-dht-multipeer", /* Name to give running binary */
"-c",
- "test_dht_multipeer_data.conf", /* Config file to use */
-#if VERBOSE
- "-L", "DEBUG",
-#endif
+ "test_dht_multipeer_data.conf", /* Config file to use */
NULL
};
struct GNUNET_GETOPT_CommandLineOption options[] = {
GNUNET_GETOPT_OPTION_END
};
/* Run the run function as a new program */
- ret = GNUNET_PROGRAM_run ((sizeof (argv) / sizeof (char *)) - 1,
- argv, "test-dht-multipeer", "nohelp",
- options, &run, &ok);
+ ret =
+ GNUNET_PROGRAM_run ((sizeof (argv) / sizeof (char *)) - 1, argv,
+ "test-dht-multipeer", "nohelp", options, &run, &ok);
if (ret != GNUNET_OK)
- {
- GNUNET_log(GNUNET_ERROR_TYPE_WARNING, "`test-dht-multipeer': Failed with error code %d\n", ret);
- }
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+ "`test-dht-multipeer': Failed with error code %d\n", ret);
+ }
return ok;
}
+
int
main (int argc, char *argv[])
{
int ret;
GNUNET_log_setup ("test-dht-multipeer",
-#if VERBOSE
- "DEBUG",
-#else
"WARNING",
-#endif
NULL);
ret = check ();
/**
* of by the testing framework.
*/
if (GNUNET_DISK_directory_remove (test_directory) != GNUNET_OK)
- {
- GNUNET_log(GNUNET_ERROR_TYPE_WARNING, "Failed to remove testing directory %s\n", test_directory);
- }
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+ "Failed to remove testing directory %s\n", test_directory);
+ }
return ret;
}
-/* end of test_dht_twopeer_put_get.c */
+/* end of test_dht_multipeer.c */
projects / oweals / gnunet.git / blobdiff