Merge pull request #39 from ogournet/dlock

dlock: remove unused refcnt

Author: acassen

src/gtp_conn.c

@@ -39,7 +39,7 @@ extern thread_master_t *master;
 /* Local data */
 struct hlist_head *gtp_conn_tab;
 static int gtp_conn_tab_cnt = 0;
-dlock_mutex_t *__gtp_conn_lock_array;
+pthread_mutex_t *__gtp_conn_lock_array;
 
 
 /*
@@ -60,15 +60,15 @@ gtp_conn_unlock_id(uint64_t id)
 int
 gtp_conn_lock_init(void)
 {
-        __gtp_conn_lock_array = dlock_init();
-        return 0;
+	__gtp_conn_lock_array = dlock_init();
+	return 0;
 }
 
 int
 gtp_conn_lock_destroy(void)
 {
 	FREE(__gtp_conn_lock_array);
-        return 0;
+	return 0;
 }
 
 
@@ -78,18 +78,18 @@ gtp_conn_lock_destroy(void)
 int
 gtp_conn_get(gtp_conn_t *c)
 {
-        if (!c)
-                return 0;
-        __sync_add_and_fetch(&c->refcnt, 1);
+	if (!c)
+		return 0;
+	__sync_add_and_fetch(&c->refcnt, 1);
 	return 0;
 }
 
 int
 gtp_conn_put(gtp_conn_t *c)
 {
-        if (!c)
-                return 0;
-        __sync_sub_and_fetch(&c->refcnt, 1);
+	if (!c)
+		return 0;
+	__sync_sub_and_fetch(&c->refcnt, 1);
 	return 0;
 }
 

src/gtp_htab.c

@@ -33,45 +33,34 @@
 
 
 /*
- *      Distributate lock handling
+ *      Distributed lock handling
  */
-static dlock_mutex_t *
-dlock_hash(dlock_mutex_t *__array, uint32_t w1, uint32_t w2)
+static pthread_mutex_t *
+dlock_hash(pthread_mutex_t *__array, uint32_t w1, uint32_t w2)
 {
-	return __array + (jhash_2words(w1, w2, 0) & DLOCK_HASHTAB_MASK);
+	return &__array[(jhash_2words(w1, w2, 0) & DLOCK_HASHTAB_MASK)];
 }
 
 int
-dlock_lock_id(dlock_mutex_t *__array, uint32_t w1, uint32_t w2)
+dlock_lock_id(pthread_mutex_t *__array, uint32_t w1, uint32_t w2)
 {
-	dlock_mutex_t *m = dlock_hash(__array, w1, w2);
-	pthread_mutex_lock(&m->mutex);
-	__sync_add_and_fetch(&m->refcnt, 1);
+	pthread_mutex_t *m = dlock_hash(__array, w1, w2);
+	pthread_mutex_lock(m);
 	return 0;
 }
 
 int
-dlock_unlock_id(dlock_mutex_t *__array, uint32_t w1, uint32_t w2)
+dlock_unlock_id(pthread_mutex_t *__array, uint32_t w1, uint32_t w2)
 {
-	dlock_mutex_t *m = dlock_hash(__array, w1, w2);
-	if (__sync_sub_and_fetch(&m->refcnt, 1) == 0)
-		pthread_mutex_unlock(&m->mutex);
+	pthread_mutex_t *m = dlock_hash(__array, w1, w2);
+	pthread_mutex_unlock(m);
 	return 0;
 }
 
-dlock_mutex_t *
+pthread_mutex_t *
 dlock_init(void)
 {
-	dlock_mutex_t *new;
-	new = (dlock_mutex_t *) MALLOC(DLOCK_HASHTAB_SIZE * sizeof(dlock_mutex_t));
-        return new;
-}
-
-int
-dlock_destroy(dlock_mutex_t *__array)
-{
-	FREE(__array);
-	return 0;
+	return MALLOC(DLOCK_HASHTAB_SIZE * sizeof(pthread_mutex_t));
 }
 
 /*

src/include/gtp_htab.h

@@ -27,22 +27,16 @@
 #define DLOCK_HASHTAB_SIZE    (1 << DLOCK_HASHTAB_BITS)
 #define DLOCK_HASHTAB_MASK    (DLOCK_HASHTAB_SIZE - 1)
 
-typedef struct _dlock_mutex {
-	pthread_mutex_t		mutex;
-	uint32_t		refcnt;
-} dlock_mutex_t;
-
 /* htab */
 typedef struct _gtp_htab {
 	struct hlist_head	*htab;
-	dlock_mutex_t		*dlock;
+	pthread_mutex_t		*dlock;
 } gtp_htab_t;
 
 /* Prototypes */
-extern int dlock_lock_id(dlock_mutex_t *, uint32_t, uint32_t);
-extern int dlock_unlock_id(dlock_mutex_t *, uint32_t, uint32_t);
-extern dlock_mutex_t *dlock_init(void);
-extern int dlock_destroy(dlock_mutex_t *);
+extern int dlock_lock_id(pthread_mutex_t *, uint32_t, uint32_t);
+extern int dlock_unlock_id(pthread_mutex_t *, uint32_t, uint32_t);
+extern pthread_mutex_t *dlock_init(void);
 extern void gtp_htab_init(gtp_htab_t *, size_t);
 extern void gtp_htab_destroy(gtp_htab_t *);