utils: ref_get() returns the new value of the reference counter
authorMartin Willi <martin@revosec.ch>
Wed, 8 May 2013 13:07:09 +0000 (15:07 +0200)
committerMartin Willi <martin@revosec.ch>
Tue, 11 Jun 2013 13:54:27 +0000 (15:54 +0200)
This allows us to use ref_get() for getting unique values.

src/libstrongswan/utils/utils.c
src/libstrongswan/utils/utils.h

index aa59f4a..30084cd 100644 (file)
@@ -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;
 }
 
 /**
index ff1a007..8cc4851 100644 (file)
@@ -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.