summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2016-06-15 18:42:00 +0200
committerChristian Grothoff <christian@grothoff.org>2016-06-15 22:55:02 +0200
commit754c4ef24c7758755136309661dbbb38fd75cd8d (patch)
treee5fba1bb22edb0506f9519fda0e4d64267095b2c /src
parent0c3f6dde252500f55bc3f4154a0c103666251594 (diff)
downloadexchange-754c4ef24c7758755136309661dbbb38fd75cd8d.tar.gz
exchange-754c4ef24c7758755136309661dbbb38fd75cd8d.tar.bz2
exchange-754c4ef24c7758755136309661dbbb38fd75cd8d.zip
nicer reports
-fix leak -fix leaks
Diffstat (limited to 'src')
-rw-r--r--src/benchmark/taler-exchange-benchmark.c31
-rw-r--r--src/exchange-tools/taler-exchange-keyup.c6
2 files changed, 30 insertions, 7 deletions
diff --git a/src/benchmark/taler-exchange-benchmark.c b/src/benchmark/taler-exchange-benchmark.c
index a92087b4..9c4b8cbf 100644
--- a/src/benchmark/taler-exchange-benchmark.c
+++ b/src/benchmark/taler-exchange-benchmark.c
@@ -253,7 +253,9 @@ static unsigned int num_invalid_coins;
static int run_exchange;
/**
- * Enables printing of "-" and "." to indicate progress.
+ * Enables printing of "C" and "W" to indicate progress (warm/cold)
+ * every 50 iterations. Also includes how long the iteration took,
+ * so we can see if it is stable.
*/
static int be_verbose;
@@ -686,7 +688,7 @@ refresh_coin (struct Coin *coin)
keys = TALER_EXCHANGE_get_keys (exchange);
for (curr.value = COIN_VALUE >> 1; curr.value > 0; curr.value = curr.value >> 1)
{
- if (acc_value + curr.value <= coin->left.value)
+ while (acc_value + curr.value <= coin->left.value)
{
GNUNET_array_append (denoms,
ndenoms,
@@ -710,6 +712,9 @@ refresh_coin (struct Coin *coin)
dpks,
&blob_size);
invalidate_coin (coin);
+ GNUNET_array_grow (denoms,
+ ndenoms,
+ 0);
GNUNET_array_grow (dpks,
ndenoms2,
0);
@@ -1091,10 +1096,22 @@ benchmark_run (void *cls)
}
warm++;
if ( be_verbose &&
- (0 == (warm % 10)) )
+ (0 == (warm % 50)) )
+ {
+ static struct GNUNET_TIME_Absolute last;
+ struct GNUNET_TIME_Relative duration;
+
+ if (0 != last.abs_value_us)
+ duration = GNUNET_TIME_absolute_get_duration (last);
+ else
+ duration = GNUNET_TIME_UNIT_FOREVER_REL;
+ last = GNUNET_TIME_absolute_get ();
fprintf (stderr,
- "%s",
- WARM_THRESHOLD < warm ? "." : "-");
+ "%s - %s\n",
+ WARM_THRESHOLD < warm ? "WARM" : "COLD",
+ GNUNET_STRINGS_relative_time_to_string (duration,
+ GNUNET_YES));
+ }
if (WARM_THRESHOLD == warm)
{
GNUNET_log (GNUNET_ERROR_TYPE_INFO,
@@ -1345,7 +1362,7 @@ do_shutdown (void *cls)
num_deposit,
num_refresh,
GNUNET_STRINGS_relative_time_to_string (duration,
- GNUNET_NO));
+ GNUNET_YES));
}
else
{
@@ -1406,6 +1423,7 @@ run (void *cls)
bank_details = json_load_file (bank_details_filename,
JSON_REJECT_DUPLICATES,
NULL);
+ GNUNET_free (bank_details_filename);
if (NULL == bank_details)
{
fail ("Failed to parse file with BANK_DETAILS");
@@ -1426,6 +1444,7 @@ run (void *cls)
merchant_details = json_load_file (merchant_details_filename,
JSON_REJECT_DUPLICATES,
NULL);
+ GNUNET_free (merchant_details_filename);
if (NULL == merchant_details)
{
fail ("Failed to parse file with MERCHANT_DETAILS");
diff --git a/src/exchange-tools/taler-exchange-keyup.c b/src/exchange-tools/taler-exchange-keyup.c
index 69d28361..21024ffc 100644
--- a/src/exchange-tools/taler-exchange-keyup.c
+++ b/src/exchange-tools/taler-exchange-keyup.c
@@ -807,13 +807,14 @@ exchange_keys_update_cointype (void *cls,
&denomkey_issue);
if (GNUNET_OK !=
TALER_EXCHANGEDB_denomination_key_write (dkf,
- &denomkey_issue))
+ &denomkey_issue))
{
fprintf (stderr,
"Failed to write denomination key information to file `%s'.\n",
dkf);
*ret = GNUNET_SYSERR;
GNUNET_CRYPTO_rsa_private_key_free (denomkey_issue.denom_priv.rsa_private_key);
+ GNUNET_CRYPTO_rsa_public_key_free (denomkey_issue.denom_pub.rsa_public_key);
return;
}
if ( (NULL != auditor_output_file) &&
@@ -828,9 +829,12 @@ exchange_keys_update_cointype (void *cls,
auditorrequestfile,
STRERROR (errno));
*ret = GNUNET_SYSERR;
+ GNUNET_CRYPTO_rsa_private_key_free (denomkey_issue.denom_priv.rsa_private_key);
+ GNUNET_CRYPTO_rsa_public_key_free (denomkey_issue.denom_pub.rsa_public_key);
return;
}
GNUNET_CRYPTO_rsa_private_key_free (denomkey_issue.denom_priv.rsa_private_key);
+ GNUNET_CRYPTO_rsa_public_key_free (denomkey_issue.denom_pub.rsa_public_key);
p.anchor = GNUNET_TIME_absolute_add (p.anchor,
p.duration_spend);
p.anchor = GNUNET_TIME_absolute_subtract (p.anchor,