X-Git-Url: https://git.liburcu.org/?p=urcu.git;a=blobdiff_plain;f=rculfhash.c;h=8ed9c10b2386c710c2791ed8db3565d4ea13bce5;hp=93c2d7850fad9da9c333b47f738af08758ed62ed;hb=59e371e3c619d7f85698bd997ac556cea49632f3;hpb=973e5e1b7837176071749d727e37bdfe9e3c4f0e

diff --git a/rculfhash.c b/rculfhash.c
index 93c2d78..8ed9c10 100644
--- a/rculfhash.c
+++ b/rculfhash.c
@@ -246,7 +246,7 @@ struct cds_lfht {
 	void (*cds_lfht_rcu_register_thread)(void);
 	void (*cds_lfht_rcu_unregister_thread)(void);
 	pthread_attr_t *resize_attr;	/* Resize threads attributes */
-	unsigned long count;		/* global approximate item count */
+	long count;			/* global approximate item count */
 	struct ht_items_count *percpu_count;	/* per-cpu item count */
 };
 
@@ -556,7 +556,7 @@ void ht_count_add(struct cds_lfht *ht, unsigned long size)
 		return;
 	percpu_count = uatomic_add_return(&ht->percpu_count[cpu].add, 1);
 	if (unlikely(!(percpu_count & ((1UL << COUNT_COMMIT_ORDER) - 1)))) {
-		unsigned long count;
+		long count;
 
 		dbg_printf("add percpu %lu\n", percpu_count);
 		count = uatomic_add_return(&ht->count,
@@ -565,7 +565,7 @@ void ht_count_add(struct cds_lfht *ht, unsigned long size)
 		if (!(count & (count - 1))) {
 			if ((count >> CHAIN_LEN_RESIZE_THRESHOLD) < size)
 				return;
-			dbg_printf("add set global %lu\n", count);
+			dbg_printf("add set global %ld\n", count);
 			cds_lfht_resize_lazy_count(ht, size,
 				count >> (CHAIN_LEN_TARGET - 1));
 		}
@@ -585,7 +585,7 @@ void ht_count_del(struct cds_lfht *ht, unsigned long size)
 		return;
 	percpu_count = uatomic_add_return(&ht->percpu_count[cpu].del, 1);
 	if (unlikely(!(percpu_count & ((1UL << COUNT_COMMIT_ORDER) - 1)))) {
-		unsigned long count;
+		long count;
 
 		dbg_printf("del percpu %lu\n", percpu_count);
 		count = uatomic_add_return(&ht->count,
@@ -594,7 +594,13 @@ void ht_count_del(struct cds_lfht *ht, unsigned long size)
 		if (!(count & (count - 1))) {
 			if ((count >> CHAIN_LEN_RESIZE_THRESHOLD) >= size)
 				return;
-			dbg_printf("del set global %lu\n", count);
+			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) * (nr_cpus_mask + 1))
+				return;
 			cds_lfht_resize_lazy_count(ht, size,
 				count >> (CHAIN_LEN_TARGET - 1));
 		}
@@ -1274,11 +1280,11 @@ void cds_lfht_lookup(struct cds_lfht *ht, void *key, size_t key_len,
 	node = clear_flag(node);
 	for (;;) {
 		if (unlikely(is_end(node))) {
-			node = NULL;
+			node = next = NULL;
 			break;
 		}
 		if (unlikely(node->p.reverse_hash > reverse_hash)) {
-			node = NULL;
+			node = next = NULL;
 			break;
 		}
 		next = rcu_dereference(node->p.next);
@@ -1310,11 +1316,11 @@ void cds_lfht_next(struct cds_lfht *ht, struct cds_lfht_iter *iter)
 
 	for (;;) {
 		if (unlikely(is_end(node))) {
-			node = NULL;
+			node = next = NULL;
 			break;
 		}
 		if (unlikely(node->p.reverse_hash > reverse_hash)) {
-			node = NULL;
+			node = next = NULL;
 			break;
 		}
 		next = rcu_dereference(node->p.next);
@@ -1446,16 +1452,16 @@ int cds_lfht_destroy(struct cds_lfht *ht, pthread_attr_t **attr)
 }
 
 void cds_lfht_count_nodes(struct cds_lfht *ht,
-		unsigned long *approx_before,
+		long *approx_before,
 		unsigned long *count,
 		unsigned long *removed,
-		unsigned long *approx_after)
+		long *approx_after)
 {
 	struct cds_lfht_node *node, *next;
 	struct _cds_lfht_node *lookup;
 	unsigned long nr_dummy = 0;
 
-	*approx_before = uatomic_read(&ht->count);
+	*approx_before = 0;
 	if (nr_cpus_mask >= 0) {
 		int i;
 
@@ -1485,7 +1491,7 @@ void cds_lfht_count_nodes(struct cds_lfht *ht,
 		node = clear_flag(next);
 	} while (!is_end(node));
 	dbg_printf("number of dummy nodes: %lu\n", nr_dummy);
-	*approx_after = uatomic_read(&ht->count);
+	*approx_after = 0;
 	if (nr_cpus_mask >= 0) {
 		int i;