X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=tests%2Ftest_urcu_hash.c;h=2bdaa38ac6da8e3da5654ff06516fca12846c3cc;hb=59b10634e3ec5ca35111f24d8b880935193e6266;hp=80169127dcd3121b59cd9d6b082ec2a0eaa30960;hpb=3967a8a8984fe5cb7ac83996db6709c8aae857c2;p=urcu.git

diff --git a/tests/test_urcu_hash.c b/tests/test_urcu_hash.c
index 8016912..2bdaa38 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)
@@ -104,8 +116,12 @@ 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 int validate_lookup;
+
 static inline void loop_sleep(unsigned long l)
 {
 	while(l-- != 0)
@@ -382,12 +398,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) % rand_pool) + 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);
@@ -442,7 +462,7 @@ void *thr_writer(void *_count)
 			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) % rand_pool) + write_pool_offset),
 				sizeof(void *));
 			if (add_unique)
 				ret_node = cds_lfht_add_unique(test_ht, node);
@@ -458,7 +478,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) % rand_pool) + write_pool_offset),
 				sizeof(void *));
 			if (node)
 				ret = cds_lfht_remove(test_ht, node);
@@ -516,14 +536,13 @@ static int populate_hash(void)
 	if (add_unique && init_populate * 10 > rand_pool) {
 		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).\n", init_populate, rand_pool);
-		return -1;
+"larger random pool (-p option). This may take a while...\n", init_populate, rand_pool);
 	}
 
 	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) % rand_pool) + init_pool_offset),
 			sizeof(void *));
 		if (add_unique)
 			ret_node = cds_lfht_add_unique(test_ht, node);
@@ -554,6 +573,11 @@ void show_usage(int argc, char **argv)
 	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(" [-V] Validate lookups of init values (use with filled init pool, same lookup range, with different write range).");
 	printf("\n");
 }
 
@@ -656,6 +680,22 @@ 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 'V':
+			validate_lookup = 1;
+			break;
+
 		}
 	}
 
@@ -697,7 +737,11 @@ 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);
+			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);
@@ -767,6 +811,7 @@ int main(int argc, char **argv)
 		nr_writers, wdelay, rand_pool, 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);