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

remove deadlocking log statements

Browse Source
This commit is contained in:
Christian Grothoff 2021-03-01 14:08:15 +01:00
parent 15ed6ffb07
commit 2c8afda8b3
No known key found for this signature in database
GPG Key ID: 939E6BE1E29FC3CC
4 changed files with 4 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
contrib/gana

@ -1 +1 @@
Subproject commit cf4c9cc53b19e2296481ae6c89aa6e5375a198e3 Subproject commit 4c5ae13bf6c7e3cb070e9d56065cfdfc053f0b3a

12
src/util/taler-exchange-secmod-eddsa.c
View File

@ -342,8 +342,6 @@ static void *
sign_worker (void *cls) sign_worker (void *cls)
{ {
(void) cls; (void) cls;
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Crypto worker launching\n");
GNUNET_assert (0 == pthread_mutex_lock (&work_lock)); GNUNET_assert (0 == pthread_mutex_lock (&work_lock));
while (! in_shutdown) while (! in_shutdown)
{ {
@ -357,9 +355,6 @@ sign_worker (void *cls)
wi); wi);
work_counter--; work_counter--;
GNUNET_assert (0 == pthread_mutex_unlock (&work_lock)); GNUNET_assert (0 == pthread_mutex_unlock (&work_lock));
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Processing sign request %p\n",
wi);
{ {
if (GNUNET_OK != if (GNUNET_OK !=
GNUNET_CRYPTO_eddsa_sign_ (&wi->key->exchange_priv.eddsa_priv, GNUNET_CRYPTO_eddsa_sign_ (&wi->key->exchange_priv.eddsa_priv,
@ -391,16 +386,12 @@ sign_worker (void *cls)
if (in_shutdown) if (in_shutdown)
break; break;
/* queue is empty, wait for work */ /* queue is empty, wait for work */
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Crypto worker waiting for work...\n");
GNUNET_assert (0 == GNUNET_assert (0 ==
pthread_cond_wait (&work_cond, pthread_cond_wait (&work_cond,
&work_lock)); &work_lock));
} }
GNUNET_assert (0 == GNUNET_assert (0 ==
pthread_mutex_unlock (&work_lock)); pthread_mutex_unlock (&work_lock));
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Crypto worker exiting\n");
return NULL; return NULL;
} }
@ -549,9 +540,6 @@ handle_done (void *cls)
.exchange_sig = wi->signature .exchange_sig = wi->signature
}; };
GNUNET_log (GNUNET_ERROR_TYPE_INFO,
"Transmitting signature for request %p\n",
wi);
(void) transmit (&wi->addr, (void) transmit (&wi->addr,
wi->addr_size, wi->addr_size,
&sr.header); &sr.header);

9
src/util/taler-exchange-secmod-rsa.c
View File

@ -410,8 +410,6 @@ static void *
sign_worker (void *cls) sign_worker (void *cls)
{ {
(void) cls; (void) cls;
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Crypto worker launching\n");
GNUNET_assert (0 == pthread_mutex_lock (&work_lock)); GNUNET_assert (0 == pthread_mutex_lock (&work_lock));
while (! in_shutdown) while (! in_shutdown)
{ {
@ -425,9 +423,6 @@ sign_worker (void *cls)
wi); wi);
work_counter--; work_counter--;
GNUNET_assert (0 == pthread_mutex_unlock (&work_lock)); GNUNET_assert (0 == pthread_mutex_unlock (&work_lock));
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Processing sign request %p\n",
wi);
wi->rsa_signature wi->rsa_signature
= GNUNET_CRYPTO_rsa_sign_blinded (wi->dk->denom_priv.rsa_private_key, = GNUNET_CRYPTO_rsa_sign_blinded (wi->dk->denom_priv.rsa_private_key,
wi->blinded_msg, wi->blinded_msg,
@ -454,16 +449,12 @@ sign_worker (void *cls)
if (in_shutdown) if (in_shutdown)
break; break;
/* queue is empty, wait for work */ /* queue is empty, wait for work */
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Crypto worker waiting for work...\n");
GNUNET_assert (0 == GNUNET_assert (0 ==
pthread_cond_wait (&work_cond, pthread_cond_wait (&work_cond,
&work_lock)); &work_lock));
} }
GNUNET_assert (0 == GNUNET_assert (0 ==
pthread_mutex_unlock (&work_lock)); pthread_mutex_unlock (&work_lock));
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Crypto worker exiting\n");
return NULL; return NULL;
} }

5
src/util/url.c
View File

@ -247,8 +247,9 @@ TALER_url_join (const char *base_url,
{ {
/* Must be an actual base URL! */ /* Must be an actual base URL! */
GNUNET_log (GNUNET_ERROR_TYPE_ERROR, GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
"Base URL `%s' does not end with '/'\n", "Base URL `%s' does not end with '/', cannot join with `%s'\n",
base_url); base_url,
path);
return NULL; return NULL;
} }
if ('/' == path[0]) if ('/' == path[0])