X-Git-Url: https://git.liburcu.org/?a=blobdiff_plain;f=tests%2Ftest_urcu_hash.c;h=24245932c0862925bd7584abf9d448921d456c7a;hb=c8f5b3840334aed3e15baf10f6dc0f4fd074a367;hp=b13b1bd6f125d18dfbf4d6c6e603d21a49c33bd3;hpb=cd1ae16ab299679750ce9d80579180951f8b877c;p=urcu.git

diff --git a/tests/test_urcu_hash.c b/tests/test_urcu_hash.c
index b13b1bd..2424593 100644
--- a/tests/test_urcu_hash.c
+++ b/tests/test_urcu_hash.c
@@ -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)
@@ -103,9 +115,15 @@ static unsigned long rduration;
 
 static unsigned long init_hash_size = DEFAULT_HASH_SIZE;
 static unsigned long init_populate;
-static unsigned long rand_pool = DEFAULT_RAND_POOL;
+static int opt_auto_resize;
 static int add_only, add_unique;
 
+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)
@@ -151,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.
  */
@@ -357,12 +400,16 @@ void *thr_reader(void *_count)
 	for (;;) {
 		rcu_read_lock();
 		node = cds_lfht_lookup(test_ht,
-			(void *)(unsigned long)(rand_r(&rand_lookup) % rand_pool),
+			(void *)(((unsigned long) rand_r(&rand_lookup) % lookup_pool_size) + lookup_pool_offset),
 			sizeof(void *));
-		if (node == NULL)
+		if (node == NULL) {
+			if (validate_lookup) {
+				printf("[ERROR] Lookup cannot find initial node.\n");
+			}
 			lookup_fail++;
-		else
+		} else {
 			lookup_ok++;
+		}
 		debug_yield_read();
 		if (unlikely(rduration))
 			loop_sleep(rduration);
@@ -412,11 +459,12 @@ void *thr_writer(void *_count)
 	cmm_smp_mb();
 
 	for (;;) {
-		if (add_only || rand_r(&rand_lookup) & 1) {
+		if ((addremove == AR_ADD || add_only)
+				|| (addremove == AR_RANDOM && rand_r(&rand_lookup) & 1)) {
 			node = malloc(sizeof(struct cds_lfht_node));
 			rcu_read_lock();
 			cds_lfht_node_init(node,
-				(void *)(unsigned long)(rand_r(&rand_lookup) % rand_pool),
+				(void *)(((unsigned long) rand_r(&rand_lookup) % write_pool_size) + write_pool_offset),
 				sizeof(void *));
 			if (add_unique)
 				ret_node = cds_lfht_add_unique(test_ht, node);
@@ -432,7 +480,7 @@ void *thr_writer(void *_count)
 			/* May delete */
 			rcu_read_lock();
 			node = cds_lfht_lookup(test_ht,
-				(void *)(unsigned long)(rand_r(&rand_lookup) % rand_pool),
+				(void *)(((unsigned long) rand_r(&rand_lookup) % write_pool_size) + write_pool_offset),
 				sizeof(void *));
 			if (node)
 				ret = cds_lfht_remove(test_ht, node);
@@ -480,17 +528,23 @@ void *thr_writer(void *_count)
 	return ((void*)2);
 }
 
-static void populate_hash(void)
+static int populate_hash(void)
 {
 	struct cds_lfht_node *node, *ret_node;
 
 	if (!init_populate)
-		return;
+		return 0;
+
+	if (add_unique && 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) 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) % rand_pool),
+			(void *)(((unsigned long) rand_r(&rand_lookup) % init_pool_size) + init_pool_offset),
 			sizeof(void *));
 		if (add_unique)
 			ret_node = cds_lfht_add_unique(test_ht, node);
@@ -503,6 +557,7 @@ static void populate_hash(void)
 			nr_add++;
 		nr_writes++;
 	}
+	return 0;
 }
 
 void show_usage(int argc, char **argv)
@@ -515,11 +570,18 @@ 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(" [-k nr_nodes] Number of nodes to insert initially.");
+	printf(" [-A] Automatically resize hash table.");
+	printf(" [-R offset] Lookup pool offset.");
+	printf(" [-S offset] Write pool offset.");
+	printf(" [-T offset] Init pool offset.");
+	printf(" [-M size] Lookup pool size.");
+	printf(" [-N size] Write pool size.");
+	printf(" [-O size] Init pool size.");
+	printf(" [-V] Validate lookups of init values (use with filled init pool, same lookup range, with different write range).");
 	printf("\n");
 }
 
@@ -534,6 +596,8 @@ int main(int argc, char **argv)
 		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);
@@ -597,13 +661,6 @@ 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);
@@ -620,6 +677,31 @@ int main(int argc, char **argv)
 		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;
+
 		}
 	}
 
@@ -630,15 +712,34 @@ int main(int argc, char **argv)
 		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("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("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());
 
@@ -647,8 +748,13 @@ int main(int argc, char **argv)
 	count_reader = malloc(sizeof(*count_reader) * nr_readers);
 	count_writer = malloc(sizeof(*count_writer) * nr_writers);
 	test_ht = cds_lfht_new(test_hash, test_compare, 0x42UL,
-			 init_hash_size, call_rcu);
-	populate_hash();
+			init_hash_size,
+			opt_auto_resize ? CDS_LFHT_AUTO_RESIZE : 0,
+			call_rcu, synchronize_rcu, rcu_read_lock,
+			rcu_read_unlock, rcu_thread_offline,
+			rcu_thread_online);
+	ret = populate_hash();
+	assert(!ret);
         err = create_all_cpu_call_rcu_data(0);
         assert(!err);
 
@@ -671,7 +777,10 @@ int main(int argc, char **argv)
 
 	test_go = 1;
 
-	sleep(duration);
+	remain = duration;
+	do {
+		remain = sleep(remain);
+	} while (remain > 0);
 
 	test_stop = 1;
 
@@ -707,12 +816,13 @@ int main(int argc, char **argv)
 	       tot_writes);
 	printf("SUMMARY %-25s testdur %4lu nr_readers %3u rdur %6lu "
 		"nr_writers %3u "
-		"wdelay %6lu rand_pool %12llu nr_reads %12llu nr_writes %12llu nr_ops %12llu "
+		"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, rand_pool, tot_reads, tot_writes,
+		nr_writers, wdelay, 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);