X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=rculfhash.c;h=fe8beedd7a9119d6b88e9a5e3fddec4267fd22a9;hb=920f8ef668b03c65ca414bd6d53db314da920d1f;hp=e379c7126629921a221e2f2971764c6380ce89ff;hpb=1af6e26eb514ede8d278177e30213b9e0c7152d4;p=urcu.git

diff --git a/rculfhash.c b/rculfhash.c
index e379c71..fe8beed 100644
--- a/rculfhash.c
+++ b/rculfhash.c
@@ -446,24 +446,28 @@ unsigned int fls_ulong(unsigned long x)
 #endif
 }
 
+/*
+ * Return the minimum order for which x <= (1UL << order).
+ * Return -1 if x is 0.
+ */
 int get_count_order_u32(uint32_t x)
 {
-	int order;
+	if (!x)
+		return -1;
 
-	order = fls_u32(x) - 1;
-	if (x & (x - 1))
-		order++;
-	return order;
+	return fls_u32(x - 1);
 }
 
+/*
+ * Return the minimum order for which x <= (1UL << order).
+ * Return -1 if x is 0.
+ */
 int get_count_order_ulong(unsigned long x)
 {
-	int order;
+	if (!x)
+		return -1;
 
-	order = fls_ulong(x) - 1;
-	if (x & (x - 1))
-		order++;
-	return order;
+	return fls_ulong(x - 1);
 }
 
 #ifdef POISON_FREE
@@ -1609,8 +1613,8 @@ void _do_cds_lfht_grow(struct cds_lfht *ht,
 
 	old_order = get_count_order_ulong(old_size) + 1;
 	new_order = get_count_order_ulong(new_size) + 1;
-	printf("resize from %lu (order %lu) to %lu (order %lu) buckets\n",
-	       old_size, old_order, new_size, new_order);
+	dbg_printf("resize from %lu (order %lu) to %lu (order %lu) buckets\n",
+		   old_size, old_order, new_size, new_order);
 	assert(new_size > old_size);
 	init_table(ht, old_order, new_order - old_order);
 }
@@ -1625,8 +1629,8 @@ void _do_cds_lfht_shrink(struct cds_lfht *ht,
 	new_size = max(new_size, MIN_TABLE_SIZE);
 	old_order = get_count_order_ulong(old_size) + 1;
 	new_order = get_count_order_ulong(new_size) + 1;
-	printf("resize from %lu (order %lu) to %lu (order %lu) buckets\n",
-	       old_size, old_order, new_size, new_order);
+	dbg_printf("resize from %lu (order %lu) to %lu (order %lu) buckets\n",
+		   old_size, old_order, new_size, new_order);
 	assert(new_size < old_size);
 
 	/* Remove and unlink all dummy nodes to remove. */