Revert "Add internal functions to fetch a refcount"
authorRichard Levitte <levitte@openssl.org>
Sun, 28 May 2017 13:01:36 +0000 (15:01 +0200)
committerRichard Levitte <levitte@openssl.org>
Sun, 28 May 2017 13:02:42 +0000 (15:02 +0200)
It turned out to be a bad idea.

This reverts commits 6891a79da67ccd621b67e49b60ddc188d7864291
and c27bc74698ed043b7549d5637ec0a8cf65b39e59.

Reviewed-by: Andy Polyakov <appro@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/3576)

include/internal/refcount.h

index 5fae6fda23259835b4ab134bd533d2f84169929e..591561ffeeb7e4a4ebe7ee8f1b005b7c378cf15a 100644 (file)
 
 typedef _Atomic int CRYPTO_REF_COUNT;
 
-static ossl_inline int CRYPTO_GET_REF(_Atomic int *val, int *ret, void *lock)
-{
-    *ret = atomic_fetch_add_explicit(val, 0, memory_order_relaxed);
-    return 1;
-}
-
 static ossl_inline int CRYPTO_UP_REF(_Atomic int *val, int *ret, void *lock)
 {
     *ret = atomic_fetch_add_explicit(val, 1, memory_order_relaxed) + 1;
@@ -48,12 +42,6 @@ static ossl_inline int CRYPTO_DOWN_REF(_Atomic int *val, int *ret, void *lock)
 
 typedef int CRYPTO_REF_COUNT;
 
-static ossl_inline int CRYPTO_GET_REF(int *val, int *ret, void *lock)
-{
-    *ret = __atomic_fetch_add(val, 0, __ATOMIC_RELAXED);
-    return 1;
-}
-
 static ossl_inline int CRYPTO_UP_REF(int *val, int *ret, void *lock)
 {
     *ret = __atomic_fetch_add(val, 1, __ATOMIC_RELAXED) + 1;
@@ -72,7 +60,6 @@ static ossl_inline int CRYPTO_DOWN_REF(int *val, int *ret, void *lock)
 
 typedef int CRYPTO_REF_COUNT;
 
-# define CRYPTO_GET_REF(val, ret, lock) CRYPTO_atomic_add(val, 0, ret, lock)
 # define CRYPTO_UP_REF(val, ret, lock) CRYPTO_atomic_add(val, 1, ret, lock)
 # define CRYPTO_DOWN_REF(val, ret, lock) CRYPTO_atomic_add(val, -1, ret, lock)