cheng/libsodium
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Simplify the fallback _sodium_crit_enter() code

Browse Source
This commit is contained in:
Frank Denis 2016-04-25 20:15:33 +02:00
parent f8ff8ebf66
commit d908d08b0d
1 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/libsodium/sodium/core.c
View File

@ -58,7 +58,7 @@ sodium_init(void)
return 0; return 0;
} }
#ifdef HAVE_PTHREAD #if defined(HAVE_PTHREAD) && !defined(__EMSCRIPTEN__)
static pthread_mutex_t _sodium_lock = PTHREAD_MUTEX_INITIALIZER; static pthread_mutex_t _sodium_lock = PTHREAD_MUTEX_INITIALIZER;
@ -113,20 +113,16 @@ static volatile int _sodium_lock;
static int static int
_sodium_crit_enter(void) _sodium_crit_enter(void)
{ {
if (__sync_lock_test_and_set(&_sodium_lock, 1) != 0) {
for (;;) {
if (_sodium_lock == 0U &&
__sync_lock_test_and_set(&_sodium_lock, 1) == 0) {
break;
}
# ifdef HAVE_NANOSLEEP # ifdef HAVE_NANOSLEEP
{
struct timespec q; struct timespec q;
memset(&q, 0, sizeof q); memset(&q, 0, sizeof q);
(void) nanosleep(&q, NULL);
}
# endif # endif
} while (__sync_lock_test_and_set(&_sodium_lock, 1) != 0) {
# ifdef HAVE_NANOSLEEP
(void) nanosleep(&q, NULL);
# elif defined(__x86_64__) || defined(__i386__)
__asm__ __volatile__ ("pause");
# endif
} }
return 0; return 0;
} }