X-Git-Url: https://git.liburcu.org/?p=urcu.git;a=blobdiff_plain;f=tests%2Ftest_urcu_hash.c;h=9416224d8af115491d689ff4328078482591d78c;hp=be0eaf4f6e746864ff8093503999cb1304144016;hb=94df63189704b8f6483c737988df3728f5e13c2d;hpb=3c16bf4b5cae53ee352482072bec2e326477d8b3

diff --git a/tests/test_urcu_hash.c b/tests/test_urcu_hash.c
index be0eaf4..9416224 100644
--- a/tests/test_urcu_hash.c
+++ b/tests/test_urcu_hash.c
@@ -1,9 +1,9 @@
 /*
- * test_ht.c
+ * test_urcu_hash.c
  *
  * Userspace RCU library - test program
  *
- * Copyright February 2009 - Mathieu Desnoyers <mathieu.desnoyers@polymtl.ca>
+ * Copyright 2009-2012 - Mathieu Desnoyers <mathieu.desnoyers@polymtl.ca>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -21,119 +21,130 @@
  */
 
 #define _GNU_SOURCE
-#include <stdio.h>
-#include <pthread.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sys/types.h>
-#include <sys/wait.h>
-#include <unistd.h>
-#include <stdio.h>
-#include <assert.h>
-#include <sched.h>
-#include <errno.h>
-
-#ifdef __linux__
-#include <syscall.h>
-#endif
+#include "test_urcu_hash.h"
+
+enum test_hash {
+	TEST_HASH_RW,
+	TEST_HASH_UNIQUE,
+};
 
-#define DEFAULT_HASH_SIZE	32
-#define DEFAULT_RAND_POOL	1000000
+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,
+	},
 
-/* Make this big enough to include the POWER5+ L3 cacheline size of 256B */
-#define CACHE_LINE_SIZE 4096
+};
 
-/* hardcoded number of CPUs */
-#define NR_CPUS 16384
+static enum test_hash test_choice = TEST_HASH_RW;
 
-#if defined(_syscall0)
-_syscall0(pid_t, gettid)
-#elif defined(__NR_gettid)
-static inline pid_t gettid(void)
+void (*get_sigusr1_cb(void))(int)
 {
-	return syscall(__NR_gettid);
+	return test_hash_cb[test_choice].sigusr1;
 }
-#else
-#warning "use pid as tid"
-static inline pid_t gettid(void)
+
+void (*get_sigusr2_cb(void))(int)
 {
-	return getpid();
+	return test_hash_cb[test_choice].sigusr2;
 }
-#endif
 
-#ifndef DYNAMIC_LINK_TEST
-#define _LGPL_SOURCE
-#else
-#define debug_yield_read()
-#endif
-#include <urcu.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;
-};
+void *(*get_thr_reader_cb(void))(void *)
+{
+	return test_hash_cb[test_choice].thr_reader;
+}
 
-static unsigned int __thread rand_lookup;
-static unsigned long __thread nr_add;
-static unsigned long __thread nr_addexist;
-static unsigned long __thread nr_del;
-static unsigned long __thread nr_delnoent;
-static unsigned long __thread lookup_fail;
-static unsigned long __thread lookup_ok;
+void *(*get_thr_writer_cb(void))(void *)
+{
+	return test_hash_cb[test_choice].thr_writer;
+}
 
-static struct cds_lfht *test_ht;
+int (*get_populate_hash_cb(void))(void)
+{
+	return test_hash_cb[test_choice].populate_hash;
+}
 
-struct test_data {
-	int a;
-	int b;
-};
+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;
 
-static volatile int test_go, test_stop;
+volatile int test_go, test_stop;
 
-static unsigned long wdelay;
+unsigned long wdelay;
 
-static unsigned long duration;
+unsigned long duration;
 
 /* read-side C.S. duration, in loops */
-static unsigned long rduration;
+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;
+unsigned long init_hash_size = DEFAULT_HASH_SIZE;
+unsigned long min_hash_alloc_size = DEFAULT_MIN_ALLOC_SIZE;
+unsigned long max_hash_buckets_size = (1UL << 20);
+unsigned long init_populate;
+int opt_auto_resize;
+int add_only, add_unique, add_replace;
+const struct cds_lfht_mm_type *memory_backend;
 
-static inline void loop_sleep(unsigned long l)
-{
-	while(l-- != 0)
-		caa_cpu_relax();
-}
+unsigned long init_pool_offset, lookup_pool_offset, write_pool_offset;
+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 */
 
-static int verbose_mode;
+int count_pipe[2];
 
-#define printf_verbose(fmt, args...)		\
-	do {					\
-		if (verbose_mode)		\
-			printf(fmt, ## args);	\
-	} while (0)
+int verbose_mode;
 
-static unsigned int cpu_affinities[NR_CPUS];
-static unsigned int next_aff = 0;
-static int use_affinity = 0;
+unsigned int cpu_affinities[NR_CPUS];
+unsigned int next_aff = 0;
+int use_affinity = 0;
 
 pthread_mutex_t affinity_mutex = PTHREAD_MUTEX_INITIALIZER;
 
-static void set_affinity(void)
+DEFINE_URCU_TLS(unsigned long long, nr_writes);
+DEFINE_URCU_TLS(unsigned long long, nr_reads);
+
+unsigned int nr_readers;
+unsigned int nr_writers;
+
+static pthread_mutex_t rcu_copy_mutex = PTHREAD_MUTEX_INITIALIZER;
+
+void set_affinity(void)
 {
+#if HAVE_SCHED_SETAFFINITY
 	cpu_set_t mask;
-	int cpu;
-	int ret;
+	int cpu, ret;
+#endif /* HAVE_SCHED_SETAFFINITY */
 
 	if (!use_affinity)
 		return;
 
+#if HAVE_SCHED_SETAFFINITY
 	ret = pthread_mutex_lock(&affinity_mutex);
 	if (ret) {
 		perror("Error in pthread mutex lock");
@@ -147,30 +158,14 @@ static void set_affinity(void)
 	}
 	CPU_ZERO(&mask);
 	CPU_SET(cpu, &mask);
+#if SCHED_SETAFFINITY_ARGS == 2
+	sched_setaffinity(0, &mask);
+#else
 	sched_setaffinity(0, sizeof(mask), &mask);
+#endif
+#endif /* HAVE_SCHED_SETAFFINITY */
 }
 
-/*
- * returns 0 if test should end.
- */
-static int test_duration_write(void)
-{
-	return !test_stop;
-}
-
-static int test_duration_read(void)
-{
-	return !test_stop;
-}
-
-static unsigned long long __thread nr_writes;
-static unsigned long long __thread nr_reads;
-
-static unsigned int nr_readers;
-static unsigned int nr_writers;
-
-pthread_mutex_t rcu_copy_mutex = PTHREAD_MUTEX_INITIALIZER;
-
 void rcu_copy_mutex_lock(void)
 {
 	int ret;
@@ -192,142 +187,10 @@ void rcu_copy_mutex_unlock(void)
 	}
 }
 
-/*
- * Hash function
- * Source: http://burtleburtle.net/bob/c/lookup3.c
- * Originally Public Domain
- */
-
-#define rot(x, k) (((x) << (k)) | ((x) >> (32 - (k))))
-
-#define mix(a, b, c) \
-do { \
-	a -= c; a ^= rot(c,  4); c += b; \
-	b -= a; b ^= rot(a,  6); a += c; \
-	c -= b; c ^= rot(b,  8); b += a; \
-	a -= c; a ^= rot(c, 16); c += b; \
-	b -= a; b ^= rot(a, 19); a += c; \
-	c -= b; c ^= rot(b,  4); b += a; \
-} while (0)
-
-#define final(a, b, c) \
-{ \
-	c ^= b; c -= rot(b, 14); \
-	a ^= c; a -= rot(c, 11); \
-	b ^= a; b -= rot(a, 25); \
-	c ^= b; c -= rot(b, 16); \
-	a ^= c; a -= rot(c,  4);\
-	b ^= a; b -= rot(a, 14); \
-	c ^= b; c -= rot(b, 24); \
-}
-
-static __attribute__((unused))
-uint32_t hash_u32(
-	const uint32_t *k,	/* the key, an array of uint32_t values */
-	size_t length,		/* the length of the key, in uint32_ts */
-	uint32_t initval)	/* the previous hash, or an arbitrary value */
+unsigned long test_compare(const void *key1, size_t key1_len,
+			   const void *key2, size_t key2_len)
 {
-	uint32_t a, b, c;
-
-	/* Set up the internal state */
-	a = b = c = 0xdeadbeef + (((uint32_t) length) << 2) + initval;
-
-	/*----------------------------------------- handle most of the key */
-	while (length > 3) {
-		a += k[0];
-		b += k[1];
-		c += k[2];
-		mix(a, b, c);
-		length -= 3;
-		k += 3;
-	}
-
-	/*----------------------------------- handle the last 3 uint32_t's */
-	switch (length) {	/* all the case statements fall through */
-	case 3: c += k[2];
-	case 2: b += k[1];
-	case 1: a += k[0];
-		final(a, b, c);
-	case 0:			/* case 0: nothing left to add */
-		break;
-	}
-	/*---------------------------------------------- report the result */
-	return c;
-}
-
-static
-void hashword2(
-	const uint32_t *k,	/* the key, an array of uint32_t values */
-	size_t length,		/* the length of the key, in uint32_ts */
-	uint32_t *pc,		/* IN: seed OUT: primary hash value */
-	uint32_t *pb)		/* IN: more seed OUT: secondary hash value */
-{
-	uint32_t a, b, c;
-
-	/* Set up the internal state */
-	a = b = c = 0xdeadbeef + ((uint32_t) (length << 2)) + *pc;
-	c += *pb;
-
-	/*----------------------------------------- handle most of the key */
-	while (length > 3) {
-		a += k[0];
-		b += k[1];
-		c += k[2];
-		mix(a, b, c);
-		length -= 3;
-		k += 3;
-	}
-
-	/*----------------------------------- handle the last 3 uint32_t's */
-	switch (length) {	/* all the case statements fall through */
-	case 3: c += k[2];
-	case 2: b += k[1];
-	case 1: a += k[0];
-		final(a, b, c);
-	case 0:			/* case 0: nothing left to add */
-		break;
-	}
-	/*---------------------------------------------- report the result */
-	*pc = c;
-	*pb = b;
-}
-
-#if (CAA_BITS_PER_LONG == 32)
-static
-unsigned long test_hash(void *_key, size_t length, unsigned long seed)
-{
-	unsigned long key = (unsigned long) _key;
-	unsigned long v;
-
-	assert(length == sizeof(unsigned long));
-	return hash_u32(&v, 1, seed);
-}
-#else
-static
-unsigned long test_hash(void *_key, size_t length, unsigned long seed)
-{
-	union {
-		uint64_t v64;
-		uint32_t v32[2];
-	} v;
-	union {
-		uint64_t v64;
-		uint32_t v32[2];
-	} key;
-
-	assert(length == sizeof(unsigned long));
-	v.v64 = (uint64_t) seed;
-	key.v64 = (uint64_t) _key;
-	hashword2(key.v32, 2, &v.v32[0], &v.v32[1]);
-	return v.v64;
-}
-#endif
-
-static
-unsigned long test_compare(void *key1, size_t key1_len,
-                           void *key2, size_t key2_len)
-{
-	if (unlikely(key1_len != key2_len))
+	if (caa_unlikely(key1_len != key2_len))
 		return -1;
 	assert(key1_len == sizeof(unsigned long));
 	if (key1 == key2)
@@ -336,195 +199,149 @@ unsigned long test_compare(void *key1, size_t key1_len,
 		return 1;
 }
 
-void *thr_reader(void *_count)
+void *thr_count(void *arg)
 {
-	unsigned long long *count = _count;
-	struct cds_lfht_node *node;
-
-	printf_verbose("thread_begin %s, thread id : %lx, tid %lu\n",
-			"reader", pthread_self(), (unsigned long)gettid());
-
-	set_affinity();
+	printf_verbose("thread_begin %s, tid %lu\n",
+			"counter", urcu_get_thread_id());
 
 	rcu_register_thread();
 
-	while (!test_go)
-	{
-	}
-	cmm_smp_mb();
-
 	for (;;) {
+		unsigned long count;
+		long approx_before, approx_after;
+		ssize_t len;
+		char buf[1];
+
+		rcu_thread_offline();
+		len = read(count_pipe[0], buf, 1);
+		rcu_thread_online();
+		if (caa_unlikely(!test_duration_read()))
+			break;
+		if (len != 1)
+			continue;
+		/* Accounting */
+		printf("Counting nodes... ");
+		fflush(stdout);
 		rcu_read_lock();
-		node = cds_lfht_lookup(test_ht,
-			(void *)(unsigned long)(rand_r(&rand_lookup) % rand_pool),
-			sizeof(void *));
-		if (node == NULL)
-			lookup_fail++;
-		else
-			lookup_ok++;
-		debug_yield_read();
-		if (unlikely(rduration))
-			loop_sleep(rduration);
+		cds_lfht_count_nodes(test_ht, &approx_before, &count,
+				&approx_after);
 		rcu_read_unlock();
-		nr_reads++;
-		if (unlikely(!test_duration_read()))
-			break;
+		printf("done.\n");
+		printf("Approximation before node accounting: %ld nodes.\n",
+			approx_before);
+		printf("Accounting of nodes in the hash table: "
+			"%lu nodes.\n",
+			count);
+		printf("Approximation after node accounting: %ld nodes.\n",
+			approx_after);
 	}
-
 	rcu_unregister_thread();
-
-	*count = nr_reads;
-	printf_verbose("thread_end %s, thread id : %lx, tid %lu\n",
-			"reader", pthread_self(), (unsigned long)gettid());
-	printf_verbose("readid : %lx, lookupfail %lu, lookupok %lu\n",
-			pthread_self(), lookup_fail, lookup_ok);
-	return ((void*)1);
-
+	return NULL;
 }
 
-static
 void free_node_cb(struct rcu_head *head)
 {
-	struct cds_lfht_node *node =
-		caa_container_of(head, struct cds_lfht_node, head);
+	struct lfht_test_node *node =
+		caa_container_of(head, struct lfht_test_node, head);
 	free(node);
 }
 
-void *thr_writer(void *_count)
+static
+void test_delete_all_nodes(struct cds_lfht *ht)
 {
-	struct cds_lfht_node *node, *ret_node;
-	struct wr_count *count = _count;
-	int ret;
-
-	printf_verbose("thread_begin %s, thread id : %lx, tid %lu\n",
-			"writer", pthread_self(), (unsigned long)gettid());
+	struct cds_lfht_iter iter;
+	struct lfht_test_node *node;
+	unsigned long count = 0;
 
-	set_affinity();
+	cds_lfht_for_each_entry(ht, &iter, node, node) {
+		int ret;
 
-	rcu_register_thread();
-
-	while (!test_go)
-	{
-	}
-	cmm_smp_mb();
-
-	for (;;) {
-		if (add_only || 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),
-				sizeof(void *));
-			if (add_unique)
-				ret_node = cds_lfht_add_unique(test_ht, node);
-			else
-				cds_lfht_add(test_ht, node);
-			rcu_read_unlock();
-			if (add_unique && ret_node != node) {
-				free(node);
-				nr_addexist++;
-			} else
-				nr_add++;
-		} else {
-			/* May delete */
-			rcu_read_lock();
-			node = cds_lfht_lookup(test_ht,
-				(void *)(unsigned long)(rand_r(&rand_lookup) % rand_pool),
-				sizeof(void *));
-			if (node)
-				ret = cds_lfht_remove(test_ht, node);
-			else
-				ret = -ENOENT;
-			rcu_read_unlock();
-			if (ret == 0) {
-				call_rcu(&node->head, free_node_cb);
-				nr_del++;
-			} else
-				nr_delnoent++;
-		}
-#if 0
-		//if (nr_writes % 100000 == 0) {
-		if (nr_writes % 1000 == 0) {
-			rcu_read_lock();
-			if (rand_r(&rand_lookup) & 1) {
-				ht_resize(test_ht, 1);
-			} else {
-				ht_resize(test_ht, -1);
-			}
-			rcu_read_unlock();
-		}
-#endif //0
-		nr_writes++;
-		if (unlikely(!test_duration_write()))
-			break;
-		if (unlikely(wdelay))
-			loop_sleep(wdelay);
+		ret = cds_lfht_del(test_ht, cds_lfht_iter_get_node(&iter));
+		assert(!ret);
+		call_rcu(&node->head, free_node_cb);
+		count++;
 	}
-
-	rcu_unregister_thread();
-
-	printf_verbose("thread_end %s, thread id : %lx, tid %lu\n",
-			"writer", pthread_self(), (unsigned long)gettid());
-	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->update_ops = nr_writes;
-	count->add = nr_add;
-	count->add_exist = nr_addexist;
-	count->remove = nr_del;
-	return ((void*)2);
+	printf("deleted %lu nodes.\n", count);
 }
 
 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) <OPTIONS>\n",
+		argv[0]);
+	printf("OPTIONS:\n");
 #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(" [-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("        [-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 number of buckets)\n");
+	printf("        [-m size] (minimum number of allocated buckets)\n");
+	printf("        [-n size] (maximum number of buckets)\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("        [-B order|chunk|mmap] Specify the memory backend.\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.\n");
+	printf("		(use with filled init pool, same lookup range,\n");
+	printf("		with different write range)\n");
+	printf("	[-U] Uniqueness test.\n");
+	printf("	[-C] Number of hash chains.\n");
 	printf("\n");
 }
 
 int main(int argc, char **argv)
 {
-	int err;
 	pthread_t *tid_reader, *tid_writer;
+	pthread_t tid_count;
 	void *tret;
 	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;
+	unsigned long count;
+	long approx_before, approx_after;
+	int i, a, ret, err, mainret = 0;
+	struct sigaction act;
+	unsigned int remain;
+	unsigned int nr_readers_created = 0, nr_writers_created = 0;
+	long long nr_leaked;
 
 	if (argc < 4) {
 		show_usage(argc, argv);
-		return -1;
+		mainret = 1;
+		goto end;
 	}
 
 	err = sscanf(argv[1], "%u", &nr_readers);
 	if (err != 1) {
 		show_usage(argc, argv);
-		return -1;
+		mainret = 1;
+		goto end;
 	}
 
 	err = sscanf(argv[2], "%u", &nr_writers);
 	if (err != 1) {
 		show_usage(argc, argv);
-		return -1;
+		mainret = 1;
+		goto end;
 	}
 	
 	err = sscanf(argv[3], "%lu", &duration);
 	if (err != 1) {
 		show_usage(argc, argv);
-		return -1;
+		mainret = 1;
+		goto end;
 	}
 
 	for (i = 4; i < argc; i++) {
@@ -542,7 +359,8 @@ int main(int argc, char **argv)
 		case 'a':
 			if (argc < i + 2) {
 				show_usage(argc, argv);
-				return -1;
+				mainret = 1;
+				goto end;
 			}
 			a = atoi(argv[++i]);
 			cpu_affinities[next_aff++] = a;
@@ -552,136 +370,405 @@ int main(int argc, char **argv)
 		case 'c':
 			if (argc < i + 2) {
 				show_usage(argc, argv);
-				return -1;
+				mainret = 1;
+				goto end;
 			}
 			rduration = atol(argv[++i]);
 			break;
 		case 'd':
 			if (argc < i + 2) {
 				show_usage(argc, argv);
-				return -1;
+				mainret = 1;
+				goto end;
 			}
 			wdelay = atol(argv[++i]);
 			break;
 		case 'v':
 			verbose_mode = 1;
 			break;
-		case 'p':
+		case 'h':
 			if (argc < i + 2) {
 				show_usage(argc, argv);
-				return -1;
+				mainret = 1;
+				goto end;
 			}
-			rand_pool = atol(argv[++i]);
+			init_hash_size = atol(argv[++i]);
 			break;
-		case 'h':
+		case 'm':
 			if (argc < i + 2) {
 				show_usage(argc, argv);
-				return -1;
+				mainret = 1;
+				goto end;
 			}
-			init_hash_size = atol(argv[++i]);
+			min_hash_alloc_size = atol(argv[++i]);
+			break;
+		case 'n':
+			if (argc < i + 2) {
+				show_usage(argc, argv);
+				mainret = 1;
+				goto end;
+			}
+			max_hash_buckets_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 'B':
+			if (argc < i + 2) {
+				show_usage(argc, argv);
+				mainret = 1;
+				goto end;
+			}
+			i++;
+			if (!strcmp("order", argv[i]))
+				memory_backend = &cds_lfht_mm_order;
+			else if (!strcmp("chunk", argv[i]))
+				memory_backend = &cds_lfht_mm_chunk;
+			else if (!strcmp("mmap", argv[i]))
+				memory_backend = &cds_lfht_mm_mmap;
+			else {
+				printf("Please specify memory backend with order|chunk|mmap.\n");
+				mainret = 1;
+				goto end;
+			}
+			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;
+		case 'U':
+			test_choice = TEST_HASH_UNIQUE;
+			break;
+		case 'C':
+			nr_hash_chains = atol(argv[++i]);
+			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",
+		printf("Error: Initial number of buckets (%lu) is not a power of 2.\n",
 			init_hash_size);
-		return -1;
+		mainret = 1;
+		goto end;
+	}
+
+	if (min_hash_alloc_size && min_hash_alloc_size & (min_hash_alloc_size - 1)) {
+		printf("Error: Minimum number of allocated buckets (%lu) is not a power of 2.\n",
+			min_hash_alloc_size);
+		mainret = 1;
+		goto end;
+	}
+
+	if (max_hash_buckets_size && max_hash_buckets_size & (max_hash_buckets_size - 1)) {
+		printf("Error: Maximum number of buckets (%lu) is not a power of 2.\n",
+			max_hash_buckets_size);
+		mainret = 1;
+		goto end;
+	}
+
+	memset(&act, 0, sizeof(act));
+	ret = sigemptyset(&act.sa_mask);
+	if (ret == -1) {
+		perror("sigemptyset");
+		mainret = 1;
+		goto end;
+	}
+	act.sa_handler = get_sigusr1_cb();
+	act.sa_flags = SA_RESTART;
+	ret = sigaction(SIGUSR1, &act, NULL);
+	if (ret == -1) {
+		perror("sigaction");
+		mainret = 1;
+		goto end;
+	}
+
+	act.sa_handler = get_sigusr2_cb();
+	act.sa_flags = SA_RESTART;
+	ret = sigaction(SIGUSR2, &act, NULL);
+	if (ret == -1) {
+		perror("sigaction");
+		mainret = 1;
+		goto end;
 	}
 
 	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());
+		add_unique ? " uniquify" : ( add_replace ? " replace" : " insert"));
+	printf_verbose("Initial number of buckets: %lu buckets.\n", init_hash_size);
+	printf_verbose("Minimum number of allocated buckets: %lu buckets.\n", min_hash_alloc_size);
+	printf_verbose("Maximum number of buckets: %lu buckets.\n", max_hash_buckets_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("Number of hash chains: %lu.\n",
+		nr_hash_chains);
+	printf_verbose("thread %-6s, tid %lu\n",
+			"main", urcu_get_thread_id());
 
 	tid_reader = malloc(sizeof(*tid_reader) * nr_readers);
+	if (!tid_reader) {
+		mainret = 1;
+		goto end;
+	}
 	tid_writer = malloc(sizeof(*tid_writer) * nr_writers);
+	if (!tid_writer) {
+		mainret = 1;
+		goto end_free_tid_reader;
+	}
 	count_reader = malloc(sizeof(*count_reader) * nr_readers);
+	if (!count_reader) {
+		mainret = 1;
+		goto end_free_tid_writer;
+	}
 	count_writer = malloc(sizeof(*count_writer) * nr_writers);
-	test_ht = cds_lfht_new(test_hash, test_compare, 0x42UL,
-			 init_hash_size, call_rcu);
+	if (!count_writer) {
+		mainret = 1;
+		goto end_free_count_reader;
+	}
+
+	err = create_all_cpu_call_rcu_data(0);
+	if (err) {
+		printf("Per-CPU call_rcu() worker threads unavailable. Using default global worker thread.\n");
+	}
+
+	if (memory_backend) {
+		test_ht = _cds_lfht_new(init_hash_size, min_hash_alloc_size,
+				max_hash_buckets_size,
+				(opt_auto_resize ? CDS_LFHT_AUTO_RESIZE : 0) |
+				CDS_LFHT_ACCOUNTING, memory_backend,
+				&rcu_flavor, NULL);
+	} else {
+		test_ht = cds_lfht_new(init_hash_size, min_hash_alloc_size,
+				max_hash_buckets_size,
+				(opt_auto_resize ? CDS_LFHT_AUTO_RESIZE : 0) |
+				CDS_LFHT_ACCOUNTING, NULL);
+	}
+	if (!test_ht) {
+		printf("Error allocating hash table.\n");
+		mainret = 1;
+		goto end_free_call_rcu_data;
+	}
+
+	/*
+	 * Hash Population needs to be seen as a RCU reader
+	 * thread from the point of view of resize.
+	 */
+	rcu_register_thread();
+	ret = (get_populate_hash_cb())();
+	assert(!ret);
 
-        err = create_all_cpu_call_rcu_data(0);
-        assert(!err);
+	rcu_thread_offline();
 
 	next_aff = 0;
 
+	ret = pipe(count_pipe);
+	if (ret == -1) {
+		perror("pipe");
+		mainret = 1;
+		goto end_online;
+	}
+
+	/* spawn counter thread */
+	err = pthread_create(&tid_count, NULL, thr_count,
+			     NULL);
+	if (err != 0) {
+		errno = err;
+		mainret = 1;
+		perror("pthread_create");
+		goto end_close_pipe;
+	}
+
 	for (i = 0; i < nr_readers; i++) {
-		err = pthread_create(&tid_reader[i], NULL, thr_reader,
+		err = pthread_create(&tid_reader[i],
+				     NULL, get_thr_reader_cb(),
 				     &count_reader[i]);
-		if (err != 0)
-			exit(1);
+		if (err != 0) {
+			errno = err;
+			mainret = 1;
+			perror("pthread_create");
+			goto end_pthread_join;
+		}
+		nr_readers_created++;
 	}
 	for (i = 0; i < nr_writers; i++) {
-		err = pthread_create(&tid_writer[i], NULL, thr_writer,
+		err = pthread_create(&tid_writer[i],
+				     NULL, get_thr_writer_cb(),
 				     &count_writer[i]);
-		if (err != 0)
-			exit(1);
+		if (err != 0) {
+			errno = err;
+			mainret = 1;
+			perror("pthread_create");
+			goto end_pthread_join;
+		}
+		nr_writers_created++;
 	}
 
 	cmm_smp_mb();
 
 	test_go = 1;
 
-	sleep(duration);
+	remain = duration;
+	do {
+		remain = sleep(remain);
+	} while (remain > 0);
 
 	test_stop = 1;
 
-	for (i = 0; i < nr_readers; i++) {
+end_pthread_join:
+	for (i = 0; i < nr_readers_created; i++) {
 		err = pthread_join(tid_reader[i], &tret);
-		if (err != 0)
-			exit(1);
+		if (err != 0) {
+			errno = err;
+			mainret = 1;
+			perror("pthread_join");
+		}
 		tot_reads += count_reader[i];
 	}
-	for (i = 0; i < nr_writers; i++) {
+	for (i = 0; i < nr_writers_created; i++) {
 		err = pthread_join(tid_writer[i], &tret);
-		if (err != 0)
-			exit(1);
+		if (err != 0) {
+			errno = err;
+			mainret = 1;
+			perror("pthread_join");
+		}
 		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;
 	}
-	printf("Counting nodes... ");
+
+	/* teardown counter thread */
+	act.sa_handler = SIG_IGN;
+	act.sa_flags = SA_RESTART;
+	ret = sigaction(SIGUSR2, &act, NULL);
+	if (ret == -1) {
+		mainret = 1;
+		perror("sigaction");
+	}
+	{
+		char msg[1] = { 0x42 };
+		ssize_t ret;
+
+		do {
+			ret = write(count_pipe[1], msg, 1);	/* wakeup thread */
+		} while (ret == -1L && errno == EINTR);
+	}
+	err = pthread_join(tid_count, &tret);
+	if (err != 0) {
+		errno = err;
+		mainret = 1;
+		perror("pthread_join");
+	}
+
+end_close_pipe:
+	for (i = 0; i < 2; i++) {
+		err = close(count_pipe[i]);
+		if (err) {
+			mainret = 1;
+			perror("close pipe");
+		}
+	}
 	fflush(stdout);
-	cds_lfht_count_nodes(test_ht, &count, &removed);
+end_online:
+	rcu_thread_online();
+	rcu_read_lock();
+	printf("Counting nodes... ");
+	cds_lfht_count_nodes(test_ht, &approx_before, &count, &approx_after);
 	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);
+	test_delete_all_nodes(test_ht);
+	rcu_read_unlock();
+	rcu_thread_offline();
+	if (count) {
+		printf("Approximation before node accounting: %ld nodes.\n",
+			approx_before);
+		printf("Nodes deleted from hash table before destroy: "
+			"%lu nodes.\n",
+			count);
+		printf("Approximation after node accounting: %ld nodes.\n",
+			approx_after);
+	}
 
-	if (ret)
+	ret = cds_lfht_destroy(test_ht, NULL);
+	if (ret) {
 		printf_verbose("final delete aborted\n");
-	else
+		mainret = 1;
+	} else {
 		printf_verbose("final delete success\n");
+	}
 	printf_verbose("total number of reads : %llu, writes %llu\n", tot_reads,
 	       tot_writes);
+	nr_leaked = (long long) tot_add + init_populate - tot_remove - count;
 	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 "
-		"nr_add %12llu nr_add_fail %12llu nr_remove %12llu nr_leaked %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, rand_pool, tot_reads, tot_writes,
+		nr_writers, wdelay, 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);
-	free(count_reader);
+		nr_leaked);
+	if (nr_leaked != 0) {
+		mainret = 1;
+		printf("WARNING: %lld nodes were leaked!\n", nr_leaked);
+	}
+
+	rcu_unregister_thread();
+end_free_call_rcu_data:
+	free_all_cpu_call_rcu_data();
 	free(count_writer);
-	return 0;
+end_free_count_reader:
+	free(count_reader);
+end_free_tid_writer:
+	free(tid_writer);
+end_free_tid_reader:
+	free(tid_reader);
+end:
+	if (!mainret)
+		exit(EXIT_SUCCESS);
+	else
+		exit(EXIT_FAILURE);
 }