X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Ftestbed%2Fgnunet-testbed-profiler.c;h=17f1d6ba90bbee84e7e6413bc70440fc2a84213f;hb=db9c68c76d7a9eb3f200df9d0fcaf971387cb061;hp=c646add7ad8b346614991de39e43182b121e54ee;hpb=9ae60ce30ada99a913b4349a4bfff27d09d41287;p=oweals%2Fgnunet.git diff --git a/src/testbed/gnunet-testbed-profiler.c b/src/testbed/gnunet-testbed-profiler.c index c646add7a..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,11 +21,11 @@ /** * @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" @@ -36,120 +36,21 @@ GNUNET_log (kind, __VA_ARGS__) -/** - * DLL of operations - */ -struct DLLOperation -{ - /** - * The testbed operation handle - */ - struct GNUNET_TESTBED_Operation *op; - - /** - * Closure - */ - void *cls; - - /** - * The next pointer for DLL - */ - struct DLLOperation *next; - - /** - * The prev pointer for DLL - */ - struct DLLOperation *prev; -}; - - -/** - * Availanle states during profiling - */ -enum State -{ - /** - * Initial state - */ - STATE_INIT = 0, - - /** - * Starting slaves - */ - STATE_SLAVES_STARTING, - - /** - * Creating peers - */ - STATE_PEERS_CREATING, - - /** - * Starting peers - */ - 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 -}; - - -/** - * An array of hosts loaded from the hostkeys file - */ -static struct GNUNET_TESTBED_Host **hosts; - -/** - * The array of peers; we fill this as the peers are given to us by the testbed - */ -static struct GNUNET_TESTBED_Peer **peers; - -/* /\** */ -/* * Operation handle */ -/* *\/ */ -/* static struct GNUNET_TESTBED_Operation *op; */ - -/** - * Host registration handle - */ -static struct GNUNET_TESTBED_HostRegistrationHandle *reg_handle; - -/** - * Handle to the master controller process - */ -struct GNUNET_TESTBED_ControllerProc *mc_proc; - -/** - * Handle to the master controller - */ -struct GNUNET_TESTBED_Controller *mc; - /** * Handle to global configuration */ struct GNUNET_CONFIGURATION_Handle *cfg; /** - * Head of the operations list - */ -struct DLLOperation *dll_op_head; - -/** - * Tail of the operations list + * Peer linking - topology operation */ -struct DLLOperation *dll_op_tail; +struct GNUNET_TESTBED_Operation *topology_op; /** - * Peer linking - topology operation + * Name of the file with the hosts to run the test over (configuration option). + * It will be NULL if ENABLE_LL is set */ -struct GNUNET_TESTBED_Operation *topology_op; +static char *hosts_file; /** * Abort task identifier @@ -161,46 +62,16 @@ static GNUNET_SCHEDULER_TaskIdentifier abort_task; */ static GNUNET_SCHEDULER_TaskIdentifier shutdown_task; -/** - * Host registration task identifier - */ -static GNUNET_SCHEDULER_TaskIdentifier register_hosts_task; - /** * Global event mask for all testbed events */ uint64_t event_mask; -/** - * The starting time of a profiling step - */ -struct GNUNET_TIME_Absolute prof_start_time; - -/** - * Duration profiling step has taken - */ -struct GNUNET_TIME_Relative prof_time; - -/** - * Current peer id - */ -unsigned int peer_id; - /** * Number of peers to be started by the profiler */ static unsigned int num_peers; -/** - * Number of hosts in the hosts array - */ -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 */ @@ -227,9 +98,9 @@ static unsigned int failed_links; static int result; /** - * current state of profiling + * Are we running non interactively */ -enum State state; +static int noninteractive; /** @@ -241,35 +112,18 @@ enum State state; static void 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_cancel (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_CONTAINER_DLL_remove (dll_op_head, dll_op_tail, dll_op); - GNUNET_free (dll_op); + GNUNET_SCHEDULER_cancel (abort_task); + abort_task = GNUNET_SCHEDULER_NO_TASK; } - if (NULL != mc) - GNUNET_TESTBED_controller_disconnect (mc); - if (NULL != mc_proc) - GNUNET_TESTBED_controller_stop (mc_proc); if (NULL != cfg) + { GNUNET_CONFIGURATION_destroy (cfg); - GNUNET_SCHEDULER_shutdown (); /* Stop scheduler to shutdown testbed run */ + cfg = NULL; + } + GNUNET_SCHEDULER_shutdown (); /* Stop scheduler to shutdown testbed run */ } @@ -291,115 +145,6 @@ do_abort (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) } - - - -/** - * 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) - { - shutdown_task = GNUNET_SCHEDULER_add_now (&do_shutdown, NULL); - return; - } - state = STATE_PEERS_LINKING; - /* Do overlay connect */ - prof_start_time = GNUNET_TIME_absolute_get (); - topology_op = - GNUNET_TESTBED_overlay_configure_topology (NULL, num_peers, peers, - GNUNET_TESTBED_TOPOLOGY_ERDOS_RENYI, - num_links, - GNUNET_TESTBED_TOPOLOGY_DISABLE_AUTO_RETRY, - GNUNET_TESTBED_TOPOLOGY_OPTION_END); - } -} - - -/** - * Functions of this signature are called when a peer has been successfully - * created - * - * @param cls the closure from GNUNET_TESTBED_peer_create() - * @param peer the handle for the created peer; NULL on any error during - * creation - * @param emsg NULL if peer is not NULL; else MAY contain the error description - */ -static void -peer_create_cb (void *cls, struct GNUNET_TESTBED_Peer *peer, const char *emsg) -{ - struct DLLOperation *dll_op = cls; - struct GNUNET_TESTBED_Peer **peer_ptr; - static unsigned int created_peers; - unsigned int peer_cnt; - - if (NULL != emsg) - { - LOG (GNUNET_ERROR_TYPE_WARNING, - _("Creating a peer failed. Error: %s\n"), emsg); - GNUNET_TESTBED_operation_done (dll_op->op); - GNUNET_CONTAINER_DLL_remove (dll_op_head, dll_op_tail, dll_op); - GNUNET_free (dll_op); - GNUNET_SCHEDULER_cancel (abort_task); - abort_task = GNUNET_SCHEDULER_add_now (&do_abort, NULL); - return; - } - peer_ptr = dll_op->cls; - GNUNET_assert (NULL == *peer_ptr); - *peer_ptr = peer; - GNUNET_TESTBED_operation_done (dll_op->op); - GNUNET_CONTAINER_DLL_remove (dll_op_head, dll_op_tail, dll_op); - GNUNET_free (dll_op); - if (++created_peers == num_peers) - { - prof_time = GNUNET_TIME_absolute_get_duration (prof_start_time); - 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 (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 @@ -407,9 +152,12 @@ peer_create_cb (void *cls, struct GNUNET_TESTBED_Peer *peer, const char *emsg) 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); + 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); } @@ -424,228 +172,81 @@ static void controller_event_cb (void *cls, const struct GNUNET_TESTBED_EventInformation *event) { - struct DLLOperation *dll_op; - struct GNUNET_TESTBED_Operation *op; - - switch (state) + switch (event->type) { - case STATE_SLAVES_STARTING: - 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) { - case GNUNET_TESTBED_ET_OPERATION_FINISHED: + printf ("F"); + fflush (stdout); + failed_links++; + if (++cont_fails > num_cont_fails) { - 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); - GNUNET_free (dll_op); - op = event->details.operation_finished.operation; - if (NULL != event->details.operation_finished.emsg) - { - LOG (GNUNET_ERROR_TYPE_WARNING, - _("An operation has failed while starting slaves\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); - /* Proceed to start peers */ - if (++slaves_started == num_hosts - 1) - { - printf ("%u controllers started successfully\n", num_hosts); - fflush (stdout); - 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); - } - } - } - break; - default: - GNUNET_assert (0); - } - break; - case STATE_PEERS_STARTING: - switch (event->type) - { - case GNUNET_TESTBED_ET_OPERATION_FINISHED: - /* Control reaches here when peer start fails */ - case GNUNET_TESTBED_ET_PEER_START: - /* 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 (); + 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); - } + 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++; - 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); } break; - default: - GNUNET_assert (0); - } -} - - -/** - * Task to register all hosts available in the global host list - * - * @param cls NULL - * @param tc the scheduler task context - */ -static void -register_hosts (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc); - - -/** - * Callback which will be called to after a host registration succeeded or failed - * - * @param cls the closure - * @param emsg the error message; NULL if host registration is successful - */ -static void -host_registration_completion (void *cls, const char *emsg) -{ - reg_handle = NULL; - if (NULL != emsg) + case GNUNET_TESTBED_ET_CONNECT: { - LOG (GNUNET_ERROR_TYPE_WARNING, - _("Host registration failed for a host. Error: %s\n"), emsg); - GNUNET_SCHEDULER_cancel (abort_task); - abort_task = GNUNET_SCHEDULER_add_now (&do_abort, NULL); - return; + if (0 != cont_fails) + cont_fails--; + if (0 == established_links) + printf ("Establishing links. Please wait\n"); + printf ("."); + fflush (stdout); + established_links++; } - register_hosts_task = GNUNET_SCHEDULER_add_now (®ister_hosts, NULL); -} - - -/** - * Task to register all hosts available in the global host list - * - * @param cls NULL - * @param tc the scheduler task context - */ -static void -register_hosts (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) -{ - struct DLLOperation *dll_op; - static unsigned int reg_host; - unsigned int slave; - - register_hosts_task = GNUNET_SCHEDULER_NO_TASK; - if (reg_host == num_hosts - 1) - { - LOG (GNUNET_ERROR_TYPE_DEBUG, - "All hosts successfully registered\n"); - /* Start slaves */ - state = STATE_SLAVES_STARTING; - for (slave = 1; slave < num_hosts; slave++) - { - dll_op = GNUNET_malloc (sizeof (struct DLLOperation)); - dll_op->op = GNUNET_TESTBED_controller_link (dll_op, - mc, - hosts[slave], - hosts[0], - cfg, - GNUNET_YES); - GNUNET_CONTAINER_DLL_insert_tail (dll_op_head, dll_op_tail, dll_op); - } - return; + break; + default: + GNUNET_break (0); } - reg_handle = GNUNET_TESTBED_register_host (mc, hosts[++reg_host], - host_registration_completion, - NULL); } /** - * Callback to signal successfull startup of the controller process + * Signature of a main function for a testcase. * - * @param cls the closure from GNUNET_TESTBED_controller_start() - * @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 + * @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 -status_cb (void *cls, const struct GNUNET_CONFIGURATION_Handle *config, int status) +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) { - if (GNUNET_SCHEDULER_NO_TASK != abort_task) - GNUNET_SCHEDULER_cancel (abort_task); - if (GNUNET_OK != status) - { - mc_proc = NULL; - abort_task = GNUNET_SCHEDULER_add_now (&do_abort, NULL); - return; - } - 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); - event_mask |= (1LL << GNUNET_TESTBED_ET_OPERATION_FINISHED); - mc = GNUNET_TESTBED_controller_connect (config, hosts[0], event_mask, - &controller_event_cb, NULL); - if (NULL == mc) + result = GNUNET_OK; + fprintf (stdout, "\n"); + print_overlay_links_summary (); + if (noninteractive) { - LOG (GNUNET_ERROR_TYPE_WARNING, - _("Unable to connect to master controller -- Check config\n")); - abort_task = GNUNET_SCHEDULER_add_now (&do_abort, NULL); + 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; } - register_hosts_task = GNUNET_SCHEDULER_add_now (®ister_hosts, NULL); - abort_task = GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL, - &do_abort, NULL); +#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; } @@ -661,50 +262,20 @@ static void run (void *cls, char *const *args, const char *cfgfile, const struct GNUNET_CONFIGURATION_Handle *config) { - unsigned int nhost; - - if (NULL == args[0]) - { - fprintf (stderr, _("No hosts-file specified on command line\n")); - return; - } if (0 == num_peers) { - result = GNUNET_OK; - return; - } - num_hosts = GNUNET_TESTBED_hosts_load_from_file (args[0], &hosts); - if (0 == num_hosts) - { - fprintf (stderr, _("No hosts loaded. Need atleast one host\n")); - return; - } - for (nhost = 0; nhost < num_hosts; nhost++) - { - if (GNUNET_YES != GNUNET_TESTBED_is_host_habitable (hosts[nhost])) - { - fprintf (stderr, _("Host %s cannot start testbed\n"), - GNUNET_TESTBED_host_get_hostname_ (hosts[nhost])); - break; - } - } - if (num_hosts != nhost) - { - fprintf (stderr, _("Exiting\n")); - shutdown_task = GNUNET_SCHEDULER_add_now (&do_shutdown, NULL); + LOG (GNUNET_ERROR_TYPE_ERROR, _("Exiting as the number of peers is %u\n"), + num_peers); return; } cfg = GNUNET_CONFIGURATION_dup (config); - mc_proc = - GNUNET_TESTBED_controller_start (GNUNET_TESTBED_host_get_hostname_ - (hosts[0]), - hosts[0], - cfg, - status_cb, - NULL); + event_mask = 0; + event_mask |= (1LL << GNUNET_TESTBED_ET_CONNECT); + 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); } @@ -718,27 +289,35 @@ int main (int argc, char *const *argv) { static const struct GNUNET_GETOPT_CommandLineOption options[] = { - { '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 }, + {'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] hosts-file", - _("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)