not not break

This commit is contained in:
Christian Grothoff 2021-01-29 10:00:23 +01:00
parent 7d0d8d9f1c
commit fee5d3b716
No known key found for this signature in database
GPG Key ID: 939E6BE1E29FC3CC
2 changed files with 22 additions and 5 deletions

View File

@ -342,6 +342,8 @@ 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)
{ {
@ -355,7 +357,7 @@ 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_INFO, GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Processing sign request %p\n", "Processing sign request %p\n",
wi); wi);
{ {
@ -386,10 +388,10 @@ sign_worker (void *cls)
} }
GNUNET_assert (0 == pthread_mutex_lock (&work_lock)); GNUNET_assert (0 == pthread_mutex_lock (&work_lock));
} }
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_INFO, GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Crypto worker waiting for work...\n"); "Crypto worker waiting for work...\n");
GNUNET_assert (0 == GNUNET_assert (0 ==
pthread_cond_wait (&work_cond, pthread_cond_wait (&work_cond,
@ -397,6 +399,8 @@ sign_worker (void *cls)
} }
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;
} }
@ -1633,6 +1637,9 @@ run (void *cls,
num_workers = sysconf (_SC_NPROCESSORS_CONF); num_workers = sysconf (_SC_NPROCESSORS_CONF);
if (0 == num_workers) if (0 == num_workers)
num_workers = 1; num_workers = 1;
GNUNET_log (GNUNET_ERROR_TYPE_INFO,
"Starting %u crypto workers\n",
num_workers);
workers = GNUNET_new_array (num_workers, workers = GNUNET_new_array (num_workers,
pthread_t); pthread_t);
for (unsigned int i = 0; i<num_workers; i++) for (unsigned int i = 0; i<num_workers; i++)

View File

@ -410,6 +410,8 @@ 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)
{ {
@ -423,6 +425,9 @@ 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,
@ -446,10 +451,10 @@ sign_worker (void *cls)
} }
GNUNET_assert (0 == pthread_mutex_lock (&work_lock)); GNUNET_assert (0 == pthread_mutex_lock (&work_lock));
} }
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_INFO, GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Crypto worker waiting for work...\n"); "Crypto worker waiting for work...\n");
GNUNET_assert (0 == GNUNET_assert (0 ==
pthread_cond_wait (&work_cond, pthread_cond_wait (&work_cond,
@ -457,6 +462,8 @@ sign_worker (void *cls)
} }
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;
} }
@ -2024,6 +2031,9 @@ run (void *cls,
num_workers = sysconf (_SC_NPROCESSORS_CONF); num_workers = sysconf (_SC_NPROCESSORS_CONF);
if (0 == num_workers) if (0 == num_workers)
num_workers = 1; num_workers = 1;
GNUNET_log (GNUNET_ERROR_TYPE_INFO,
"Starting %u crypto workers\n",
num_workers);
workers = GNUNET_new_array (num_workers, workers = GNUNET_new_array (num_workers,
pthread_t); pthread_t);
for (unsigned int i = 0; i<num_workers; i++) for (unsigned int i = 0; i<num_workers; i++)