#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_MINUTES, 5)
+#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 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 10
#define TEST_DATA_SIZE 8
-#define MAX_OUTSTANDING_PUTS 10
+#define MAX_OUTSTANDING_PUTS 100
+
+#define MAX_OUTSTANDING_GETS 100
-#define MAX_OUTSTANDING_GETS 10
+#define PATH_TRACKING GNUNET_NO
-#define PATH_TRACKING GNUNET_YES
-/* Structs */
struct TestPutContext
{
*/
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 GETS to perform
+ */
+static struct TestGetContext *all_gets_tail;
/**
* List of PUTS to perform
*/
-struct TestPutContext *all_puts;
+static struct TestPutContext *all_puts_head;
+
+/**
+ * List of PUTS to perform
+ */
+static struct TestPutContext *all_puts_tail;
/**
* Handle to the set of all peers run for this test.
*/
static GNUNET_SCHEDULER_TaskIdentifier die_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.
*/
}
}
+static void
+do_stop (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+{
+ GNUNET_TESTING_daemons_stop (pg, TIMEOUT, &shutdown_callback, NULL);
+ pg = NULL;
+}
+
+
/**
- * Task to release DHT handles for PUT
+ * Master context for 'stat_run'.
+ */
+struct StatMaster
+{
+ struct GNUNET_STATISTICS_Handle *stat;
+ unsigned int daemon;
+ unsigned int value;
+};
+
+struct StatValues
+{
+ const char *subsystem;
+ const char *name;
+ unsigned long long total;
+};
+
+/**
+ * Statistics we print out.
+ */
+static struct StatValues stats[] = {
+ {"core", "# bytes decrypted", 0},
+ {"core", "# bytes encrypted", 0},
+ {"transport", "# bytes received via TCP", 0},
+ {"transport", "# bytes transmitted via TCP", 0},
+ {"dht", "# PUT messages queued for transmission"},
+ {"dht", "# P2P PUT requests received"},
+ {"dht", "# GET messages queued for transmission"},
+ {"dht", "# P2P GET requests received"},
+ {"dht", "# RESULT messages queued for transmission"},
+ {"dht", "# P2P RESULTS received"},
+ {"dht", "# Queued messages discarded (peer disconnected)"},
+ {NULL, NULL}
+};
+
+
+/**
+ * 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 int
+print_stat (void *cls, const char *subsystem, const char *name, uint64_t value,
+ int is_persistent)
+{
+ struct StatMaster *sm = cls;
+
+ stats[sm->value].total += value;
+ fprintf (stderr, "Peer %2u: %12s/%50s = %12llu\n", sm->daemon, subsystem,
+ name, (unsigned long long) value);
+ return GNUNET_OK;
+}
+
+
+/**
+ * Function that gathers stats from all daemons.
*/
static void
-put_disconnect_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+stat_run (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc);
+
+
+/**
+ * Function called when GET operation on stats is done.
+ */
+static void
+get_done (void *cls, int success)
{
- struct TestPutContext *test_put = cls;
+ struct StatMaster *sm = cls;
- test_put->disconnect_task = GNUNET_SCHEDULER_NO_TASK;
- GNUNET_DHT_disconnect (test_put->dht_handle);
- test_put->dht_handle = NULL;
+ GNUNET_break (GNUNET_OK == success);
+ sm->value++;
+ GNUNET_SCHEDULER_add_now (&stat_run, sm);
}
+
+/**
+ * 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);
+}
+
+
/**
* Function scheduled to be run on the successful completion of this
* testcase.
static void
finish_testing (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
{
- GNUNET_assert (pg != NULL);
- struct TestPutContext *test_put = all_puts;
- struct TestGetContext *test_get = all_gets;
+ struct TestPutContext *test_put;
+ struct TestGetContext *test_get;
+ struct StatMaster *sm;
- while (test_put != NULL)
+ die_task = GNUNET_SCHEDULER_NO_TASK;
+ while (NULL != (test_put = all_puts_head))
{
- if (test_put->disconnect_task != GNUNET_SCHEDULER_NO_TASK)
- GNUNET_SCHEDULER_cancel (test_put->disconnect_task);
+ 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);
- test_put = test_put->next;
+ GNUNET_CONTAINER_DLL_remove (all_puts_head,
+ all_puts_tail,
+ test_put);
+ GNUNET_free (test_put);
}
- while (test_get != NULL)
+ while (NULL != (test_get = all_gets_head))
{
- if (test_get->disconnect_task != GNUNET_SCHEDULER_NO_TASK)
- GNUNET_SCHEDULER_cancel (test_get->disconnect_task);
+ 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);
- test_get = test_get->next;
+ GNUNET_CONTAINER_DLL_remove (all_gets_head,
+ all_gets_tail,
+ test_get);
+ GNUNET_free (test_get);
}
-
- GNUNET_TESTING_daemons_stop (pg, TIMEOUT, &shutdown_callback, NULL);
- ok = 0;
+ 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);
}
end_badly (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
{
const char *emsg = cls;
+ struct TestPutContext *test_put;
+ struct TestGetContext *test_get;
+ die_task = GNUNET_SCHEDULER_NO_TASK;
fprintf (stderr,
"Failing test with error: `%s'!\n",
emsg);
-
- struct TestPutContext *test_put = all_puts;
- struct TestGetContext *test_get = all_gets;
-
- while (test_put != NULL)
+ while (NULL != (test_put = all_puts_head))
{
- if (test_put->disconnect_task != GNUNET_SCHEDULER_NO_TASK)
- GNUNET_SCHEDULER_cancel (test_put->disconnect_task);
+ 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);
- test_put = test_put->next;
+ GNUNET_CONTAINER_DLL_remove (all_puts_head,
+ all_puts_tail,
+ test_put);
+ GNUNET_free (test_put);
}
- while (test_get != NULL)
+ while (NULL != (test_get = all_gets_head))
{
- if (test_get->disconnect_task != GNUNET_SCHEDULER_NO_TASK)
- GNUNET_SCHEDULER_cancel (test_get->disconnect_task);
+ 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);
- test_get = test_get->next;
+ GNUNET_CONTAINER_DLL_remove (all_gets_head,
+ all_gets_tail,
+ test_get);
+ GNUNET_free (test_get);
}
-
- GNUNET_TESTING_daemons_stop (pg, TIMEOUT, &shutdown_callback, NULL);
ok = 1;
+ GNUNET_TESTING_daemons_stop (pg, TIMEOUT, &shutdown_callback, NULL);
+ pg = NULL;
}
GNUNET_HashCode search_key; /* Key stored under */
char original_data[TEST_DATA_SIZE]; /* Made up data to store */
- test_get->disconnect_task = GNUNET_SCHEDULER_NO_TASK;
+ 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++;
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Get from peer %s for key %s failed!\n",
- test_get->daemon->shortname, GNUNET_h2s (&search_key));
+ 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);
GNUNET_DHT_disconnect (test_get->dht_handle);
test_get->dht_handle = NULL;
- fprintf (stderr,
- "%llu gets succeeded, %llu gets failed!\n",
- gets_completed, gets_failed);
- if ((gets_failed > 0) && (outstanding_gets == 0)) /* Had some failures */
+ GNUNET_CONTAINER_DLL_remove (all_gets_head,
+ all_gets_tail,
+ test_get);
+ GNUNET_free (test_get);
+ if ((gets_failed > 10) && (outstanding_gets == 0))
{
- GNUNET_SCHEDULER_cancel (die_task);
- die_task =
- GNUNET_SCHEDULER_add_now (&end_badly, "not all gets succeeded");
- return;
+ /* 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 == num_peers * num_peers) &&
+ 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);
- //GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_MINUTES, 5), &get_topology, NULL);
+ ok = 0;
die_task = GNUNET_SCHEDULER_add_now (&finish_testing, NULL);
}
}
+
/**
* Iterator called if the GET request initiated returns a response.
*
struct TestGetContext *test_get = cls;
GNUNET_HashCode search_key; /* Key stored under */
char original_data[TEST_DATA_SIZE]; /* Made up data to store */
- unsigned int i;
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 PATH_TRACKING
if (put_path != NULL)
{
- fprintf (stderr, "PUT Path: ");
+ 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, "\n");
}
if (get_path != NULL)
{
- fprintf (stderr, "GET Path: ");
+ 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, "\n");
+ fprintf (stderr, "%s%s\n",
+ get_path_length > 0 ? "->":"",
+ GNUNET_i2s (&test_get->daemon->id));
}
#endif
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
- {
- fprintf (stderr, "GET successful!\n");
- gets_completed++;
- test_get->succeeded = GNUNET_YES;
+ fprintf (stderr,
+ "Key or data is not the same as was inserted!\n");
+ return;
}
-
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Received correct GET response!\n");
- GNUNET_SCHEDULER_cancel (test_get->disconnect_task);
- test_get->disconnect_task = GNUNET_SCHEDULER_add_now (&get_stop_task, test_get);
+ 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);
}
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);
-
if (outstanding_gets > MAX_OUTSTANDING_GETS)
{
- GNUNET_SCHEDULER_add_delayed (GET_DELAY, &do_get, test_get);
+ 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);
- /* Insert the data at the first peer */
GNUNET_assert (test_get->dht_handle != NULL);
outstanding_gets++;
test_get->get_handle =
- GNUNET_DHT_get_start (test_get->dht_handle, GNUNET_TIME_UNIT_FOREVER_REL,
- GNUNET_BLOCK_TYPE_TEST, &key,
- 1, route_option, NULL, 0,
- &get_result_iterator, 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);
+ GNUNET_DHT_get_start (test_get->dht_handle, GNUNET_TIME_UNIT_FOREVER_REL,
+ 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);
+}
+
+
+/**
+ * Task to release DHT handles for PUT
+ */
+static void
+put_disconnect_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+{
+ struct TestPutContext *test_put = cls;
+
+ 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);
+}
+
+
+/**
+ * Schedule the GET requests
+ */
+static void
+start_gets (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+{
+ unsigned long long i;
+ unsigned long long j;
+ struct TestGetContext *test_get;
+
+#if VERBOSE
+ fprintf (stderr,
+ "Issuing %llu GETs\n",
+ num_peers * num_peers);
#endif
- test_get->disconnect_task =
- GNUNET_SCHEDULER_add_delayed (GET_TIMEOUT, &get_stop_task, test_get);
- GNUNET_SCHEDULER_add_now (&do_get, test_get->next);
+ for (i = 0; i < num_peers; i++)
+ for (j = 0; j < num_peers; j++)
+ {
+ 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);
+ }
}
+
/**
* Called when the PUT request has been transmitted to the DHT service.
- * Schedule the GET request for some time in the future.
*/
static void
put_finished (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
outstanding_puts--;
puts_completed++;
-
- GNUNET_SCHEDULER_cancel (test_put->disconnect_task);
- test_put->disconnect_task =
+ GNUNET_SCHEDULER_cancel (test_put->task);
+ test_put->task =
GNUNET_SCHEDULER_add_now (&put_disconnect_task, test_put);
- if (puts_completed == num_peers)
- {
- GNUNET_assert (outstanding_puts == 0);
- GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply
- (GNUNET_TIME_UNIT_SECONDS, 10), &do_get,
- all_gets);
+ if (puts_completed != num_peers * num_peers)
return;
- }
+
+ GNUNET_assert (outstanding_puts == 0);
+ GNUNET_SCHEDULER_add_delayed (START_DELAY,
+ &start_gets,
+ NULL);
}
+
/**
* Set up some data, and call API PUT function
*/
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);
-
+ test_put->task = GNUNET_SCHEDULER_NO_TASK;
if (outstanding_puts > MAX_OUTSTANDING_PUTS)
{
- GNUNET_SCHEDULER_add_delayed (PUT_DELAY, &do_put, test_put);
+ test_put->task = GNUNET_SCHEDULER_add_delayed (PUT_DELAY, &do_put, test_put);
return;
}
-
-#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
+ 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++;
+#if VERBOSE > 2
+ fprintf (stderr, "PUT %u at `%s'\n",
+ test_put->uid,
+ GNUNET_i2s (&test_put->daemon->id));
+#endif
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->disconnect_task =
+ test_put->task =
GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL,
&put_disconnect_task, test_put);
- GNUNET_SCHEDULER_add_now (&do_put, test_put->next);
}
+static void
+run_dht_test (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+{
+ unsigned long long i;
+ struct TestPutContext *test_put;
+
+#if PATH_TRACKING
+ route_option = GNUNET_DHT_RO_RECORD_ROUTE | GNUNET_DHT_RO_DEMULTIPLEX_EVERYWHERE;
+#else
+ route_option = GNUNET_DHT_RO_DEMULTIPLEX_EVERYWHERE;
+#endif
+ die_task =
+ GNUNET_SCHEDULER_add_delayed (TIMEOUT, &end_badly,
+ "from setup puts/gets");
+ fprintf (stderr,
+ "Issuing %llu PUTs (one per peer)\n",
+ 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);
+ }
+}
+
/**
* This function is called once testing has finished setting up the topology.
* failure (peers failed to connect).
*/
static void
-run_dht_test (void *cls, const char *emsg)
+startup_done (void *cls, const char *emsg)
{
- unsigned long long i;
- unsigned long long j;
- uint32_t temp_daemon;
- struct TestPutContext *test_put;
- struct TestGetContext *test_get;
-
if (emsg != NULL)
{
fprintf (stderr,
"topology setup failed");
return;
}
-
-#if PATH_TRACKING
- route_option = GNUNET_DHT_RO_RECORD_ROUTE;
-#else
- route_option = GNUNET_DHT_RO_NONE;
-#endif
die_task =
- GNUNET_SCHEDULER_add_delayed (TIMEOUT, &end_badly,
+ GNUNET_SCHEDULER_add_delayed (START_DELAY, &run_dht_test,
"from setup puts/gets");
- fprintf (stderr,
- "Issuing %llu PUTs (one per peer)\n",
- num_peers);
- for (i = 0; i < num_peers; i++)
- {
- test_put = GNUNET_malloc (sizeof (struct TestPutContext));
- test_put->uid = i;
- test_put->daemon = GNUNET_TESTING_daemon_get (pg, i);
- test_put->next = all_puts;
- all_puts = test_put;
- }
- GNUNET_SCHEDULER_add_now (&do_put, all_puts);
-
- fprintf (stderr,
- "Issuing %llu GETs\n",
- num_peers * num_peers);
- for (i = 0; i < num_peers; i++)
- for (j = 0; j < num_peers; j++)
- {
- test_get = GNUNET_malloc (sizeof (struct TestGetContext));
- test_get->uid = i;
- temp_daemon = j;
- test_get->daemon = GNUNET_TESTING_daemon_get (pg, temp_daemon);
- test_get->next = all_gets;
- all_gets = test_get;
- }
}
num_peers,
TIMEOUT,
NULL,
- &run_dht_test,
+ &startup_done,
NULL,
NULL);
- if (NULL == pg)
- {
- GNUNET_break (0);
- return;
- }
+ GNUNET_assert (NULL != pg);
}
projects / oweals / gnunet.git / blobdiff