X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Ftestbed%2Fgnunet-testbed-profiler.c;h=17f1d6ba90bbee84e7e6413bc70440fc2a84213f;hb=db9c68c76d7a9eb3f200df9d0fcaf971387cb061;hp=ead28f360507395761c47b14513e1bb5cc514be7;hpb=5acd913903a8fa4a4244a5c490204daf7759d451;p=oweals%2Fgnunet.git diff --git a/src/testbed/gnunet-testbed-profiler.c b/src/testbed/gnunet-testbed-profiler.c index ead28f360..17f1d6ba9 100644 --- a/src/testbed/gnunet-testbed-profiler.c +++ b/src/testbed/gnunet-testbed-profiler.c @@ -1,6 +1,6 @@ /* This file is part of GNUnet. - (C) 2011, 2012 Christian Grothoff (and other contributing authors) + (C) 2008--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 @@ -21,23 +21,36 @@ /** * @file testbed/gnunet-testbed-profiler.c * @brief Profiling driver for the testbed. - * @author Sree Harsha Totakura + * @author Sree Harsha Totakura */ #include "platform.h" -#include "gnunet_common.h" +#include "gnunet_util_lib.h" #include "gnunet_testbed_service.h" +#include "testbed_api_hosts.h" + +/** + * Generic loggins shorthand + */ +#define LOG(kind,...) \ + GNUNET_log (kind, __VA_ARGS__) /** - * The array of peers; we fill this as the peers are given to us by the testbed + * Handle to global configuration */ -static struct GNUNET_TESTBED_Peer **peers; +struct GNUNET_CONFIGURATION_Handle *cfg; /** - * Operation handle + * Peer linking - topology operation */ -static struct GNUNET_TESTBED_Operation *op; +struct GNUNET_TESTBED_Operation *topology_op; + +/** + * Name of the file with the hosts to run the test over (configuration option). + * It will be NULL if ENABLE_LL is set + */ +static char *hosts_file; /** * Abort task identifier @@ -45,20 +58,50 @@ static struct GNUNET_TESTBED_Operation *op; static GNUNET_SCHEDULER_TaskIdentifier abort_task; /** - * Current peer id + * Shutdown task identifier + */ +static GNUNET_SCHEDULER_TaskIdentifier shutdown_task; + +/** + * Global event mask for all testbed events */ -unsigned int peer_id; +uint64_t event_mask; /** * Number of peers to be started by the profiler */ static unsigned int num_peers; +/** + * 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 */ static int result; +/** + * Are we running non interactively + */ +static int noninteractive; + /** * Shutdown nicely @@ -69,10 +112,18 @@ static int result; static void do_shutdown (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) { + shutdown_task = GNUNET_SCHEDULER_NO_TASK; if (GNUNET_SCHEDULER_NO_TASK != abort_task) + { GNUNET_SCHEDULER_cancel (abort_task); - GNUNET_free_non_null (peers); - GNUNET_SCHEDULER_shutdown (); /* Stop scheduler to shutdown testbed run */ + abort_task = GNUNET_SCHEDULER_NO_TASK; + } + if (NULL != cfg) + { + GNUNET_CONFIGURATION_destroy (cfg); + cfg = NULL; + } + GNUNET_SCHEDULER_shutdown (); /* Stop scheduler to shutdown testbed run */ } @@ -85,25 +136,29 @@ 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, "Test timedout -- Aborting\n"); + LOG (GNUNET_ERROR_TYPE_WARNING, "Aborting\n"); abort_task = GNUNET_SCHEDULER_NO_TASK; - GNUNET_SCHEDULER_add_now (&do_shutdown, NULL); + result = GNUNET_SYSERR; + if (GNUNET_SCHEDULER_NO_TASK != shutdown_task) + GNUNET_SCHEDULER_cancel (shutdown_task); + shutdown_task = GNUNET_SCHEDULER_add_now (&do_shutdown, NULL); } /** - * Task to be executed when peers are ready - * - * @param cls NULL - * @param tc the task context + * Function to print summary about how many overlay links we have made and how + * many failed */ static void -master_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) +print_overlay_links_summary () { - result = GNUNET_OK; - GNUNET_assert (NULL != peers[0]); - op = GNUNET_TESTBED_peer_stop (peers[0], NULL, NULL); - GNUNET_assert (NULL != op); + static int printed_already; + + if (GNUNET_YES == printed_already) + return; + printed_already = GNUNET_YES; + printf ("%u links succeeded\n", established_links); + printf ("%u links failed due to timeouts\n", failed_links); } @@ -117,23 +172,81 @@ static void controller_event_cb (void *cls, const struct GNUNET_TESTBED_EventInformation *event) { - switch (event->type) { - case GNUNET_TESTBED_ET_PEER_START: - GNUNET_assert (NULL == peers[peer_id]); - GNUNET_assert (NULL != event->details.peer_start.peer); - peers[peer_id++] = event->details.peer_start.peer; + 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\n"); + print_overlay_links_summary (); + if (GNUNET_SCHEDULER_NO_TASK != abort_task) + GNUNET_SCHEDULER_cancel (abort_task); + abort_task = GNUNET_SCHEDULER_add_now (&do_abort, NULL); + return; + } + } break; - case GNUNET_TESTBED_ET_PEER_STOP: - GNUNET_assert (NULL != op); - GNUNET_TESTBED_operation_done (op); - GNUNET_assert (peers[0] == event->details.peer_stop.peer); - GNUNET_SCHEDULER_add_now (&do_shutdown, NULL); + 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); + GNUNET_break (0); + } +} + + +/** + * Signature of a main function for a testcase. + * + * @param cls closure + * @param h the run handle + * @param num_peers number of peers in 'peers' + * @param peers handle to peers run in the testbed + * @param links_succeeded the number of overlay link connection attempts that + * succeeded + * @param links_failed the number of overlay link + */ +static void +test_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) +{ + result = GNUNET_OK; + fprintf (stdout, "\n"); + print_overlay_links_summary (); + if (noninteractive) + { + GNUNET_SCHEDULER_cancel (abort_task); + abort_task = GNUNET_SCHEDULER_NO_TASK; + shutdown_task = GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL, + &do_shutdown, NULL); + return; } +#if (!ENABLE_SUPERMUC) + fprintf (stdout, "Testbed running, waiting for keystroke to shut down\n"); + fflush (stdout); + (void) getc (stdin); +#endif + fprintf (stdout, "Shutting down. Please wait\n"); + fflush (stdout); + shutdown_task = GNUNET_SCHEDULER_add_now (&do_shutdown, NULL); + return; } @@ -143,30 +256,26 @@ controller_event_cb (void *cls, * @param cls closure * @param args remaining command-line arguments * @param cfgfile name of the configuration file used (for saving, can be NULL!) - * @param cfg configuration + * @param config configuration */ static void run (void *cls, char *const *args, const char *cfgfile, const struct GNUNET_CONFIGURATION_Handle *config) { - uint64_t event_mask; - if (0 == num_peers) { - result = GNUNET_OK; + LOG (GNUNET_ERROR_TYPE_ERROR, _("Exiting as the number of peers is %u\n"), + num_peers); return; } - peers = GNUNET_malloc (num_peers * sizeof (struct GNUNET_TESTBED_Peer *)); + cfg = GNUNET_CONFIGURATION_dup (config); event_mask = 0; - event_mask |= (1LL << GNUNET_TESTBED_ET_PEER_START); - event_mask |= (1LL << GNUNET_TESTBED_ET_PEER_STOP); event_mask |= (1LL << GNUNET_TESTBED_ET_CONNECT); - event_mask |= (1LL << GNUNET_TESTBED_ET_DISCONNECT); - GNUNET_TESTBED_run (NULL, config, num_peers, event_mask, &controller_event_cb, - NULL, &master_task, NULL); + event_mask |= (1LL << GNUNET_TESTBED_ET_OPERATION_FINISHED); + GNUNET_TESTBED_run (hosts_file, cfg, num_peers, event_mask, controller_event_cb, + NULL, &test_run, NULL); abort_task = - GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply - (GNUNET_TIME_UNIT_SECONDS, 5), &do_abort, + GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL, &do_abort, NULL); } @@ -180,21 +289,35 @@ 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 }, + {'p', "num-peers", "COUNT", + gettext_noop ("create COUNT number of peers"), + GNUNET_YES, &GNUNET_GETOPT_set_uint, &num_peers}, + {'e', "num-errors", "COUNT", + gettext_noop ("tolerate COUNT number of continious timeout failures"), + GNUNET_YES, &GNUNET_GETOPT_set_uint, &num_cont_fails}, + {'n', "non-interactive", NULL, + gettext_noop ("run profiler in non-interactive mode where upon " + "testbed setup the profiler does not wait for a " + "keystroke but continues to run until a termination " + "signal is received"), + GNUNET_NO, &GNUNET_GETOPT_set_one, &noninteractive}, +#if !ENABLE_SUPERMUC + {'H', "hosts", "FILENAME", + gettext_noop ("name of the file with the login information for the testbed"), + GNUNET_YES, &GNUNET_GETOPT_set_string, &hosts_file}, +#endif GNUNET_GETOPT_OPTION_END }; + const char *binaryHelp = "gnunet-testbed-profiler [OPTIONS]"; int ret; if (GNUNET_OK != GNUNET_STRINGS_get_utf8_args (argc, argv, &argc, &argv)) return 2; - result = GNUNET_SYSERR; ret = - GNUNET_PROGRAM_run (argc, argv, "gnunet-testbed-profiler [OPTIONS]", - _("Profiler for testbed"), + GNUNET_PROGRAM_run (argc, argv, "gnunet-testbed-profiler", binaryHelp, options, &run, NULL); + GNUNET_free ((void *) argv); if (GNUNET_OK != ret) return ret; if (GNUNET_OK != result)