aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/mintdb/perf_taler_mintdb_init.c78
-rw-r--r--src/mintdb/perf_taler_mintdb_interpreter.c21
-rw-r--r--src/mintdb/test_perf_taler_mintdb.c38
3 files changed, 83 insertions, 54 deletions
diff --git a/src/mintdb/perf_taler_mintdb_init.c b/src/mintdb/perf_taler_mintdb_init.c
index c78e3a7b..725b3be0 100644
--- a/src/mintdb/perf_taler_mintdb_init.c
+++ b/src/mintdb/perf_taler_mintdb_init.c
@@ -132,6 +132,7 @@ PERF_TALER_MINTDB_denomination_free (struct TALER_MINTDB_DenominationKeyIssueInf
GNUNET_CRYPTO_rsa_private_key_free (dki->denom_priv.rsa_private_key);
GNUNET_CRYPTO_rsa_public_key_free (dki->denom_pub.rsa_public_key);
+ GNUNET_free (dki);
return GNUNET_OK;
}
@@ -149,9 +150,10 @@ PERF_TALER_MINTDB_reserve_init ()
(reserve = GNUNET_new (struct PERF_TALER_MINTDB_Reserve)));
{/* private */
struct GNUNET_CRYPTO_EddsaPrivateKey *private;
- GNUNET_assert (NULL !=
- (private = GNUNET_CRYPTO_eddsa_key_create ()));
+ private = GNUNET_CRYPTO_eddsa_key_create ();
+ GNUNET_assert (NULL != private);
reserve->private = *private;
+ GNUNET_free (private);
}
GNUNET_CRYPTO_eddsa_key_get_public (&reserve->private,
@@ -188,6 +190,7 @@ PERF_TALER_MINTDB_reserve_free (struct PERF_TALER_MINTDB_Reserve *reserve)
{
if (NULL == reserve)
return GNUNET_OK;
+ GNUNET_free (reserve);
return GNUNET_OK;
}
@@ -296,7 +299,6 @@ PERF_TALER_MINTDB_deposit_copy (const struct TALER_MINTDB_Deposit *deposit)
GNUNET_CRYPTO_rsa_public_key_dup (deposit->coin.denom_pub.rsa_public_key);
copy->coin.denom_sig.rsa_signature =
GNUNET_CRYPTO_rsa_signature_dup (deposit->coin.denom_sig.rsa_signature);
-
return copy;
}
@@ -313,7 +315,7 @@ PERF_TALER_MINTDB_deposit_free (struct TALER_MINTDB_Deposit *deposit)
GNUNET_CRYPTO_rsa_public_key_free (deposit->coin.denom_pub.rsa_public_key);
GNUNET_CRYPTO_rsa_signature_free (deposit->coin.denom_sig.rsa_signature);
json_decref (deposit->wire);
-
+ GNUNET_free (deposit);
return GNUNET_OK;
}
@@ -344,22 +346,22 @@ PERF_TALER_MINTDB_coin_init (
/* public_info */
GNUNET_CRYPTO_eddsa_key_get_public (&coin->priv,
&coin->public_info.coin_pub.eddsa_pub);
- GNUNET_assert (NULL !=
- (coin->public_info.denom_pub.rsa_public_key =
- GNUNET_CRYPTO_rsa_public_key_dup (dki->denom_pub.rsa_public_key)));
- GNUNET_assert (NULL !=
- (coin->public_info.denom_sig.rsa_signature =
- GNUNET_CRYPTO_rsa_sign (dki->denom_priv.rsa_private_key,
- &coin->public_info.coin_pub,
- sizeof (struct TALER_CoinSpendPublicKeyP))));
+ coin->public_info.denom_pub.rsa_public_key =
+ GNUNET_CRYPTO_rsa_public_key_dup (dki->denom_pub.rsa_public_key);
+ coin->public_info.denom_sig.rsa_signature =
+ GNUNET_CRYPTO_rsa_sign (dki->denom_priv.rsa_private_key,
+ &coin->public_info.coin_pub,
+ sizeof (struct TALER_CoinSpendPublicKeyP));
+ GNUNET_assert (NULL != coin->public_info.denom_pub.rsa_public_key);
+ GNUNET_assert (NULL != coin->public_info.denom_sig.rsa_signature);
/* blind */
- GNUNET_assert (NULL !=
- (coin->blind.sig.rsa_signature =
- GNUNET_CRYPTO_rsa_signature_dup (coin->public_info.denom_sig.rsa_signature)));
- GNUNET_assert (NULL !=
- (coin->blind.denom_pub.rsa_public_key =
- GNUNET_CRYPTO_rsa_public_key_dup (dki->denom_pub.rsa_public_key)));
+ coin->blind.sig.rsa_signature =
+ GNUNET_CRYPTO_rsa_signature_dup (coin->public_info.denom_sig.rsa_signature);
+ coin->blind.denom_pub.rsa_public_key =
+ GNUNET_CRYPTO_rsa_public_key_dup (dki->denom_pub.rsa_public_key);
+ GNUNET_assert (NULL != coin->blind.sig.rsa_signature);
+ GNUNET_assert (NULL != coin->blind.denom_pub.rsa_public_key);
TALER_amount_ntoh (&coin->blind.amount_with_fee,
&dki->issue.properties.value);
TALER_amount_ntoh (&coin->blind.withdraw_fee,
@@ -367,20 +369,7 @@ PERF_TALER_MINTDB_coin_init (
coin->blind.reserve_pub = reserve->reserve.pub;
GNUNET_CRYPTO_hash_create_random (GNUNET_CRYPTO_QUALITY_WEAK,
&coin->blind.h_coin_envelope);
- {
- struct {
- struct TALER_ReservePublicKeyP reserve_pub;
- struct GNUNET_HashCode hash;
- } data;
-
- data.reserve_pub = reserve->reserve.pub;
- data.hash = coin->blind.h_coin_envelope;
- GNUNET_assert (NULL !=
- (coin->blind.sig.rsa_signature =
- GNUNET_CRYPTO_rsa_sign (dki->denom_priv.rsa_private_key,
- &data,
- sizeof (data))));
- }
+
return coin;
}
@@ -395,8 +384,8 @@ PERF_TALER_MINTDB_coin_copy (const struct PERF_TALER_MINTDB_Coin *coin)
{
struct PERF_TALER_MINTDB_Coin *copy;
- GNUNET_assert (NULL !=
- (copy = GNUNET_new (struct PERF_TALER_MINTDB_Coin)));
+ copy = GNUNET_new (struct PERF_TALER_MINTDB_Coin);
+ GNUNET_assert (NULL != copy);
/* priv */
copy->priv = coin->priv;
/* public_info */
@@ -438,6 +427,7 @@ PERF_TALER_MINTDB_coin_free (struct PERF_TALER_MINTDB_Coin *coin)
GNUNET_CRYPTO_rsa_signature_free (coin->public_info.denom_sig.rsa_signature);
GNUNET_CRYPTO_rsa_signature_free (coin->blind.sig.rsa_signature);
GNUNET_CRYPTO_rsa_public_key_free (coin->blind.denom_pub.rsa_public_key);
+ GNUNET_free (coin);
return GNUNET_OK;
}
@@ -481,6 +471,7 @@ PERF_TALER_MINTDB_refresh_session_free (struct TALER_MINTDB_RefreshSession *refr
if (NULL == refresh_session)
return GNUNET_OK;
return GNUNET_OK;
+ GNUNET_free (refresh_session);
}
@@ -547,9 +538,9 @@ PERF_TALER_MINTDB_refresh_melt_copy (const struct TALER_MINTDB_RefreshMelt *melt
copy = GNUNET_new (struct TALER_MINTDB_RefreshMelt);
*copy = *melt;
- GNUNET_assert (NULL !=
- (copy->coin.denom_sig.rsa_signature =
- GNUNET_CRYPTO_rsa_signature_dup (melt->coin.denom_sig.rsa_signature)));
+ copy->coin.denom_sig.rsa_signature =
+ GNUNET_CRYPTO_rsa_signature_dup (melt->coin.denom_sig.rsa_signature);
+ GNUNET_assert (NULL != copy->coin.denom_sig.rsa_signature);
return copy;
}
@@ -565,6 +556,7 @@ int
PERF_TALER_MINTDB_refresh_melt_free (struct TALER_MINTDB_RefreshMelt *melt)
{
GNUNET_CRYPTO_rsa_signature_free (melt->coin.denom_sig.rsa_signature);
+ GNUNET_free (melt);
return GNUNET_OK;
}
@@ -582,8 +574,18 @@ PERF_TALER_MINTDB_refresh_commit_coin_init ()
GNUNET_assert (NULL != commit_coin);
{/* refresh_link */
refresh_link = GNUNET_new (struct TALER_RefreshLinkEncrypted);
- GNUNET_assert (NULL != refresh_link);
+ *refresh_link = (struct TALER_RefreshLinkEncrypted)
+ {
+ .blinding_key_enc = "blinding_key",
+ .blinding_key_enc_size = 13
+ };
+ refresh_link->blinding_key_enc_size = 32;
+ GNUNET_CRYPTO_random_block (GNUNET_CRYPTO_QUALITY_WEAK,
+ &refresh_link->coin_priv_enc,
+ sizeof(struct TALER_CoinSpendPrivateKeyP));
}
+ commit_coin->coin_ev = "coin_ev";
+ commit_coin->coin_ev_size = 8;
commit_coin->refresh_link = refresh_link;
return commit_coin;
}
diff --git a/src/mintdb/perf_taler_mintdb_interpreter.c b/src/mintdb/perf_taler_mintdb_interpreter.c
index e65d05e5..9882b830 100644
--- a/src/mintdb/perf_taler_mintdb_interpreter.c
+++ b/src/mintdb/perf_taler_mintdb_interpreter.c
@@ -62,15 +62,14 @@ data_free (struct PERF_TALER_MINTDB_Data *data)
case PERF_TALER_MINTDB_TIME:
if (NULL == data->data.time)
return;
- GNUNET_free (data->data.time);
- data->data.time = NULL;
- return;
+ GNUNET_free (data->data.time);
+ data->data.time = NULL;
+ return;
case PERF_TALER_MINTDB_DEPOSIT:
if (NULL == data->data.deposit)
return;
PERF_TALER_MINTDB_deposit_free (data->data.deposit);
- GNUNET_free (data->data.deposit);
data->data.deposit = NULL;
return;
@@ -78,7 +77,6 @@ data_free (struct PERF_TALER_MINTDB_Data *data)
if (NULL == data->data.coin)
return;
PERF_TALER_MINTDB_coin_free (data->data.coin);
- GNUNET_free (data->data.coin);
data->data.coin = NULL;
return;
@@ -86,7 +84,6 @@ data_free (struct PERF_TALER_MINTDB_Data *data)
if (NULL == data->data.reserve)
return;
PERF_TALER_MINTDB_reserve_free (data->data.reserve);
- GNUNET_free (data->data.reserve);
data->data.reserve = NULL;
return;
@@ -94,7 +91,6 @@ data_free (struct PERF_TALER_MINTDB_Data *data)
if (NULL == data->data.dki)
return;
PERF_TALER_MINTDB_denomination_free (data->data.dki);
- GNUNET_free (data->data.dki);
data->data.dki = NULL;
return;
@@ -123,7 +119,7 @@ data_copy (const struct PERF_TALER_MINTDB_Data *data, struct PERF_TALER_MINTDB_D
case PERF_TALER_MINTDB_DEPOSIT:
copy->data.deposit =
- PERF_TALER_MINTDB_deposit_copy (data->data.deposit);
+ PERF_TALER_MINTDB_deposit_copy (data->data.deposit);
return;
case PERF_TALER_MINTDB_COIN:
@@ -133,12 +129,12 @@ data_copy (const struct PERF_TALER_MINTDB_Data *data, struct PERF_TALER_MINTDB_D
case PERF_TALER_MINTDB_RESERVE:
copy->data.reserve =
- PERF_TALER_MINTDB_reserve_copy (data->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);
+ PERF_TALER_MINTDB_denomination_copy (data->data.dki);
return;
default:
@@ -639,10 +635,9 @@ cmd_clean (struct PERF_TALER_MINTDB_Cmd cmd[])
break;
default:
- data_free (&cmd[i].exposed);
break;
-
}
+ data_free (&cmd[i].exposed);
}
return GNUNET_OK;
}
@@ -661,9 +656,7 @@ interpret_end_loop (struct PERF_TALER_MINTDB_interpreter_state *state)
jump = state->cmd[state->i].details.end_loop.index_loop;
// Cleaning up the memory in the loop
for (i = jump; i < state->i; i++)
- {
data_free (&state->cmd[i].exposed);
- }
state->cmd[jump].details.loop.curr_iteration++;
/* If the loop is not finished */
diff --git a/src/mintdb/test_perf_taler_mintdb.c b/src/mintdb/test_perf_taler_mintdb.c
index 26f142a2..c1e28784 100644
--- a/src/mintdb/test_perf_taler_mintdb.c
+++ b/src/mintdb/test_perf_taler_mintdb.c
@@ -20,6 +20,7 @@
*/
#include "platform.h"
#include "perf_taler_mintdb_interpreter.h"
+#include "perf_taler_mintdb_init.h"
#define NB_DENOMINATION_INIT 2
@@ -35,13 +36,46 @@
#define NB_WITHDRAW_SAVE 1
/**
+ * Allocate, copies and free all the data used in the interpreter
+ * Used to check for memory leaks
+ */
+void
+test_alocate ()
+{
+ struct TALER_MINTDB_DenominationKeyIssueInformation *dki, *dki_copy;
+ struct PERF_TALER_MINTDB_Reserve *reserve, *reserve_copy;
+ struct PERF_TALER_MINTDB_Coin *coin, *coin_copy;
+ struct TALER_MINTDB_Deposit *deposit, *deposit_copy;
+
+ dki = PERF_TALER_MINTDB_denomination_init ();
+ reserve = PERF_TALER_MINTDB_reserve_init ();
+ coin = PERF_TALER_MINTDB_coin_init (dki,
+ reserve);
+ deposit = PERF_TALER_MINTDB_deposit_init (coin);
+
+ dki_copy = PERF_TALER_MINTDB_denomination_copy (dki);
+ reserve_copy = PERF_TALER_MINTDB_reserve_copy (reserve);
+ coin_copy = PERF_TALER_MINTDB_coin_copy (coin);
+ deposit_copy = PERF_TALER_MINTDB_deposit_copy (deposit);
+
+ PERF_TALER_MINTDB_denomination_free (dki);
+ PERF_TALER_MINTDB_denomination_free (dki_copy);
+ PERF_TALER_MINTDB_reserve_free (reserve);
+ PERF_TALER_MINTDB_reserve_free (reserve_copy);
+ PERF_TALER_MINTDB_coin_free (coin);
+ PERF_TALER_MINTDB_coin_free (coin_copy);
+ PERF_TALER_MINTDB_deposit_free (deposit);
+ PERF_TALER_MINTDB_deposit_free (deposit_copy);
+}
+
+/**
* Runs the performances tests for the mint database
* and logs the results using Gauger
*/
int
main (int argc, char ** argv)
{
- int ret;
+ int ret = 0;
struct PERF_TALER_MINTDB_Cmd init[] =
{
PERF_TALER_MINTDB_INIT_CMD_END ("init")
@@ -128,11 +162,11 @@ main (int argc, char ** argv)
PERF_TALER_MINTDB_INIT_CMD_END ("end"),
};
+ test_alocate ();
ret = PERF_TALER_MINTDB_run_benchmark ("perf-taler-mintdb",
"./test-mint-db-postgres.conf",
init,
benchmark);
-
if (GNUNET_SYSERR == ret)
return 1;
return 0;
generated by cgit v1.2.3 (git 2.39.1) at 2025-09-30 18:57:22 +0000