From: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Date: Mon, 28 Nov 2011 14:01:39 +0000 (-0500)
Subject: rculfhash: cleanup ht_count_add/ht_count_del
X-Git-Tag: v0.7.0~43^2~33
X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=314558bf8e679784e0c4d5638ffbdfbc72595246;p=userspace-rcu.git

rculfhash: cleanup ht_count_add/ht_count_del

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
---

diff --git a/rculfhash.c b/rculfhash.c
index 49c7863..dd49c50 100644
--- a/rculfhash.c
+++ b/rculfhash.c
@@ -536,26 +536,28 @@ void ht_count_add(struct cds_lfht *ht, unsigned long size, unsigned long hash)
 {
 	unsigned long split_count;
 	int index;
+	long count;
 
 	if (caa_unlikely(!ht->split_count))
 		return;
 	index = ht_get_split_count_index(hash);
 	split_count = uatomic_add_return(&ht->split_count[index].add, 1);
-	if (caa_unlikely(!(split_count & ((1UL << COUNT_COMMIT_ORDER) - 1)))) {
-		long count;
-
-		dbg_printf("add split count %lu\n", split_count);
-		count = uatomic_add_return(&ht->count,
-					   1UL << COUNT_COMMIT_ORDER);
-		/* If power of 2 */
-		if (!(count & (count - 1))) {
-			if ((count >> CHAIN_LEN_RESIZE_THRESHOLD) < size)
-				return;
-			dbg_printf("add set global %ld\n", count);
-			cds_lfht_resize_lazy_count(ht, size,
-				count >> (CHAIN_LEN_TARGET - 1));
-		}
-	}
+	if (caa_likely(split_count & ((1UL << COUNT_COMMIT_ORDER) - 1)))
+		return;
+	/* Only if number of add multiple of 1UL << COUNT_COMMIT_ORDER */
+
+	dbg_printf("add split count %lu\n", split_count);
+	count = uatomic_add_return(&ht->count,
+				   1UL << COUNT_COMMIT_ORDER);
+	if (likely(count & (count - 1)))
+		return;
+	/* Only if global count is power of 2 */
+
+	if ((count >> CHAIN_LEN_RESIZE_THRESHOLD) < size)
+		return;
+	dbg_printf("add set global %ld\n", count);
+	cds_lfht_resize_lazy_count(ht, size,
+		count >> (CHAIN_LEN_TARGET - 1));
 }
 
 static
@@ -563,32 +565,34 @@ void ht_count_del(struct cds_lfht *ht, unsigned long size, unsigned long hash)
 {
 	unsigned long split_count;
 	int index;
+	long count;
 
 	if (caa_unlikely(!ht->split_count))
 		return;
 	index = ht_get_split_count_index(hash);
 	split_count = uatomic_add_return(&ht->split_count[index].del, 1);
-	if (caa_unlikely(!(split_count & ((1UL << COUNT_COMMIT_ORDER) - 1)))) {
-		long count;
-
-		dbg_printf("del split count %lu\n", split_count);
-		count = uatomic_add_return(&ht->count,
-					   -(1UL << COUNT_COMMIT_ORDER));
-		/* If power of 2 */
-		if (!(count & (count - 1))) {
-			if ((count >> CHAIN_LEN_RESIZE_THRESHOLD) >= size)
-				return;
-			dbg_printf("del set global %ld\n", count);
-			/*
-			 * Don't shrink table if the number of nodes is below a
-			 * certain threshold.
-			 */
-			if (count < (1UL << COUNT_COMMIT_ORDER) * (split_count_mask + 1))
-				return;
-			cds_lfht_resize_lazy_count(ht, size,
-				count >> (CHAIN_LEN_TARGET - 1));
-		}
-	}
+	if (caa_likely(split_count & ((1UL << COUNT_COMMIT_ORDER) - 1)))
+		return;
+	/* Only if number of deletes multiple of 1UL << COUNT_COMMIT_ORDER */
+
+	dbg_printf("del split count %lu\n", split_count);
+	count = uatomic_add_return(&ht->count,
+				   -(1UL << COUNT_COMMIT_ORDER));
+	if (likely(count & (count - 1)))
+		return;
+	/* Only if global count is power of 2 */
+
+	if ((count >> CHAIN_LEN_RESIZE_THRESHOLD) >= size)
+		return;
+	dbg_printf("del set global %ld\n", count);
+	/*
+	 * Don't shrink table if the number of nodes is below a
+	 * certain threshold.
+	 */
+	if (count < (1UL << COUNT_COMMIT_ORDER) * (split_count_mask + 1))
+		return;
+	cds_lfht_resize_lazy_count(ht, size,
+		count >> (CHAIN_LEN_TARGET - 1));
 }
 
 static