QuasarApp/openssl
4
0
Fork 0
mirror of https://github.com/QuasarApp/openssl.git synced 2025-05-15 02:49:39 +00:00
Code Issues Projects Releases Wiki Activity

Corrections according the review comments.

Browse Source 
Updated indentations according project rules, renamed file-local define to the shorter version - USE_RWLOCK, fixed declaration after the if statement in CRYPTO_THREAD_lock_new().
Reviewed-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/1981)
(cherry picked from commit ec93a2921f6128ac931466ae171fba92a0eab45d)
This commit is contained in:
Dmitry Kostjuchenko 2016-11-28 19:54:43 +02:00 committed by Richard Levitte
parent 90078aa018
commit 23e6bf041b
1 changed files with 22 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
crypto/threads_pthread.c
View File

@ -11,13 +11,13 @@
#if defined(OPENSSL_THREADS) && !defined(CRYPTO_TDEBUG) && !defined(OPENSSL_SYS_WINDOWS) #if defined(OPENSSL_THREADS) && !defined(CRYPTO_TDEBUG) && !defined(OPENSSL_SYS_WINDOWS)
#ifdef PTHREAD_RWLOCK_INITIALIZER # ifdef PTHREAD_RWLOCK_INITIALIZER
#define OPENSSL_THREADS_HAVE_PTHREAD_RWLOCK # define USE_RWLOCK
#endif # endif
CRYPTO_RWLOCK *CRYPTO_THREAD_lock_new(void) CRYPTO_RWLOCK *CRYPTO_THREAD_lock_new(void)
{ {
#ifdef OPENSSL_THREADS_HAVE_PTHREAD_RWLOCK # ifdef USE_RWLOCK
CRYPTO_RWLOCK *lock = OPENSSL_zalloc(sizeof(pthread_rwlock_t)); CRYPTO_RWLOCK *lock = OPENSSL_zalloc(sizeof(pthread_rwlock_t));
if (lock == NULL) if (lock == NULL)
return NULL; return NULL;
@ -26,62 +26,63 @@ CRYPTO_RWLOCK *CRYPTO_THREAD_lock_new(void)
OPENSSL_free(lock); OPENSSL_free(lock);
return NULL; return NULL;
} }
#else # else
pthread_mutexattr_t attr;
CRYPTO_RWLOCK *lock = OPENSSL_zalloc(sizeof(pthread_mutex_t)); CRYPTO_RWLOCK *lock = OPENSSL_zalloc(sizeof(pthread_mutex_t));
if (lock == NULL) if (lock == NULL)
return NULL; return NULL;
pthread_mutexattr_t attr;
pthread_mutexattr_init(&attr); pthread_mutexattr_init(&attr);
pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE); pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE);
if (pthread_mutex_init(lock, &attr) != 0) { if (pthread_mutex_init(lock, &attr) != 0) {
pthread_mutexattr_destroy(&attr); pthread_mutexattr_destroy(&attr);
OPENSSL_free(lock); OPENSSL_free(lock);
return NULL; return NULL;
} }
pthread_mutexattr_destroy(&attr); pthread_mutexattr_destroy(&attr);
#endif # endif
return lock; return lock;
} }
int CRYPTO_THREAD_read_lock(CRYPTO_RWLOCK *lock) int CRYPTO_THREAD_read_lock(CRYPTO_RWLOCK *lock)
{ {
#ifdef OPENSSL_THREADS_HAVE_PTHREAD_RWLOCK # ifdef USE_RWLOCK
if (pthread_rwlock_rdlock(lock) != 0) if (pthread_rwlock_rdlock(lock) != 0)
return 0; return 0;
#else # else
if (pthread_mutex_lock(lock) != 0) if (pthread_mutex_lock(lock) != 0)
return 0; return 0;
#endif # endif
return 1; return 1;
} }
int CRYPTO_THREAD_write_lock(CRYPTO_RWLOCK *lock) int CRYPTO_THREAD_write_lock(CRYPTO_RWLOCK *lock)
{ {
#ifdef OPENSSL_THREADS_HAVE_PTHREAD_RWLOCK # ifdef USE_RWLOCK
if (pthread_rwlock_wrlock(lock) != 0) if (pthread_rwlock_wrlock(lock) != 0)
return 0; return 0;
#else # else
if (pthread_mutex_lock(lock) != 0) if (pthread_mutex_lock(lock) != 0)
return 0; return 0;
#endif # endif
return 1; return 1;
} }
int CRYPTO_THREAD_unlock(CRYPTO_RWLOCK *lock) int CRYPTO_THREAD_unlock(CRYPTO_RWLOCK *lock)
{ {
#ifdef OPENSSL_THREADS_HAVE_PTHREAD_RWLOCK # ifdef USE_RWLOCK
if (pthread_rwlock_unlock(lock) != 0) if (pthread_rwlock_unlock(lock) != 0)
return 0; return 0;
#else # else
if (pthread_mutex_unlock(lock) != 0) if (pthread_mutex_unlock(lock) != 0)
return 0; return 0;
#endif # endif
return 1; return 1;
} }
@ -91,11 +92,11 @@ void CRYPTO_THREAD_lock_free(CRYPTO_RWLOCK *lock)
if (lock == NULL) if (lock == NULL)
return; return;
#ifdef OPENSSL_THREADS_HAVE_PTHREAD_RWLOCK # ifdef USE_RWLOCK
pthread_rwlock_destroy(lock); pthread_rwlock_destroy(lock);
#else # else
pthread_mutex_destroy(lock); pthread_mutex_destroy(lock);
#endif # endif
OPENSSL_free(lock); OPENSSL_free(lock);
return; return;