summaryrefslogtreecommitdiff
path: root/crypto/threads_pthread.c
diff options
context:
space:
mode:
authorPauli <paul.dale@oracle.com>2017-09-25 12:04:42 +1000
committerPauli <paul.dale@oracle.com>2017-10-10 08:45:52 +1000
commit94683b7acb62a5d99b8b4d66283e6d6dd0007f7a (patch)
tree10cec2abdb2f43af401d65c1060c083bb0865fdf /crypto/threads_pthread.c
parent338ead0ff9b22aecbc3b28e37ea05d142e13ee13 (diff)
downloadopenssl-new-94683b7acb62a5d99b8b4d66283e6d6dd0007f7a.tar.gz
Add a CRYPTO_atomic_read call which allows an int variable to be read
in an atomic fashion. Reviewed-by: Rich Salz <rsalz@openssl.org> (Merged from https://github.com/openssl/openssl/pull/4414)
Diffstat (limited to 'crypto/threads_pthread.c')
-rw-r--r--crypto/threads_pthread.c19
1 files changed, 19 insertions, 0 deletions
diff --git a/crypto/threads_pthread.c b/crypto/threads_pthread.c
index 9644c25aea..3f8ada2c37 100644
--- a/crypto/threads_pthread.c
+++ b/crypto/threads_pthread.c
@@ -169,6 +169,25 @@ int CRYPTO_atomic_add(int *val, int amount, int *ret, CRYPTO_RWLOCK *lock)
return 1;
}
+int CRYPTO_atomic_read(int *val, int *ret, CRYPTO_RWLOCK *lock)
+{
+# if defined(__GNUC__) && defined(__ATOMIC_ACQUIRE)
+ if (__atomic_is_lock_free(sizeof(*val), val)) {
+ __atomic_load(val, ret, __ATOMIC_ACQUIRE);
+ return 1;
+ }
+# endif
+ if (!CRYPTO_THREAD_write_lock(lock))
+ return 0;
+
+ *ret = *val;
+
+ if (!CRYPTO_THREAD_unlock(lock))
+ return 0;
+
+ return 1;
+}
+
# ifdef OPENSSL_SYS_UNIX
static pthread_once_t fork_once_control = PTHREAD_ONCE_INIT;