X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Fats-tests%2Fperf_ats.c;h=6198d1464c9f3784261a83a5d803afa7967f4c73;hb=f6ff4c48d5d41875e03b59df33117cb4ba943877;hp=34334c6439ee01100700ac742ac9db6e3ed1eaa2;hpb=85e3ad70b63d5e91f727fe4c1dee856934a09b89;p=oweals%2Fgnunet.git diff --git a/src/ats-tests/perf_ats.c b/src/ats-tests/perf_ats.c index 34334c643..6198d1464 100644 --- a/src/ats-tests/perf_ats.c +++ b/src/ats-tests/perf_ats.c @@ -1,22 +1,22 @@ /* - This file is part of GNUnet. - (C) 2010-2013 Christian Grothoff (and other contributing authors) - - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. - - GNUnet is distributed in the hope that it will be useful, but - WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. -*/ + This file is part of GNUnet. + (C) 2010-2013 Christian Grothoff (and other contributing authors) + + GNUnet is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published + by the Free Software Foundation; either version 3, or (at your + option) any later version. + + GNUnet is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + General Public License for more details. + + You should have received a copy of the GNU General Public License + along with GNUnet; see the file COPYING. If not, write to the + Free Software Foundation, Inc., 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. + */ /** * @file ats/perf_ats.c * @brief ats benchmark: start peers and modify preferences, monitor change over time @@ -28,227 +28,168 @@ #include "gnunet_testbed_service.h" #include "gnunet_ats_service.h" #include "gnunet_core_service.h" +#include "perf_ats.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 TESTNAME_PREFIX "perf_ats_" -#define DEFAULT_SLAVES_NUM 3 -#define DEFAULT_MASTERS_NUM 1 +#define TEST_ATS_PREFRENCE_FREQUENCY GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 1) +#define TEST_ATS_PREFRENCE_START 1.0 +#define TEST_ATS_PREFRENCE_DELTA 1.0 #define TEST_MESSAGE_TYPE_PING 12345 #define TEST_MESSAGE_TYPE_PONG 12346 #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. + * Connect peers with testbed */ -struct BenchmarkPeer +struct TestbedConnectOperation { /** - * Handle with testbed. - */ - struct GNUNET_TESTBED_Peer *peer; - - /** - * Unique identifier - */ - int no; - - /** - * master: GNUNET_YES/NO - */ - int master; - - /** - * Peer ID + * The benchmarking master initiating this connection */ - struct GNUNET_PeerIdentity id; + struct BenchmarkPeer *master; /** - * Core handle + * The benchmarking slave to connect to */ - struct GNUNET_CORE_Handle *ch; + struct BenchmarkPeer *slave; /** - * 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 + * Testbed operation to connect peers */ - struct GNUNET_TESTBED_Operation *core_op; + struct GNUNET_TESTBED_Operation *connect_op; +}; - /** - * ATS performance handle - */ - struct GNUNET_ATS_PerformanceHandle *p_handle; +/** + * Overall state of the performance benchmark + */ +struct BenchmarkState +{ + /* Are we connected to ATS service of all peers: GNUNET_YES/NO */ + int connected_ATS_service; - /** - * Testbed connecect operation - */ - struct ConnectOperation *connect_ops; + /* Are we connected to CORE service of all peers: GNUNET_YES/NO */ + int connected_COMM_service; - /** - * ATS Measurement Partner - */ - struct BenchmarkPeer *destination; + /* Are we connected to all peers: GNUNET_YES/NO */ + int connected_PEERS; - GNUNET_SCHEDULER_TaskIdentifier ats_task; + /* Are we connected to all slave peers on CORE level: GNUNET_YES/NO */ + int connected_CORE; - /* Message exchange */ + /* Are we connected to CORE service of all peers: GNUNET_YES/NO */ + int benchmarking; +}; - /** - * Core transmit handle - */ - struct GNUNET_CORE_TransmitHandle *cth; +/** + * Shutdown task + */ +static GNUNET_SCHEDULER_TaskIdentifier shutdown_task; - /** - * DLL for pending messages: head - */ - struct PendingMessages *p_head; +/** + * Progress task + */ +static GNUNET_SCHEDULER_TaskIdentifier progress_task; - /** - * DLL for pending messages: tail - */ - struct PendingMessages *p_tail; +/** + * Test result + */ +static int result; - /** - * Bit-mask for next partner selection - */ - uint32_t send_mask; +/** + * Test result logging + */ +static int logging; - /** - * Current message for partner? - */ - int partner_msg; +/**Test core (GNUNET_YES) or transport (GNUNET_NO) + */ +static int test_core; - /** - * Number of core connections - */ - int core_connections; +/** + * Solver string + */ +static char *solver; - /** - * Number of slave connections - */ - int slave_connections; +/** + * Preference string + */ +static char *testname; - /** - * Statistics - */ - unsigned int messages_sent; - unsigned int messages_sent_partner; - unsigned int messages_received; -}; +/** + * Preference string + */ +static char *pref_str; +/** + * ATS preference value + */ +static int pref_val; -static int c_master_peers; +/** + * Number master peers + */ +static int num_masters; /** * Array of master peers - * Preferences to be set for */ -static struct BenchmarkPeer *bp_master; - -static int c_slave_peers; +static struct BenchmarkPeer *mps; +/** + * Number slave peers + */ +static int num_slaves; /** * 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 */ - int connected_ATS_service; - - /* Are we connected to CORE service of all peers: GNUNET_YES/NO */ - int connected_CORE_service; - - /* Are we connected to all peers: GNUNET_YES/NO */ - int connected_PEERS; - - /* Are we connected to all slave peers on CORE level: GNUNET_YES/NO */ - int connected_CORE; - - /* 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; +static struct BenchmarkPeer *sps; /** - * Shutdown task + * Benchmark duration */ -static GNUNET_SCHEDULER_TaskIdentifier shutdown_task; - -static int result; -static char *solver; -static char *preference; +static struct GNUNET_TIME_Relative perf_duration; /** - * Pending Responses + * Logging frequency */ -struct PendingMessages -{ - struct PendingMessages *prev; - struct PendingMessages *next; - struct GNUNET_PeerIdentity target; -}; - +static struct GNUNET_TIME_Relative log_frequency; /** - * Information we track for a peer in the testbed. + * Benchmark state */ -struct ConnectOperation -{ - struct BenchmarkPeer *master; - - struct BenchmarkPeer *slave; - /** - * Testbed operation to connect peers - */ - struct GNUNET_TESTBED_Operation *connect_op; - -}; - +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 = (perf_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, _("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, + "%c Master [%u] -> Slave [%u]: sent %u KiB/s (%.2f \%), received %u KiB/s (%.2f \%)\n", + (mp->pref_partner == mp->partners[c_s].dest) ? '*' : ' ', + mp->no, mp->partners[c_s].dest->no, + (mp->partners[c_s].bytes_sent / 1024) / duration, + ((double) mp->partners[c_s].bytes_sent * 100) / mp->total_bytes_sent, + (mp->partners[c_s].bytes_received / 1024) / duration, + ((double) mp->partners[c_s].bytes_received * 100) / mp->total_bytes_received ); + } } } @@ -261,420 +202,364 @@ 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; + if (GNUNET_YES == logging) + perf_logging_stop(); - state.benchmarking = GNUNET_NO; + shutdown_task = GNUNET_SCHEDULER_NO_TASK; + if (GNUNET_SCHEDULER_NO_TASK != progress_task) + { + fprintf (stderr, "0\n"); + GNUNET_SCHEDULER_cancel (progress_task); + } + progress_task = GNUNET_SCHEDULER_NO_TASK; evaluate (); - GNUNET_log (GNUNET_ERROR_TYPE_INFO, _("Benchmarking done\n")); + state.benchmarking = GNUNET_NO; + 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 != bp_master[c_p].cth) - { - GNUNET_CORE_notify_transmit_ready_cancel(bp_master[c_p].cth); - bp_master[c_p].cth = NULL; - } - - if (NULL != bp_master[c_p].ats_perf_op) - { - GNUNET_TESTBED_operation_done (bp_master[c_p].ats_perf_op); - bp_master[c_p].ats_perf_op = NULL; - } - - if (NULL != bp_master[c_p].core_op) - { - GNUNET_TESTBED_operation_done (bp_master[c_p].core_op); - bp_master[c_p].core_op = NULL; - } - - 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; - } - - 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].peer_id_op) + { + GNUNET_TESTBED_operation_done (mps[c_m].peer_id_op); + mps[c_m].peer_id_op = NULL; + } + + if (GNUNET_SCHEDULER_NO_TASK != mps[c_m].ats_task) + GNUNET_SCHEDULER_cancel (mps[c_m].ats_task); + mps[c_m].ats_task = GNUNET_SCHEDULER_NO_TASK; + + for (c_op = 0; c_op < num_slaves; c_op++) + { + + if (NULL != mps[c_m].partners[c_op].cth) + { + GNUNET_CORE_notify_transmit_ready_cancel (mps[c_m].partners[c_op].cth); + mps[c_m].partners[c_op].cth = NULL; + } + if (NULL != mps[c_m].partners[c_op].tth) + { + GNUNET_TRANSPORT_notify_transmit_ready_cancel (mps[c_m].partners[c_op].tth); + mps[c_m].partners[c_op].tth = NULL; + } + + + if (NULL != mps[c_m].core_connect_ops[c_op].connect_op) + { + GNUNET_log(GNUNET_ERROR_TYPE_INFO, + _("Failed to connect peer 0 and %u\n"), c_op); + GNUNET_TESTBED_operation_done ( + mps[c_m].core_connect_ops[c_op].connect_op); + mps[c_m].core_connect_ops[c_op].connect_op = NULL; + result = 1; + } + } + + 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; + } + + if (NULL != mps[c_m].comm_op) + { + GNUNET_TESTBED_operation_done (mps[c_m].comm_op); + mps[c_m].comm_op = NULL; + } + GNUNET_free(mps[c_m].core_connect_ops); + GNUNET_free(mps[c_m].partners); + mps[c_m].partners = NULL; } - for (c_p = 0; c_p < c_slave_peers; c_p++) + for (c_s = 0; c_s < num_slaves; c_s++) { - 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; - } - - if (NULL != bp_slaves[c_p].ats_perf_op) - { - GNUNET_TESTBED_operation_done (bp_slaves[c_p].ats_perf_op); - bp_slaves[c_p].ats_perf_op = 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].peer_id_op) + { + GNUNET_TESTBED_operation_done (sps[c_s].peer_id_op); + sps[c_s].peer_id_op = NULL; + } + + for (c_op = 0; c_op < num_slaves; c_op++) + { + if (NULL != sps[c_s].partners[c_op].cth) + { + GNUNET_CORE_notify_transmit_ready_cancel (sps[c_s].partners[c_op].cth); + sps[c_s].partners[c_op].cth = NULL; + } + + if (NULL != sps[c_s].partners[c_op].tth) + { + GNUNET_TRANSPORT_notify_transmit_ready_cancel (sps[c_s].partners[c_op].tth); + sps[c_s].partners[c_op].tth = 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].comm_op) + { + GNUNET_TESTBED_operation_done (sps[c_s].comm_op); + sps[c_s].comm_op = NULL; + } + + GNUNET_free(sps[c_s].partners); + sps[c_s].partners = NULL; } - GNUNET_SCHEDULER_shutdown(); + GNUNET_SCHEDULER_shutdown (); } static struct BenchmarkPeer * find_peer (const struct GNUNET_PeerIdentity * peer) { - int c_p; + 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; + 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 *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 ); + } +} + +static size_t +comm_send_ready (void *cls, size_t size, void *buf) { - struct BenchmarkPeer *bp; + static char msgbuf[TEST_MESSAGE_SIZE]; + struct BenchmarkPartner *p = cls; + struct GNUNET_MessageHeader *msg; + + if (GNUNET_YES == test_core) + p->cth = NULL; + else + p->tth = NULL; + + if (NULL == buf) + { + GNUNET_break (0); + return 0; + } + if (size < TEST_MESSAGE_SIZE) + { + GNUNET_break (0); + return 0; + } - bp = find_peer (id); + GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "Master [%u]: Sending PING to [%u]\n", + p->me->no, p->dest->no); - if (NULL == bp) - { - GNUNET_break (0); - return; - } + p->messages_sent++; + p->bytes_sent += TEST_MESSAGE_SIZE; + p->me->total_messages_sent++; + p->me->total_bytes_sent += TEST_MESSAGE_SIZE; + + msg = (struct GNUNET_MessageHeader *) &msgbuf; + memset (&msgbuf, 'a', TEST_MESSAGE_SIZE); + msg->type = htons (TEST_MESSAGE_TYPE_PING); + msg->size = htons (TEST_MESSAGE_SIZE); + memcpy (buf, msg, TEST_MESSAGE_SIZE); + return TEST_MESSAGE_SIZE; } 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) +comm_schedule_send (struct BenchmarkPartner *p) { - 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); -} + if (GNUNET_YES == test_core) + { + p->cth = GNUNET_CORE_notify_transmit_ready ( + p->me->ch, GNUNET_NO, 0, GNUNET_TIME_UNIT_MINUTES, &p->dest->id, + TEST_MESSAGE_SIZE, &comm_send_ready, p); + } + else + { + p->tth = GNUNET_TRANSPORT_notify_transmit_ready ( + p->me->th, &p->dest->id, TEST_MESSAGE_SIZE, 0,GNUNET_TIME_UNIT_MINUTES, + &comm_send_ready, p); + } -static size_t -core_send_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; - - bp->messages_sent ++; - if (GNUNET_YES == bp->partner_msg) - { - bp->messages_sent_partner ++; - bp->partner_msg = GNUNET_NO; - } - - msg = (struct GNUNET_MessageHeader *) &msgbuf; - memset (&msgbuf, 'a', TEST_MESSAGE_SIZE); - msg->type = htons (TEST_MESSAGE_TYPE_PING); - msg->size = htons (TEST_MESSAGE_SIZE); - memcpy (buf, msg, TEST_MESSAGE_SIZE); - return TEST_MESSAGE_SIZE; } -static struct BenchmarkPeer * -get_next (struct BenchmarkPeer *p) +static void +print_progress () { - 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 int calls; + progress_task = GNUNET_SCHEDULER_NO_TASK; -} + fprintf (stderr, "%llu..", + (long long unsigned) perf_duration.rel_value_us / (1000 * 1000) - calls); + calls++; + progress_task = GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_SECONDS, + &print_progress, NULL ); +} 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, - GNUNET_ATS_PREFERENCE_BANDWIDTH, (double) last, - GNUNET_ATS_PREFERENCE_END); - last++; - bp->ats_task = GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_SECONDS, - &ats_pref_task, bp); + struct BenchmarkPeer *me = cls; + + me->ats_task = GNUNET_SCHEDULER_NO_TASK; + + GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, " Master [%u] set preference for slave [%u] to %f\n", + me->no, me->pref_partner->no, me->pref_value); + GNUNET_ATS_performance_change_preference (me->ats_perf_handle, + &me->pref_partner->id, + pref_val, me->pref_value, GNUNET_ATS_PREFERENCE_END); + me->pref_value += TEST_ATS_PREFRENCE_DELTA; + me->ats_task = GNUNET_SCHEDULER_add_delayed (TEST_ATS_PREFRENCE_FREQUENCY, + &ats_pref_task, cls); } - -static void +static void do_benchmark () { - int c_m; - struct BenchmarkPeer *s; - struct BenchmarkPeer *bp; - - 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")); - - if (GNUNET_SCHEDULER_NO_TASK != shutdown_task) - GNUNET_SCHEDULER_cancel (shutdown_task); - 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 ++) - { - 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); - } + int c_m; + int c_s; + if ((state.connected_ATS_service == GNUNET_NO) + || (state.connected_COMM_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")); + if (GNUNET_SCHEDULER_NO_TASK != shutdown_task) + GNUNET_SCHEDULER_cancel (shutdown_task); + shutdown_task = GNUNET_SCHEDULER_add_delayed (perf_duration, + &do_shutdown, NULL ); -static void -connect_completion_callback (void *cls, - struct GNUNET_TESTBED_Operation *op, - const char *emsg) -{ - struct ConnectOperation *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); - } - 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); - if (GNUNET_SCHEDULER_NO_TASK != shutdown_task) - GNUNET_SCHEDULER_cancel(shutdown_task); - shutdown_task = GNUNET_SCHEDULER_add_now (do_shutdown, NULL); - } - GNUNET_TESTBED_operation_done(op); - ops++; - for (c = 0; c < c_slave_peers; c++) - { - if (cop == &cop->master->connect_ops[c]) - cop->master->connect_ops[c].connect_op = NULL; - } - if (ops == c_master_peers * c_slave_peers) - { - state.connected_PEERS = GNUNET_YES; - GNUNET_SCHEDULER_add_now (&do_benchmark, NULL); - } -} + progress_task = GNUNET_SCHEDULER_add_now (&print_progress, NULL ); + /* Start sending test messages */ + for (c_m = 0; c_m < num_masters; c_m++) + { + for (c_s = 0; c_s < num_slaves; c_s++) + comm_schedule_send (&mps[c_m].partners[c_s]); + if (pref_val != GNUNET_ATS_PREFERENCE_END) + mps[c_m].ats_task = GNUNET_SCHEDULER_add_now (&ats_pref_task, &mps[c_m]); + } + if (GNUNET_YES == logging) + perf_logging_start (log_frequency, testname, mps, num_masters); + +} static void -do_connect_peers (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) +connect_completion_callback (void *cls, struct GNUNET_TESTBED_Operation *op, + const char *emsg) { - int c_m; - int c_s; - struct BenchmarkPeer *bp; - - 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")); - - for (c_m = 0; c_m < c_master_peers; c_m ++) - { - bp = &bp_master[c_m]; - bp->connect_ops = GNUNET_malloc (c_slave_peers * sizeof (struct ConnectOperation)); - - for (c_s = 0; c_s < c_slave_peers; c_s ++) - { - 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; - } - } - } + struct TestbedConnectOperation *cop = cls; + static int ops = 0; + int c; + if (NULL == emsg) + { + GNUNET_log(GNUNET_ERROR_TYPE_INFO, + _("Connected master [%u] with slave [%u]\n"), cop->master->no, + cop->slave->no); + } + else + { + GNUNET_log(GNUNET_ERROR_TYPE_ERROR, + _("Failed to connect master peer [%u] with slave [%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_TESTBED_operation_done (op); + ops++; + for (c = 0; c < num_slaves; c++) + { + if (cop == &cop->master->core_connect_ops[c]) + cop->master->core_connect_ops[c].connect_op = NULL; + } + if (ops == num_masters * num_slaves) + { + state.connected_PEERS = GNUNET_YES; + GNUNET_SCHEDULER_add_now (&do_benchmark, NULL ); + } } - -/** - * Controller event callback - * - * @param cls NULL - * @param event the controller event - */ static void -controller_event_cb (void *cls, - const struct GNUNET_TESTBED_EventInformation *event) +do_connect_peers (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) { - //struct BenchmarkPeer *p = cls; - switch (event->type) + int c_m; + int c_s; + struct BenchmarkPeer *p; + + if ((state.connected_ATS_service == GNUNET_NO) + || (state.connected_COMM_service == GNUNET_NO)) + return; + + GNUNET_log(GNUNET_ERROR_TYPE_INFO, _("Connecting peers on CORE level\n")); + + for (c_m = 0; c_m < num_masters; c_m++) { - 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); + p = &mps[c_m]; + p->core_connect_ops = GNUNET_malloc (num_slaves * + sizeof (struct TestbedConnectOperation)); + + for (c_s = 0; c_s < num_slaves; c_s++) + { + GNUNET_log(GNUNET_ERROR_TYPE_INFO, + _("Connecting master [%u] with slave [%u]\n"), p->no, sps[c_s].no); + p->core_connect_ops[c_s].master = p; + p->core_connect_ops[c_s].slave = &sps[c_s]; + p->core_connect_ops[c_s].connect_op = GNUNET_TESTBED_overlay_connect ( + NULL, &connect_completion_callback, &p->core_connect_ops[c_s], + sps[c_s].peer, p->peer); + if (NULL == p->core_connect_ops[c_s].connect_op) + { + GNUNET_log(GNUNET_ERROR_TYPE_ERROR, + _("Could not connect master [%u] and slave [%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; + } + } } } @@ -685,480 +570,456 @@ controller_event_cb (void *cls, * @param peer peer identity this notification is about */ static void -core_connect_cb (void *cls, const struct GNUNET_PeerIdentity * peer) +comm_connect_cb (void *cls, const struct GNUNET_PeerIdentity * peer) { - struct BenchmarkPeer *p = cls; - struct BenchmarkPeer *t; + struct BenchmarkPeer *me = cls; + struct BenchmarkPeer *remote; char *id; int c; - int cs; + int completed; - id = GNUNET_strdup (GNUNET_i2s (&p->id)); - - t = find_peer (peer); - if (NULL == t) + remote = find_peer (peer); + if (NULL == remote) { - GNUNET_break (0); - return; + GNUNET_break(0); + return; } - 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)); + id = GNUNET_strdup (GNUNET_i2s (&me->id)); + GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "%s [%u] `%s' connected to %s [%u] %s\n", + (me->master == GNUNET_YES) ? "Master": "Slave", me->no, id, + (remote->master == GNUNET_YES) ? "Master": "Slave", remote->no, + GNUNET_i2s (peer)); - p->core_connections ++; - if ((GNUNET_YES == p->master) && (GNUNET_NO == t->master) && (GNUNET_NO == state.connected_CORE)) + me->core_connections++; + if ((GNUNET_YES == me->master) && (GNUNET_NO == remote->master) + && (GNUNET_NO == state.connected_CORE)) { - p->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); + me->core_slave_connections++; + + if (me->core_slave_connections == num_slaves) + { + GNUNET_log(GNUNET_ERROR_TYPE_INFO, "Master [%u] connected all slaves\n", + me->no); + } + completed = GNUNET_YES; + for (c = 0; c < num_masters; c++) + { + if (mps[c].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) +comm_disconnect_cb (void *cls, const struct GNUNET_PeerIdentity * peer) { - struct BenchmarkPeer *p = cls; - struct BenchmarkPeer *t; + struct BenchmarkPeer *me = cls; + struct BenchmarkPeer *remote; char *id; - t = find_peer (peer); - if (NULL == t) + remote = find_peer (peer); + if (NULL == remote) { - 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 --; + id = GNUNET_strdup (GNUNET_i2s (&me->id)); + GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "%s disconnected from %s \n", id, + GNUNET_i2s (peer)); + GNUNET_assert(me->core_connections > 0); + me->core_connections--; - if ((GNUNET_YES == state.benchmarking) && - ((GNUNET_YES == p->master) || (GNUNET_YES == t->master))) + if ((GNUNET_YES == state.benchmarking) + && ((GNUNET_YES == me->master) || (GNUNET_YES == remote->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) +comm_send_pong_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 char msgbuf[TEST_MESSAGE_SIZE]; + struct BenchmarkPartner *p = cls; + struct GNUNET_MessageHeader *msg; -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); - - pm = bp->p_head; - GNUNET_CONTAINER_DLL_remove (bp->p_head, bp->p_tail, pm); - GNUNET_free (pm); + if (GNUNET_YES == test_core) + p->cth = NULL; + else + p->tth = NULL; + p->messages_sent++; + p->bytes_sent += TEST_MESSAGE_SIZE; + p->me->total_messages_sent++; + p->me->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) +comm_handle_ping (void *cls, const struct GNUNET_PeerIdentity *other, + 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; - } - - 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; + int c_m; + struct BenchmarkPeer *me = cls; + struct BenchmarkPartner *p = NULL; + for (c_m = 0; c_m < num_masters; c_m++) + { + /* Find a partner with other as destination */ + 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_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->me->total_messages_received++; + p->me->total_bytes_received += TEST_MESSAGE_SIZE; + + if (GNUNET_YES == test_core) + { + GNUNET_assert (NULL == p->cth); + p->cth = GNUNET_CORE_notify_transmit_ready (me->ch, GNUNET_NO, 0, + GNUNET_TIME_UNIT_MINUTES, &p->dest->id, TEST_MESSAGE_SIZE, + &comm_send_pong_ready, p); + } + else + { + GNUNET_assert (NULL == p->tth); + p->tth = GNUNET_TRANSPORT_notify_transmit_ready (me->th, &p->dest->id, + TEST_MESSAGE_SIZE, 0, GNUNET_TIME_UNIT_MINUTES, &comm_send_pong_ready, + p); + } + return GNUNET_OK; } static int -core_handle_pong (void *cls, const struct GNUNET_PeerIdentity *other, - const struct GNUNET_MessageHeader *message) +comm_handle_pong (void *cls, const struct GNUNET_PeerIdentity *other, + const struct GNUNET_MessageHeader *message) { - struct BenchmarkPeer *me = cls; - struct BenchmarkPeer *remote; - struct BenchmarkPeer *next; - - remote = find_peer (other); - - if (NULL == remote) - { - GNUNET_break (0); - return GNUNET_SYSERR; - } - - if (NULL != me->cth) - { - GNUNET_break (0); - return GNUNET_OK; - } - - 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; -} + int c_s; + struct BenchmarkPeer *me = cls; + struct BenchmarkPartner *p = NULL; + 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_log(GNUNET_ERROR_TYPE_DEBUG, + "Master [%u]: Received PONG from [%u], next message\n", me->no, + p->dest->no); + + p->messages_received++; + p->bytes_received += TEST_MESSAGE_SIZE; + p->me->total_messages_received++; + p->me->total_bytes_received += TEST_MESSAGE_SIZE; + + comm_schedule_send (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); - if (NULL == peer->ch) - GNUNET_log (GNUNET_ERROR_TYPE_ERROR, - "Failed to create core connection \n"); - return peer->ch; + struct BenchmarkPeer *me = cls; + + static const struct GNUNET_CORE_MessageHandler handlers[] = { { + &comm_handle_ping, TEST_MESSAGE_TYPE_PING, 0 }, { &comm_handle_pong, + TEST_MESSAGE_TYPE_PONG, 0 }, { NULL, 0, 0 } }; + + me->ch = GNUNET_CORE_connect (cfg, me, NULL, comm_connect_cb, + comm_disconnect_cb, NULL, GNUNET_NO, NULL, GNUNET_NO, handlers); + if (NULL == me->ch) + GNUNET_log(GNUNET_ERROR_TYPE_ERROR, "Failed to create core connection \n"); + return me->ch; } +static void +core_disconnect_adapter (void *cls, void *op_result) +{ + struct BenchmarkPeer *me = cls; + + GNUNET_CORE_disconnect (me->ch); + me->ch = NULL; +} + +static void +comm_connect_completion_cb (void *cls, struct GNUNET_TESTBED_Operation *op, + void *ca_result, const char *emsg) +{ + static int comm_done = 0; + if ((NULL != emsg) || (NULL == ca_result)) + { + 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 ); + return; + } + comm_done++; + + if (comm_done == num_slaves + num_masters) + { + GNUNET_log(GNUNET_ERROR_TYPE_INFO, "Connected to all %s services\n", + (GNUNET_YES == test_core) ? "CORE" : "TRANSPORT"); + state.connected_COMM_service = GNUNET_YES; + GNUNET_SCHEDULER_add_now (&do_connect_peers, 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 -core_connect_completion_cb (void *cls, - struct GNUNET_TESTBED_Operation *op, - void *ca_result, - const char *emsg ) +transport_recv_cb (void *cls, + const struct GNUNET_PeerIdentity * peer, + const struct GNUNET_MessageHeader * message) { - static int core_done = 0; - if ((NULL != emsg) || (NULL == ca_result)) - { - 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); - return; - } - core_done ++; - - if (core_done == c_slave_peers + c_master_peers) - { - 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); - } + if (TEST_MESSAGE_SIZE != ntohs (message->size) || + (TEST_MESSAGE_TYPE_PING != ntohs (message->type) && + TEST_MESSAGE_TYPE_PONG != ntohs (message->type))) + { + return; + } + if (TEST_MESSAGE_TYPE_PING == ntohs (message->type)) + comm_handle_ping (cls, peer, message); + + if (TEST_MESSAGE_TYPE_PONG == ntohs (message->type)) + comm_handle_pong (cls, peer, message); } -/** - * Called to disconnect from peer's statistics service - * - * @param cls peer context - * @param op_result service handle returned from the connect adapter - */ +static void * +transport_connect_adapter (void *cls, const struct GNUNET_CONFIGURATION_Handle *cfg) +{ + struct BenchmarkPeer *me = cls; + + me->th = GNUNET_TRANSPORT_connect (cfg, &me->id, me, &transport_recv_cb, + &comm_connect_cb, &comm_disconnect_cb); + if (NULL == me->th) + GNUNET_log(GNUNET_ERROR_TYPE_ERROR, "Failed to create transport connection \n"); + return me->th; +} + static void -core_disconnect_adapter (void *cls, void *op_result) +transport_disconnect_adapter (void *cls, void *op_result) { - struct BenchmarkPeer *peer = cls; + struct BenchmarkPeer *me = cls; - GNUNET_CORE_disconnect (peer->ch); - peer->ch = NULL; + GNUNET_TRANSPORT_disconnect (me->th); + me->th = NULL; } static void -do_connect_core (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) +do_comm_connect (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) { - 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++) + int c_s; + int c_m; + GNUNET_log(GNUNET_ERROR_TYPE_INFO, "Connecting to all %s services\n", + (GNUNET_YES == test_core) ? "CORE" : "TRANSPORT"); + for (c_m = 0; c_m < num_masters; c_m++) { - 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]); - + if (GNUNET_YES == test_core) + mps[c_m].comm_op = GNUNET_TESTBED_service_connect (NULL, mps[c_m].peer, + "core", &comm_connect_completion_cb, NULL, &core_connect_adapter, + &core_disconnect_adapter, &mps[c_m]); + else + { + mps[c_m].comm_op = GNUNET_TESTBED_service_connect (NULL, mps[c_m].peer, + "transport", &comm_connect_completion_cb, NULL, &transport_connect_adapter, + &transport_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].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]); + if (GNUNET_YES == test_core) + sps[c_s].comm_op = GNUNET_TESTBED_service_connect (NULL, sps[c_s].peer, + "core", &comm_connect_completion_cb, NULL, &core_connect_adapter, + &core_disconnect_adapter, &sps[c_s]); + else + { + sps[c_s].comm_op = GNUNET_TESTBED_service_connect (NULL, sps[c_s].peer, + "transport", &comm_connect_completion_cb, NULL, &transport_connect_adapter, + &transport_disconnect_adapter, &sps[c_s]); + } } } +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 *me = cls; + int c_a; + char *peer_id; + peer_id = GNUNET_strdup (GNUNET_i2s (&me->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 0 + if ((GNUNET_YES == me->master) + && (0 == memcmp (&address->peer, &me->destination->id, + sizeof(struct GNUNET_PeerIdentity)))) + { + GNUNET_log(GNUNET_ERROR_TYPE_INFO, "Bandwidth for master %u: %lu %lu\n", + me->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; + struct BenchmarkPeer *me = cls; + + me->ats_perf_handle = GNUNET_ATS_performance_init (cfg, + &ats_performance_info_cb, me); + if (NULL == me->ats_perf_handle) + GNUNET_log(GNUNET_ERROR_TYPE_ERROR, + "Failed to create ATS performance handle \n"); + return me->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; + struct BenchmarkPeer *me = cls; - GNUNET_ATS_performance_done(peer->p_handle); - peer->p_handle = NULL; + GNUNET_ATS_performance_done (me->ats_perf_handle); + me->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); - if (GNUNET_SCHEDULER_NO_TASK != shutdown_task) - 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)) - { - 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); - } + static int op_done = 0; + + if ((NULL != emsg) || (NULL == ca_result)) + { + 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 ); + return; + } + op_done++; + if (op_done == (num_masters + num_slaves)) + { + GNUNET_log(GNUNET_ERROR_TYPE_INFO, "Connected to all ATS services\n"); + state.connected_ATS_service = GNUNET_YES; + GNUNET_SCHEDULER_add_now (&do_comm_connect, 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, "%s [%u] has peer id `%s'\n", + (p->master == GNUNET_YES) ? "Master" : "Slave", 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. * @@ -1171,57 +1032,67 @@ 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, preference, 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); - - GNUNET_assert (NULL == cls); - GNUNET_assert (c_slave_peers + c_master_peers == num_peers); - GNUNET_assert (NULL != peers_); - - GNUNET_log (GNUNET_ERROR_TYPE_INFO, - _("Initializing... \n")); - - for (c_p = 0; c_p < c_master_peers; c_p++) + int c_m; + int c_s; + GNUNET_assert(NULL == cls); + GNUNET_assert(num_masters + num_slaves == 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); + + shutdown_task = GNUNET_SCHEDULER_add_delayed ( + GNUNET_TIME_relative_multiply (TEST_TIMEOUT, num_masters + num_slaves), + &do_shutdown, NULL ); + + /* Setup master peers */ + 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].pref_partner = &sps[c_m]; + mps[c_m].pref_value = TEST_ATS_PREFRENCE_START; + mps[c_m].partners = + GNUNET_malloc (num_slaves * sizeof (struct BenchmarkPeer)); + mps[c_m].num_partners = num_slaves; + /* Initialize partners */ + for (c_s = 0; c_s < num_slaves; c_s++) + { + mps[c_m].partners[c_s].me = &mps[c_m]; + mps[c_m].partners[c_s].dest = &sps[c_s]; + } + mps[c_m].peer_id_op = GNUNET_TESTBED_peer_get_information (mps[c_m].peer, + GNUNET_TESTBED_PIT_IDENTITY, &peerinformation_cb, &mps[c_m]); } - for (c_p = 0; c_p < c_slave_peers; c_p++) + /* Setup slave peers */ + 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].num_partners = num_masters; + /* Initialize partners */ + for (c_m = 0; c_m < num_masters; c_m++) + { + sps[c_s].partners[c_m].me = &sps[c_s]; + sps[c_s].partners[c_m].dest = &mps[c_m]; + } + 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[]) { @@ -1229,7 +1100,9 @@ main (int argc, char *argv[]) char *tmp_sep; char *test_name; char *conf_name; + char *comm_name; char *dotexe; + char *prefs[GNUNET_ATS_PreferenceCount] = GNUNET_ATS_PreferenceTypeString; int c; result = 0; @@ -1238,79 +1111,191 @@ main (int argc, char *argv[]) tmp = strstr (argv[0], TESTNAME_PREFIX); if (NULL == tmp) { - fprintf (stderr, "Unable to parse test name `%s'\n", argv[0]); - return GNUNET_SYSERR; + fprintf (stderr, "Unable to parse test name `%s'\n", argv[0]); + return GNUNET_SYSERR; } - tmp += strlen(TESTNAME_PREFIX); + tmp += strlen (TESTNAME_PREFIX); solver = GNUNET_strdup (tmp); - if (NULL != (dotexe = strstr (solver, ".exe")) && - dotexe[4] == '\0') + if (NULL != (dotexe = strstr (solver, ".exe")) && dotexe[4] == '\0') dotexe[0] = '\0'; tmp_sep = strchr (solver, '_'); if (NULL == tmp_sep) { - fprintf (stderr, "Unable to parse test name `%s'\n", argv[0]); - GNUNET_free (solver); - return GNUNET_SYSERR; + fprintf (stderr, "Unable to parse test name `%s'\n", argv[0]); + GNUNET_free(solver); + return GNUNET_SYSERR; } tmp_sep[0] = '\0'; - preference = GNUNET_strdup(tmp_sep + 1); + comm_name = GNUNET_strdup (&tmp_sep[1]); + tmp_sep = strchr (comm_name, '_'); + if (NULL == tmp_sep) + { + fprintf (stderr, "Unable to parse test name `%s'\n", argv[0]); + GNUNET_free(solver); + return GNUNET_SYSERR; + } + tmp_sep[0] = '\0'; + for (c = 0; c <= strlen (comm_name); c++) + comm_name[c] = toupper (comm_name[c]); + if (0 == strcmp (comm_name, "CORE")) + test_core = GNUNET_YES; + else if (0 == strcmp (comm_name, "TRANSPORT")) + test_core = GNUNET_NO; + else + { + GNUNET_free (comm_name); + GNUNET_free (solver); + return GNUNET_SYSERR; + } + + pref_str = GNUNET_strdup(tmp_sep + 1); + + GNUNET_asprintf (&conf_name, "%s%s_%s.conf", TESTNAME_PREFIX, solver, + pref_str); + GNUNET_asprintf (&test_name, "%s%s_%s", TESTNAME_PREFIX, solver, pref_str); + + for (c = 0; c <= strlen (pref_str); c++) + pref_str[c] = toupper (pref_str[c]); + pref_val = -1; + + if (0 != strcmp (pref_str, "NONE")) + { + for (c = 1; c < GNUNET_ATS_PreferenceCount; c++) + { + if (0 == strcmp (pref_str, prefs[c])) + { + pref_val = c; + break; + } + } + } + else + { + /* abuse terminator to indicate no pref */ + pref_val = GNUNET_ATS_PREFERENCE_END; + } + if (-1 == pref_val) + { + fprintf (stderr, "Unknown preference: `%s'\n", pref_str); + GNUNET_free(solver); + GNUNET_free(pref_str); + GNUNET_free (comm_name); + return -1; + } - GNUNET_asprintf(&conf_name, "%s%s_%s.conf", TESTNAME_PREFIX, solver, preference); - GNUNET_asprintf(&test_name, "%s%s_%s", TESTNAME_PREFIX, solver, preference); + for (c = 0; c < (argc - 1); c++) + { + if (0 == strcmp (argv[c], "-d")) + break; + } + if (c < argc - 1) + { + if (GNUNET_OK != GNUNET_STRINGS_fancy_time_to_relative (argv[c + 1], &perf_duration)) + fprintf (stderr, "Failed to parse duration `%s'\n", argv[c + 1]); + } + else + { + perf_duration = BENCHMARK_DURATION; + } + fprintf (stderr, "Running benchmark for %llu secs\n", (unsigned long long) (perf_duration.rel_value_us) / (1000 * 1000)); - for (c = 0; c < (argc -1); c++) + for (c = 0; c < (argc - 1); c++) { - if (0 == strcmp(argv[c], "-s")) - break; + if (0 == strcmp (argv[c], "-s")) + break; } - if (c < argc-1) + 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++) + for (c = 0; c < (argc - 1); c++) { - if (0 == strcmp(argv[c], "-m")) - break; + if (0 == strcmp (argv[c], "-m")) + break; } - if (c < argc-1) + 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; + num_masters = DEFAULT_MASTERS_NUM; + + logging = GNUNET_NO; + for (c = 0; c < argc; c++) + { + if (0 == strcmp (argv[c], "-l")) + logging = GNUNET_YES; + } + + if (GNUNET_YES == logging) + { + for (c = 0; c < (argc - 1); c++) + { + if (0 == strcmp (argv[c], "-f")) + break; + } + if (c < argc - 1) + { + if (GNUNET_OK != GNUNET_STRINGS_fancy_time_to_relative (argv[c + 1], &log_frequency)) + fprintf (stderr, "Failed to parse duration `%s'\n", argv[c + 1]); + } + else + { + log_frequency = LOGGING_FREQUENCY; + } + fprintf (stderr, "Using log frequency %llu ms\n", + (unsigned long long) (log_frequency.rel_value_us) / (1000)); + } - bp_slaves = GNUNET_malloc (c_slave_peers * sizeof (struct BenchmarkPeer)); - bp_master = GNUNET_malloc (c_master_peers * sizeof (struct BenchmarkPeer)); + GNUNET_asprintf (&testname, "%s_%s_%s",solver, comm_name, pref_str); + + if (num_slaves < num_masters) + { + fprintf (stderr, "Number of master peers is lower than slaves! exit...\n"); + GNUNET_free(test_name); + GNUNET_free(solver); + GNUNET_free(pref_str); + GNUNET_free (comm_name); + return GNUNET_SYSERR; + } state.connected_ATS_service = GNUNET_NO; - state.connected_CORE_service = GNUNET_NO; + state.connected_COMM_service = GNUNET_NO; state.connected_PEERS = GNUNET_NO; + state.benchmarking = 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 (test_name, - conf_name, c_slave_peers + c_master_peers, - event_mask, &controller_event_cb, NULL, - &test_main, NULL); - - GNUNET_free (solver); - GNUNET_free (preference); - GNUNET_free (conf_name); - GNUNET_free (test_name); - GNUNET_free (bp_slaves); + (void) GNUNET_TESTBED_test_run ("perf-ats", conf_name, + num_slaves + num_masters, event_mask, &controller_event_cb, NULL, + &main_run, NULL ); + + GNUNET_free(solver); + GNUNET_free(pref_str); + GNUNET_free(conf_name); + GNUNET_free(test_name); + GNUNET_free(testname); + GNUNET_free (comm_name); + GNUNET_free(mps); + GNUNET_free(sps); return result; }