/*
- * test_ht.c
+ * test_urcu_hash.c
*
* Userspace RCU library - test program
*
/* 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)
#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 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;
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 inline void loop_sleep(unsigned long l)
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.
*/
void *thr_reader(void *_count)
{
unsigned long long *count = _count;
- struct rcu_ht_node *node;
+ struct cds_lfht_node *node;
printf_verbose("thread_begin %s, thread id : %lx, tid %lu\n",
"reader", pthread_self(), (unsigned long)gettid());
for (;;) {
rcu_read_lock();
- node = ht_lookup(test_ht,
+ node = cds_lfht_lookup(test_ht,
(void *)(unsigned long)(rand_r(&rand_lookup) % rand_pool),
sizeof(void *));
if (node == NULL)
nr_reads++;
if (unlikely(!test_duration_read()))
break;
+ if (unlikely((nr_reads & ((1 << 10) - 1)) == 0))
+ rcu_quiescent_state();
}
rcu_unregister_thread();
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, *ret_node;
+ struct cds_lfht_node *node, *ret_node;
struct wr_count *count = _count;
int ret;
cmm_smp_mb();
for (;;) {
- if (add_only || 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,
+ cds_lfht_node_init(node,
(void *)(unsigned long)(rand_r(&rand_lookup) % rand_pool),
sizeof(void *));
if (add_unique)
- ret_node = ht_add_unique(test_ht, node);
+ ret_node = cds_lfht_add_unique(test_ht, node);
else
- ht_add(test_ht, node);
+ cds_lfht_add(test_ht, node);
rcu_read_unlock();
if (add_unique && ret_node != node) {
free(node);
} else {
/* May delete */
rcu_read_lock();
- node = ht_lookup(test_ht,
+ node = cds_lfht_lookup(test_ht,
(void *)(unsigned long)(rand_r(&rand_lookup) % rand_pool),
sizeof(void *));
if (node)
- ret = ht_remove(test_ht, node);
+ ret = cds_lfht_remove(test_ht, node);
else
ret = -ENOENT;
rcu_read_unlock();
break;
if (unlikely(wdelay))
loop_sleep(wdelay);
+ if (unlikely((nr_writes & ((1 << 10) - 1)) == 0))
+ rcu_quiescent_state();
}
rcu_unregister_thread();
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);
}
+static int populate_hash(void)
+{
+ struct cds_lfht_node *node, *ret_node;
+
+ if (!init_populate)
+ return 0;
+
+ 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;
+ }
+
+ 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),
+ sizeof(void *));
+ if (add_unique)
+ ret_node = cds_lfht_add_unique(test_ht, node);
+ else
+ cds_lfht_add(test_ht, node);
+ if (add_unique && ret_node != node) {
+ free(node);
+ 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(" [-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("\n");
}
unsigned long long *count_reader;
struct wr_count *count_writer;
unsigned long long tot_reads = 0, tot_writes = 0,
- tot_add = 0, tot_remove = 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);
case 'i':
add_only = 1;
break;
+ case 'k':
+ init_populate = atol(argv[++i]);
+ break;
+ case 'A':
+ opt_auto_resize = 1;
+ break;
}
}
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);
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,
- init_hash_size, call_rcu);
-
+ test_ht = cds_lfht_new(test_hash, test_compare, 0x42UL,
+ 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);
test_go = 1;
- sleep(duration);
+ remain = duration;
+ do {
+ remain = sleep(remain);
+ } while (remain > 0);
test_stop = 1;
exit(1);
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... ");
fflush(stdout);
- ht_count_nodes(test_ht, &count, &removed);
+ 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 = ht_destroy(test_ht);
+ ret = cds_lfht_destroy(test_ht);
if (ret)
printf_verbose("final delete aborted\n");
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_remove %12llu nr_leaked %12llu\n",
+ "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,
- tot_reads + tot_writes, tot_add, tot_remove,
- tot_add - tot_remove - count);
+ 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);
projects / urcu.git / blobdiff