utils: ref_get() returns the new value of the reference counter

This allows us to use ref_get() for getting unique values.

diff --git a/src/libstrongswan/utils/utils.c b/src/libstrongswan/utils/utils.c
index aa59f4a4dc19de9b8810527995e0641ecfea03eb..30084cd81cda31895ca5e4d09ddd9f5cb5cda127 100644 (file)
--- a/src/libstrongswan/utils/utils.c
+++ b/src/libstrongswan/utils/utils.c
@@ -466,11 +466,15 @@ static pthread_mutex_t ref_mutex = PTHREAD_MUTEX_INITIALIZER;
 /**
  * Increase refcount
  */
-void ref_get(refcount_t *ref)
+refcount_t ref_get(refcount_t *ref)
 {
+       refcount_t current;
+
        pthread_mutex_lock(&ref_mutex);
-       (*ref)++;
+       current = ++(*ref);
        pthread_mutex_unlock(&ref_mutex);
+
+       return current;
 }
 
 /**

diff --git a/src/libstrongswan/utils/utils.h b/src/libstrongswan/utils/utils.h
index ff1a007c11976adee1bb292cea197921a5ea23bb..8cc48513be6a0fa17c521273b72b3c9b7eddd491 100644 (file)
--- a/src/libstrongswan/utils/utils.h
+++ b/src/libstrongswan/utils/utils.h
@@ -661,7 +661,7 @@ typedef volatile u_int refcount_t;
 
 #ifdef HAVE_GCC_ATOMIC_OPERATIONS
 
-#define ref_get(ref) {__sync_fetch_and_add(ref, 1); }
+#define ref_get(ref) __sync_add_and_fetch(ref, 1)
 #define ref_put(ref) (!__sync_sub_and_fetch(ref, 1))
 
 #define cas_bool(ptr, oldval, newval) \
@@ -677,8 +677,9 @@ typedef volatile u_int refcount_t;
  * Increments the reference counter atomic.
  *
  * @param ref  pointer to ref counter
+ * @return             new value of ref
  */
-void ref_get(refcount_t *ref);
+refcount_t ref_get(refcount_t *ref);
 
 /**
  * Put back a unused reference.