X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Ftestbed%2Fgnunet-testbed-profiler.c;h=3bddfac09e99318c5da4739641e89c565e594d66;hb=f4d040c0f0dd2fef3d73b1f4532c76219f760f75;hp=4144c3da5cb38249fbe746368fdfaa146c9b5c21;hpb=75357bec5d503045dcf5d5cfd5805300e0605d9d;p=oweals%2Fgnunet.git diff --git a/src/testbed/gnunet-testbed-profiler.c b/src/testbed/gnunet-testbed-profiler.c index 4144c3da5..3bddfac09 100644 --- a/src/testbed/gnunet-testbed-profiler.c +++ b/src/testbed/gnunet-testbed-profiler.c @@ -26,6 +26,7 @@ #include "platform.h" #include "gnunet_common.h" +#include "gnunet_util_lib.h" #include "gnunet_testbed_service.h" #include "testbed_api_hosts.h" @@ -33,7 +34,8 @@ * Generic loggins shorthand */ #define LOG(kind,...) \ - GNUNET_log_from (kind, "testbed-api-testbed", __VA_ARGS__) + GNUNET_log (kind, __VA_ARGS__) + /** * DLL of operations @@ -85,7 +87,18 @@ enum State /** * Starting peers */ - STATE_PEERS_STARTING + STATE_PEERS_STARTING, + + /** + * Linking peers + */ + STATE_PEERS_LINKING, + + /** + * Destroying peers; we can do this as the controller takes care of stopping a + * peer if it is running + */ + STATE_PEERS_DESTROYING }; @@ -134,11 +147,21 @@ struct DLLOperation *dll_op_head; */ struct DLLOperation *dll_op_tail; +/** + * Peer linking - topology operation + */ +struct GNUNET_TESTBED_Operation *topology_op; + /** * Abort task identifier */ static GNUNET_SCHEDULER_TaskIdentifier abort_task; +/** + * Shutdown task identifier + */ +static GNUNET_SCHEDULER_TaskIdentifier shutdown_task; + /** * Host registration task identifier */ @@ -174,6 +197,31 @@ static unsigned int num_peers; */ static unsigned int num_hosts; +/** + * Number of random links to be established between peers + */ +static unsigned int num_links; + +/** + * Number of timeout failures to tolerate + */ +static unsigned int num_cont_fails; + +/** + * Continuous failures during overlay connect operations + */ +static unsigned int cont_fails; + +/** + * Links which are successfully established + */ +static unsigned int established_links; + +/** + * Links which are not successfully established + */ +static unsigned int failed_links; + /** * Global testing status */ @@ -184,6 +232,11 @@ static int result; */ enum State state; +/** + * The topology we want to acheive + */ +enum GNUNET_TESTBED_TopologyOption topology; + /** * Shutdown nicely @@ -197,19 +250,22 @@ do_shutdown (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) struct DLLOperation *dll_op; unsigned int nhost; + shutdown_task = GNUNET_SCHEDULER_NO_TASK; if (GNUNET_SCHEDULER_NO_TASK != abort_task) GNUNET_SCHEDULER_cancel (abort_task); if (GNUNET_SCHEDULER_NO_TASK != register_hosts_task) GNUNET_SCHEDULER_cancel (register_hosts_task); if (NULL != reg_handle) GNUNET_TESTBED_cancel_registration (reg_handle); + if (NULL != topology_op) + GNUNET_TESTBED_operation_done (topology_op); for (nhost = 0; nhost < num_hosts; nhost++) if (NULL != hosts[nhost]) GNUNET_TESTBED_host_destroy (hosts[nhost]); GNUNET_free_non_null (hosts); while (NULL != (dll_op = dll_op_head)) { - GNUNET_TESTBED_operation_cancel (dll_op->op); + GNUNET_TESTBED_operation_done (dll_op->op); GNUNET_CONTAINER_DLL_remove (dll_op_head, dll_op_tail, dll_op); GNUNET_free (dll_op); } @@ -232,10 +288,82 @@ do_shutdown (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) static void do_abort (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) { - GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "Aborting\n"); + LOG (GNUNET_ERROR_TYPE_WARNING, "Aborting\n"); abort_task = GNUNET_SCHEDULER_NO_TASK; result = GNUNET_SYSERR; - GNUNET_SCHEDULER_add_now (&do_shutdown, NULL); + if (GNUNET_SCHEDULER_NO_TASK != shutdown_task) + GNUNET_SCHEDULER_cancel (shutdown_task); + shutdown_task = GNUNET_SCHEDULER_add_now (&do_shutdown, NULL); +} + + + + + +/** + * Functions of this signature are called when a peer has been successfully + * started or stopped. + * + * @param cls the closure from GNUNET_TESTBED_peer_start/stop() + * @param emsg NULL on success; otherwise an error description + */ +static void +peer_churn_cb (void *cls, const char *emsg) +{ + struct DLLOperation *dll_op = cls; + struct GNUNET_TESTBED_Operation *op; + static unsigned int started_peers; + + op = dll_op->op; + GNUNET_CONTAINER_DLL_remove (dll_op_head, dll_op_tail, dll_op); + GNUNET_free (dll_op); + if (NULL != emsg) + { + LOG (GNUNET_ERROR_TYPE_WARNING, + _("An operation has failed while starting peers\n")); + GNUNET_TESTBED_operation_done (op); + GNUNET_SCHEDULER_cancel (abort_task); + abort_task = GNUNET_SCHEDULER_add_now (&do_abort, NULL); + return; + } + GNUNET_TESTBED_operation_done (op); + if (++started_peers == num_peers) + { + prof_time = GNUNET_TIME_absolute_get_duration (prof_start_time); + printf ("%u peers started successfully in %.2f seconds\n", + num_peers, ((double) prof_time.rel_value) / 1000.00); + fflush (stdout); + result = GNUNET_OK; + if ((0 == num_links) && (topology == GNUNET_TESTBED_TOPOLOGY_ERDOS_RENYI)) + { + shutdown_task = GNUNET_SCHEDULER_add_now (&do_shutdown, NULL); + return; + } + state = STATE_PEERS_LINKING; + /* Do overlay connect */ + prof_start_time = GNUNET_TIME_absolute_get (); + switch (topology) + { + case GNUNET_TESTBED_TOPOLOGY_ERDOS_RENYI: + topology_op = + GNUNET_TESTBED_overlay_configure_topology (NULL, num_peers, peers, + topology, + num_links, + GNUNET_TESTBED_TOPOLOGY_DISABLE_AUTO_RETRY, + GNUNET_TESTBED_TOPOLOGY_OPTION_END); + break; + case GNUNET_TESTBED_TOPOLOGY_CLIQUE: + topology_op = + GNUNET_TESTBED_overlay_configure_topology (NULL, num_peers, peers, + topology, + GNUNET_TESTBED_TOPOLOGY_DISABLE_AUTO_RETRY, + GNUNET_TESTBED_TOPOLOGY_OPTION_END); + num_links = num_peers * (num_peers - 1); + break; + default: + GNUNET_assert (0); + } + } } @@ -276,20 +404,65 @@ peer_create_cb (void *cls, struct GNUNET_TESTBED_Peer *peer, const char *emsg) if (++created_peers == num_peers) { prof_time = GNUNET_TIME_absolute_get_duration (prof_start_time); - printf ("All peers created successfully in %.2f seconds\n", - ((double) prof_time.rel_value) / 1000.00); + printf ("%u peers created successfully in %.2f seconds\n", + num_peers, ((double) prof_time.rel_value) / 1000.00); + fflush (stdout); /* Now peers are to be started */ state = STATE_PEERS_STARTING; + prof_start_time = GNUNET_TIME_absolute_get (); for (peer_cnt = 0; peer_cnt < num_peers; peer_cnt++) { dll_op = GNUNET_malloc (sizeof (struct DLLOperation)); - dll_op->op = GNUNET_TESTBED_peer_start (NULL, peers[peer_cnt], NULL, NULL); + dll_op->op = GNUNET_TESTBED_peer_start (dll_op, peers[peer_cnt], + &peer_churn_cb, dll_op); GNUNET_CONTAINER_DLL_insert_tail (dll_op_head, dll_op_tail, dll_op); } } } +/** + * Function to print summary about how many overlay links we have made and how + * many failed + */ +static void +print_overlay_links_summary () +{ + prof_time = GNUNET_TIME_absolute_get_duration (prof_start_time); + printf ("\n%u links established in %.2f seconds\n", + established_links, ((double) prof_time.rel_value) / 1000.00); + printf ("%u links failed due to timeouts\n", failed_links); +} + + +/** + * Function to start peers + */ +static void +start_peers () +{ + struct DLLOperation *dll_op; + unsigned int peer_cnt; + + state = STATE_PEERS_CREATING; + prof_start_time = GNUNET_TIME_absolute_get (); + peers = GNUNET_malloc (sizeof (struct GNUNET_TESTBED_Peer *) + * num_peers); + for (peer_cnt = 0; peer_cnt < num_peers; peer_cnt++) + { + dll_op = GNUNET_malloc (sizeof (struct DLLOperation)); + dll_op->cls = &peers[peer_cnt]; + dll_op->op = GNUNET_TESTBED_peer_create (mc, + hosts + [peer_cnt % num_hosts], + cfg, + &peer_create_cb, + dll_op); + GNUNET_CONTAINER_DLL_insert_tail (dll_op_head, dll_op_tail, dll_op); + } +} + + /** * Controller event callback * @@ -311,7 +484,6 @@ controller_event_cb (void *cls, case GNUNET_TESTBED_ET_OPERATION_FINISHED: { static unsigned int slaves_started; - unsigned int peer_cnt; dll_op = event->details.operation_finished.op_cls; GNUNET_CONTAINER_DLL_remove (dll_op_head, dll_op_tail, dll_op); @@ -330,23 +502,9 @@ controller_event_cb (void *cls, /* Proceed to start peers */ if (++slaves_started == num_hosts - 1) { - printf ("All slaves started successfully\n"); - state = STATE_PEERS_CREATING; - prof_start_time = GNUNET_TIME_absolute_get (); - peers = GNUNET_malloc (sizeof (struct GNUNET_TESTBED_Peer *) - * num_peers); - for (peer_cnt = 0; peer_cnt < num_peers; peer_cnt++) - { - dll_op = GNUNET_malloc (sizeof (struct DLLOperation)); - dll_op->cls = &peers[peer_cnt]; - dll_op->op = GNUNET_TESTBED_peer_create (mc, - hosts - [peer_cnt % num_hosts], - cfg, - &peer_create_cb, - dll_op); - GNUNET_CONTAINER_DLL_insert_tail (dll_op_head, dll_op_tail, dll_op); - } + printf ("%u controllers started successfully\n", num_hosts); + fflush (stdout); + start_peers (); } } break; @@ -359,15 +517,54 @@ controller_event_cb (void *cls, { case GNUNET_TESTBED_ET_OPERATION_FINISHED: /* Control reaches here when peer start fails */ - GNUNET_break (0); - break; case GNUNET_TESTBED_ET_PEER_START: - GNUNET_break (0); + /* we handle peer starts in peer_churn_cb */ break; default: GNUNET_assert (0); } break; + case STATE_PEERS_LINKING: + switch (event->type) + { + case GNUNET_TESTBED_ET_OPERATION_FINISHED: + /* Control reaches here when a peer linking operation fails */ + if (NULL != event->details.operation_finished.emsg) + { + printf ("F"); + fflush (stdout); + failed_links++; + if (++cont_fails > num_cont_fails) + { + printf ("\nAborting due to very high failure rate"); + print_overlay_links_summary (); + GNUNET_SCHEDULER_cancel (abort_task); + abort_task = GNUNET_SCHEDULER_add_now (&do_abort, NULL); + return; + } + } + break; + case GNUNET_TESTBED_ET_CONNECT: + { + if (0 != cont_fails) + cont_fails--; + if (0 == established_links) + printf ("Establishing links. Please wait\n"); + printf ("."); + fflush (stdout); + established_links++; + } + break; + default: + GNUNET_assert (0); + } + if ((established_links + failed_links) == num_links) + { + print_overlay_links_summary (); + result = GNUNET_OK; + shutdown_task = GNUNET_SCHEDULER_add_now (&do_shutdown, NULL); + } + break; default: GNUNET_assert (0); } @@ -449,7 +646,7 @@ register_hosts (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) * Callback to signal successfull startup of the controller process * * @param cls the closure from GNUNET_TESTBED_controller_start() - * @param cfg the configuration with which the controller has been started; + * @param config the configuration with which the controller has been started; * NULL if status is not GNUNET_OK * @param status GNUNET_OK if the startup is successfull; GNUNET_SYSERR if not, * GNUNET_TESTBED_controller_stop() shouldn't be called in this case @@ -457,7 +654,8 @@ register_hosts (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) static void status_cb (void *cls, const struct GNUNET_CONFIGURATION_Handle *config, int status) { - GNUNET_SCHEDULER_cancel (abort_task); + if (GNUNET_SCHEDULER_NO_TASK != abort_task) + GNUNET_SCHEDULER_cancel (abort_task); if (GNUNET_OK != status) { mc_proc = NULL; @@ -479,7 +677,10 @@ status_cb (void *cls, const struct GNUNET_CONFIGURATION_Handle *config, int stat abort_task = GNUNET_SCHEDULER_add_now (&do_abort, NULL); return; } - register_hosts_task = GNUNET_SCHEDULER_add_now (®ister_hosts, NULL); + if (num_hosts > 1) + register_hosts_task = GNUNET_SCHEDULER_add_now (®ister_hosts, NULL); + else + start_peers (); abort_task = GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL, &do_abort, NULL); } @@ -517,17 +718,17 @@ run (void *cls, char *const *args, const char *cfgfile, } for (nhost = 0; nhost < num_hosts; nhost++) { - if (GNUNET_YES != GNUNET_TESTBED_is_host_habitable (hosts[nhost])) + if (GNUNET_YES != GNUNET_TESTBED_is_host_habitable (hosts[nhost], config)) { fprintf (stderr, _("Host %s cannot start testbed\n"), - GNUNET_TESTBED_host_get_hostname_ (hosts[nhost])); + GNUNET_TESTBED_host_get_hostname_ (hosts[nhost])); break; } } if (num_hosts != nhost) { fprintf (stderr, _("Exiting\n")); - GNUNET_SCHEDULER_add_now (&do_shutdown, NULL); + shutdown_task = GNUNET_SCHEDULER_add_now (&do_shutdown, NULL); return; } cfg = GNUNET_CONFIGURATION_dup (config); @@ -545,6 +746,41 @@ run (void *cls, char *const *args, const char *cfgfile, } +/** + * Set an option of type 'char *' from the command line. + * A pointer to this function should be passed as part of the + * 'struct GNUNET_GETOPT_CommandLineOption' array to initialize options + * of this type. It should be followed by a pointer to a value of + * type 'char *'. + * + * @param ctx command line processing context + * @param scls additional closure (will point to the 'char *', + * which will be allocated) + * @param option name of the option + * @param value actual value of the option (a string) + * @return GNUNET_OK to continue procesing; GNUNET_SYSERR to signal error + */ +int +set_topology (struct GNUNET_GETOPT_CommandLineProcessorContext *ctx, + void *scls, const char *option, const char *value) +{ + enum GNUNET_TESTBED_TopologyOption *val = scls; + + if (0 == strncasecmp ("CLIQUE", value, strlen ("CLIQUE"))) + { + *val = GNUNET_TESTBED_TOPOLOGY_CLIQUE; + return GNUNET_OK; + } + if (0 == strncasecmp ("RANDOM", value, strlen ("RANDOM"))) + { + *val = GNUNET_TESTBED_TOPOLOGY_ERDOS_RENYI; + return GNUNET_OK; + } + FPRINTF (stderr, "%s", _("Only `CLIQUE' and `RANDOM' are permitted.\n")); + return GNUNET_SYSERR; +} + + /** * Main function. * @@ -554,16 +790,25 @@ int main (int argc, char *const *argv) { static const struct GNUNET_GETOPT_CommandLineOption options[] = { - { 'n', "num-peers", "COUNT", - gettext_noop ("create COUNT number of peers"), - GNUNET_YES, &GNUNET_GETOPT_set_uint, &num_peers }, - { 'n', "num-peers", "COUNT", + { 'p', "num-peers", "COUNT", gettext_noop ("create COUNT number of peers"), GNUNET_YES, &GNUNET_GETOPT_set_uint, &num_peers }, + { 'n', "num-links", "COUNT", + gettext_noop ("create COUNT number of random links"), + GNUNET_YES, &GNUNET_GETOPT_set_uint, &num_links }, + { 'e', "num-errors", "COUNT", + gettext_noop ("tolerate COUNT number of continious timeout failures"), + GNUNET_YES, &GNUNET_GETOPT_set_uint, &num_cont_fails }, + { 't', "topology", "TOPOLOGY", + gettext_noop ("Try to acheive TOPOLOGY. This options takes either CLIQUE " + "or RANDOM. For CLIQUE the parameter -n is ignored. The " + "default is to acheive a random graph topology."), + GNUNET_YES, &set_topology, &topology }, GNUNET_GETOPT_OPTION_END }; int ret; + topology = GNUNET_TESTBED_TOPOLOGY_ERDOS_RENYI; if (GNUNET_OK != GNUNET_STRINGS_get_utf8_args (argc, argv, &argc, &argv)) return 2; @@ -572,6 +817,7 @@ main (int argc, char *const *argv) GNUNET_PROGRAM_run (argc, argv, "gnunet-testbed-profiler [OPTIONS] hosts-file", _("Profiler for testbed"), options, &run, NULL); + GNUNET_free ((void*) argv); if (GNUNET_OK != ret) return ret; if (GNUNET_OK != result)