X-Git-Url: https://git.liburcu.org/?p=urcu.git;a=blobdiff_plain;f=tests%2Ftest_urcu_hash.c;h=b68db492cc0a794e0503059de006109e41e4da02;hp=ba8f9e93c2697e126786c7d16e9cd9e7bc3f339c;hb=adc0de68ccd78689659ed49d4b3d5d36c6720e20;hpb=273399de2e11da5cfea7b412a4bdd904467e9126

diff --git a/tests/test_urcu_hash.c b/tests/test_urcu_hash.c
index ba8f9e9..b68db49 100644
--- a/tests/test_urcu_hash.c
+++ b/tests/test_urcu_hash.c
@@ -1,5 +1,5 @@
 /*
- * test_ht.c
+ * test_urcu_hash.c
  *
  * Userspace RCU library - test program
  *
@@ -37,8 +37,8 @@
 #include <syscall.h>
 #endif
 
-#define HASH_SIZE	32
-#define RAND_POOL	10000
+#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
@@ -46,6 +46,18 @@
 /* hardcoded number of CPUs */
 #define NR_CPUS 16384
 
+#ifdef POISON_FREE
+#define poison_free(ptr)				\
+	do {						\
+		memset(ptr, 0x42, sizeof(*(ptr)));	\
+		free(ptr);				\
+	} while (0)
+#else
+#define poison_free(ptr)	free(ptr)
+#endif
+
+
+
 #if defined(_syscall0)
 _syscall0(pid_t, gettid)
 #elif defined(__NR_gettid)
@@ -66,10 +78,17 @@ 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;
+};
+
 static unsigned int __thread rand_lookup;
 static unsigned long __thread nr_add;
 static unsigned long __thread nr_addexist;
@@ -78,7 +97,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;
@@ -94,6 +113,17 @@ 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 init_populate;
+static int opt_auto_resize;
+static int add_only, add_unique, add_replace;
+
+static unsigned long init_pool_offset, lookup_pool_offset, write_pool_offset;
+static unsigned long init_pool_size = DEFAULT_RAND_POOL,
+	lookup_pool_size = DEFAULT_RAND_POOL,
+	write_pool_size = DEFAULT_RAND_POOL;
+static int validate_lookup;
+
 static inline void loop_sleep(unsigned long l)
 {
 	while(l-- != 0)
@@ -105,7 +135,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];
@@ -139,6 +169,31 @@ static void set_affinity(void)
 	sched_setaffinity(0, sizeof(mask), &mask);
 }
 
+static enum {
+	AR_RANDOM = 0,
+	AR_ADD = 1,
+	AR_REMOVE = -1,
+} addremove;	/* 1: add, -1 remove, 0: random */
+
+static
+void sigusr1_handler(int signo)
+{
+	switch (addremove) {
+	case AR_ADD:
+		printf("Add/Remove: random.\n");
+		addremove = AR_RANDOM;
+		break;
+	case AR_RANDOM:
+		printf("Add/Remove: remove only.\n");
+		addremove = AR_REMOVE;
+		break;
+	case AR_REMOVE:
+		printf("Add/Remove: add only.\n");
+		addremove = AR_ADD;
+		break;
+	}
+}
+
 /*
  * returns 0 if test should end.
  */
@@ -328,7 +383,8 @@ 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;
+	struct cds_lfht_iter iter;
 
 	printf_verbose("thread_begin %s, thread id : %lx, tid %lu\n",
 			"reader", pthread_self(), (unsigned long)gettid());
@@ -344,13 +400,19 @@ void *thr_reader(void *_count)
 
 	for (;;) {
 		rcu_read_lock();
-		node = ht_lookup(test_ht,
-			(void *)(unsigned long)(rand_r(&rand_lookup) % RAND_POOL),
-			sizeof(void *));
-		if (node == NULL)
+		cds_lfht_lookup(test_ht,
+			(void *)(((unsigned long) rand_r(&rand_lookup) % lookup_pool_size) + lookup_pool_offset),
+			sizeof(void *), &iter);
+		node = cds_lfht_iter_get_node(&iter);
+		if (node == NULL) {
+			if (validate_lookup) {
+				printf("[ERROR] Lookup cannot find initial node.\n");
+				exit(-1);
+			}
 			lookup_fail++;
-		else
+		} else {
 			lookup_ok++;
+		}
 		debug_yield_read();
 		if (unlikely(rduration))
 			loop_sleep(rduration);
@@ -358,6 +420,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();
@@ -374,15 +438,16 @@ 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;
-	unsigned long long *count = _count;
+	struct cds_lfht_node *node, *ret_node;
+	struct cds_lfht_iter iter;
+	struct wr_count *count = _count;
 	int ret;
 
 	printf_verbose("thread_begin %s, thread id : %lx, tid %lu\n",
@@ -398,27 +463,42 @@ void *thr_writer(void *_count)
 	cmm_smp_mb();
 
 	for (;;) {
-		if (rand_r(&rand_lookup) & 1) {
-			node = malloc(sizeof(struct rcu_ht_node));
+		if ((addremove == AR_ADD || add_only)
+				|| (addremove == AR_RANDOM && 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) % write_pool_size) + write_pool_offset),
 				sizeof(void *));
-			ret = ht_add_unique(test_ht, node);
+			if (add_unique) {
+				ret_node = cds_lfht_add_unique(test_ht, node);
+			} else {
+				if (add_replace)
+					ret_node = cds_lfht_replace(test_ht, node);
+				else
+					cds_lfht_add(test_ht, node);
+			}
 			rcu_read_unlock();
-			if (ret) {
+			if (add_unique && ret_node != node) {
 				free(node);
 				nr_addexist++;
-			} else
-				nr_add++;
+			} else {
+				if (add_replace && ret_node) {
+					call_rcu(&ret_node->head, free_node_cb);
+					nr_addexist++;
+				} else {
+					nr_add++;
+				}
+			}
 		} else {
 			/* May delete */
 			rcu_read_lock();
-			node = ht_lookup(test_ht,
-				(void *)(unsigned long)(rand_r(&rand_lookup) % RAND_POOL),
-				sizeof(void *));
+			cds_lfht_lookup(test_ht,
+				(void *)(((unsigned long) rand_r(&rand_lookup) % write_pool_size) + write_pool_offset),
+				sizeof(void *), &iter);
+			node = cds_lfht_iter_get_node(&iter);
 			if (node)
-				ret = ht_remove(test_ht, node);
+				ret = cds_lfht_del(test_ht, node);
 			else
 				ret = -ENOENT;
 			rcu_read_unlock();
@@ -445,6 +525,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();
@@ -454,21 +536,82 @@ void *thr_writer(void *_count)
 	printf_verbose("info id %lx: nr_add %lu, nr_addexist %lu, nr_del %lu, "
 			"nr_delnoent %lu\n", pthread_self(), nr_add,
 			nr_addexist, nr_del, nr_delnoent);
-	*count = nr_writes;
+	count->update_ops = nr_writes;
+	count->add = nr_add;
+	count->add_exist = nr_addexist;
+	count->remove = nr_del;
 	return ((void*)2);
 }
 
+static int populate_hash(void)
+{
+	struct cds_lfht_node *node, *ret_node;
+
+	if (!init_populate)
+		return 0;
+
+	if ((add_unique || add_replace) && init_populate * 10 > init_pool_size) {
+		printf("WARNING: required to populate %lu nodes (-k), but random "
+"pool is quite small (%lu values) and we are in add_unique (-u) or add_replace (-s) mode. Try with a "
+"larger random pool (-p option). This may take a while...\n", init_populate, init_pool_size);
+	}
+
+	while (nr_add < init_populate) {
+		node = malloc(sizeof(struct cds_lfht_node));
+		cds_lfht_node_init(node,
+			(void *)(((unsigned long) rand_r(&rand_lookup) % init_pool_size) + init_pool_offset),
+			sizeof(void *));
+		rcu_read_lock();
+		if (add_unique) {
+			ret_node = cds_lfht_add_unique(test_ht, node);
+		} else {
+			if (add_replace)
+				ret_node = cds_lfht_replace(test_ht, node);
+			else
+				cds_lfht_add(test_ht, node);
+		}
+		rcu_read_unlock();
+		if (add_unique && ret_node != node) {
+			free(node);
+			nr_addexist++;
+		} else {
+			if (add_replace && ret_node) {
+				call_rcu(&ret_node->head, free_node_cb);
+				nr_addexist++;
+			} else {
+				nr_add++;
+			}
+		}
+		nr_writes++;
+	}
+	return 0;
+}
+
 void show_usage(int argc, char **argv)
 {
-	printf("Usage : %s nr_readers nr_writers duration (s)", argv[0]);
+	printf("Usage : %s nr_readers nr_writers duration (s)\n", argv[0]);
 #ifdef DEBUG_YIELD
-	printf(" [-r] [-w] (yield reader and/or writer)");
+	printf("        [-r] [-w] (yield reader and/or writer)\n");
 #endif
-	printf(" [-d delay] (writer period (us))");
-	printf(" [-c duration] (reader C.S. duration (in loops))");
-	printf(" [-v] (verbose output)");
-	printf(" [-a cpu#] [-a cpu#]... (affinity)");
-	printf("\n");
+	printf("        [-d delay] (writer period (us))\n");
+	printf("        [-c duration] (reader C.S. duration (in loops))\n");
+	printf("        [-v] (verbose output)\n");
+	printf("        [-a cpu#] [-a cpu#]... (affinity)\n");
+	printf("        [-h size] (initial hash table size)\n");
+	printf("        [not -u nor -s] Add entries (supports redundant keys).\n");
+	printf("        [-u] Uniquify add (no redundant keys).\n");
+	printf("        [-s] Replace (swap) entries.\n");
+	printf("        [-i] Add only (no removal).\n");
+	printf("        [-k nr_nodes] Number of nodes to insert initially.\n");
+	printf("        [-A] Automatically resize hash table.\n");
+	printf("        [-R offset] Lookup pool offset.\n");
+	printf("        [-S offset] Write pool offset.\n");
+	printf("        [-T offset] Init pool offset.\n");
+	printf("        [-M size] Lookup pool size.\n");
+	printf("        [-N size] Write pool size.\n");
+	printf("        [-O size] Init pool size.\n");
+	printf("        [-V] Validate lookups of init values (use with filled init pool, same lookup range, with different write range).\n");
+	printf("\n\n");
 }
 
 int main(int argc, char **argv)
@@ -476,9 +619,14 @@ int main(int argc, char **argv)
 	int err;
 	pthread_t *tid_reader, *tid_writer;
 	void *tret;
-	unsigned long long *count_reader, *count_writer;
-	unsigned long long tot_reads = 0, tot_writes = 0;
+	unsigned long long *count_reader;
+	struct wr_count *count_writer;
+	unsigned long long tot_reads = 0, tot_writes = 0,
+		tot_add = 0, tot_add_exist = 0, tot_remove = 0;
+	unsigned long count, removed;
 	int i, a, ret;
+	struct sigaction act;
+	unsigned int remain;
 
 	if (argc < 4) {
 		show_usage(argc, argv);
@@ -542,13 +690,96 @@ int main(int argc, char **argv)
 		case 'v':
 			verbose_mode = 1;
 			break;
+		case 'h':
+			if (argc < i + 2) {
+				show_usage(argc, argv);
+				return -1;
+			}
+			init_hash_size = atol(argv[++i]);
+			break;
+		case 'u':
+			if (add_replace) {
+				printf("Please specify at most one of -s or -u.\n");
+				exit(-1);
+			}
+			add_unique = 1;
+			break;
+		case 's':
+			if (add_unique) {
+				printf("Please specify at most one of -s or -u.\n");
+				exit(-1);
+			}
+			add_replace = 1;
+			break;
+		case 'i':
+			add_only = 1;
+			break;
+		case 'k':
+			init_populate = atol(argv[++i]);
+			break;
+		case 'A':
+			opt_auto_resize = 1;
+			break;
+		case 'R':
+			lookup_pool_offset = atol(argv[++i]);
+			break;
+		case 'S':
+			write_pool_offset = atol(argv[++i]);
+			break;
+		case 'T':
+			init_pool_offset = atol(argv[++i]);
+			break;
+		case 'M':
+			lookup_pool_size = atol(argv[++i]);
+			break;
+		case 'N':
+			write_pool_size = atol(argv[++i]);
+			break;
+		case 'O':
+			init_pool_size = atol(argv[++i]);
+			break;
+		case 'V':
+			validate_lookup = 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;
+	}
+
+	memset(&act, 0, sizeof(act));
+	ret = sigemptyset(&act.sa_mask);
+	if (ret == -1) {
+		perror("sigemptyset");
+		return -1;
+	}
+	act.sa_handler = sigusr1_handler;
+	act.sa_flags = SA_RESTART;
+	ret = sigaction(SIGUSR1, &act, NULL);
+	if (ret == -1) {
+		perror("sigaction");
+		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("Mode:%s%s.\n",
+		add_only ? " add only" : " add/remove",
+		add_unique ? " uniquify" : ( add_replace ? " replace" : " insert"));
+	printf_verbose("Initial hash table size: %lu buckets.\n", init_hash_size);
+	printf_verbose("Init pool size offset %lu size %lu.\n",
+		init_pool_offset, init_pool_size);
+	printf_verbose("Lookup pool size offset %lu size %lu.\n",
+		lookup_pool_offset, lookup_pool_size);
+	printf_verbose("Update pool size offset %lu size %lu.\n",
+		write_pool_offset, write_pool_size);
 	printf_verbose("thread %-6s, thread id : %lx, tid %lu\n",
 			"main", pthread_self(), (unsigned long)gettid());
 
@@ -556,8 +787,22 @@ 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);
+
+	err = create_all_cpu_call_rcu_data(0);
+        assert(!err);
+
+	/*
+	 * Hash creation and population needs to be seen as a RCU reader
+	 * thread from the point of view of resize.
+	 */
+	rcu_register_thread();
+	test_ht = cds_lfht_new(test_hash, test_compare, 0x42UL,
+			init_hash_size,
+			opt_auto_resize ? CDS_LFHT_AUTO_RESIZE : 0, NULL);
+      	ret = populate_hash();
+	assert(!ret);
+	rcu_unregister_thread();
+
 	next_aff = 0;
 
 	for (i = 0; i < nr_readers; i++) {
@@ -577,7 +822,10 @@ int main(int argc, char **argv)
 
 	test_go = 1;
 
-	sleep(duration);
+	remain = duration;
+	do {
+		remain = sleep(remain);
+	} while (remain > 0);
 
 	test_stop = 1;
 
@@ -591,26 +839,35 @@ int main(int argc, char **argv)
 		err = pthread_join(tid_writer[i], &tret);
 		if (err != 0)
 			exit(1);
-		tot_writes += count_writer[i];
+		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;
 	}
-	ret = ht_destroy(test_ht);
-	if (ret) {
-		unsigned long count, removed;
-
-		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);
-	}
+	ret = cds_lfht_destroy(test_ht, NULL);
 
-	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\n",
+		"wdelay %6lu nr_reads %12llu nr_writes %12llu nr_ops %12llu "
+		"nr_add %12llu nr_add_fail %12llu nr_remove %12llu nr_leaked %12lld\n",
 		argv[0], duration, nr_readers, rduration,
 		nr_writers, wdelay, tot_reads, tot_writes,
-		tot_reads + tot_writes);
+		tot_reads + tot_writes, tot_add, tot_add_exist, tot_remove,
+		(long long) tot_add + init_populate - tot_remove - count);
+	free_all_cpu_call_rcu_data();
 	free(tid_reader);
 	free(tid_writer);
 	free(count_reader);