From 30ff41beab5d8a53cbcbdab4109b32b9ef5c0f6e Mon Sep 17 00:00:00 2001 From: Pauli Date: Mon, 9 Oct 2017 14:39:43 +1000 Subject: Add atomic write call Reviewed-by: Rich Salz (Merged from https://github.com/openssl/openssl/pull/4414) --- crypto/threads_none.c | 8 +++++++- crypto/threads_pthread.c | 19 +++++++++++++++++++ crypto/threads_win.c | 6 ++++++ 3 files changed, 32 insertions(+), 1 deletion(-) (limited to 'crypto') diff --git a/crypto/threads_none.c b/crypto/threads_none.c index 7e9ec2d151..30ed4e6999 100644 --- a/crypto/threads_none.c +++ b/crypto/threads_none.c @@ -127,7 +127,13 @@ int CRYPTO_atomic_add(int *val, int amount, int *ret, CRYPTO_RWLOCK *lock) int CRYPTO_atomic_read(int *val, int *ret, CRYPTO_RWLOCK *lock) { - *ret = *val; + *ret = *val; + return 1; +} + +int CRYPTO_atomic_write(int *val, int n, CRYPTO_RWLOCK *lock) +{ + *val = n; return 1; } diff --git a/crypto/threads_pthread.c b/crypto/threads_pthread.c index 3f8ada2c37..34be314f1f 100644 --- a/crypto/threads_pthread.c +++ b/crypto/threads_pthread.c @@ -188,6 +188,25 @@ int CRYPTO_atomic_read(int *val, int *ret, CRYPTO_RWLOCK *lock) return 1; } +int CRYPTO_atomic_write(int *val, int n, CRYPTO_RWLOCK *lock) +{ +# if defined(__GNUC__) && defined(__ATOMIC_RELEASE) + if (__atomic_is_lock_free(sizeof(*val), val)) { + __atomic_store(val, &n, __ATOMIC_RELEASE); + return 1; + } +# endif + if (!CRYPTO_THREAD_write_lock(lock)) + return 0; + + *val = n; + + if (!CRYPTO_THREAD_unlock(lock)) + return 0; + + return 1; +} + # ifdef OPENSSL_SYS_UNIX static pthread_once_t fork_once_control = PTHREAD_ONCE_INIT; diff --git a/crypto/threads_win.c b/crypto/threads_win.c index 6f9c7b1bd3..ab2eb25740 100644 --- a/crypto/threads_win.c +++ b/crypto/threads_win.c @@ -139,6 +139,12 @@ int CRYPTO_atomic_read(int *val, int *ret, CRYPTO_RWLOCK *lock) return 1; } +int CRYPTO_atomic_write(int *val, int n, CRYPTO_RWLOCK *lock) +{ + InterlockedExchange(val, n); + return 1; +} + int openssl_init_fork_handlers(void) { return 0; -- cgit v1.2.3