X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=tests%2Ftest_urcu_hash.c;h=a2b5b7bca656902dc11b3d3e3d2902a8235df0c0;hb=2d72fae24ceebe2efa486b5bad421f39917ec0a6;hp=3578cc9b2b121bb57dd916dd1a3d3811e86cd420;hpb=18ca7a5b5573e511a66f118ec863df82a6d247e4;p=userspace-rcu.git

diff --git a/tests/test_urcu_hash.c b/tests/test_urcu_hash.c
index 3578cc9..a2b5b7b 100644
--- a/tests/test_urcu_hash.c
+++ b/tests/test_urcu_hash.c
@@ -23,13 +23,72 @@
 #define _GNU_SOURCE
 #include "test_urcu_hash.h"
 
-unsigned int __thread rand_lookup;
-unsigned long __thread nr_add;
-unsigned long __thread nr_addexist;
-unsigned long __thread nr_del;
-unsigned long __thread nr_delnoent;
-unsigned long __thread lookup_fail;
-unsigned long __thread lookup_ok;
+enum test_hash {
+	TEST_HASH_RW,
+	TEST_HASH_UNIQUE,
+};
+
+struct test_hash_cb {
+	void (*sigusr1)(int signo);
+	void (*sigusr2)(int signo);
+	void *(*thr_reader)(void *_count);
+	void *(*thr_writer)(void *_count);
+	int (*populate_hash)(void);
+};
+
+static
+struct test_hash_cb test_hash_cb[] = {
+	[TEST_HASH_RW] = {
+		test_hash_rw_sigusr1_handler,
+		test_hash_rw_sigusr2_handler,
+		test_hash_rw_thr_reader,
+		test_hash_rw_thr_writer,
+		test_hash_rw_populate_hash,
+	},
+	[TEST_HASH_UNIQUE] = {
+		test_hash_unique_sigusr1_handler,
+		test_hash_unique_sigusr2_handler,
+		test_hash_unique_thr_reader,
+		test_hash_unique_thr_writer,
+		test_hash_unique_populate_hash,
+	},
+
+};
+
+static enum test_hash test_choice = TEST_HASH_RW;
+
+void (*get_sigusr1_cb(void))(int)
+{
+	return test_hash_cb[test_choice].sigusr1;
+}
+
+void (*get_sigusr2_cb(void))(int)
+{
+	return test_hash_cb[test_choice].sigusr2;
+}
+
+void *(*get_thr_reader_cb(void))(void *)
+{
+	return test_hash_cb[test_choice].thr_reader;
+}
+
+void *(*get_thr_writer_cb(void))(void *)
+{
+	return test_hash_cb[test_choice].thr_writer;
+}
+
+int (*get_populate_hash_cb(void))(void)
+{
+	return test_hash_cb[test_choice].populate_hash;
+}
+
+DEFINE_URCU_TLS(unsigned int, rand_lookup);
+DEFINE_URCU_TLS(unsigned long, nr_add);
+DEFINE_URCU_TLS(unsigned long, nr_addexist);
+DEFINE_URCU_TLS(unsigned long, nr_del);
+DEFINE_URCU_TLS(unsigned long, nr_delnoent);
+DEFINE_URCU_TLS(unsigned long, lookup_fail);
+DEFINE_URCU_TLS(unsigned long, lookup_ok);
 
 struct cds_lfht *test_ht;
 
@@ -55,6 +114,7 @@ unsigned long init_pool_size = DEFAULT_RAND_POOL,
 	lookup_pool_size = DEFAULT_RAND_POOL,
 	write_pool_size = DEFAULT_RAND_POOL;
 int validate_lookup;
+unsigned long nr_hash_chains;	/* 0: normal table, other: number of hash chains */
 
 int count_pipe[2];
 
@@ -66,8 +126,8 @@ int use_affinity = 0;
 
 pthread_mutex_t affinity_mutex = PTHREAD_MUTEX_INITIALIZER;
 
-unsigned long long __thread nr_writes;
-unsigned long long __thread nr_reads;
+DEFINE_URCU_TLS(unsigned long long, nr_writes);
+DEFINE_URCU_TLS(unsigned long long, nr_reads);
 
 unsigned int nr_readers;
 unsigned int nr_writers;
@@ -141,7 +201,8 @@ unsigned long test_compare(const void *key1, size_t key1_len,
 void *thr_count(void *arg)
 {
 	printf_verbose("thread_begin %s, thread id : %lx, tid %lu\n",
-			"counter", pthread_self(), (unsigned long)gettid());
+			"counter", (unsigned long) pthread_self(),
+			(unsigned long) gettid());
 
 	rcu_register_thread();
 
@@ -230,6 +291,8 @@ printf("        [not -u nor -s] Add entries (supports redundant keys).\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("	[-U] Uniqueness test.\n");
+	printf("	[-C] Number of hash chains.\n");
 	printf("\n\n");
 }
 
@@ -393,7 +456,12 @@ int main(int argc, char **argv)
 		case 'V':
 			validate_lookup = 1;
 			break;
-
+		case 'U':
+			test_choice = TEST_HASH_UNIQUE;
+			break;
+		case 'C':
+			nr_hash_chains = atol(argv[++i]);
+			break;
 		}
 	}
 
@@ -422,7 +490,7 @@ int main(int argc, char **argv)
 		perror("sigemptyset");
 		return -1;
 	}
-	act.sa_handler = test_hash_rw_sigusr1_handler;
+	act.sa_handler = get_sigusr1_cb();
 	act.sa_flags = SA_RESTART;
 	ret = sigaction(SIGUSR1, &act, NULL);
 	if (ret == -1) {
@@ -442,7 +510,7 @@ int main(int argc, char **argv)
 	if (err != 0)
 		exit(1);
 
-	act.sa_handler = test_hash_rw_sigusr2_handler;
+	act.sa_handler = get_sigusr2_cb();
 	act.sa_flags = SA_RESTART;
 	ret = sigaction(SIGUSR2, &act, NULL);
 	if (ret == -1) {
@@ -466,8 +534,11 @@ int main(int argc, char **argv)
 		lookup_pool_offset, lookup_pool_size);
 	printf_verbose("Update pool size offset %lu size %lu.\n",
 		write_pool_offset, write_pool_size);
+	printf_verbose("Number of hash chains: %lu.\n",
+		nr_hash_chains);
 	printf_verbose("thread %-6s, thread id : %lx, tid %lu\n",
-			"main", pthread_self(), (unsigned long)gettid());
+			"main", (unsigned long) pthread_self(),
+			(unsigned long) gettid());
 
 	tid_reader = malloc(sizeof(*tid_reader) * nr_readers);
 	tid_writer = malloc(sizeof(*tid_writer) * nr_writers);
@@ -491,13 +562,17 @@ int main(int argc, char **argv)
 				(opt_auto_resize ? CDS_LFHT_AUTO_RESIZE : 0) |
 				CDS_LFHT_ACCOUNTING, NULL);
 	}
+	if (!test_ht) {
+		printf("Error allocating hash table.\n");
+		return -1;
+	}
 
 	/*
 	 * Hash Population needs to be seen as a RCU reader
 	 * thread from the point of view of resize.
 	 */
 	rcu_register_thread();
-      	ret = test_hash_rw_populate_hash();
+      	ret = (get_populate_hash_cb())();
 	assert(!ret);
 
 	rcu_thread_offline();
@@ -506,14 +581,14 @@ int main(int argc, char **argv)
 
 	for (i = 0; i < nr_readers; i++) {
 		err = pthread_create(&tid_reader[i],
-				     NULL, test_hash_rw_thr_reader,
+				     NULL, get_thr_reader_cb(),
 				     &count_reader[i]);
 		if (err != 0)
 			exit(1);
 	}
 	for (i = 0; i < nr_writers; i++) {
 		err = pthread_create(&tid_writer[i],
-				     NULL, test_hash_rw_thr_writer,
+				     NULL, get_thr_writer_cb(),
 				     &count_writer[i]);
 		if (err != 0)
 			exit(1);