diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/libstrongswan/utils/utils.c | 14 | ||||
-rw-r--r-- | src/libstrongswan/utils/utils.h | 13 |
2 files changed, 24 insertions, 3 deletions
diff --git a/src/libstrongswan/utils/utils.c b/src/libstrongswan/utils/utils.c index fe80edb82..e4da6ddb9 100644 --- a/src/libstrongswan/utils/utils.c +++ b/src/libstrongswan/utils/utils.c @@ -528,7 +528,6 @@ refcount_t ref_get(refcount_t *ref) pthread_mutex_lock(&ref_mutex); current = ++(*ref); pthread_mutex_unlock(&ref_mutex); - return current; } @@ -546,6 +545,19 @@ bool ref_put(refcount_t *ref) } /** + * Current refcount + */ +refcount_t ref_cur(refcount_t *ref) +{ + refcount_t current; + + pthread_mutex_lock(&ref_mutex); + current = *ref; + pthread_mutex_unlock(&ref_mutex); + return current; +} + +/** * Single mutex for all compare and swap operations. */ static pthread_mutex_t cas_mutex = PTHREAD_MUTEX_INITIALIZER; diff --git a/src/libstrongswan/utils/utils.h b/src/libstrongswan/utils/utils.h index a55e7d831..4b2990371 100644 --- a/src/libstrongswan/utils/utils.h +++ b/src/libstrongswan/utils/utils.h @@ -752,6 +752,7 @@ typedef u_int refcount_t; #define ref_get(ref) __sync_add_and_fetch(ref, 1) #define ref_put(ref) (!__sync_sub_and_fetch(ref, 1)) +#define ref_cur(ref) __sync_fetch_and_add(ref, 0) #define cas_bool(ptr, oldval, newval) \ (__sync_bool_compare_and_swap(ptr, oldval, newval)) @@ -763,7 +764,7 @@ typedef u_int refcount_t; /** * Get a new reference. * - * Increments the reference counter atomic. + * Increments the reference counter atomically. * * @param ref pointer to ref counter * @return new value of ref @@ -773,7 +774,7 @@ refcount_t ref_get(refcount_t *ref); /** * Put back a unused reference. * - * Decrements the reference counter atomic and + * Decrements the reference counter atomically and * says if more references available. * * @param ref pointer to ref counter @@ -782,6 +783,14 @@ refcount_t ref_get(refcount_t *ref); bool ref_put(refcount_t *ref); /** + * Get the current value of the reference counter. + * + * @param ref pointer to ref counter + * @return current value of ref + */ +refcount_t ref_cur(refcount_t *ref); + +/** * Atomically replace value of ptr with newval if it currently equals oldval. * * @param ptr pointer to variable |