X-Git-Url: https://git.liburcu.org/?a=blobdiff_plain;f=tests%2Ftest_urcu_hash.c;h=ffd8e2f774111625be67d5698caef5216fe11dde;hb=5567839e38c20a97960b6472bddbfd7eb6d9bc40;hp=56bd41f977dd868ca9b4f6270f05b0c10a673095;hpb=14756542cf5e8f90662ea8bd922d1349f44228fe;p=urcu.git

diff --git a/tests/test_urcu_hash.c b/tests/test_urcu_hash.c
index 56bd41f..ffd8e2f 100644
--- a/tests/test_urcu_hash.c
+++ b/tests/test_urcu_hash.c
@@ -37,8 +37,8 @@
 #include <syscall.h>
 #endif
 
-#define HASH_SIZE	32
-#define RAND_POOL	1000000
+#define DEFAULT_HASH_SIZE	32
+#define DEFAULT_RAND_POOL	1000000
 
 /* Make this big enough to include the POWER5+ L3 cacheline size of 256B */
 #define CACHE_LINE_SIZE 4096
@@ -66,13 +66,14 @@ static inline pid_t gettid(void)
 #else
 #define debug_yield_read()
 #endif
-#include <urcu.h>
+#include <urcu-qsbr.h>
 #include <urcu/rculfhash.h>
 #include <urcu-call-rcu.h>
 
 struct wr_count {
 	unsigned long update_ops;
 	unsigned long add;
+	unsigned long add_exist;
 	unsigned long remove;
 };
 
@@ -84,7 +85,7 @@ static unsigned long __thread nr_delnoent;
 static unsigned long __thread lookup_fail;
 static unsigned long __thread lookup_ok;
 
-static struct rcu_ht *test_ht;
+static struct cds_lfht *test_ht;
 
 struct test_data {
 	int a;
@@ -100,6 +101,10 @@ static unsigned long duration;
 /* read-side C.S. duration, in loops */
 static unsigned long rduration;
 
+static unsigned long init_hash_size = DEFAULT_HASH_SIZE;
+static unsigned long rand_pool = DEFAULT_RAND_POOL;
+static int add_only, add_unique;
+
 static inline void loop_sleep(unsigned long l)
 {
 	while(l-- != 0)
@@ -111,7 +116,7 @@ static int verbose_mode;
 #define printf_verbose(fmt, args...)		\
 	do {					\
 		if (verbose_mode)		\
-			printf(fmt, args);	\
+			printf(fmt, ## args);	\
 	} while (0)
 
 static unsigned int cpu_affinities[NR_CPUS];
@@ -334,7 +339,7 @@ unsigned long test_compare(void *key1, size_t key1_len,
 void *thr_reader(void *_count)
 {
 	unsigned long long *count = _count;
-	struct rcu_ht_node *node;
+	struct cds_lfht_node *node;
 
 	printf_verbose("thread_begin %s, thread id : %lx, tid %lu\n",
 			"reader", pthread_self(), (unsigned long)gettid());
@@ -350,8 +355,8 @@ void *thr_reader(void *_count)
 
 	for (;;) {
 		rcu_read_lock();
-		node = ht_lookup(test_ht,
-			(void *)(unsigned long)(rand_r(&rand_lookup) % RAND_POOL),
+		node = cds_lfht_lookup(test_ht,
+			(void *)(unsigned long)(rand_r(&rand_lookup) % rand_pool),
 			sizeof(void *));
 		if (node == NULL)
 			lookup_fail++;
@@ -364,6 +369,8 @@ void *thr_reader(void *_count)
 		nr_reads++;
 		if (unlikely(!test_duration_read()))
 			break;
+		if (unlikely((nr_reads & ((1 << 10) - 1)) == 0))
+			rcu_quiescent_state();
 	}
 
 	rcu_unregister_thread();
@@ -380,14 +387,14 @@ void *thr_reader(void *_count)
 static
 void free_node_cb(struct rcu_head *head)
 {
-	struct rcu_ht_node *node =
-		caa_container_of(head, struct rcu_ht_node, head);
+	struct cds_lfht_node *node =
+		caa_container_of(head, struct cds_lfht_node, head);
 	free(node);
 }
 
 void *thr_writer(void *_count)
 {
-	struct rcu_ht_node *node, *ret_node;
+	struct cds_lfht_node *node, *ret_node;
 	struct wr_count *count = _count;
 	int ret;
 
@@ -404,15 +411,18 @@ void *thr_writer(void *_count)
 	cmm_smp_mb();
 
 	for (;;) {
-		if (rand_r(&rand_lookup) & 1) {
-			node = malloc(sizeof(struct rcu_ht_node));
+		if (add_only || rand_r(&rand_lookup) & 1) {
+			node = malloc(sizeof(struct cds_lfht_node));
 			rcu_read_lock();
-			ht_node_init(node,
-				(void *)(unsigned long)(rand_r(&rand_lookup) % RAND_POOL),
+			cds_lfht_node_init(node,
+				(void *)(unsigned long)(rand_r(&rand_lookup) % rand_pool),
 				sizeof(void *));
-			ret_node = ht_add_unique(test_ht, node);
+			if (add_unique)
+				ret_node = cds_lfht_add_unique(test_ht, node);
+			else
+				cds_lfht_add(test_ht, node);
 			rcu_read_unlock();
-			if (ret_node != node) {
+			if (add_unique && ret_node != node) {
 				free(node);
 				nr_addexist++;
 			} else
@@ -420,11 +430,11 @@ void *thr_writer(void *_count)
 		} else {
 			/* May delete */
 			rcu_read_lock();
-			node = ht_lookup(test_ht,
-				(void *)(unsigned long)(rand_r(&rand_lookup) % RAND_POOL),
+			node = cds_lfht_lookup(test_ht,
+				(void *)(unsigned long)(rand_r(&rand_lookup) % rand_pool),
 				sizeof(void *));
 			if (node)
-				ret = ht_remove(test_ht, node);
+				ret = cds_lfht_remove(test_ht, node);
 			else
 				ret = -ENOENT;
 			rcu_read_unlock();
@@ -451,6 +461,8 @@ void *thr_writer(void *_count)
 			break;
 		if (unlikely(wdelay))
 			loop_sleep(wdelay);
+		if (unlikely((nr_writes & ((1 << 10) - 1)) == 0))
+			rcu_quiescent_state();
 	}
 
 	rcu_unregister_thread();
@@ -462,6 +474,7 @@ void *thr_writer(void *_count)
 			nr_addexist, nr_del, nr_delnoent);
 	count->update_ops = nr_writes;
 	count->add = nr_add;
+	count->add_exist = nr_addexist;
 	count->remove = nr_del;
 	return ((void*)2);
 }
@@ -476,6 +489,10 @@ void show_usage(int argc, char **argv)
 	printf(" [-c duration] (reader C.S. duration (in loops))");
 	printf(" [-v] (verbose output)");
 	printf(" [-a cpu#] [-a cpu#]... (affinity)");
+	printf(" [-p size] (random key value pool size)");
+	printf(" [-h size] (initial hash table size)");
+	printf(" [-u] Uniquify add.");
+	printf(" [-i] Add only (no removal).");
 	printf("\n");
 }
 
@@ -487,7 +504,7 @@ int main(int argc, char **argv)
 	unsigned long long *count_reader;
 	struct wr_count *count_writer;
 	unsigned long long tot_reads = 0, tot_writes = 0,
-		tot_add = 0, tot_remove = 0;
+		tot_add = 0, tot_add_exist = 0, tot_remove = 0;
 	unsigned long count, removed;
 	int i, a, ret;
 
@@ -553,13 +570,45 @@ int main(int argc, char **argv)
 		case 'v':
 			verbose_mode = 1;
 			break;
+		case 'p':
+			if (argc < i + 2) {
+				show_usage(argc, argv);
+				return -1;
+			}
+			rand_pool = atol(argv[++i]);
+			break;
+		case 'h':
+			if (argc < i + 2) {
+				show_usage(argc, argv);
+				return -1;
+			}
+			init_hash_size = atol(argv[++i]);
+			break;
+		case 'u':
+			add_unique = 1;
+			break;
+		case 'i':
+			add_only = 1;
+			break;
 		}
 	}
 
+	/* Check if hash size is power of 2 */
+	if (init_hash_size && init_hash_size & (init_hash_size - 1)) {
+		printf("Error: Hash table size %lu is not a power of 2.\n",
+			init_hash_size);
+		return -1;
+	}
+
 	printf_verbose("running test for %lu seconds, %u readers, %u writers.\n",
 		duration, nr_readers, nr_writers);
 	printf_verbose("Writer delay : %lu loops.\n", wdelay);
 	printf_verbose("Reader duration : %lu loops.\n", rduration);
+	printf_verbose("Random pool size : %lu.\n", rand_pool);
+	printf_verbose("Mode:%s%s.\n",
+		add_only ? " add only" : " add/remove",
+		add_unique ? " uniquify" : "");
+	printf_verbose("Initial hash table size: %lu buckets.\n", init_hash_size);
 	printf_verbose("thread %-6s, thread id : %lx, tid %lu\n",
 			"main", pthread_self(), (unsigned long)gettid());
 
@@ -567,8 +616,8 @@ int main(int argc, char **argv)
 	tid_writer = malloc(sizeof(*tid_writer) * nr_writers);
 	count_reader = malloc(sizeof(*count_reader) * nr_readers);
 	count_writer = malloc(sizeof(*count_writer) * nr_writers);
-	test_ht = ht_new(test_hash, test_compare, 0x42UL,
-			 HASH_SIZE, call_rcu);
+	test_ht = cds_lfht_new(test_hash, test_compare, 0x42UL,
+			 init_hash_size, call_rcu);
 
         err = create_all_cpu_call_rcu_data(0);
         assert(!err);
@@ -608,24 +657,31 @@ int main(int argc, char **argv)
 			exit(1);
 		tot_writes += count_writer[i].update_ops;
 		tot_add += count_writer[i].add;
+		tot_add_exist += count_writer[i].add_exist;
 		tot_remove += count_writer[i].remove;
 	}
-	ht_count_nodes(test_ht, &count, &removed);
+	printf("Counting nodes... ");
+	fflush(stdout);
+	cds_lfht_count_nodes(test_ht, &count, &removed);
+	printf("done.\n");
 	if (count || removed)
 		printf("WARNING: nodes left in the hash table upon destroy: "
 			"%lu nodes + %lu logically removed.\n", count, removed);
-	(void) ht_destroy(test_ht);
+	ret = cds_lfht_destroy(test_ht);
 
-	printf_verbose("final delete: %d items\n", ret);
+	if (ret)
+		printf_verbose("final delete aborted\n");
+	else
+		printf_verbose("final delete success\n");
 	printf_verbose("total number of reads : %llu, writes %llu\n", tot_reads,
 	       tot_writes);
 	printf("SUMMARY %-25s testdur %4lu nr_readers %3u rdur %6lu "
 		"nr_writers %3u "
-		"wdelay %6lu nr_reads %12llu nr_writes %12llu nr_ops %12llu "
-		"nr_add %12llu nr_remove %12llu nr_leaked %12llu\n",
+		"wdelay %6lu rand_pool %12llu nr_reads %12llu nr_writes %12llu nr_ops %12llu "
+		"nr_add %12llu nr_add_fail %12llu nr_remove %12llu nr_leaked %12llu\n",
 		argv[0], duration, nr_readers, rduration,
-		nr_writers, wdelay, tot_reads, tot_writes,
-		tot_reads + tot_writes, tot_add, tot_remove,
+		nr_writers, wdelay, rand_pool, tot_reads, tot_writes,
+		tot_reads + tot_writes, tot_add, tot_add_exist, tot_remove,
 		tot_add - tot_remove - count);
 	free(tid_reader);
 	free(tid_writer);