From 9daa97e9089b4798c225562ac1ee2f7a5cdf91dd Mon Sep 17 00:00:00 2001 From: Matthias Wachs Date: Tue, 17 Sep 2013 18:17:28 +0000 Subject: [PATCH] improved ats performance tests to support parallel transmissions --- src/ats-tests/perf_ats.c | 1363 ++++++++++++++++---------------------- 1 file changed, 576 insertions(+), 787 deletions(-) diff --git a/src/ats-tests/perf_ats.c b/src/ats-tests/perf_ats.c index e52b5f114..4c0c666fd 100644 --- a/src/ats-tests/perf_ats.c +++ b/src/ats-tests/perf_ats.c @@ -30,7 +30,7 @@ #include "gnunet_core_service.h" #define TEST_TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 10) -#define BENCHMARK_DURATION GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 5) +#define BENCHMARK_DURATION GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 15) #define TESTNAME_PREFIX "perf_ats_" #define DEFAULT_SLAVES_NUM 3 #define DEFAULT_MASTERS_NUM 1 @@ -40,6 +40,55 @@ #define TEST_MESSAGE_SIZE 1000 #define TEST_MESSAGE_FREQUENCY GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 1) +/** + * Information we track for a peer in the testbed. + */ +struct BenchmarkPartner +{ + struct BenchmarkPeer *src; + + struct BenchmarkPeer *dest; + /** + * Core transmit handles + */ + void *cth; + + unsigned int messages_sent; + + unsigned int bytes_sent; + + unsigned int messages_received; + + unsigned int bytes_received; +}; + + +struct MasterInformation +{ + int core_slave_connections; + + /** + * Testbed connect operation + */ + struct TestbedConnectOperation *core_connect_ops; +}; + +/** + * Connect peers with testbed + */ +struct TestbedConnectOperation +{ + struct BenchmarkPeer *master; + + struct BenchmarkPeer *slave; + + /** + * Testbed operation to connect peers + */ + struct GNUNET_TESTBED_Operation *connect_op; +}; + + /** * Information we track for a peer in the testbed. @@ -56,9 +105,6 @@ struct BenchmarkPeer */ int no; - /** - * master: GNUNET_YES/NO - */ int master; /** @@ -67,20 +113,15 @@ struct BenchmarkPeer struct GNUNET_PeerIdentity id; /** - * Core handle + * Testbed operation to get peer information */ - struct GNUNET_CORE_Handle *ch; + struct GNUNET_TESTBED_Operation *peer_id_op; /** * Testbed operation to connect to ATS performance service */ struct GNUNET_TESTBED_Operation *ats_perf_op; - /** - * Testbed operation to get peer information - */ - struct GNUNET_TESTBED_Operation *info_op; - /** * Testbed operation to connect to core */ @@ -89,83 +130,25 @@ struct BenchmarkPeer /** * ATS performance handle */ - struct GNUNET_ATS_PerformanceHandle *p_handle; - - /** - * Testbed connecect operation - */ - struct ConnectOperation *connect_ops; + struct GNUNET_ATS_PerformanceHandle *ats_perf_handle; /** - * ATS Measurement Partner - */ - struct BenchmarkPeer *destination; - - GNUNET_SCHEDULER_TaskIdentifier ats_task; - - /* Message exchange */ - - /** - * Core transmit handle - */ - struct GNUNET_CORE_TransmitHandle *cth; - - /** - * DLL for pending messages: head - */ - struct PendingMessages *p_head; - - /** - * DLL for pending messages: tail - */ - struct PendingMessages *p_tail; - - /** - * Bit-mask for next partner selection + * Core handle */ - uint32_t send_mask; + struct GNUNET_CORE_Handle *ch; - /** - * Current message for partner? - */ - int partner_msg; + struct BenchmarkPartner *partners; - /** - * Number of core connections - */ int core_connections; - /** - * Number of slave connections - */ - int slave_connections; + struct MasterInformation mi; - /** - * Statistics - */ - unsigned int messages_sent; - unsigned int messages_sent_partner; - unsigned int messages_received; + unsigned int total_messages_sent; + unsigned int total_bytes_sent; + unsigned int total_messages_received; + unsigned int total_bytes_received; }; - -static int c_master_peers; - -/** - * Array of master peers - * Preferences to be set for - */ -static struct BenchmarkPeer *bp_master; - -static int c_slave_peers; - -/** - * Array of slave peers - * Peer used for measurements - */ -static struct BenchmarkPeer *bp_slaves; - - struct BenchmarkState { /* Are we connected to ATS service of all peers: GNUNET_YES/NO */ @@ -182,78 +165,92 @@ struct BenchmarkState /* Are we connected to CORE service of all peers: GNUNET_YES/NO */ int benchmarking; - - int *core_connections; - - uint32_t partner_map; }; -static struct BenchmarkState state; /** * Shutdown task */ static GNUNET_SCHEDULER_TaskIdentifier shutdown_task; +/** + * Test result + */ static int result; + +/** + * Solver string + */ static char *solver; + +/** + * Preference string + */ static char *pref_str; -static int pref_val; /** - * Pending Responses + * ATS preference value */ -struct PendingMessages -{ - struct PendingMessages *prev; - struct PendingMessages *next; - struct GNUNET_PeerIdentity target; -}; +static int pref_val; +/** + * Number master peers + */ +static int num_masters; /** - * Information we track for a peer in the testbed. + * Array of master peers */ -struct ConnectOperation -{ - struct BenchmarkPeer *master; +struct BenchmarkPeer *mps; - struct BenchmarkPeer *slave; - /** - * Testbed operation to connect peers - */ - struct GNUNET_TESTBED_Operation *connect_op; +/** + * Number slave peers + */ +static int num_slaves; +/** + * Array of slave peers + */ +struct BenchmarkPeer *sps; -}; +/** + * Benchmark state + */ +static struct BenchmarkState state; static void -core_connect_completion_cb (void *cls, - struct GNUNET_TESTBED_Operation *op, - void *ca_result, - const char *emsg ); - - -static void evaluate () +evaluate () { - int c_p; - struct BenchmarkPeer *bp; - int total_out; - int partner_out; + int c_m; + int c_s; + unsigned int duration; + struct BenchmarkPeer *mp; - for (c_p = 0; c_p < c_master_peers; c_p++) + duration = (BENCHMARK_DURATION.rel_value_us / (1000 * 1000)); + for (c_m = 0; c_m < num_masters; c_m++) { - bp = &bp_master[c_p]; - total_out = (bp->messages_sent * TEST_MESSAGE_SIZE) / 10240; - partner_out = (bp->messages_sent_partner * TEST_MESSAGE_SIZE) / 10240; - - fprintf (stderr, _("Master peer %u: Out total: %u KiB/s, out partner %u KiB/s\n"), - bp->no, - total_out, partner_out - /*partner_out / (total_out / 100)*/); + mp = &mps[c_m]; + fprintf (stderr, _("Master [%u]: sent: %u KiB in %u sec. = %u KiB/s, received: %u KiB in %u sec. = %u KiB/s\n"), + mp->no, + mp->total_bytes_sent / 1024, + duration, + (mp->total_bytes_sent / 1024) / duration , + mp->total_bytes_received / 1024, + duration, + (mp->total_bytes_received / 1024) / duration); + + for (c_s = 0; c_s < num_slaves; c_s ++) + { + fprintf (stderr, "Master [%u] -> Slave [%u]: sent %u KiB/s, received %u KiB/s \n", + mp->no, + mp->partners[c_s].dest->no, + (mp->partners[c_s].bytes_sent / 1024) / duration, + (mp->partners[c_s].bytes_received / 1024) / duration); + } } } + /** * Shutdown nicely * @@ -263,207 +260,155 @@ static void evaluate () static void do_shutdown (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) { - int c_p; + int c_m; + int c_s; int c_op; - struct PendingMessages *cur; - struct PendingMessages *next; shutdown_task = GNUNET_SCHEDULER_NO_TASK; - + evaluate(); state.benchmarking = GNUNET_NO; + GNUNET_log(GNUNET_ERROR_TYPE_INFO, _("Benchmarking done\n")); - evaluate (); - GNUNET_log (GNUNET_ERROR_TYPE_INFO, _("Benchmarking done\n")); - - for (c_p = 0; c_p < c_master_peers; c_p++) + for (c_m = 0; c_m < num_masters; c_m++) { - next = bp_master[c_p].p_head; - for (cur = next; cur != NULL; cur = next ) - { - next = cur->next; - GNUNET_CONTAINER_DLL_remove (bp_master[c_p].p_head, bp_master[c_p].p_tail, cur); - GNUNET_free (cur); - } - - if (GNUNET_SCHEDULER_NO_TASK != bp_master[c_p].ats_task) - { - GNUNET_SCHEDULER_cancel (bp_master[c_p].ats_task); - bp_master[c_p].ats_task = GNUNET_SCHEDULER_NO_TASK; - } + if (NULL != mps[c_m].peer_id_op) + { + GNUNET_TESTBED_operation_done (mps[c_m].peer_id_op); + mps[c_m].peer_id_op = NULL; + } - if (NULL != bp_master[c_p].cth) - { - GNUNET_CORE_notify_transmit_ready_cancel(bp_master[c_p].cth); - bp_master[c_p].cth = NULL; - } + for (c_op = 0; c_op < num_slaves; c_op++) + { - if (NULL != bp_master[c_p].ats_perf_op) + if (NULL != mps[c_m].partners[c_op].cth) { - GNUNET_TESTBED_operation_done (bp_master[c_p].ats_perf_op); - bp_master[c_p].ats_perf_op = NULL; + GNUNET_CORE_notify_transmit_ready_cancel (mps[c_m].partners[c_op].cth); + mps[c_m].partners[c_op].cth = NULL; } - if (NULL != bp_master[c_p].core_op) + if (NULL != mps[c_m].mi.core_connect_ops[c_op].connect_op) { - GNUNET_TESTBED_operation_done (bp_master[c_p].core_op); - bp_master[c_p].core_op = NULL; + GNUNET_log(GNUNET_ERROR_TYPE_INFO, + _("Failed to connect peer 0 and %u\n"), c_op); + GNUNET_TESTBED_operation_done ( + mps[c_m].mi.core_connect_ops[c_op].connect_op); + mps[c_m].mi.core_connect_ops[c_op].connect_op = NULL; + result = 1; } + } - if (NULL != bp_master[c_p].info_op) - { - GNUNET_break (0); - GNUNET_TESTBED_operation_done (bp_master[c_p].info_op); - bp_master[c_p].info_op = NULL; - } + if (NULL != mps[c_m].ats_perf_op) + { + GNUNET_TESTBED_operation_done (mps[c_m].ats_perf_op); + mps[c_m].ats_perf_op = NULL; + } - for (c_op = 0; c_op < c_slave_peers; c_op++) - { - if (NULL != bp_master[c_p].connect_ops[c_op].connect_op) - { - GNUNET_log (GNUNET_ERROR_TYPE_INFO, _("Failed to connect peer 0 and %u\n"), c_p); - GNUNET_TESTBED_operation_done (bp_master[c_p].connect_ops[c_op].connect_op); - bp_master[c_p].connect_ops[c_op].connect_op = NULL; - result = 1; - } - } - GNUNET_free (bp_master[c_p].connect_ops); + if (NULL != mps[c_m].core_op) + { + GNUNET_TESTBED_operation_done (mps[c_m].core_op); + mps[c_m].core_op = NULL; + } } - for (c_p = 0; c_p < c_slave_peers; c_p++) - { - next = bp_slaves[c_p].p_head; - for (cur = next; cur != NULL; cur = next ) - { - next = cur->next; - GNUNET_CONTAINER_DLL_remove (bp_slaves[c_p].p_head, bp_slaves[c_p].p_tail, cur); - GNUNET_free (cur); - } - if (NULL != bp_slaves[c_p].cth) - { - GNUNET_CORE_notify_transmit_ready_cancel(bp_slaves[c_p].cth); - bp_slaves[c_p].cth = NULL; - } + for (c_s = 0; c_s < num_slaves; c_s++) + { + if (NULL != sps[c_s].peer_id_op) + { + GNUNET_TESTBED_operation_done (sps[c_s].peer_id_op); + sps[c_s].peer_id_op = NULL; + } - if (NULL != bp_slaves[c_p].ats_perf_op) + for (c_op = 0; c_op < num_slaves; c_op++) + { + if (NULL != sps[c_s].partners[c_op].cth) { - GNUNET_TESTBED_operation_done (bp_slaves[c_p].ats_perf_op); - bp_slaves[c_p].ats_perf_op = NULL; + GNUNET_CORE_notify_transmit_ready_cancel (sps[c_s].partners[c_op].cth); + sps[c_s].partners[c_op].cth = NULL; } + } - if (NULL != bp_slaves[c_p].core_op) - { - GNUNET_TESTBED_operation_done (bp_slaves[c_p].core_op); - bp_slaves[c_p].core_op = NULL; - } - if (NULL != bp_slaves[c_p].info_op) - { - GNUNET_break (0); - GNUNET_TESTBED_operation_done (bp_slaves[c_p].info_op); - bp_slaves[c_p].info_op = NULL; - } + if (NULL != sps[c_s].ats_perf_op) + { + GNUNET_TESTBED_operation_done (sps[c_s].ats_perf_op); + sps[c_s].ats_perf_op = NULL; + } + if (NULL != sps[c_s].core_op) + { + GNUNET_TESTBED_operation_done (sps[c_s].core_op); + sps[c_s].core_op = NULL; + } } - GNUNET_SCHEDULER_shutdown(); + + GNUNET_SCHEDULER_shutdown (); } + static struct BenchmarkPeer * find_peer (const struct GNUNET_PeerIdentity * peer) { int c_p; - for (c_p = 0; c_p < c_master_peers; c_p++) + for (c_p = 0; c_p < num_masters; c_p++) { - if (0 == memcmp (&bp_master[c_p].id, peer, sizeof (struct GNUNET_PeerIdentity))) - return &bp_master[c_p]; + if (0 + == memcmp (&mps[c_p].id, peer, + sizeof(struct GNUNET_PeerIdentity))) + return &mps[c_p]; } - for (c_p = 0; c_p < c_slave_peers; c_p++) + for (c_p = 0; c_p < num_slaves; c_p++) { - if (0 == memcmp (&bp_slaves[c_p].id, peer, sizeof (struct GNUNET_PeerIdentity))) - return &bp_slaves[c_p]; + if (0 == memcmp (&sps[c_p].id, peer, + sizeof(struct GNUNET_PeerIdentity))) + return &sps[c_p]; } - return NULL; } +/** + * Controller event callback + * + * @param cls NULL + * @param event the controller event + */ static void -store_information (struct GNUNET_PeerIdentity *id, - const struct GNUNET_HELLO_Address *address, - int address_active, - struct GNUNET_BANDWIDTH_Value32NBO bandwidth_out, - struct GNUNET_BANDWIDTH_Value32NBO bandwidth_in, - const struct GNUNET_ATS_Information *ats, - uint32_t ats_count) +controller_event_cb (void *cls, + const struct GNUNET_TESTBED_EventInformation *event) { - struct BenchmarkPeer *bp; - - bp = find_peer (id); - - if (NULL == bp) + //struct BenchmarkPeer *p = cls; + switch (event->type) { - GNUNET_break (0); - return; + case GNUNET_TESTBED_ET_CONNECT: + break; + case GNUNET_TESTBED_ET_OPERATION_FINISHED: + break; + default: + GNUNET_break(0); + result = 2; + GNUNET_SCHEDULER_cancel (shutdown_task); + shutdown_task = GNUNET_SCHEDULER_add_now (&do_shutdown, NULL ); } } -static void -ats_performance_info_cb (void *cls, - const struct GNUNET_HELLO_Address *address, - int address_active, - struct GNUNET_BANDWIDTH_Value32NBO bandwidth_out, - struct GNUNET_BANDWIDTH_Value32NBO bandwidth_in, - const struct GNUNET_ATS_Information *ats, - uint32_t ats_count) -{ - struct BenchmarkPeer *bp = cls; - int c_a; - char *peer_id; - - peer_id = GNUNET_strdup (GNUNET_i2s (&bp->id)); - for (c_a = 0; c_a < ats_count; c_a++) - { - /*GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, _("%c %03u: %s %s %u\n"), - (GNUNET_YES == p->master) ? 'M' : 'S', - p->no, - GNUNET_i2s (&address->peer), - GNUNET_ATS_print_property_type(ntohl(ats[c_a].type)), - ntohl(ats[c_a].value));*/ - } - - if ((GNUNET_YES == bp->master) && - (0 == memcmp (&address->peer, &bp->destination->id, - sizeof (struct GNUNET_PeerIdentity)))) - { - GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Bandwidth for master %u: %lu %lu\n", - bp->no, - (long unsigned int) ntohl(bandwidth_in.value__), - (long unsigned int) ntohl(bandwidth_in.value__)); - } - - store_information (&bp->id, address, address_active, - bandwidth_in, bandwidth_out, - ats, ats_count); - - GNUNET_free (peer_id); -} static size_t core_send_ready (void *cls, size_t size, void *buf) { static char msgbuf[TEST_MESSAGE_SIZE]; - struct BenchmarkPeer *bp = cls; + struct BenchmarkPartner *partner = cls; struct GNUNET_MessageHeader *msg; - bp->cth = NULL; + partner->cth = NULL; + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Master [%u]: Sending PING to [%u]\n", + partner->src->no, partner->dest->no); - bp->messages_sent ++; - if (GNUNET_YES == bp->partner_msg) - { - bp->messages_sent_partner ++; - bp->partner_msg = GNUNET_NO; - } + partner->messages_sent ++; + partner->bytes_sent += TEST_MESSAGE_SIZE; + partner->src->total_messages_sent ++; + partner->src->total_bytes_sent += TEST_MESSAGE_SIZE; msg = (struct GNUNET_MessageHeader *) &msgbuf; memset (&msgbuf, 'a', TEST_MESSAGE_SIZE); @@ -473,129 +418,86 @@ core_send_ready (void *cls, size_t size, void *buf) return TEST_MESSAGE_SIZE; } -static struct BenchmarkPeer * -get_next (struct BenchmarkPeer *p) -{ - uint32_t b_index; - uint32_t index; - int counter; - - if (0 == p->send_mask) - p->send_mask = (1 << c_slave_peers) - 1; /* Next round */ - - GNUNET_assert (p->send_mask <= (1 << c_slave_peers) - 1); - counter = 0; - do - { - index = GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_WEAK, c_slave_peers); - b_index = 1 << index; - counter++; - } - while ((b_index != (p->send_mask & b_index)) && (counter < c_slave_peers)); - if ((b_index != (p->send_mask & b_index)) && (counter == c_slave_peers)) - { - /* To many random attempts use fcfs */ - for (index = 0; index < c_slave_peers - 1; index ++) - { - b_index = 1 << index; - if (b_index == (p->send_mask & b_index)) - break; - } - } - p->send_mask ^= b_index; /* Remove bit */ - return &bp_slaves[index]; -} - static void -ats_pref_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) -{ - static double last = 1; - struct BenchmarkPeer *bp = cls; - - bp->ats_task = GNUNET_SCHEDULER_NO_TASK; - - GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Set preference for master %u: %f\n", - bp->no, last); - GNUNET_ATS_performance_change_preference (bp->p_handle, &bp->destination->id, - pref_val, (double) last, - GNUNET_ATS_PREFERENCE_END); - last++; - bp->ats_task = GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_SECONDS, - &ats_pref_task, bp); -} - - -static void do_benchmark () { int c_m; - struct BenchmarkPeer *s; - struct BenchmarkPeer *bp; + int c_s; - if ((state.connected_ATS_service == GNUNET_NO) || - (state.connected_CORE_service == GNUNET_NO) || - (state.connected_PEERS == GNUNET_NO) || - (state.connected_CORE == GNUNET_NO)) + if ((state.connected_ATS_service == GNUNET_NO) + || (state.connected_CORE_service == GNUNET_NO) + || (state.connected_PEERS == GNUNET_NO) + || (state.connected_CORE == GNUNET_NO)) return; state.benchmarking = GNUNET_YES; - GNUNET_log (GNUNET_ERROR_TYPE_INFO, - _("Benchmarking start\n")); + GNUNET_log(GNUNET_ERROR_TYPE_INFO, _("Benchmarking start\n")); if (GNUNET_SCHEDULER_NO_TASK != shutdown_task) GNUNET_SCHEDULER_cancel (shutdown_task); - shutdown_task = GNUNET_SCHEDULER_add_delayed (BENCHMARK_DURATION, &do_shutdown, NULL); + shutdown_task = GNUNET_SCHEDULER_add_delayed (BENCHMARK_DURATION, + &do_shutdown, NULL ); /* Start sending test messages */ - for (c_m = 0; c_m < c_master_peers; c_m ++) + for (c_s = 0; c_s < num_slaves; c_s++) { - bp = &bp_master[c_m]; - s = get_next (bp); - if (0 == memcmp(&s->id, &bp->destination->id, sizeof (struct GNUNET_PeerIdentity))) - bp->partner_msg = GNUNET_YES; - bp->cth = GNUNET_CORE_notify_transmit_ready (bp->ch, - GNUNET_NO, 0, GNUNET_TIME_UNIT_MINUTES, - &s->id, TEST_MESSAGE_SIZE, &core_send_ready, bp); - bp->ats_task = GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_SECONDS, - &ats_pref_task, bp); + for (c_m = 0; c_m < num_masters; c_m++) + { + + sps[c_s].partners[c_m].src = &sps[c_s]; + sps[c_s].partners[c_m].dest = &mps[c_m]; + } + } + + for (c_m = 0; c_m < num_masters; c_m++) + { + for (c_s = 0; c_s < num_slaves; c_s++) + { + mps[c_m].partners[c_s].src = &mps[c_m]; + mps[c_m].partners[c_s].dest = &sps[c_s]; + mps[c_m].partners[c_s].cth = GNUNET_CORE_notify_transmit_ready (mps[c_m].ch, + GNUNET_NO, 0, GNUNET_TIME_UNIT_MINUTES, &sps[c_s].id, + TEST_MESSAGE_SIZE, &core_send_ready, &mps[c_m].partners[c_s]); + } } } -static void -connect_completion_callback (void *cls, - struct GNUNET_TESTBED_Operation *op, - const char *emsg) +static void +connect_completion_callback (void *cls, struct GNUNET_TESTBED_Operation *op, + const char *emsg) { - struct ConnectOperation *cop = cls; - static int ops = 0 ; + struct TestbedConnectOperation *cop = cls; + static int ops = 0; int c; if (NULL == emsg) { - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - _("Connected master peer %u with peer %u\n"), cop->master->no, cop->slave->no); + GNUNET_log(GNUNET_ERROR_TYPE_INFO, + _("Connected master peer %u with peer %u\n"), cop->master->no, + cop->slave->no); } else { - GNUNET_log (GNUNET_ERROR_TYPE_ERROR, - _("Failed to connect master peer%u with peer %u\n"), cop->master->no, cop->slave->no); - GNUNET_break (0); + GNUNET_log(GNUNET_ERROR_TYPE_ERROR, + _("Failed to connect master peer%u with peer %u\n"), cop->master->no, + cop->slave->no); + GNUNET_break(0); if (GNUNET_SCHEDULER_NO_TASK != shutdown_task) - GNUNET_SCHEDULER_cancel(shutdown_task); - shutdown_task = GNUNET_SCHEDULER_add_now (do_shutdown, NULL); + GNUNET_SCHEDULER_cancel (shutdown_task); + shutdown_task = GNUNET_SCHEDULER_add_now (do_shutdown, NULL ); } - GNUNET_TESTBED_operation_done(op); + GNUNET_TESTBED_operation_done (op); ops++; - for (c = 0; c < c_slave_peers; c++) + for (c = 0; c < num_slaves; c++) { - if (cop == &cop->master->connect_ops[c]) - cop->master->connect_ops[c].connect_op = NULL; + if (cop == &cop->master->mi.core_connect_ops[c]) + cop->master->mi.core_connect_ops[c].connect_op = NULL; } - if (ops == c_master_peers * c_slave_peers) + if (ops == num_masters * num_slaves) { state.connected_PEERS = GNUNET_YES; - GNUNET_SCHEDULER_add_now (&do_benchmark, NULL); + GNUNET_SCHEDULER_add_now (&do_benchmark, NULL ); } } @@ -605,74 +507,48 @@ do_connect_peers (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) { int c_m; int c_s; - struct BenchmarkPeer *bp; + struct BenchmarkPeer *p; - if ((state.connected_ATS_service == GNUNET_NO) || - (state.connected_CORE_service == GNUNET_NO)) + if ((state.connected_ATS_service == GNUNET_NO) + || (state.connected_CORE_service == GNUNET_NO)) { return; } - GNUNET_log (GNUNET_ERROR_TYPE_INFO, _("Connecting peers on CORE level\n")); + GNUNET_log(GNUNET_ERROR_TYPE_INFO, _("Connecting peers on CORE level\n")); - for (c_m = 0; c_m < c_master_peers; c_m ++) + for (c_m = 0; c_m < num_masters; c_m++) { - bp = &bp_master[c_m]; - bp->connect_ops = GNUNET_malloc (c_slave_peers * sizeof (struct ConnectOperation)); + p = &mps[c_m]; + p->mi.core_connect_ops = GNUNET_malloc (num_slaves * + sizeof (struct TestbedConnectOperation)); - for (c_s = 0; c_s < c_slave_peers; c_s ++) + for (c_s = 0; c_s < num_slaves; c_s++) + { + GNUNET_log(GNUNET_ERROR_TYPE_INFO, + _("Connecting master peer %u with slave peer %u\n"), p->no, + sps[c_s].no); + p->mi.core_connect_ops[c_s].master = p; + p->mi.core_connect_ops[c_s].slave = &sps[c_s]; + p->mi.core_connect_ops[c_s].connect_op = GNUNET_TESTBED_overlay_connect (NULL, + &connect_completion_callback, &p->mi.core_connect_ops[c_s], + sps[c_s].peer, p->peer); + if (NULL == p->mi.core_connect_ops[c_s].connect_op) { - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - _("Connecting master peer %u with slave peer %u\n"), - bp->no, bp_slaves[c_s].no); - bp->connect_ops[c_s].master = bp; - bp->connect_ops[c_s].slave = &bp_slaves[c_s]; - bp->connect_ops[c_s].connect_op = GNUNET_TESTBED_overlay_connect( NULL, - &connect_completion_callback, - &bp->connect_ops[c_s], - bp_slaves[c_s].peer, - bp->peer); - if (NULL == bp->connect_ops[c_s].connect_op) - { - GNUNET_log (GNUNET_ERROR_TYPE_ERROR, - _("Could not connect master peer %u and slave peer %u\n"), - bp->no, bp_slaves[c_s].no); - GNUNET_break (0); - if (GNUNET_SCHEDULER_NO_TASK != shutdown_task) - GNUNET_SCHEDULER_cancel(shutdown_task); - shutdown_task = GNUNET_SCHEDULER_add_now (do_shutdown, NULL); - return; - } + GNUNET_log(GNUNET_ERROR_TYPE_ERROR, + _("Could not connect master peer %u and slave peer %u\n"), p->no, + sps[c_s].no); + GNUNET_break(0); + if (GNUNET_SCHEDULER_NO_TASK != shutdown_task) + GNUNET_SCHEDULER_cancel (shutdown_task); + shutdown_task = GNUNET_SCHEDULER_add_now (do_shutdown, NULL ); + return; } + } } } -/** - * Controller event callback - * - * @param cls NULL - * @param event the controller event - */ -static void -controller_event_cb (void *cls, - const struct GNUNET_TESTBED_EventInformation *event) -{ - //struct BenchmarkPeer *p = cls; - switch (event->type) - { - case GNUNET_TESTBED_ET_CONNECT: - break; - case GNUNET_TESTBED_ET_OPERATION_FINISHED: - break; - default: - GNUNET_break (0); - result = 2; - GNUNET_SCHEDULER_cancel (shutdown_task); - shutdown_task = GNUNET_SCHEDULER_add_now (&do_shutdown, NULL); - } -} - /** * Method called whenever a given peer connects. * @@ -686,57 +562,50 @@ core_connect_cb (void *cls, const struct GNUNET_PeerIdentity * peer) struct BenchmarkPeer *t; char *id; int c; - int cs; + int completed; t = find_peer (peer); if (NULL == t) { - GNUNET_break (0); - return; + GNUNET_break(0); + return; } id = GNUNET_strdup (GNUNET_i2s (&p->id)); - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "%s %s connected to %s %s\n", - (p->master == GNUNET_YES) ? "Master": "Slave", - id, - (t->master == GNUNET_YES) ? "Master": "Slave", - GNUNET_i2s (peer)); - - p->core_connections ++; - if ((GNUNET_YES == p->master) && (GNUNET_NO == t->master) && (GNUNET_NO == state.connected_CORE)) + GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "%s %s connected to %s %s\n", + (p->master == GNUNET_YES) ? "Master": "Slave", id, + (t->master == GNUNET_YES) ? "Master": "Slave", GNUNET_i2s (peer)); + + p->core_connections++; + if ((GNUNET_YES == p->master) && (GNUNET_NO == t->master) + && (GNUNET_NO == state.connected_CORE)) { - p->slave_connections ++; + p->mi.core_slave_connections++; - if (p->slave_connections == c_slave_peers) - { - GNUNET_log (GNUNET_ERROR_TYPE_INFO, - "Master %u connected all slaves\n", p->no); - } - cs = GNUNET_YES; - for (c = 0; c < c_master_peers; c ++) - { - if (bp_master[c].slave_connections != c_slave_peers) - cs = GNUNET_NO; - } - if (GNUNET_YES == cs) - { - GNUNET_log (GNUNET_ERROR_TYPE_INFO, - "All master peers connected all slave peers\n", id, GNUNET_i2s (peer)); - state.connected_CORE = GNUNET_YES; - GNUNET_SCHEDULER_add_now (&do_benchmark, NULL); - } - } - GNUNET_free (id); + if (p->mi.core_slave_connections == num_slaves) + { + GNUNET_log(GNUNET_ERROR_TYPE_INFO, "Master %u connected all slaves\n", + p->no); + } + completed = GNUNET_YES; + for (c = 0; c < num_masters; c++) + { + if (mps[c].mi.core_slave_connections != num_slaves) + completed = GNUNET_NO; + } + if (GNUNET_YES == completed) + { + GNUNET_log(GNUNET_ERROR_TYPE_INFO, + "All master peers connected all slave peers\n", id, + GNUNET_i2s (peer)); + state.connected_CORE = GNUNET_YES; + GNUNET_SCHEDULER_add_now (&do_benchmark, NULL ); + } + } + GNUNET_free(id); } -/** - * Method called whenever a peer disconnects. - * - * @param cls closure - * @param peer peer identity this notification is about - */ static void core_disconnect_cb (void *cls, const struct GNUNET_PeerIdentity * peer) { @@ -747,411 +616,336 @@ core_disconnect_cb (void *cls, const struct GNUNET_PeerIdentity * peer) t = find_peer (peer); if (NULL == t) { - GNUNET_break (0); - return; + GNUNET_break(0); + return; } id = GNUNET_strdup (GNUNET_i2s (&p->id)); - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "%s disconnected from %s \n", id, GNUNET_i2s (peer)); - GNUNET_assert (p->core_connections > 0); - p->core_connections --; + GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "%s disconnected from %s \n", id, + GNUNET_i2s (peer)); + GNUNET_assert(p->core_connections > 0); + p->core_connections--; - if ((GNUNET_YES == state.benchmarking) && - ((GNUNET_YES == p->master) || (GNUNET_YES == t->master))) + if ((GNUNET_YES == state.benchmarking) + && ((GNUNET_YES == p->master) || (GNUNET_YES == t->master))) { - GNUNET_log (GNUNET_ERROR_TYPE_ERROR, - "%s disconnected from %s while benchmarking \n", id, GNUNET_i2s (peer)); + GNUNET_log(GNUNET_ERROR_TYPE_ERROR, + "%s disconnected from %s while benchmarking \n", id, GNUNET_i2s (peer)); } - - GNUNET_free (id); + GNUNET_free(id); } -static size_t -core_send_echo_queued_ready (void *cls, size_t size, void *buf); - static size_t core_send_echo_ready (void *cls, size_t size, void *buf) { - static char msgbuf[TEST_MESSAGE_SIZE]; - struct BenchmarkPeer *bp = cls; - struct GNUNET_MessageHeader *msg; - - bp->cth = NULL; - - msg = (struct GNUNET_MessageHeader *) &msgbuf; - memset (&msgbuf, 'a', TEST_MESSAGE_SIZE); - msg->type = htons (TEST_MESSAGE_TYPE_PONG); - msg->size = htons (TEST_MESSAGE_SIZE); - memcpy (buf, msg, TEST_MESSAGE_SIZE); - - /* send echo */ - if (NULL != bp->p_head) - bp->cth = GNUNET_CORE_notify_transmit_ready (bp->ch, - GNUNET_NO, 0, GNUNET_TIME_UNIT_MINUTES, - &bp->p_head->target, - TEST_MESSAGE_SIZE, &core_send_echo_queued_ready, bp); - - return TEST_MESSAGE_SIZE; -} - -static size_t -core_send_echo_queued_ready (void *cls, size_t size, void *buf) -{ - struct BenchmarkPeer *bp = cls; - struct PendingMessages *pm; - GNUNET_assert (NULL != bp->p_head); + static char msgbuf[TEST_MESSAGE_SIZE]; + struct BenchmarkPartner *p = cls; + struct GNUNET_MessageHeader *msg; - pm = bp->p_head; - GNUNET_CONTAINER_DLL_remove (bp->p_head, bp->p_tail, pm); - GNUNET_free (pm); + p->cth = NULL; + p->messages_sent ++; + p->bytes_sent += TEST_MESSAGE_SIZE; + p->src->total_messages_sent ++; + p->src->total_bytes_sent += TEST_MESSAGE_SIZE; - return core_send_echo_ready (cls, size, buf); + msg = (struct GNUNET_MessageHeader *) &msgbuf; + memset (&msgbuf, 'a', TEST_MESSAGE_SIZE); + msg->type = htons (TEST_MESSAGE_TYPE_PONG); + msg->size = htons (TEST_MESSAGE_SIZE); + memcpy (buf, msg, TEST_MESSAGE_SIZE); + return TEST_MESSAGE_SIZE; } static int core_handle_ping (void *cls, const struct GNUNET_PeerIdentity *other, - const struct GNUNET_MessageHeader *message) + const struct GNUNET_MessageHeader *message) { - struct BenchmarkPeer *me = cls; - struct BenchmarkPeer *remote; - struct PendingMessages *pm; - - remote = find_peer (other); - - if (NULL == remote) - { - GNUNET_break (0); - return GNUNET_SYSERR; - } - - if (NULL != me->cth) - { - pm = GNUNET_malloc (sizeof (struct PendingMessages)); - pm->target = (*other); - GNUNET_CONTAINER_DLL_insert_tail (me->p_head, me->p_tail, pm); - return GNUNET_OK; - } - - if (GNUNET_NO == remote->master) - { - GNUNET_break (0); - return GNUNET_OK; - } + int c_m; + struct BenchmarkPeer *me = cls; + struct BenchmarkPartner *p = NULL; + for (c_m = 0; c_m < num_masters; c_m++) + { + if (0 == memcmp (other, &me->partners[c_m].dest->id, sizeof (struct GNUNET_PeerIdentity))) + { + p = &me->partners[c_m]; + break; + } + } + if (NULL == p) + { + GNUNET_break (0); + return GNUNET_SYSERR; + } + GNUNET_assert (NULL == p->cth); - me->messages_received ++; - /* send echo */ - me->cth = GNUNET_CORE_notify_transmit_ready (me->ch, - GNUNET_NO, 0, GNUNET_TIME_UNIT_MINUTES, - &remote->id, - TEST_MESSAGE_SIZE, &core_send_echo_ready, me); - return GNUNET_OK; + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "Slave [%u]: Received PING from [%u], sending PONG\n", + me->no, p->dest->no); + + p->messages_received ++; + p->bytes_received += TEST_MESSAGE_SIZE; + p->src->total_messages_received ++; + p->src->total_bytes_received += TEST_MESSAGE_SIZE; + + p->cth = GNUNET_CORE_notify_transmit_ready (me->ch, GNUNET_NO, 0, + GNUNET_TIME_UNIT_MINUTES, &p->dest->id, TEST_MESSAGE_SIZE, + &core_send_echo_ready, p); + return GNUNET_OK; } static int core_handle_pong (void *cls, const struct GNUNET_PeerIdentity *other, - const struct GNUNET_MessageHeader *message) + const struct GNUNET_MessageHeader *message) { - struct BenchmarkPeer *me = cls; - struct BenchmarkPeer *remote; - struct BenchmarkPeer *next; + int c_s; + struct BenchmarkPeer *me = cls; + struct BenchmarkPartner *p = NULL; - remote = find_peer (other); + for (c_s = 0; c_s < num_slaves; c_s++) + { + if (0 == memcmp (other, &me->partners[c_s].dest->id, sizeof (struct GNUNET_PeerIdentity))) + { + p = &me->partners[c_s]; + break; + } + } + if (NULL == p) + { + GNUNET_break (0); + return GNUNET_SYSERR; + } + GNUNET_assert (NULL == p->cth); - if (NULL == remote) - { - GNUNET_break (0); - return GNUNET_SYSERR; - } + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "Master [%u]: Received PONG from [%u], next message\n", + me->no, p->dest->no); - if (NULL != me->cth) - { - GNUNET_break (0); - return GNUNET_OK; - } + p->messages_received ++; + p->bytes_received += TEST_MESSAGE_SIZE; + p->src->total_messages_received ++; + p->src->total_bytes_received += TEST_MESSAGE_SIZE; - if (GNUNET_YES == remote->master) - { - GNUNET_break (0); - return GNUNET_OK; - } - me->messages_received ++; - next = get_next (me); - if (0 == memcmp(&remote->id, &me->destination->id, sizeof (struct GNUNET_PeerIdentity))) - me->partner_msg = GNUNET_YES; - me->cth = GNUNET_CORE_notify_transmit_ready (me->ch, - GNUNET_NO, 0, GNUNET_TIME_UNIT_MINUTES, - &next->id, - TEST_MESSAGE_SIZE, &core_send_ready, me); - - return GNUNET_OK; -} + p->cth = GNUNET_CORE_notify_transmit_ready (me->ch, + GNUNET_NO, 0, GNUNET_TIME_UNIT_MINUTES, &p->dest->id, + TEST_MESSAGE_SIZE, &core_send_ready, p); + return GNUNET_OK; +} -/** - * Called to open a connection to the peer's ATS performance - * - * @param cls peer context - * @param cfg configuration of the peer to connect to; will be available until - * GNUNET_TESTBED_operation_done() is called on the operation returned - * from GNUNET_TESTBED_service_connect() - * @return service handle to return in 'op_result', NULL on error - */ static void * -core_connect_adapter (void *cls, - const struct GNUNET_CONFIGURATION_Handle *cfg) +core_connect_adapter (void *cls, const struct GNUNET_CONFIGURATION_Handle *cfg) { struct BenchmarkPeer *peer = cls; static const struct GNUNET_CORE_MessageHandler handlers[] = { - {&core_handle_ping, TEST_MESSAGE_TYPE_PING, 0}, - {&core_handle_pong, TEST_MESSAGE_TYPE_PONG, 0}, - {NULL, 0, 0} - }; - - peer->ch = GNUNET_CORE_connect(cfg, peer, NULL, - core_connect_cb, core_disconnect_cb, - NULL, GNUNET_NO, NULL, GNUNET_NO, handlers); + {&core_handle_ping, TEST_MESSAGE_TYPE_PING, 0 }, + {&core_handle_pong, TEST_MESSAGE_TYPE_PONG, 0 }, + { NULL, 0, 0 } }; + + peer->ch = GNUNET_CORE_connect (cfg, peer, NULL, core_connect_cb, + core_disconnect_cb, NULL, GNUNET_NO, NULL, GNUNET_NO, handlers); if (NULL == peer->ch) - GNUNET_log (GNUNET_ERROR_TYPE_ERROR, - "Failed to create core connection \n"); + GNUNET_log(GNUNET_ERROR_TYPE_ERROR, "Failed to create core connection \n"); return peer->ch; } -/** - * Callback to be called when a service connect operation is completed - * - * @param cls the callback closure from functions generating an operation - * @param op the operation that has been finished - * @param ca_result the service handle returned from GNUNET_TESTBED_ConnectAdapter() - * @param emsg error message in case the operation has failed; will be NULL if - * operation has executed successfully. - */ static void -core_connect_completion_cb (void *cls, - struct GNUNET_TESTBED_Operation *op, - void *ca_result, - const char *emsg ) +core_disconnect_adapter (void *cls, void *op_result) +{ + struct BenchmarkPeer *peer = cls; + + GNUNET_CORE_disconnect (peer->ch); + peer->ch = NULL; +} + + +static void +core_connect_completion_cb (void *cls, struct GNUNET_TESTBED_Operation *op, + void *ca_result, const char *emsg) { static int core_done = 0; if ((NULL != emsg) || (NULL == ca_result)) { - GNUNET_log (GNUNET_ERROR_TYPE_INFO, - _("Initialization failed, shutdown\n")); - GNUNET_break (0); + GNUNET_log(GNUNET_ERROR_TYPE_INFO, _("Initialization failed, shutdown\n")); + GNUNET_break(0); if (GNUNET_SCHEDULER_NO_TASK != shutdown_task) - GNUNET_SCHEDULER_cancel(shutdown_task); - shutdown_task = GNUNET_SCHEDULER_add_now (do_shutdown, NULL); + GNUNET_SCHEDULER_cancel (shutdown_task); + shutdown_task = GNUNET_SCHEDULER_add_now (do_shutdown, NULL ); return; } - core_done ++; + core_done++; - if (core_done == c_slave_peers + c_master_peers) + if (core_done == num_slaves + num_masters) { - GNUNET_log (GNUNET_ERROR_TYPE_INFO, - "Connected to all CORE services\n"); + GNUNET_log(GNUNET_ERROR_TYPE_INFO, "Connected to all CORE services\n"); state.connected_CORE_service = GNUNET_YES; - GNUNET_SCHEDULER_add_now (&do_connect_peers, NULL); + GNUNET_SCHEDULER_add_now (&do_connect_peers, NULL ); } } -/** - * Called to disconnect from peer's statistics service - * - * @param cls peer context - * @param op_result service handle returned from the connect adapter - */ static void -core_disconnect_adapter (void *cls, void *op_result) +do_connect_core (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) { - struct BenchmarkPeer *peer = cls; + int c_s; + int c_m; + GNUNET_log(GNUNET_ERROR_TYPE_INFO, "Connecting to all CORE services\n"); + for (c_m = 0; c_m < num_masters; c_m++) + { + mps[c_m].core_op = GNUNET_TESTBED_service_connect (NULL, + mps[c_m].peer, "core", core_connect_completion_cb, NULL, + &core_connect_adapter, &core_disconnect_adapter, &mps[c_m]); + } - GNUNET_CORE_disconnect (peer->ch); - peer->ch = NULL; + for (c_s = 0; c_s < num_slaves; c_s++) + { + sps[c_s].core_op = GNUNET_TESTBED_service_connect (NULL, + sps[c_s].peer, "core", core_connect_completion_cb, NULL, + &core_connect_adapter, &core_disconnect_adapter, &sps[c_s]); + } } static void -do_connect_core (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) +ats_performance_info_cb (void *cls, const struct GNUNET_HELLO_Address *address, + int address_active, struct GNUNET_BANDWIDTH_Value32NBO bandwidth_out, + struct GNUNET_BANDWIDTH_Value32NBO bandwidth_in, + const struct GNUNET_ATS_Information *ats, uint32_t ats_count) { - int c_p; - GNUNET_log (GNUNET_ERROR_TYPE_INFO, - "Connecting to all CORE services\n"); - for (c_p = 0; c_p < c_master_peers; c_p++) + struct BenchmarkPeer *p = cls; + int c_a; + char *peer_id; + + peer_id = GNUNET_strdup (GNUNET_i2s (&p->id)); + for (c_a = 0; c_a < ats_count; c_a++) { - bp_master[c_p].core_op = GNUNET_TESTBED_service_connect (NULL, - bp_master[c_p].peer, "core", - core_connect_completion_cb, NULL, - &core_connect_adapter, - &core_disconnect_adapter, - &bp_master[c_p]); + /*GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, _("%c %03u: %s %s %u\n"), + (GNUNET_YES == p->master) ? 'M' : 'S', + p->no, + GNUNET_i2s (&address->peer), + GNUNET_ATS_print_property_type(ntohl(ats[c_a].type)), + ntohl(ats[c_a].value));*/ } - - for (c_p = 0; c_p < c_slave_peers; c_p++) +#if 0 + if ((GNUNET_YES == p->master) + && (0 == memcmp (&address->peer, &p->destination->id, + sizeof(struct GNUNET_PeerIdentity)))) { - bp_slaves[c_p].core_op = GNUNET_TESTBED_service_connect (NULL, - bp_slaves[c_p].peer, "core", - core_connect_completion_cb, NULL, - &core_connect_adapter, - &core_disconnect_adapter, - &bp_slaves[c_p]); + GNUNET_log(GNUNET_ERROR_TYPE_INFO, "Bandwidth for master %u: %lu %lu\n", + p->no, (long unsigned int ) ntohl (bandwidth_in.value__), + (long unsigned int ) ntohl (bandwidth_in.value__)); } -} + store_information (&bp->id, address, address_active, bandwidth_in, + bandwidth_out, ats, ats_count); +#endif + GNUNET_free(peer_id); +} -/** - * Called to open a connection to the peer's ATS performance - * - * @param cls peer context - * @param cfg configuration of the peer to connect to; will be available until - * GNUNET_TESTBED_operation_done() is called on the operation returned - * from GNUNET_TESTBED_service_connect() - * @return service handle to return in 'op_result', NULL on error - */ static void * ats_perf_connect_adapter (void *cls, - const struct GNUNET_CONFIGURATION_Handle *cfg) + const struct GNUNET_CONFIGURATION_Handle *cfg) { struct BenchmarkPeer *peer = cls; - peer->p_handle = GNUNET_ATS_performance_init (cfg, &ats_performance_info_cb, peer); - if (NULL == peer->p_handle) - GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Failed to create ATS performance handle \n"); - return peer->p_handle; + peer->ats_perf_handle = GNUNET_ATS_performance_init (cfg, &ats_performance_info_cb, + peer); + if (NULL == peer->ats_perf_handle) + GNUNET_log(GNUNET_ERROR_TYPE_ERROR, + "Failed to create ATS performance handle \n"); + return peer->ats_perf_handle; } -/** - * Called to disconnect from peer's statistics service - * - * @param cls peer context - * @param op_result service handle returned from the connect adapter - */ static void ats_perf_disconnect_adapter (void *cls, void *op_result) { struct BenchmarkPeer *peer = cls; - GNUNET_ATS_performance_done(peer->p_handle); - peer->p_handle = NULL; + GNUNET_ATS_performance_done (peer->ats_perf_handle); + peer->ats_perf_handle = NULL; } - -/** - * Callback to be called when a service connect operation is completed - * - * @param cls the callback closure from functions generating an operation - * @param op the operation that has been finished - * @param ca_result the service handle returned from GNUNET_TESTBED_ConnectAdapter() - * @param emsg error message in case the operation has failed; will be NULL if - * operation has executed successfully. - */ static void -ats_connect_completion_cb (void *cls, - struct GNUNET_TESTBED_Operation *op, - void *ca_result, - const char *emsg ) +ats_connect_completion_cb (void *cls, struct GNUNET_TESTBED_Operation *op, + void *ca_result, const char *emsg) { static int op_done = 0; + if ((NULL != emsg) || (NULL == ca_result)) { - GNUNET_log (GNUNET_ERROR_TYPE_INFO, - _("Initialization failed, shutdown\n")); - GNUNET_break (0); + GNUNET_log(GNUNET_ERROR_TYPE_INFO, _("Initialization failed, shutdown\n")); + GNUNET_break(0); if (GNUNET_SCHEDULER_NO_TASK != shutdown_task) - GNUNET_SCHEDULER_cancel(shutdown_task); - shutdown_task = GNUNET_SCHEDULER_add_now (do_shutdown, NULL); + GNUNET_SCHEDULER_cancel (shutdown_task); + shutdown_task = GNUNET_SCHEDULER_add_now (do_shutdown, NULL ); return; } - - op_done ++; - if (op_done == (c_slave_peers + c_master_peers)) + op_done++; + if (op_done == (num_masters+ num_slaves)) { - GNUNET_log (GNUNET_ERROR_TYPE_INFO, - "Connected to all ATS services\n"); + GNUNET_log(GNUNET_ERROR_TYPE_INFO, "Connected to all ATS services\n"); state.connected_ATS_service = GNUNET_YES; - GNUNET_SCHEDULER_add_now (&do_connect_core, NULL); + GNUNET_SCHEDULER_add_now (&do_connect_core, NULL ); } } + static void do_connect_ats (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) { - int c_p; - GNUNET_log (GNUNET_ERROR_TYPE_INFO, - "Connecting to all ATS services %u\n", c_slave_peers); - for (c_p = 0; c_p < c_master_peers; c_p++) + int c_m; + int c_s; + + GNUNET_log(GNUNET_ERROR_TYPE_INFO, "Connecting to all ATS services\n"); + for (c_m = 0; c_m < num_masters; c_m++) { - bp_master[c_p].ats_perf_op = GNUNET_TESTBED_service_connect (NULL, - bp_master[c_p].peer, "ats", - ats_connect_completion_cb, NULL, - &ats_perf_connect_adapter, - &ats_perf_disconnect_adapter, - &bp_master[c_p]); + mps[c_m].ats_perf_op = GNUNET_TESTBED_service_connect (NULL, + mps[c_m].peer, "ats", ats_connect_completion_cb, NULL, + &ats_perf_connect_adapter, &ats_perf_disconnect_adapter, + &mps[c_m]); } - for (c_p = 0; c_p < c_slave_peers; c_p++) + for (c_s = 0; c_s < num_slaves; c_s++) { - bp_slaves[c_p].ats_perf_op = GNUNET_TESTBED_service_connect (NULL, - bp_slaves[c_p].peer, "ats", - ats_connect_completion_cb, NULL, - &ats_perf_connect_adapter, - &ats_perf_disconnect_adapter, - &bp_slaves[c_p]); + sps[c_s].ats_perf_op = GNUNET_TESTBED_service_connect (NULL, + sps[c_s].peer, "ats", ats_connect_completion_cb, NULL, + &ats_perf_connect_adapter, &ats_perf_disconnect_adapter, + &sps[c_s]); } } - -/** - * Callback to be called when the requested peer information is available - * - * @param cb_cls the closure from GNUNET_TETSBED_peer_get_information() - * @param op the operation this callback corresponds to - * @param pinfo the result; will be NULL if the operation has failed - * @param emsg error message if the operation has failed; will be NULL if the - * operation is successfull - */ static void -peerinformation_cb (void *cb_cls, - struct GNUNET_TESTBED_Operation *op, - const struct GNUNET_TESTBED_PeerInformation*pinfo, - const char *emsg) +peerinformation_cb (void *cb_cls, struct GNUNET_TESTBED_Operation *op, + const struct GNUNET_TESTBED_PeerInformation*pinfo, const char *emsg) { struct BenchmarkPeer *p = cb_cls; - static int done = 0; + static int done = 0; + + GNUNET_assert (pinfo->pit == GNUNET_TESTBED_PIT_IDENTITY); + + p->id = *pinfo->result.id; + GNUNET_log(GNUNET_ERROR_TYPE_INFO, "[%c %03u] Peers %s\n", + (p->master == GNUNET_YES) ? 'M' : 'S', p->no, GNUNET_i2s (&p->id)); - if (pinfo->pit == GNUNET_TESTBED_PIT_IDENTITY) - { - p->id = *pinfo->result.id; - GNUNET_log (GNUNET_ERROR_TYPE_INFO, - "[%c %03u] Peers %s\n", - (p->master == GNUNET_YES) ? 'M' : 'S', p->no, GNUNET_i2s (&p->id)); - } - else - { - GNUNET_assert (0); - } GNUNET_TESTBED_operation_done (op); - p->info_op = NULL; + p->peer_id_op = NULL; done++; - if (done == c_master_peers + c_slave_peers) + if (done == num_slaves + num_masters) { - GNUNET_log (GNUNET_ERROR_TYPE_INFO, - "Retrieved all peer ID, connect to ATS\n"); - state.connected_CORE_service = GNUNET_YES; - GNUNET_SCHEDULER_add_now (&do_connect_ats, NULL); + GNUNET_log(GNUNET_ERROR_TYPE_INFO, + "Retrieved all peer ID, connect to ATS\n"); + GNUNET_SCHEDULER_add_now (&do_connect_ats, NULL ); } } - /** * Signature of a main function for a testcase. * @@ -1164,59 +958,53 @@ peerinformation_cb (void *cb_cls, * failed */ static void -test_main (void *cls, - struct GNUNET_TESTBED_RunHandle *h, - unsigned int num_peers, - struct GNUNET_TESTBED_Peer **peers_, - unsigned int links_succeeded, - unsigned int links_failed) +main_run (void *cls, struct GNUNET_TESTBED_RunHandle *h, + unsigned int num_peers, struct GNUNET_TESTBED_Peer **peers_, + unsigned int links_succeeded, unsigned int links_failed) { - int c_p; - - GNUNET_log (GNUNET_ERROR_TYPE_INFO, - _("Benchmarking solver `%s' on preference `%s' with %u master and %u slave peers\n"), - solver, pref_str, c_master_peers, c_slave_peers); - - shutdown_task = GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply(TEST_TIMEOUT, c_master_peers + c_slave_peers), &do_shutdown, NULL); + int c_m; + int c_s; + GNUNET_assert(NULL == cls); + GNUNET_assert(num_masters + num_slaves == num_peers); + GNUNET_assert(NULL != peers_); - GNUNET_assert (NULL == cls); - GNUNET_assert (c_slave_peers + c_master_peers == num_peers); - GNUNET_assert (NULL != peers_); + GNUNET_log(GNUNET_ERROR_TYPE_INFO, + _("Benchmarking solver `%s' on preference `%s' with %u master and %u slave peers\n"), + solver, pref_str, num_masters, num_slaves); - GNUNET_log (GNUNET_ERROR_TYPE_INFO, - _("Initializing... \n")); + shutdown_task = GNUNET_SCHEDULER_add_delayed ( + GNUNET_TIME_relative_multiply (TEST_TIMEOUT, + num_masters + num_slaves), &do_shutdown, NULL ); /* Setup master peers */ - for (c_p = 0; c_p < c_master_peers; c_p++) + for (c_m = 0; c_m < num_masters; c_m++) { - GNUNET_assert (NULL != peers_[c_p]); - bp_master[c_p].no = c_p; - bp_master[c_p].send_mask = (1 << c_slave_peers) - 1; - bp_master[c_p].master = GNUNET_YES; - bp_master[c_p].peer = peers_[c_p]; - bp_master[c_p].info_op = GNUNET_TESTBED_peer_get_information (bp_master[c_p].peer, - GNUNET_TESTBED_PIT_IDENTITY, - &peerinformation_cb, &bp_master[c_p]); - - /* Select ATS measurement partner */ - bp_master[c_p].destination = &bp_slaves[c_p]; + GNUNET_assert(NULL != peers_[c_m]); + mps[c_m].peer = peers_[c_m]; + mps[c_m].no = c_m; + mps[c_m].master = GNUNET_YES; + mps[c_m].partners = GNUNET_malloc (num_slaves * sizeof (struct BenchmarkPeer)); + mps[c_m].peer_id_op = GNUNET_TESTBED_peer_get_information ( + mps[c_m].peer, GNUNET_TESTBED_PIT_IDENTITY, + &peerinformation_cb, + &mps[c_m]); } /* Setup slave peers */ - for (c_p = 0; c_p < c_slave_peers; c_p++) + for (c_s = 0; c_s < num_slaves; c_s++) { - GNUNET_assert (NULL != peers_[c_p + c_master_peers]); - bp_slaves[c_p].no = c_p + c_master_peers; - bp_slaves[c_p].master = GNUNET_NO; - bp_slaves[c_p].peer = peers_[c_p + c_master_peers]; - bp_slaves[c_p].info_op = GNUNET_TESTBED_peer_get_information (bp_slaves[c_p].peer, - GNUNET_TESTBED_PIT_IDENTITY, - &peerinformation_cb, &bp_slaves[c_p]); + GNUNET_assert(NULL != peers_[c_s + num_masters]); + sps[c_s].peer = peers_[c_s + num_masters]; + sps[c_s].no = c_s + num_masters; + sps[c_s].master = GNUNET_NO; + sps[c_s].partners = GNUNET_malloc (num_masters * sizeof (struct BenchmarkPeer)); + sps[c_s].peer_id_op = GNUNET_TESTBED_peer_get_information ( + sps[c_s].peer, GNUNET_TESTBED_PIT_IDENTITY, + &peerinformation_cb, + &sps[c_s]); } - } - int main (int argc, char *argv[]) { @@ -1283,13 +1071,13 @@ main (int argc, char *argv[]) } if (c < argc-1) { - if ((0L != (c_slave_peers = strtol (argv[c + 1], NULL, 10))) && (c_slave_peers >= 1)) - fprintf (stderr, "Starting %u slave peers\n", c_slave_peers); + if ((0L != (num_slaves = strtol (argv[c + 1], NULL, 10))) && (num_slaves >= 1)) + fprintf (stderr, "Starting %u slave peers\n", num_slaves); else - c_slave_peers = DEFAULT_SLAVES_NUM; + num_slaves = DEFAULT_SLAVES_NUM; } else - c_slave_peers = DEFAULT_SLAVES_NUM; + num_slaves = DEFAULT_SLAVES_NUM; for (c = 0; c < (argc -1); c++) { @@ -1298,36 +1086,37 @@ main (int argc, char *argv[]) } if (c < argc-1) { - if ((0L != (c_master_peers = strtol (argv[c + 1], NULL, 10))) && (c_master_peers >= 2)) - fprintf (stderr, "Starting %u master peers\n", c_master_peers); + if ((0L != (num_masters = strtol (argv[c + 1], NULL, 10))) && (num_masters >= 2)) + fprintf (stderr, "Starting %u master peers\n", num_masters); else - c_master_peers = DEFAULT_MASTERS_NUM; + num_masters = DEFAULT_MASTERS_NUM; } else - c_master_peers = DEFAULT_MASTERS_NUM; - - bp_slaves = GNUNET_malloc (c_slave_peers * sizeof (struct BenchmarkPeer)); - bp_master = GNUNET_malloc (c_master_peers * sizeof (struct BenchmarkPeer)); + num_masters = DEFAULT_MASTERS_NUM; state.connected_ATS_service = GNUNET_NO; state.connected_CORE_service = GNUNET_NO; state.connected_PEERS = GNUNET_NO; + mps = GNUNET_malloc (num_masters * sizeof (struct BenchmarkPeer)); + sps = GNUNET_malloc (num_slaves * sizeof (struct BenchmarkPeer)); + /* Start topology */ uint64_t event_mask; event_mask = 0; event_mask |= (1LL << GNUNET_TESTBED_ET_CONNECT); event_mask |= (1LL << GNUNET_TESTBED_ET_OPERATION_FINISHED); (void) GNUNET_TESTBED_test_run ("perf_ats", - conf_name, c_slave_peers + c_master_peers, + conf_name, num_slaves + num_masters, event_mask, &controller_event_cb, NULL, - &test_main, NULL); + &main_run, NULL); GNUNET_free (solver); GNUNET_free (pref_str); GNUNET_free (conf_name); GNUNET_free (test_name); - GNUNET_free (bp_slaves); + GNUNET_free (mps); + GNUNET_free (sps); return result; } -- 2.25.1