diff options
Diffstat (limited to 'src/benchmark/taler-exchange-benchmark.c')
-rw-r--r-- | src/benchmark/taler-exchange-benchmark.c | 910 |
1 files changed, 197 insertions, 713 deletions
diff --git a/src/benchmark/taler-exchange-benchmark.c b/src/benchmark/taler-exchange-benchmark.c index e29e117de..75424a358 100644 --- a/src/benchmark/taler-exchange-benchmark.c +++ b/src/benchmark/taler-exchange-benchmark.c @@ -28,25 +28,7 @@ #include <microhttpd.h> #include <sys/resource.h> #include "taler_util.h" -#include "taler_signatures.h" -#include "taler_exchangedb_lib.h" -#include "taler_exchange_service.h" -#include "taler_json_lib.h" -#include "taler_bank_service.h" -#include "taler_fakebank_lib.h" #include "taler_testing_lib.h" -#include "taler_error_codes.h" - -/* Error codes. */ -enum BenchmarkError -{ - MISSING_BANK_URL, - FAILED_TO_LAUNCH_BANK, - BAD_CLI_ARG, - BAD_CONFIG_FILE, - NO_CONFIG_FILE_GIVEN -}; - /** * The whole benchmark is a repetition of a "unit". Each @@ -55,56 +37,11 @@ enum BenchmarkError */ #define UNITY_SIZE 6 -#define FIRST_INSTRUCTION -1 - - -/** - * What mode should the benchmark run in? - */ -enum BenchmarkMode -{ - /** - * Run as client (with fakebank), also starts a remote exchange. - */ - MODE_CLIENT = 1, - - /** - * Run the the exchange. - */ - MODE_EXCHANGE = 2, - - /** - * Run both, for a local benchmark. - */ - MODE_BOTH = 3, -}; - - -/** - * Hold information regarding which bank has the exchange account. - */ -static const struct TALER_EXCHANGEDB_AccountInfo *exchange_bank_account; - -/** - * Configuration of our exchange. - */ -static struct TALER_TESTING_ExchangeConfiguration ec; - -/** - * Hold information about a user at the bank. - */ -static char *user_payto_uri; - -/** - * Time snapshot taken right before executing the CMDs. - */ -static struct GNUNET_TIME_Absolute start_time; /** - * Benchmark duration time taken right after the CMD interpreter - * returns. + * Credentials to use for the benchmark. */ -static struct GNUNET_TIME_Relative duration; +static struct TALER_TESTING_Credentials cred; /** * Array of all the commands the benchmark is running. @@ -117,16 +54,6 @@ static struct TALER_TESTING_Command *all_commands; static char *cfg_filename; /** - * Exit code. - */ -static enum GNUNET_GenericReturnValue result; - -/** - * Use the fakebank instead of the Python bank. - */ -static int use_fakebank; - -/** * How many coins we want to create per client and reserve. */ static unsigned int howmany_coins = 1; @@ -147,11 +74,6 @@ static unsigned int refresh_rate = 10; static unsigned int howmany_clients = 1; /** - * Bank configuration to use. - */ -static struct TALER_TESTING_BankConfiguration bc; - -/** * Log level used during the run. */ static char *loglev; @@ -162,16 +84,6 @@ static char *loglev; static char *logfile; /** - * Benchmarking mode (run as client, exchange, both) as string. - */ -static char *mode_str; - -/** - * Benchmarking mode (run as client, exchange, both). - */ -static enum BenchmarkMode mode; - -/** * Configuration. */ static struct GNUNET_CONFIGURATION_Handle *cfg; @@ -182,19 +94,20 @@ static struct GNUNET_CONFIGURATION_Handle *cfg; static int reserves_first; /** - * Currency used. + * Are we running against 'fakebank'? */ -static char *currency; +static int use_fakebank; /** - * Remote host that runs the exchange. + * Section with the configuration data for the exchange + * bank account. */ -static char *remote_host; +static char *exchange_bank_section; /** - * Remote benchmarking directory. + * Currency used. */ -static char *remote_dir; +static char *currency; /** * Array of command labels. @@ -212,12 +125,6 @@ static unsigned int label_len; static unsigned int label_off; /** - * Don't kill exchange/fakebank/wirewatch until - * requested by the user explicitly. - */ -static int linger; - -/** * Performance counters. */ static struct TALER_TESTING_Timer timings[] = { @@ -256,14 +163,15 @@ cmd_transfer_to_exchange (const char *label, return TALER_TESTING_cmd_admin_add_incoming_retry ( TALER_TESTING_cmd_admin_add_incoming (label, amount, - exchange_bank_account->auth, - user_payto_uri)); + &cred.ba_admin, + cred.user42_payto)); } /** * Throw a weighted coin with @a probability. * + * @param probability weight of the coin flip * @return #GNUNET_OK with @a probability, * #GNUNET_NO with 1 - @a probability */ @@ -298,11 +206,20 @@ run (void *cls, char *amount_1; (void) cls; - all_commands = GNUNET_new_array (howmany_reserves * (1 /* Withdraw block */ - + howmany_coins) /* All units */ - + 1 /* stat CMD */ - + 1 /* End CMD */, - struct TALER_TESTING_Command); + all_commands = GNUNET_malloc_large ( + (1 /* exchange CMD */ + + howmany_reserves + * (1 /* Withdraw block */ + + howmany_coins) /* All units */ + + 1 /* stat CMD */ + + 1 /* End CMD */) * sizeof (struct TALER_TESTING_Command)); + GNUNET_assert (NULL != all_commands); + all_commands[0] + = TALER_TESTING_cmd_get_exchange ("get-exchange", + cred.cfg, + NULL, + true, + true); GNUNET_asprintf (&amount_5, "%s:5", currency); GNUNET_asprintf (&amount_4, "%s:4", currency); GNUNET_asprintf (&amount_1, "%s:1", currency); @@ -339,9 +256,9 @@ run (void *cls, GNUNET_asprintf (&batch_label, "batch-start-%u", j); - all_commands[reserves_first - ? j - : j * (howmany_coins + 1)] + all_commands[1 + (reserves_first + ? j + : j * (howmany_coins + 1))] = TALER_TESTING_cmd_batch (add_label (batch_label), make_reserve); } @@ -360,25 +277,25 @@ run (void *cls, wl = add_label (withdraw_label); GNUNET_asprintf (&order_enc, "{\"nonce\": %llu}", - ((unsigned long long) i) + (howmany_coins - * (unsigned long long) j)); + ((unsigned long long) i) + + (howmany_coins * (unsigned long long) j)); unit[0] = - TALER_TESTING_cmd_withdraw_with_retry - (TALER_TESTING_cmd_withdraw_amount (wl, - create_reserve_label, - amount_5, - 0, /* age restriction off */ - MHD_HTTP_OK)); + TALER_TESTING_cmd_withdraw_with_retry ( + TALER_TESTING_cmd_withdraw_amount (wl, + create_reserve_label, + amount_5, + 0, /* age restriction off */ + MHD_HTTP_OK)); unit[1] = - TALER_TESTING_cmd_deposit_with_retry - (TALER_TESTING_cmd_deposit ("deposit", - wl, - 0, /* Index of the one withdrawn coin in the traits. */ - user_payto_uri, - add_label (order_enc), - GNUNET_TIME_UNIT_ZERO, - amount_1, - MHD_HTTP_OK)); + TALER_TESTING_cmd_deposit_with_retry ( + TALER_TESTING_cmd_deposit ("deposit", + wl, + 0, /* Index of the one withdrawn coin in the traits. */ + cred.user43_payto, + add_label (order_enc), + GNUNET_TIME_UNIT_ZERO, + amount_1, + MHD_HTTP_OK)); if (eval_probability (refresh_rate / 100.0)) { char *melt_label; @@ -397,21 +314,21 @@ run (void *cls, j); rl = add_label (reveal_label); unit[2] = - TALER_TESTING_cmd_melt_with_retry - (TALER_TESTING_cmd_melt (ml, - wl, - MHD_HTTP_OK, - NULL)); + TALER_TESTING_cmd_melt_with_retry ( + TALER_TESTING_cmd_melt (ml, + wl, + MHD_HTTP_OK, + NULL)); unit[3] = - TALER_TESTING_cmd_refresh_reveal_with_retry - (TALER_TESTING_cmd_refresh_reveal (rl, - ml, - MHD_HTTP_OK)); + TALER_TESTING_cmd_refresh_reveal_with_retry ( + TALER_TESTING_cmd_refresh_reveal (rl, + ml, + MHD_HTTP_OK)); unit[4] = - TALER_TESTING_cmd_refresh_link_with_retry - (TALER_TESTING_cmd_refresh_link ("link", - rl, - MHD_HTTP_OK)); + TALER_TESTING_cmd_refresh_link_with_retry ( + TALER_TESTING_cmd_refresh_link ("link", + rl, + MHD_HTTP_OK)); unit[5] = TALER_TESTING_cmd_end (); } else @@ -421,16 +338,16 @@ run (void *cls, "unit-%u-%u", i, j); - all_commands[reserves_first - ? howmany_reserves + j * howmany_coins + i - : j * (howmany_coins + 1) + (1 + i)] + all_commands[1 + (reserves_first + ? howmany_reserves + j * howmany_coins + i + : j * (howmany_coins + 1) + (1 + i))] = TALER_TESTING_cmd_batch (add_label (unit_label), unit); } } - all_commands[howmany_reserves * (1 + howmany_coins)] + all_commands[1 + howmany_reserves * (1 + howmany_coins)] = TALER_TESTING_cmd_stat (timings); - all_commands[howmany_reserves * (1 + howmany_coins) + 1] + all_commands[1 + howmany_reserves * (1 + howmany_coins) + 1] = TALER_TESTING_cmd_end (); TALER_TESTING_run2 (is, all_commands, @@ -439,7 +356,6 @@ run (void *cls, GNUNET_free (amount_4); GNUNET_free (amount_5); GNUNET_free (withdraw_fee_str); - result = GNUNET_OK; } @@ -456,10 +372,10 @@ print_stats (void) total = GNUNET_strdup ( GNUNET_STRINGS_relative_time_to_string (timings[i].total_duration, - GNUNET_YES)); + true)); latency = GNUNET_strdup ( GNUNET_STRINGS_relative_time_to_string (timings[i].success_latency, - GNUNET_YES)); + true)); fprintf (stderr, "%s-%d took %s in total with %s for latency for %u executions (%u repeats)\n", timings[i].prefix, @@ -475,45 +391,6 @@ print_stats (void) /** - * Stop the fakebank. - * - * @param cls fakebank handle - */ -static void -stop_fakebank (void *cls) -{ - struct TALER_FAKEBANK_Handle *fakebank = cls; - - TALER_FAKEBANK_stop (fakebank); -} - - -/** - * Start the fakebank. - * - * @param cls NULL - */ -static void -launch_fakebank (void *cls) -{ - struct TALER_FAKEBANK_Handle *fakebank; - - (void) cls; - fakebank - = TALER_TESTING_run_fakebank ( - exchange_bank_account->auth->wire_gateway_url, - currency); - if (NULL == fakebank) - { - GNUNET_break (0); - return; - } - GNUNET_SCHEDULER_add_shutdown (&stop_fakebank, - fakebank); -} - - -/** * Run the benchmark in parallel in many (client) processes * and summarize result. * @@ -529,358 +406,51 @@ parallel_benchmark (TALER_TESTING_Main main_cb, { enum GNUNET_GenericReturnValue result = GNUNET_OK; pid_t cpids[howmany_clients]; - pid_t fakebank = -1; - int wstatus; - struct GNUNET_OS_Process *bankd = NULL; - struct GNUNET_OS_Process *auditord = NULL; - struct GNUNET_OS_Process *exchanged = NULL; - struct GNUNET_OS_Process *wirewatch = NULL; - struct GNUNET_OS_Process *exchange_slave = NULL; - struct GNUNET_DISK_PipeHandle *exchange_slave_pipe; - if ( (MODE_CLIENT == mode) || - (MODE_BOTH == mode) ) + if (1 == howmany_clients) + { + result = TALER_TESTING_loop (main_cb, + main_cb_cls); + print_stats (); + } + else { - if (use_fakebank) + for (unsigned int i = 0; i<howmany_clients; i++) { - /* start fakebank */ - fakebank = fork (); - if (0 == fakebank) + if (0 == (cpids[i] = fork ())) { - GNUNET_log_setup ("benchmark-fakebank", - NULL == loglev ? "INFO" : loglev, + /* I am the child, do the work! */ + GNUNET_log_setup ("benchmark-worker", + loglev, logfile); - GNUNET_SCHEDULER_run (&launch_fakebank, - NULL); - exit (0); + result = TALER_TESTING_loop (main_cb, + main_cb_cls); + print_stats (); + if (GNUNET_OK != result) + GNUNET_log (GNUNET_ERROR_TYPE_ERROR, + "Failure in child process %u test suite!\n", + i); + if (GNUNET_OK == result) + exit (0); + else + exit (1); } - if (-1 == fakebank) + if (-1 == cpids[i]) { GNUNET_log_strerror (GNUNET_ERROR_TYPE_ERROR, "fork"); - return GNUNET_SYSERR; - } - } - else - { - /* start bank */ - if (GNUNET_OK != - TALER_TESTING_prepare_bank (cfg_filename, - GNUNET_NO, - "exchange-account-test", - &bc)) - { - return 1; - } - bankd = TALER_TESTING_run_bank (cfg_filename, - "http://localhost:8082/"); - if (NULL == bankd) - return 77; - } - } - - if ( (MODE_EXCHANGE == mode) || (MODE_BOTH == mode) ) - { - /* start exchange */ - exchanged = GNUNET_OS_start_process (GNUNET_OS_INHERIT_STD_ALL, - NULL, NULL, NULL, - "taler-exchange-httpd", - "taler-exchange-httpd", - "-c", config_file, - "-C", - NULL); - if ( (NULL == exchanged) && - (MODE_BOTH == mode) ) - { - if (-1 != fakebank) - { - kill (fakebank, - SIGTERM); - waitpid (fakebank, - &wstatus, - 0); - } - if (NULL != bankd) - { - GNUNET_OS_process_kill (bankd, - SIGTERM); - GNUNET_OS_process_destroy (bankd); - } - return 77; - } - /* start auditor */ - auditord = GNUNET_OS_start_process (GNUNET_OS_INHERIT_STD_ALL, - NULL, NULL, NULL, - "taler-auditor-httpd", - "taler-auditor-httpd", - "-c", config_file, - NULL); - if (NULL == auditord) - { - GNUNET_OS_process_kill (exchanged, - SIGTERM); - if (MODE_BOTH == mode) - { - if (-1 != fakebank) - { - kill (fakebank, - SIGTERM); - waitpid (fakebank, - &wstatus, - 0); - } - if (NULL != bankd) - { - GNUNET_OS_process_kill (bankd, - SIGTERM); - GNUNET_OS_process_destroy (bankd); - } - } - GNUNET_OS_process_destroy (exchanged); - return 77; - } - /* start exchange wirewatch */ - wirewatch = GNUNET_OS_start_process (GNUNET_OS_INHERIT_STD_ALL, - NULL, NULL, NULL, - "taler-exchange-wirewatch", - "taler-exchange-wirewatch", - "-c", config_file, - NULL); - if (NULL == wirewatch) - { - GNUNET_OS_process_kill (auditord, - SIGTERM); - GNUNET_OS_process_kill (exchanged, - SIGTERM); - if (MODE_BOTH == mode) - { - if (-1 != fakebank) - { - kill (fakebank, - SIGTERM); - waitpid (fakebank, - &wstatus, - 0); - } - if (NULL != bankd) - { - GNUNET_OS_process_kill (bankd, - SIGTERM); - GNUNET_OS_process_destroy (bankd); - } - } - GNUNET_OS_process_destroy (exchanged); - return 77; - } - } - - if (MODE_CLIENT == mode) - { - char *remote_cmd; - - GNUNET_asprintf (&remote_cmd, - ("cd '%s'; " - "taler-exchange-benchmark --mode=exchange -c '%s'"), - remote_dir, - config_file); - - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "remote command: %s\n", - remote_cmd); - - GNUNET_assert (NULL != (exchange_slave_pipe = - GNUNET_DISK_pipe (GNUNET_DISK_PF_BLOCKING_RW))); - - exchange_slave = GNUNET_OS_start_process (GNUNET_OS_INHERIT_STD_OUT_AND_ERR, - exchange_slave_pipe, NULL, NULL, - "ssh", - "ssh", - /* Don't ask for pw/passphrase, rather fail */ - "-oBatchMode=yes", - remote_host, - remote_cmd, - NULL); - GNUNET_free (remote_cmd); - } - - /* We always wait for the exchange, no matter if it's running locally or - remotely */ - if (0 != TALER_TESTING_wait_exchange_ready (ec.exchange_url)) - { - GNUNET_log (GNUNET_ERROR_TYPE_ERROR, - "Failed to detect running exchange at `%s'\n", - ec.exchange_url); - GNUNET_OS_process_kill (exchanged, - SIGTERM); - if ( (MODE_BOTH == mode) || (MODE_CLIENT == mode)) - { - if (-1 != fakebank) - { - kill (fakebank, - SIGTERM); - waitpid (fakebank, - &wstatus, - 0); - } - if (NULL != bankd) - { - GNUNET_OS_process_kill (bankd, - SIGTERM); - GNUNET_OS_process_destroy (bankd); + howmany_clients = i; + result = GNUNET_SYSERR; + break; } + /* fork() success, continue starting more processes! */ } - GNUNET_OS_process_wait (exchanged); - GNUNET_OS_process_destroy (exchanged); - if (NULL != wirewatch) - { - GNUNET_OS_process_kill (wirewatch, - SIGTERM); - GNUNET_OS_process_wait (wirewatch); - GNUNET_OS_process_destroy (wirewatch); - } - if (NULL != auditord) - { - GNUNET_OS_process_kill (auditord, - SIGTERM); - GNUNET_OS_process_wait (auditord); - GNUNET_OS_process_destroy (auditord); - } - return 77; - } - if ( (MODE_CLIENT == mode) || (MODE_BOTH == mode) ) - { - if (-1 != fakebank) - sleep (1); /* make sure fakebank process is ready before continuing */ - - start_time = GNUNET_TIME_absolute_get (); - result = GNUNET_OK; - - if (1 == howmany_clients) - { - result = TALER_TESTING_setup (main_cb, - main_cb_cls, - cfg, - exchanged, - GNUNET_YES); - print_stats (); - } - else + /* collect all children */ + for (unsigned int i = 0; i<howmany_clients; i++) { - for (unsigned int i = 0; i<howmany_clients; i++) - { - if (0 == (cpids[i] = fork ())) - { - /* I am the child, do the work! */ - GNUNET_log_setup ("benchmark-worker", - NULL == loglev ? "INFO" : loglev, - logfile); - - result = TALER_TESTING_setup (main_cb, - main_cb_cls, - cfg, - exchanged, - GNUNET_YES); - print_stats (); - if (GNUNET_OK != result) - GNUNET_log (GNUNET_ERROR_TYPE_ERROR, - "Failure in child process test suite!\n"); - if (GNUNET_OK == result) - exit (0); - else - exit (1); - } - if (-1 == cpids[i]) - { - GNUNET_log_strerror (GNUNET_ERROR_TYPE_ERROR, - "fork"); - howmany_clients = i; - result = GNUNET_SYSERR; - break; - } - /* fork() success, continue starting more processes! */ - } - /* collect all children */ - for (unsigned int i = 0; i<howmany_clients; i++) - { - waitpid (cpids[i], - &wstatus, - 0); - if ( (! WIFEXITED (wstatus)) || - (0 != WEXITSTATUS (wstatus)) ) - { - GNUNET_break (0); - result = GNUNET_SYSERR; - } - } - } - } - - /* Wait for our master to die or to tell us to die */ - if (MODE_EXCHANGE == mode) - (void) getchar (); - - if ( (GNUNET_YES == linger) && - ( ((mode == MODE_BOTH) || - (mode == MODE_CLIENT) ) ) ) - { - printf ("press ENTER to stop\n"); - (void) getchar (); - } - - if (MODE_CLIENT == mode) - { - char c = 'q'; - - GNUNET_assert (NULL != exchange_slave); + int wstatus; - /* Write a character to the pipe to end the exchange slave. - * We can't send a signal here, as it would just kill SSH and - * not necessarily the process on the other machine. */ - GNUNET_DISK_file_write (GNUNET_DISK_pipe_handle - (exchange_slave_pipe, GNUNET_DISK_PIPE_END_WRITE), - &c, sizeof (c)); - - GNUNET_break (GNUNET_OK == - GNUNET_OS_process_wait (exchange_slave)); - GNUNET_OS_process_destroy (exchange_slave); - } - - if ( (MODE_EXCHANGE == mode) || (MODE_BOTH == mode) ) - { - GNUNET_assert (NULL != wirewatch); - GNUNET_assert (NULL != exchanged); - GNUNET_assert (NULL != auditord); - /* stop wirewatch */ - GNUNET_break (0 == - GNUNET_OS_process_kill (wirewatch, - SIGTERM)); - GNUNET_break (GNUNET_OK == - GNUNET_OS_process_wait (wirewatch)); - GNUNET_OS_process_destroy (wirewatch); - /* stop auditor */ - GNUNET_break (0 == - GNUNET_OS_process_kill (auditord, - SIGTERM)); - GNUNET_break (GNUNET_OK == - GNUNET_OS_process_wait (auditord)); - GNUNET_OS_process_destroy (auditord); - /* stop exchange */ - GNUNET_break (0 == - GNUNET_OS_process_kill (exchanged, - SIGTERM)); - GNUNET_break (GNUNET_OK == - GNUNET_OS_process_wait (exchanged)); - GNUNET_OS_process_destroy (exchanged); - } - - if ( (MODE_CLIENT == mode) || (MODE_BOTH == mode) ) - { - /* stop fakebank */ - if (-1 != fakebank) - { - kill (fakebank, - SIGTERM); - waitpid (fakebank, + waitpid (cpids[i], &wstatus, 0); if ( (! WIFEXITED (wstatus)) || @@ -890,12 +460,6 @@ parallel_benchmark (TALER_TESTING_Main main_cb, result = GNUNET_SYSERR; } } - if (NULL != bankd) - { - GNUNET_OS_process_kill (bankd, - SIGTERM); - GNUNET_OS_process_destroy (bankd); - } } return result; } @@ -913,55 +477,65 @@ main (int argc, char *const *argv) { struct GNUNET_GETOPT_CommandLineOption options[] = { - GNUNET_GETOPT_option_mandatory - (GNUNET_GETOPT_option_cfgfile (&cfg_filename)), - GNUNET_GETOPT_option_version (PACKAGE_VERSION " " VCS_VERSION), - GNUNET_GETOPT_option_help ("Exchange benchmark"), - GNUNET_GETOPT_option_loglevel (&loglev), - GNUNET_GETOPT_option_uint ('n', - "coins-number", - "CN", - "How many coins we should instantiate per reserve", - &howmany_coins), - GNUNET_GETOPT_option_uint ('p', - "parallelism", - "NPROCS", - "How many client processes we should run", - &howmany_clients), - GNUNET_GETOPT_option_uint ('r', - "reserves", - "NRESERVES", - "How many reserves per client we should create", - &howmany_reserves), - GNUNET_GETOPT_option_uint ('R', - "refresh-rate", - "RATE", - "Probability of refresh per coin (0-100)", - &refresh_rate), - GNUNET_GETOPT_option_string ('m', - "mode", - "MODE", - "run as exchange, clients or both", - &mode_str), - GNUNET_GETOPT_option_string ('l', - "logfile", - "LF", - "will log to file LF", - &logfile), - GNUNET_GETOPT_option_flag ('f', - "fakebank", - "start a fakebank instead of the Python bank", - &use_fakebank), - GNUNET_GETOPT_option_flag ('F', - "reserves-first", - "should all reserves be created first, before starting normal operations", - &reserves_first), - GNUNET_GETOPT_option_flag ('K', - "linger", - "linger around until key press", - &linger), + GNUNET_GETOPT_option_mandatory ( + GNUNET_GETOPT_option_cfgfile ( + &cfg_filename)), + GNUNET_GETOPT_option_version ( + PACKAGE_VERSION " " VCS_VERSION), + GNUNET_GETOPT_option_flag ( + 'f', + "fakebank", + "use fakebank for the banking system", + &use_fakebank), + GNUNET_GETOPT_option_flag ( + 'F', + "reserves-first", + "should all reserves be created first, before starting normal operations", + &reserves_first), + GNUNET_GETOPT_option_help ( + "Exchange benchmark"), + GNUNET_GETOPT_option_string ( + 'l', + "logfile", + "LF", + "will log to file LF", + &logfile), + GNUNET_GETOPT_option_loglevel ( + &loglev), + GNUNET_GETOPT_option_uint ( + 'n', + "coins-number", + "CN", + "How many coins we should instantiate per reserve", + &howmany_coins), + GNUNET_GETOPT_option_uint ( + 'p', + "parallelism", + "NPROCS", + "How many client processes we should run", + &howmany_clients), + GNUNET_GETOPT_option_uint ( + 'r', + "reserves", + "NRESERVES", + "How many reserves per client we should create", + &howmany_reserves), + GNUNET_GETOPT_option_uint ( + 'R', + "refresh-rate", + "RATE", + "Probability of refresh per coin (0-100)", + &refresh_rate), + GNUNET_GETOPT_option_string ( + 'u', + "exchange-account-section", + "SECTION", + "use exchange bank account configuration from the given SECTION", + &exchange_bank_section), GNUNET_GETOPT_OPTION_END }; + enum GNUNET_GenericReturnValue result; + struct GNUNET_TIME_Relative duration; unsetenv ("XDG_DATA_HOME"); unsetenv ("XDG_CONFIG_HOME"); @@ -974,29 +548,15 @@ main (int argc, GNUNET_free (cfg_filename); if (GNUNET_NO == result) return 0; - return BAD_CLI_ARG; + return EXIT_INVALIDARGUMENT; } + if (NULL == exchange_bank_section) + exchange_bank_section = "exchange-account-1"; + if (NULL == loglev) + loglev = "INFO"; GNUNET_log_setup ("taler-exchange-benchmark", - NULL == loglev ? "INFO" : loglev, + loglev, logfile); - if (NULL == mode_str) - mode = MODE_BOTH; - else if (0 == strcmp (mode_str, - "exchange")) - mode = MODE_EXCHANGE; - else if (0 == strcmp (mode_str, - "client")) - mode = MODE_CLIENT; - else if (0 == strcmp (mode_str, - "both")) - mode = MODE_BOTH; - else - { - TALER_LOG_ERROR ("Unknown mode given: '%s'\n", - mode_str); - GNUNET_free (cfg_filename); - return BAD_CONFIG_FILE; - } if (NULL == cfg_filename) cfg_filename = GNUNET_CONFIGURATION_default_filename (); if (NULL == cfg_filename) @@ -1012,7 +572,7 @@ main (int argc, { TALER_LOG_ERROR ("Could not parse configuration\n"); GNUNET_free (cfg_filename); - return BAD_CONFIG_FILE; + return EXIT_NOTCONFIGURED; } if (GNUNET_OK != TALER_config_get_currency (cfg, @@ -1020,127 +580,45 @@ main (int argc, { GNUNET_CONFIGURATION_destroy (cfg); GNUNET_free (cfg_filename); - return BAD_CONFIG_FILE; + return EXIT_NOTCONFIGURED; } if (howmany_clients > 10240) { TALER_LOG_ERROR ("-p option value given is too large\n"); - return BAD_CLI_ARG; + return EXIT_INVALIDARGUMENT; } if (0 == howmany_clients) { TALER_LOG_ERROR ("-p option value must not be zero\n"); GNUNET_free (cfg_filename); - return BAD_CLI_ARG; - } - if (GNUNET_OK != - GNUNET_CONFIGURATION_get_value_string (cfg, - "benchmark", - "USER_PAYTO_URI", - &user_payto_uri)) - { - GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR, - "benchmark", - "USER_PAYTO_URI"); - GNUNET_free (cfg_filename); - return BAD_CONFIG_FILE; + return EXIT_INVALIDARGUMENT; } if (GNUNET_OK != - TALER_EXCHANGEDB_load_accounts (cfg, - TALER_EXCHANGEDB_ALO_AUTHDATA - | TALER_EXCHANGEDB_ALO_CREDIT)) + TALER_TESTING_get_credentials ( + cfg_filename, + exchange_bank_section, + use_fakebank + ? TALER_TESTING_BS_FAKEBANK + : TALER_TESTING_BS_IBAN, + &cred)) { GNUNET_log (GNUNET_ERROR_TYPE_ERROR, - "Configuration fails to provide exchange bank details\n"); + "Required bank credentials not given in configuration\n"); GNUNET_free (cfg_filename); - return BAD_CONFIG_FILE; + return EXIT_NOTCONFIGURED; } - exchange_bank_account - = TALER_EXCHANGEDB_find_account_by_method ("x-taler-bank"); - if (NULL == exchange_bank_account) { - GNUNET_log (GNUNET_ERROR_TYPE_ERROR, - "No bank account for `x-taler-bank` given in configuration\n"); - GNUNET_free (cfg_filename); - return BAD_CONFIG_FILE; - } - if ( (MODE_EXCHANGE == mode) || (MODE_BOTH == mode) ) - { - /* If we use the fakebank, we MUST reset the database as the fakebank - will have forgotten everything... */ - if (GNUNET_OK != - TALER_TESTING_prepare_exchange (cfg_filename, - (GNUNET_YES == use_fakebank) - ? GNUNET_YES - : GNUNET_NO, - &ec)) - { - GNUNET_log (GNUNET_ERROR_TYPE_ERROR, - "Failed to prepare the exchange for launch\n"); - GNUNET_free (cfg_filename); - return BAD_CONFIG_FILE; - } - } - else - { - if (GNUNET_OK != - GNUNET_CONFIGURATION_get_value_string (cfg, - "exchange", - "BASE_URL", - &ec.exchange_url)) - { - GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR, - "exchange", - "base_url"); - GNUNET_CONFIGURATION_destroy (cfg); - GNUNET_free (cfg_filename); - return BAD_CONFIG_FILE; - } - - if (GNUNET_OK != - GNUNET_CONFIGURATION_get_value_string (cfg, - "benchmark-remote-exchange", - "host", - &remote_host)) - { - GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR, - "benchmark-remote-exchange", - "host"); - GNUNET_CONFIGURATION_destroy (cfg); - GNUNET_free (cfg_filename); - return BAD_CONFIG_FILE; - } + struct GNUNET_TIME_Absolute start_time; - if (GNUNET_OK != - GNUNET_CONFIGURATION_get_value_string (cfg, - "benchmark-remote-exchange", - "dir", - &remote_dir)) - { - GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR, - "benchmark-remote-exchange", - "dir"); - GNUNET_CONFIGURATION_destroy (cfg); - GNUNET_free (cfg_filename); - return BAD_CONFIG_FILE; - } + start_time = GNUNET_TIME_absolute_get (); + result = parallel_benchmark (&run, + NULL, + cfg_filename); + duration = GNUNET_TIME_absolute_get_duration (start_time); } - result = parallel_benchmark (&run, - NULL, - cfg_filename); - TALER_EXCHANGEDB_unload_accounts (); - GNUNET_CONFIGURATION_destroy (cfg); - GNUNET_free (cfg_filename); - - /* If we're the exchange worker, we're done now. No need to print results */ - if (MODE_EXCHANGE == mode) - { - return (GNUNET_OK == result) ? 0 : result; - } - duration = GNUNET_TIME_absolute_get_duration (start_time); if (GNUNET_OK == result) { struct rusage usage; @@ -1148,39 +626,45 @@ main (int argc, GNUNET_assert (0 == getrusage (RUSAGE_CHILDREN, &usage)); fprintf (stdout, - "Executed (Withdraw=%u, Deposit=%u, Refresh~=%5.2f) * Reserve=%u * Parallel=%u, operations in %s\n", + "Executed (Withdraw=%u, Deposit=%u, Refresh~=%5.2f)" + " * Reserve=%u * Parallel=%u, operations in %s\n", howmany_coins, howmany_coins, (float) howmany_coins * (refresh_rate / 100.0), howmany_reserves, howmany_clients, - GNUNET_STRINGS_relative_time_to_string - (duration, - GNUNET_NO)); + GNUNET_STRINGS_relative_time_to_string ( + duration, + false)); fprintf (stdout, "(approximately %s/coin)\n", - GNUNET_STRINGS_relative_time_to_string - (GNUNET_TIME_relative_divide (duration, - (unsigned long long) howmany_coins - * howmany_reserves - * howmany_clients), - GNUNET_YES)); + GNUNET_STRINGS_relative_time_to_string ( + GNUNET_TIME_relative_divide ( + duration, + (unsigned long long) howmany_coins + * howmany_reserves + * howmany_clients), + true)); fprintf (stdout, "RAW: %04u %04u %04u %16llu\n", howmany_coins, howmany_reserves, howmany_clients, (unsigned long long) duration.rel_value_us); - fprintf (stdout, "cpu time: sys %llu user %llu\n", \ + fprintf (stdout, + "cpu time: sys %llu user %llu\n", (unsigned long long) (usage.ru_stime.tv_sec * 1000 * 1000 + usage.ru_stime.tv_usec), (unsigned long long) (usage.ru_utime.tv_sec * 1000 * 1000 + usage.ru_utime.tv_usec)); } + for (unsigned int i = 0; i<label_off; i++) GNUNET_free (labels[i]); GNUNET_array_grow (labels, label_len, 0); + GNUNET_CONFIGURATION_destroy (cfg); + GNUNET_free (cfg_filename); return (GNUNET_OK == result) ? 0 : result; } |