diff options
author | Christian Grothoff <christian@grothoff.org> | 2021-03-01 14:08:15 +0100 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2021-03-01 14:08:15 +0100 |
commit | 2c8afda8b3ead9f63cd004b47365fc831428cf21 (patch) | |
tree | f68e76a50c72c44e7c27b6c60b5eca895aa6ec40 | |
parent | 15ed6ffb07e2c1b87f08a1b168e76c743a2ae944 (diff) |
remove deadlocking log statements
m--------- | contrib/gana | 0 | ||||
-rw-r--r-- | src/util/taler-exchange-secmod-eddsa.c | 12 | ||||
-rw-r--r-- | src/util/taler-exchange-secmod-rsa.c | 9 | ||||
-rw-r--r-- | src/util/url.c | 5 |
4 files changed, 3 insertions, 23 deletions
diff --git a/contrib/gana b/contrib/gana -Subproject cf4c9cc53b19e2296481ae6c89aa6e5375a198e +Subproject 4c5ae13bf6c7e3cb070e9d56065cfdfc053f0b3 diff --git a/src/util/taler-exchange-secmod-eddsa.c b/src/util/taler-exchange-secmod-eddsa.c index ffd7b523b..7e25ac7e1 100644 --- a/src/util/taler-exchange-secmod-eddsa.c +++ b/src/util/taler-exchange-secmod-eddsa.c @@ -342,8 +342,6 @@ static void * sign_worker (void *cls) { (void) cls; - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "Crypto worker launching\n"); GNUNET_assert (0 == pthread_mutex_lock (&work_lock)); while (! in_shutdown) { @@ -357,9 +355,6 @@ sign_worker (void *cls) wi); work_counter--; GNUNET_assert (0 == pthread_mutex_unlock (&work_lock)); - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "Processing sign request %p\n", - wi); { if (GNUNET_OK != GNUNET_CRYPTO_eddsa_sign_ (&wi->key->exchange_priv.eddsa_priv, @@ -391,16 +386,12 @@ sign_worker (void *cls) if (in_shutdown) break; /* queue is empty, wait for work */ - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "Crypto worker waiting for work...\n"); GNUNET_assert (0 == pthread_cond_wait (&work_cond, &work_lock)); } GNUNET_assert (0 == pthread_mutex_unlock (&work_lock)); - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "Crypto worker exiting\n"); return NULL; } @@ -549,9 +540,6 @@ handle_done (void *cls) .exchange_sig = wi->signature }; - GNUNET_log (GNUNET_ERROR_TYPE_INFO, - "Transmitting signature for request %p\n", - wi); (void) transmit (&wi->addr, wi->addr_size, &sr.header); diff --git a/src/util/taler-exchange-secmod-rsa.c b/src/util/taler-exchange-secmod-rsa.c index d2e44e703..0a6d797e1 100644 --- a/src/util/taler-exchange-secmod-rsa.c +++ b/src/util/taler-exchange-secmod-rsa.c @@ -410,8 +410,6 @@ static void * sign_worker (void *cls) { (void) cls; - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "Crypto worker launching\n"); GNUNET_assert (0 == pthread_mutex_lock (&work_lock)); while (! in_shutdown) { @@ -425,9 +423,6 @@ sign_worker (void *cls) wi); work_counter--; GNUNET_assert (0 == pthread_mutex_unlock (&work_lock)); - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "Processing sign request %p\n", - wi); wi->rsa_signature = GNUNET_CRYPTO_rsa_sign_blinded (wi->dk->denom_priv.rsa_private_key, wi->blinded_msg, @@ -454,16 +449,12 @@ sign_worker (void *cls) if (in_shutdown) break; /* queue is empty, wait for work */ - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "Crypto worker waiting for work...\n"); GNUNET_assert (0 == pthread_cond_wait (&work_cond, &work_lock)); } GNUNET_assert (0 == pthread_mutex_unlock (&work_lock)); - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "Crypto worker exiting\n"); return NULL; } diff --git a/src/util/url.c b/src/util/url.c index f2298c0f1..5962a18b2 100644 --- a/src/util/url.c +++ b/src/util/url.c @@ -247,8 +247,9 @@ TALER_url_join (const char *base_url, { /* Must be an actual base URL! */ GNUNET_log (GNUNET_ERROR_TYPE_ERROR, - "Base URL `%s' does not end with '/'\n", - base_url); + "Base URL `%s' does not end with '/', cannot join with `%s'\n", + base_url, + path); return NULL; } if ('/' == path[0]) |