Merge branch 'master' of ssh://taler.net:/var/git/mint

This commit is contained in:
Christian Grothoff 2015-07-20 14:04:39 +02:00
commit da8fe97b66
2 changed files with 7 additions and 8 deletions

View File

@ -25,14 +25,14 @@
#define NB_DENOMINATION_INIT 15 #define NB_DENOMINATION_INIT 15
#define NB_DENOMINATION_SAVE 15 #define NB_DENOMINATION_SAVE 15
#define NB_RESERVE_INIT 100000 #define NB_RESERVE_INIT 10000
#define NB_RESERVE_SAVE 10000 #define NB_RESERVE_SAVE 1000
#define NB_DEPOSIT_INIT 100000 #define NB_DEPOSIT_INIT 10000
#define NB_DEPOSIT_SAVE 10000 #define NB_DEPOSIT_SAVE 1000
#define NB_WITHDRAW_INIT 100000 #define NB_WITHDRAW_INIT 10000
#define NB_WITHDRAW_SAVE 10000 #define NB_WITHDRAW_SAVE 1000
/** /**
* Runs the performances tests for the mint database * Runs the performances tests for the mint database
@ -193,7 +193,7 @@ main (int argc, char ** argv)
NB_RESERVE_SAVE), NB_RESERVE_SAVE),
PERF_TALER_MINTDB_INIT_CMD_LOAD_ARRAY ("09 - reserve", PERF_TALER_MINTDB_INIT_CMD_LOAD_ARRAY ("09 - reserve",
"09 - withdraw insert measure", "09 - withdraw insert measure",
"03 - save coin"), "02 - save reserve"),
PERF_TALER_MINTDB_INIT_CMD_LOAD_ARRAY ("09 - denomination", PERF_TALER_MINTDB_INIT_CMD_LOAD_ARRAY ("09 - denomination",
"09 - withdraw insert measure", "09 - withdraw insert measure",
"01 - save denomination"), "01 - save denomination"),

View File

@ -470,7 +470,6 @@ interpret (struct PERF_TALER_MINTDB_interpreter_state *state)
elapsed = GNUNET_TIME_absolute_get_difference (start, elapsed = GNUNET_TIME_absolute_get_difference (start,
stop); stop);
ips = (1.0 * state->cmd[state->i].details.gauger.divide) / (elapsed.rel_value_us/1000000.0); ips = (1.0 * state->cmd[state->i].details.gauger.divide) / (elapsed.rel_value_us/1000000.0);
printf ("gauger data:%lu - %f\n", elapsed.rel_value_us, ips);
GAUGER ("MINTDB", GAUGER ("MINTDB",
state->cmd[state->i].details.gauger.description, state->cmd[state->i].details.gauger.description,
ips, ips,