mirror/openssl
2
0
Fork 0
mirror of https://github.com/openssl/openssl.git synced 2025-01-30 14:01:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

Compile fix on platforms with missing pthread_rwlock_t.

Browse Source 
Fix compilation on platforms with missing pthread_rwlock_t implementation by replacing it with pthread_mutex_t. An example of such platform can be Android OS 2.0 - 2.1, API level 5 (Eclair), Android NDK platform - android-5 where pthread_rwlock_t is not implemented and is missing in pthread.h.

In case of missing pthread_rwlock_t implementation CRYPTO_RWLOCK will work as exclusive lock in write-only mode of pthread_rwlock_t lock.

The implementation based on pthread_mutex_t must be using PTHREAD_MUTEX_RECURSIVE mode to be compatible with recursive behavior of pthread_rwlock_rdlock.
Reviewed-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/1981)
This commit is contained in:
Dmitry Kostjuchenko 2016-11-22 18:37:43 +02:00 committed by Richard Levitte
parent 66bee01c82
commit 2accf3f7e0
1 changed files with 41 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
crypto/threads_pthread.c
View File

@ -11,8 +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
#define OPENSSL_THREADS_HAVE_PTHREAD_RWLOCK
#endif
CRYPTO_RWLOCK *CRYPTO_THREAD_lock_new(void) CRYPTO_RWLOCK *CRYPTO_THREAD_lock_new(void)
{ {
#ifdef OPENSSL_THREADS_HAVE_PTHREAD_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;
@ -21,30 +26,62 @@ CRYPTO_RWLOCK *CRYPTO_THREAD_lock_new(void)
OPENSSL_free(lock); OPENSSL_free(lock);
return NULL; return NULL;
} }
#else
CRYPTO_RWLOCK *lock = OPENSSL_zalloc(sizeof(pthread_mutex_t));
if (lock == NULL)
return NULL;
pthread_mutexattr_t attr;
pthread_mutexattr_init(&attr);
pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE);
if (pthread_mutex_init(lock, &attr) != 0) {
pthread_mutexattr_destroy(&attr);
OPENSSL_free(lock);
return NULL;
}
pthread_mutexattr_destroy(&attr);
#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
if (pthread_rwlock_rdlock(lock) != 0) if (pthread_rwlock_rdlock(lock) != 0)
return 0; return 0;
#else
if (pthread_mutex_lock(lock) != 0)
return 0;
#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
if (pthread_rwlock_wrlock(lock) != 0) if (pthread_rwlock_wrlock(lock) != 0)
return 0; return 0;
#else
if (pthread_mutex_lock(lock) != 0)
return 0;
#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
if (pthread_rwlock_unlock(lock) != 0) if (pthread_rwlock_unlock(lock) != 0)
return 0; return 0;
#else
if (pthread_mutex_unlock(lock) != 0)
return 0;
#endif
return 1; return 1;
} }
@ -54,7 +91,11 @@ void CRYPTO_THREAD_lock_free(CRYPTO_RWLOCK *lock)
if (lock == NULL) if (lock == NULL)
return; return;
#ifdef OPENSSL_THREADS_HAVE_PTHREAD_RWLOCK
pthread_rwlock_destroy(lock); pthread_rwlock_destroy(lock);
#else
pthread_mutex_destroy(lock);
#endif
OPENSSL_free(lock); OPENSSL_free(lock);
return; return;