taler/exchange
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

make performance testing more modular

Browse Source
This commit is contained in:
Fournier Nicolas 2015-07-01 10:14:51 +02:00
parent d0a6b47099
commit 17ae8871be
4 changed files with 107 additions and 135 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/mintdb/perf_taler_mintdb_init.c
View File

@ -230,6 +230,7 @@ PERF_TALER_MINTDB_deposit_init (const struct TALER_MINTDB_DenominationKeyIssueIn
GNUNET_CRYPTO_rsa_sign (dki->denom_priv.rsa_private_key, GNUNET_CRYPTO_rsa_sign (dki->denom_priv.rsa_private_key,
&coin.coin_pub.eddsa_pub, &coin.coin_pub.eddsa_pub,
sizeof (struct GNUNET_CRYPTO_EddsaPublicKey)))); sizeof (struct GNUNET_CRYPTO_EddsaPublicKey))));
GNUNET_free (eddsa_prvt);
} }
{ //csig { //csig
struct u32_presign struct u32_presign

178
src/mintdb/perf_taler_mintdb_interpreter.c
View File

@ -52,36 +52,36 @@ struct PERF_TALER_MINTDB_interpreter_state
/** /**
* Free the memory of @a data, with data of type @a type * Free the memory of @a data
*/ */
static void static void
data_free (union PERF_TALER_MINTDB_Data *data, enum PERF_TALER_MINTDB_Type type) data_free (struct PERF_TALER_MINTDB_Data *data)
{ {
switch (type) switch (data->type)
{ {
case PERF_TALER_MINTDB_DEPOSIT: case PERF_TALER_MINTDB_DEPOSIT:
PERF_TALER_MINTDB_deposit_free (data->deposit); PERF_TALER_MINTDB_deposit_free (data->data.deposit);
data->deposit = NULL; data->data.deposit = NULL;
return; return;
case PERF_TALER_MINTDB_BLINDCOIN: case PERF_TALER_MINTDB_BLINDCOIN:
PERF_TALER_MINTDB_collectable_blindcoin_free (data->blindcoin); PERF_TALER_MINTDB_collectable_blindcoin_free (data->data.blindcoin);
data->blindcoin = NULL; data->data.blindcoin = NULL;
return; return;
case PERF_TALER_MINTDB_RESERVE: case PERF_TALER_MINTDB_RESERVE:
PERF_TALER_MINTDB_reserve_free (data->reserve); PERF_TALER_MINTDB_reserve_free (data->data.reserve);
data->reserve = NULL; data->data.reserve = NULL;
return; return;
case PERF_TALER_MINTDB_DENOMINATION_INFO: case PERF_TALER_MINTDB_DENOMINATION_INFO:
PERF_TALER_MINTDB_denomination_free (data->dki); PERF_TALER_MINTDB_denomination_free (data->data.dki);
data->dki = NULL; data->data.dki = NULL;
return; return;
case PERF_TALER_MINTDB_COIN_INFO: case PERF_TALER_MINTDB_COIN_INFO:
PERF_TALER_MINTDB_coin_public_info_free (data->cpi); PERF_TALER_MINTDB_coin_public_info_free (data->data.cpi);
data->cpi = NULL; data->data.cpi = NULL;
return; return;
default: default:
@ -90,6 +90,44 @@ data_free (union PERF_TALER_MINTDB_Data *data, enum PERF_TALER_MINTDB_Type type)
} }
/**
*
*/
static void
data_copy (const struct PERF_TALER_MINTDB_Data *data, struct PERF_TALER_MINTDB_Data *copy)
{
copy->type = data->type;
switch (data->type)
{
case PERF_TALER_MINTDB_TIME:
copy->data.time = data->data.time;
return;
case PERF_TALER_MINTDB_DEPOSIT:
copy->data.deposit =
PERF_TALER_MINTDB_deposit_copy (data->data.deposit);
return;
case PERF_TALER_MINTDB_BLINDCOIN:
copy->data.blindcoin =
PERF_TALER_MINTDB_collectable_blindcoin_copy (data->data.blindcoin);
return;
case PERF_TALER_MINTDB_RESERVE:
copy->data.reserve =
PERF_TALER_MINTDB_reserve_copy (data->data.reserve);
return;
case PERF_TALER_MINTDB_DENOMINATION_INFO:
copy->data.dki =
PERF_TALER_MINTDB_denomination_copy (data->data.dki);
return;
default:
return;
}
}
/** /**
* Finds the first command in cmd with the name search * Finds the first command in cmd with the name search
* *
@ -130,10 +168,7 @@ cmd_init (struct PERF_TALER_MINTDB_Cmd cmd[])
/* Allocation of memory for saving data */ /* Allocation of memory for saving data */
cmd[i].details.save_array.data_saved = cmd[i].details.save_array.data_saved =
GNUNET_new_array (cmd[i].details.save_array.nb_saved, GNUNET_new_array (cmd[i].details.save_array.nb_saved,
union PERF_TALER_MINTDB_Data); struct PERF_TALER_MINTDB_Data);
/* Getting the type saved from the given label */
cmd[i].details.save_array.type_saved =
cmd[save_label].exposed_type;
} }
break; break;
@ -152,8 +187,6 @@ cmd_init (struct PERF_TALER_MINTDB_Cmd cmd[])
GNUNET_CRYPTO_random_permute ( GNUNET_CRYPTO_random_permute (
GNUNET_CRYPTO_QUALITY_WEAK, GNUNET_CRYPTO_QUALITY_WEAK,
cmd[save_index].details.save_array.nb_saved))); cmd[save_index].details.save_array.nb_saved)));
/* Initializing the type based on the type of the saved array */
cmd[i].exposed_type = cmd[save_index].details.save_array.type_saved;
} }
break; break;
@ -182,8 +215,7 @@ cmd_clean (struct PERF_TALER_MINTDB_Cmd cmd[])
unsigned int j; unsigned int j;
for (j = 0; j < cmd[i].details.save_array.nb_saved; j++) for (j = 0; j < cmd[i].details.save_array.nb_saved; j++)
{ {
data_free (&cmd[i].details.save_array.data_saved[j], data_free (&cmd[i].details.save_array.data_saved[j]);
cmd[i].details.save_array.type_saved);
} }
GNUNET_free (cmd[i].details.save_array.data_saved); GNUNET_free (cmd[i].details.save_array.data_saved);
cmd[i].details.save_array.data_saved = NULL; cmd[i].details.save_array.data_saved = NULL;
@ -196,7 +228,7 @@ cmd_clean (struct PERF_TALER_MINTDB_Cmd cmd[])
break; break;
default: default:
data_free (&cmd[i].exposed, cmd[i].exposed_type); data_free (&cmd[i].exposed);
break; break;
} }
@ -212,7 +244,6 @@ static void
interpret_end_loop (struct PERF_TALER_MINTDB_interpreter_state *state) interpret_end_loop (struct PERF_TALER_MINTDB_interpreter_state *state)
{ {
unsigned int i; unsigned int i;
union PERF_TALER_MINTDB_Data zero = {0};
int jump; int jump;
GNUNET_assert (GNUNET_SYSERR != GNUNET_assert (GNUNET_SYSERR !=
(jump = cmd_find (state->cmd, (jump = cmd_find (state->cmd,
@ -221,8 +252,7 @@ interpret_end_loop (struct PERF_TALER_MINTDB_interpreter_state *state)
// Cleaning up the memory in the loop // Cleaning up the memory in the loop
for (i = jump; i < state->i; i++) for (i = jump; i < state->i; i++)
{ {
data_free (&state->cmd[i].exposed, state->cmd[i].exposed_type); data_free (&state->cmd[i].exposed);
state->cmd[i].exposed = zero;
} }
state->cmd[jump].details.loop.curr_iteration++; state->cmd[jump].details.loop.curr_iteration++;
@ -282,41 +312,13 @@ interpret_save_array (struct PERF_TALER_MINTDB_interpreter_state *state)
|| (0 == GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_WEAK, || (0 == GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_WEAK,
selection_chance)))) selection_chance))))
{ {
union PERF_TALER_MINTDB_Data *save_location; struct PERF_TALER_MINTDB_Data *save_location;
union PERF_TALER_MINTDB_Data *item_saved; struct PERF_TALER_MINTDB_Data *item_saved;
save_location = &state->cmd[state->i].details.save_array save_location = &state->cmd[state->i].details.save_array
.data_saved[state->cmd[state->i].details.save_array.index]; .data_saved[state->cmd[state->i].details.save_array.index];
item_saved = &state->cmd[save_index].exposed; item_saved = &state->cmd[save_index].exposed;
switch (state->cmd[state->i].details.save_array.type_saved) data_copy (item_saved, save_location);
{
case PERF_TALER_MINTDB_TIME:
save_location->time = item_saved->time;
break;
case PERF_TALER_MINTDB_DEPOSIT:
save_location->deposit = PERF_TALER_MINTDB_deposit_copy (item_saved->deposit);
break;
case PERF_TALER_MINTDB_BLINDCOIN:
save_location->blindcoin = PERF_TALER_MINTDB_collectable_blindcoin_copy (item_saved->blindcoin);
break;
case PERF_TALER_MINTDB_RESERVE:
save_location->reserve = PERF_TALER_MINTDB_reserve_copy (item_saved->reserve);
break;
case PERF_TALER_MINTDB_DENOMINATION_INFO:
save_location->dki = PERF_TALER_MINTDB_denomination_copy (item_saved->dki);
break;
case PERF_TALER_MINTDB_COIN_INFO:
save_location->cpi = item_saved->cpi;
break;
default:
break;
}
state->cmd[state->i].details.save_array.index++; state->cmd[state->i].details.save_array.index++;
} }
} }
@ -331,7 +333,7 @@ interpret_load_array (struct PERF_TALER_MINTDB_interpreter_state *state)
{ {
unsigned int loop_iter; unsigned int loop_iter;
int loop_index, save_index; int loop_index, save_index;
union PERF_TALER_MINTDB_Data *loaded_data; struct PERF_TALER_MINTDB_Data *loaded_data;
GNUNET_assert (GNUNET_SYSERR != GNUNET_assert (GNUNET_SYSERR !=
(loop_index = cmd_find (state->cmd, (loop_index = cmd_find (state->cmd,
@ -356,39 +358,7 @@ interpret_load_array (struct PERF_TALER_MINTDB_interpreter_state *state)
* array. * array.
*/ */
loaded_data = &state->cmd[save_index].details.save_array.data_saved[loop_iter]; loaded_data = &state->cmd[save_index].details.save_array.data_saved[loop_iter];
switch (state->cmd[state->i].exposed_type) data_copy (loaded_data, &state->cmd[state->i].exposed);
{
case PERF_TALER_MINTDB_TIME:
state->cmd[state->i].exposed.time = loaded_data->time;
break;
case PERF_TALER_MINTDB_DEPOSIT:
state->cmd[state->i].exposed.deposit =
PERF_TALER_MINTDB_deposit_copy (loaded_data->deposit);
break;
case PERF_TALER_MINTDB_BLINDCOIN:
state->cmd[state->i].exposed.blindcoin =
PERF_TALER_MINTDB_collectable_blindcoin_copy (loaded_data->blindcoin);
break;
case PERF_TALER_MINTDB_RESERVE:
state->cmd[state->i].exposed.reserve =
PERF_TALER_MINTDB_reserve_copy (loaded_data->reserve);
break;
case PERF_TALER_MINTDB_DENOMINATION_INFO:
state->cmd[state->i].exposed.dki =
PERF_TALER_MINTDB_denomination_copy (loaded_data->dki);
break;
case PERF_TALER_MINTDB_COIN_INFO:
state->cmd[state->i].exposed.cpi = loaded_data->cpi;
break;
default:
break;
}
} }
/** /**
@ -418,7 +388,7 @@ interpret (struct PERF_TALER_MINTDB_interpreter_state *state)
break; break;
case PERF_TALER_MINTDB_CMD_GET_TIME: case PERF_TALER_MINTDB_CMD_GET_TIME:
clock_gettime (CLOCK_MONOTONIC, &state->cmd[state->i].exposed.time); clock_gettime (CLOCK_MONOTONIC, &state->cmd[state->i].exposed.data.time);
break; break;
case PERF_TALER_MINTDB_CMD_GAUGER: case PERF_TALER_MINTDB_CMD_GAUGER:
@ -435,8 +405,8 @@ interpret (struct PERF_TALER_MINTDB_interpreter_state *state)
(stop_index = cmd_find (state->cmd, (stop_index = cmd_find (state->cmd,
state->cmd[state->i] state->cmd[state->i]
.details.gauger.label_stop))); .details.gauger.label_stop)));
start = state->cmd[start_index].exposed.time; start = state->cmd[start_index].exposed.data.time;
stop = state->cmd[stop_index].exposed.time; stop = state->cmd[stop_index].exposed.data.time;
elapsed_ms = (start.tv_sec - stop.tv_sec) * 1000 + elapsed_ms = (start.tv_sec - stop.tv_sec) * 1000 +
(start.tv_nsec - stop.tv_nsec) / 1000000; (start.tv_nsec - stop.tv_nsec) / 1000000;
@ -480,13 +450,13 @@ interpret (struct PERF_TALER_MINTDB_interpreter_state *state)
.details.insert_deposit.label_dki))); .details.insert_deposit.label_dki)));
GNUNET_assert (NULL != GNUNET_assert (NULL !=
(deposit = PERF_TALER_MINTDB_deposit_init ( (deposit = PERF_TALER_MINTDB_deposit_init (
state->cmd[dki_index].exposed.dki))); state->cmd[dki_index].exposed.data.dki)));
GNUNET_assert ( GNUNET_assert (
state->plugin->insert_deposit (state->plugin->cls, state->plugin->insert_deposit (state->plugin->cls,
state->session, state->session,
deposit)); deposit));
state->cmd[state->i].exposed.deposit = deposit; state->cmd[state->i].exposed.data.deposit = deposit;
} }
break; break;
@ -500,7 +470,7 @@ interpret (struct PERF_TALER_MINTDB_interpreter_state *state)
state->cmd[state->i] state->cmd[state->i]
.details.get_deposit.label_source))); .details.get_deposit.label_source)));
GNUNET_assert (NULL != GNUNET_assert (NULL !=
(deposit = state->cmd[source_index].exposed.deposit)); (deposit = state->cmd[source_index].exposed.data.deposit));
state->plugin->have_deposit (state->plugin->cls, state->plugin->have_deposit (state->plugin->cls,
state->session, state->session,
deposit); deposit);
@ -525,7 +495,7 @@ interpret (struct PERF_TALER_MINTDB_interpreter_state *state)
details details
); );
json_decref (details); json_decref (details);
state->cmd[state->i].exposed.reserve = reserve; state->cmd[state->i].exposed.data.reserve = reserve;
} }
break; break;
@ -539,7 +509,7 @@ interpret (struct PERF_TALER_MINTDB_interpreter_state *state)
state->cmd[state->i] state->cmd[state->i]
.details.get_reserve.label_source))); .details.get_reserve.label_source)));
GNUNET_assert (NULL != GNUNET_assert (NULL !=
(reserve = state->cmd[source_index].exposed.reserve)); (reserve = state->cmd[source_index].exposed.data.reserve));
GNUNET_assert (GNUNET_OK == GNUNET_assert (GNUNET_OK ==
(state->plugin->reserve_get (state->plugin->cls, (state->plugin->reserve_get (state->plugin->cls,
state->session, state->session,
@ -556,7 +526,7 @@ interpret (struct PERF_TALER_MINTDB_interpreter_state *state)
state->session, state->session,
&dki->denom_pub, &dki->denom_pub,
&dki->issue); &dki->issue);
state->cmd[state->i].exposed.dki = dki; state->cmd[state->i].exposed.data.dki = dki;
} }
break; break;
@ -570,7 +540,7 @@ interpret (struct PERF_TALER_MINTDB_interpreter_state *state)
state->cmd[state->i] state->cmd[state->i]
.details.get_denomination.label_source))); .details.get_denomination.label_source)));
GNUNET_assert (NULL != GNUNET_assert (NULL !=
(dki = state->cmd[source_index].exposed.dki)); (dki = state->cmd[source_index].exposed.data.dki));
state->plugin->get_denomination_info (state->plugin->cls, state->plugin->get_denomination_info (state->plugin->cls,
state->session, state->session,
&dki->denom_pub, &dki->denom_pub,
@ -594,13 +564,13 @@ interpret (struct PERF_TALER_MINTDB_interpreter_state *state)
GNUNET_assert (NULL != GNUNET_assert (NULL !=
(blindcoin = (blindcoin =
PERF_TALER_MINTDB_collectable_blindcoin_init ( PERF_TALER_MINTDB_collectable_blindcoin_init (
state->cmd[dki_index].exposed.dki, state->cmd[dki_index].exposed.data.dki,
state->cmd[reserve_index].exposed.reserve))); state->cmd[reserve_index].exposed.data.reserve)));
state->plugin->insert_withdraw_info (state->plugin->cls, state->plugin->insert_withdraw_info (state->plugin->cls,
state->session, state->session,
blindcoin); blindcoin);
state->cmd[state->i].exposed.blindcoin = blindcoin; state->cmd[state->i].exposed.data.blindcoin = blindcoin;
} }
break; break;
@ -614,7 +584,7 @@ interpret (struct PERF_TALER_MINTDB_interpreter_state *state)
state->cmd[state->i] state->cmd[state->i]
.details.get_denomination.label_source))); .details.get_denomination.label_source)));
GNUNET_assert (NULL != GNUNET_assert (NULL !=
(blindcoin = state->cmd[source_index].exposed.blindcoin)); (blindcoin = state->cmd[source_index].exposed.data.blindcoin));
state->plugin->get_withdraw_info (state->plugin->cls, state->plugin->get_withdraw_info (state->plugin->cls,
state->session, state->session,
&blindcoin->h_coin_envelope, &blindcoin->h_coin_envelope,

61
src/mintdb/perf_taler_mintdb_interpreter.h
View File

@ -33,7 +33,7 @@
{ \ { \
.command = PERF_TALER_MINTDB_CMD_END, \ .command = PERF_TALER_MINTDB_CMD_END, \
.label = _label, \ .label = _label, \
.exposed_type = PERF_TALER_MINTDB_NONE \ .exposed.type = PERF_TALER_MINTDB_NONE \
} }
@ -44,7 +44,7 @@
{ \ { \
.command = PERF_TALER_MINTDB_CMD_DEBUG, \ .command = PERF_TALER_MINTDB_CMD_DEBUG, \
.label = _label, \ .label = _label, \
.exposed_type = PERF_TALER_MINTDB_NONE \ .exposed.type = PERF_TALER_MINTDB_NONE \
} }
/** /**
@ -56,7 +56,7 @@
{ \ { \
.command = PERF_TALER_MINTDB_CMD_LOOP , \ .command = PERF_TALER_MINTDB_CMD_LOOP , \
.label = _label , \ .label = _label , \
.exposed_type = PERF_TALER_MINTDB_NONE , \ .exposed.type = PERF_TALER_MINTDB_NONE , \
.details.loop = { \ .details.loop = { \
.max_iterations = _iter , \ .max_iterations = _iter , \
.curr_iteration = 0 } \ .curr_iteration = 0 } \
@ -69,7 +69,7 @@
{\ {\
.command = PERF_TALER_MINTDB_CMD_END_LOOP , \ .command = PERF_TALER_MINTDB_CMD_END_LOOP , \
.label = _label , \ .label = _label , \
.exposed_type = PERF_TALER_MINTDB_NONE , \ .exposed.type = PERF_TALER_MINTDB_NONE , \
.details.end_loop.label_loop = _label_loop \ .details.end_loop.label_loop = _label_loop \
} }
@ -80,7 +80,7 @@
{ \ { \
.command = PERF_TALER_MINTDB_CMD_GET_TIME, \ .command = PERF_TALER_MINTDB_CMD_GET_TIME, \
.label = _label, \ .label = _label, \
.exposed_type = PERF_TALER_MINTDB_NONE, \ .exposed.type = PERF_TALER_MINTDB_NONE, \
} }
/** /**
@ -95,7 +95,7 @@
{ \ { \
.command = PERF_TALER_MINTDB_CMD_GAUGER, \ .command = PERF_TALER_MINTDB_CMD_GAUGER, \
.label = _label, \ .label = _label, \
.exposed_type = PERF_TALER_MINTDB_NONE, \ .exposed.type = PERF_TALER_MINTDB_NONE, \
.details.gauger = { \ .details.gauger = { \
.label_start = _label_start, \ .label_start = _label_start, \
.label_stop = _label_stop, \ .label_stop = _label_stop, \
@ -111,7 +111,7 @@
{ \ { \
.command = PERF_TALER_MINTDB_CMD_START_TRANSACTION, \ .command = PERF_TALER_MINTDB_CMD_START_TRANSACTION, \
.label = _label, \ .label = _label, \
.exposed_type = PERF_TALER_MINTDB_NONE, \ .exposed.type = PERF_TALER_MINTDB_NONE, \
} }
/** /**
@ -121,7 +121,7 @@
{ \ { \
.command = PERF_TALER_MINTDB_CMD_COMMIT_TRANSACTION, \ .command = PERF_TALER_MINTDB_CMD_COMMIT_TRANSACTION, \
.label = _label, \ .label = _label, \
.exposed_type = PERF_TALER_MINTDB_NONE, \ .exposed.type = PERF_TALER_MINTDB_NONE, \
} }
/** /**
@ -132,7 +132,7 @@
{ \ { \
.command = PERF_TALER_MINTDB_CMD_SAVE_ARRAY, \ .command = PERF_TALER_MINTDB_CMD_SAVE_ARRAY, \
.label = _label, \ .label = _label, \
.exposed_type = PERF_TALER_MINTDB_NONE, \ .exposed.type = PERF_TALER_MINTDB_NONE, \
.details.save_array = { \ .details.save_array = { \
.label_loop = _label_loop, \ .label_loop = _label_loop, \
.label_save = _label_save, \ .label_save = _label_save, \
@ -148,7 +148,7 @@
{ \ { \
.command = PERF_TALER_MINTDB_CMD_LOAD_ARRAY, \ .command = PERF_TALER_MINTDB_CMD_LOAD_ARRAY, \
.label = _label, \ .label = _label, \
.exposed_type = PERF_TALER_MINTDB_NONE, \ .exposed.type = PERF_TALER_MINTDB_NONE, \
.details.load_array = { \ .details.load_array = { \
.label_loop = _label_loop, \ .label_loop = _label_loop, \
.label_save = _label_save \ .label_save = _label_save \
@ -162,7 +162,7 @@
{ \ { \
.command = PERF_TALER_MINTDB_CMD_INSERT_DENOMINATION, \ .command = PERF_TALER_MINTDB_CMD_INSERT_DENOMINATION, \
.label = _label, \ .label = _label, \
.exposed_type = PERF_TALER_MINTDB_DENOMINATION_INFO, \ .exposed.type = PERF_TALER_MINTDB_DENOMINATION_INFO, \
} }
/** /**
@ -172,7 +172,7 @@
{ \ { \
.command = PERF_TALER_MINTDB_CMD_GET_DENOMINATION, \ .command = PERF_TALER_MINTDB_CMD_GET_DENOMINATION, \
.label = _label, \ .label = _label, \
.exposed_type = PERF_TALER_MINTDB_NONE, \ .exposed.type = PERF_TALER_MINTDB_NONE, \
.details.get_denomination.label_source = _label_source, \ .details.get_denomination.label_source = _label_source, \
} }
@ -183,7 +183,7 @@
{ \ { \
.command = PERF_TALER_MINTDB_CMD_INSERT_RESERVE, \ .command = PERF_TALER_MINTDB_CMD_INSERT_RESERVE, \
.label = _label, \ .label = _label, \
.exposed_type = PERF_TALER_MINTDB_RESERVE \ .exposed.type = PERF_TALER_MINTDB_RESERVE \
} }
@ -195,7 +195,7 @@
{ \ { \
.command = PERF_TALER_MINTDB_CMD_GET_RESERVE, \ .command = PERF_TALER_MINTDB_CMD_GET_RESERVE, \
.label = _label, \ .label = _label, \
.exposed_type = PERF_TALER_MINTDB_NONE, \ .exposed.type = PERF_TALER_MINTDB_NONE, \
.details.get_reserve.label_source = _label_source \ .details.get_reserve.label_source = _label_source \
} }
@ -208,7 +208,7 @@
{ \ { \
.command = PERF_TALER_MINTDB_CMD_INSERT_DEPOSIT,\ .command = PERF_TALER_MINTDB_CMD_INSERT_DEPOSIT,\
.label = _label, \ .label = _label, \
.exposed_type = PERF_TALER_MINTDB_DEPOSIT, \ .exposed.type = PERF_TALER_MINTDB_DEPOSIT, \
.details.insert_deposit.label_dki = _label_dki, \ .details.insert_deposit.label_dki = _label_dki, \
} }
@ -221,7 +221,7 @@
{ \ { \
.command = PERF_TALER_MINTDB_CMD_GET_DEPOSIT, \ .command = PERF_TALER_MINTDB_CMD_GET_DEPOSIT, \
.label = _label, \ .label = _label, \
.exposed_type = PERF_TALER_MINTDB_NONE, \ .exposed.type = PERF_TALER_MINTDB_NONE, \
.details.get_deposit.label_source = _label_deposit \ .details.get_deposit.label_source = _label_deposit \
} }
@ -235,7 +235,7 @@
{ \ { \
.command = PERF_TALER_MINTDB_CMD_INSERT_WITHDRAW, \ .command = PERF_TALER_MINTDB_CMD_INSERT_WITHDRAW, \
.label = _label, \ .label = _label, \
.exposed_type = PERF_TALER_MINTDB_BLINDCOIN, \ .exposed.type = PERF_TALER_MINTDB_BLINDCOIN, \
.details.insert_withdraw = {\ .details.insert_withdraw = {\
.label_dki = _label_dki, \ .label_dki = _label_dki, \
.label_reserve = _label_reserve, \ .label_reserve = _label_reserve, \
@ -250,7 +250,7 @@
{ \ { \
.command = PERF_TALER_MINTDB_CMD_GET_WITHDRAW, \ .command = PERF_TALER_MINTDB_CMD_GET_WITHDRAW, \
.label = _label, \ .label = _label, \
.exposed_type = PERF_TALER_MINTDB_NONE, \ .exposed.type = PERF_TALER_MINTDB_NONE, \
.details.get_withdraw.label_source = _label_source, \ .details.get_withdraw.label_source = _label_source, \
} }
@ -274,7 +274,7 @@ enum PERF_TALER_MINTDB_Type
/** /**
* Storage for a variety of data type * Storage for a variety of data type
*/ */
union PERF_TALER_MINTDB_Data union PERF_TALER_MINTDB_Memory
{ {
struct timespec time; struct timespec time;
struct TALER_MINTDB_Deposit *deposit; struct TALER_MINTDB_Deposit *deposit;
@ -285,6 +285,16 @@ union PERF_TALER_MINTDB_Data
}; };
/**
*
*/
struct PERF_TALER_MINTDB_Data
{
union PERF_TALER_MINTDB_Memory data;
enum PERF_TALER_MINTDB_Type type;
};
/** /**
* Name of the command * Name of the command
*/ */
@ -427,14 +437,10 @@ struct PERF_TALER_MINTDB_CMD_save_array_details
* Label of the command exposing the item * Label of the command exposing the item
*/ */
const char *label_save; const char *label_save;
/**
* Type of data saved
*/
enum PERF_TALER_MINTDB_Type type_saved;
/** /**
* Array of data saved * Array of data saved
*/ */
union PERF_TALER_MINTDB_Data *data_saved; struct PERF_TALER_MINTDB_Data *data_saved;
}; };
@ -572,15 +578,10 @@ struct PERF_TALER_MINTDB_Cmd
*/ */
union PERF_TALER_MINTDB_CMD_Details details; union PERF_TALER_MINTDB_CMD_Details details;
/**
* Type of the data exposed
*/
enum PERF_TALER_MINTDB_Type exposed_type;
/** /**
* Data easily accessible * Data easily accessible
*/ */
union PERF_TALER_MINTDB_Data exposed; struct PERF_TALER_MINTDB_Data exposed;
}; };

2
src/mintdb/perf_taler_mintdb_values.h
View File

@ -29,7 +29,7 @@
#define PERF_TALER_MINTDB_NB_RESERVE_SAVE 10 #define PERF_TALER_MINTDB_NB_RESERVE_SAVE 10
#define PERF_TALER_MINTDB_NB_DEPOSIT_INIT 1000 #define PERF_TALER_MINTDB_NB_DEPOSIT_INIT 100
#define PERF_TALER_MINTDB_NB_DEPOSIT_SAVE 10 #define PERF_TALER_MINTDB_NB_DEPOSIT_SAVE 10