tests: use thread-id.h wrapper
[urcu.git] / tests / test_urcu_hash.c
index 509767c02e795411ff94cbc5582f589e2d792e31..9416224d8af115491d689ff4328078482591d78c 100644 (file)
@@ -3,7 +3,7 @@
  *
  * 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
  */
 
 #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
-
-#define DEFAULT_HASH_SIZE      32
-#define DEFAULT_MIN_ALLOC_SIZE 1
-#define DEFAULT_RAND_POOL      1000000
+#include "test_urcu_hash.h"
 
-#define TEST_HASH_SEED 0x42UL
-
-/* Make this big enough to include the POWER5+ L3 cacheline size of 256B */
-#define CACHE_LINE_SIZE 4096
+enum test_hash {
+       TEST_HASH_RW,
+       TEST_HASH_UNIQUE,
+};
 
-/* hardcoded number of CPUs */
-#define NR_CPUS 16384
+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);
+};
 
-#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
+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;
 
-#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-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 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;
-
-static struct cds_lfht *test_ht;
-
-struct test_data {
-       int a;
-       int b;
-};
-
-struct lfht_test_node {
-       struct cds_lfht_node node;
-       void *key;
-       unsigned int key_len;
-       /* cache-cold for iteration */
-       struct rcu_head head;
-};
 
-static inline struct lfht_test_node *
-to_test_node(struct cds_lfht_node *node)
+void *(*get_thr_reader_cb(void))(void *)
 {
-       return caa_container_of(node, struct lfht_test_node, node);
+       return test_hash_cb[test_choice].thr_reader;
 }
 
-static inline
-void lfht_test_node_init(struct lfht_test_node *node, void *key,
-                       size_t key_len)
+void *(*get_thr_writer_cb(void))(void *)
 {
-       cds_lfht_node_init(&node->node);
-       node->key = key;
-       node->key_len = key_len;
+       return test_hash_cb[test_choice].thr_writer;
 }
 
-static inline struct lfht_test_node *
-cds_lfht_iter_get_test_node(struct cds_lfht_iter *iter)
+int (*get_populate_hash_cb(void))(void)
 {
-       return to_test_node(cds_lfht_iter_get_node(iter));
+       return test_hash_cb[test_choice].populate_hash;
 }
 
-static volatile int test_go, test_stop;
+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);
 
-static unsigned long wdelay;
+struct cds_lfht *test_ht;
 
-static unsigned long duration;
+volatile int test_go, test_stop;
 
-/* read-side C.S. duration, in loops */
-static unsigned long rduration;
+unsigned long wdelay;
 
-static unsigned long init_hash_size = DEFAULT_HASH_SIZE;
-static unsigned long min_hash_alloc_size = DEFAULT_MIN_ALLOC_SIZE;
-static unsigned long init_populate;
-static int opt_auto_resize;
-static int add_only, add_unique, add_replace;
+unsigned long duration;
 
-static unsigned long init_pool_offset, lookup_pool_offset, write_pool_offset;
-static unsigned long init_pool_size = DEFAULT_RAND_POOL,
+/* read-side C.S. duration, in loops */
+unsigned long rduration;
+
+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;
+
+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;
-static int validate_lookup;
+int validate_lookup;
+unsigned long nr_hash_chains;  /* 0: normal table, other: number of hash chains */
 
-static int count_pipe[2];
+int count_pipe[2];
 
-static inline void loop_sleep(unsigned long l)
-{
-       while(l-- != 0)
-               caa_cpu_relax();
-}
+int verbose_mode;
 
-static int verbose_mode;
+unsigned int cpu_affinities[NR_CPUS];
+unsigned int next_aff = 0;
+int use_affinity = 0;
 
-#define printf_verbose(fmt, args...)           \
-       do {                                    \
-               if (verbose_mode)               \
-                       printf(fmt, ## args);   \
-       } while (0)
+pthread_mutex_t affinity_mutex = PTHREAD_MUTEX_INITIALIZER;
 
-static unsigned int cpu_affinities[NR_CPUS];
-static unsigned int next_aff = 0;
-static int use_affinity = 0;
+DEFINE_URCU_TLS(unsigned long long, nr_writes);
+DEFINE_URCU_TLS(unsigned long long, nr_reads);
 
-pthread_mutex_t affinity_mutex = PTHREAD_MUTEX_INITIALIZER;
+unsigned int nr_readers;
+unsigned int nr_writers;
+
+static pthread_mutex_t rcu_copy_mutex = PTHREAD_MUTEX_INITIALIZER;
 
-static void set_affinity(void)
+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");
@@ -201,66 +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 */
 }
 
-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;
-       }
-}
-
-static
-void sigusr2_handler(int signo)
-{
-       char msg[1] = { 0x42 };
-       ssize_t ret;
-
-       do {
-               ret = write(count_pipe[1], msg, 1);     /* wakeup thread */
-       } while (ret == -1L && errno == EINTR);
-}
-
-/*
- * 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;
@@ -282,139 +187,8 @@ 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 */
-{
-       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 int key = (unsigned int) _key;
-
-       assert(length == sizeof(unsigned int));
-       return hash_u32(&key, 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)
+unsigned long test_compare(const void *key1, size_t key1_len,
+                          const void *key2, size_t key2_len)
 {
        if (caa_unlikely(key1_len != key2_len))
                return -1;
@@ -425,34 +199,15 @@ unsigned long test_compare(void *key1, size_t key1_len,
                return 1;
 }
 
-static
-int test_match(struct cds_lfht_node *node, void *key)
-{
-       struct lfht_test_node *test_node = to_test_node(node);
-
-       return !test_compare(test_node->key, test_node->key_len,
-                       key, sizeof(unsigned long));
-}
-
-static
-void cds_lfht_test_lookup(struct cds_lfht *ht, void *key, size_t key_len,
-               struct cds_lfht_iter *iter)
-{
-       assert(key_len == sizeof(unsigned long));
-
-       cds_lfht_lookup(ht, test_hash(key, key_len, TEST_HASH_SEED),
-                       test_match, key, iter);
-}
-
 void *thr_count(void *arg)
 {
-       printf_verbose("thread_begin %s, thread id : %lx, tid %lu\n",
-                       "counter", pthread_self(), (unsigned long)gettid());
+       printf_verbose("thread_begin %s, tid %lu\n",
+                       "counter", urcu_get_thread_id());
 
        rcu_register_thread();
 
        for (;;) {
-               unsigned long count, removed;
+               unsigned long count;
                long approx_before, approx_after;
                ssize_t len;
                char buf[1];
@@ -468,15 +223,15 @@ void *thr_count(void *arg)
                printf("Counting nodes... ");
                fflush(stdout);
                rcu_read_lock();
-               cds_lfht_count_nodes(test_ht, &approx_before, &count, &removed,
+               cds_lfht_count_nodes(test_ht, &approx_before, &count,
                                &approx_after);
                rcu_read_unlock();
                printf("done.\n");
                printf("Approximation before node accounting: %ld nodes.\n",
                        approx_before);
                printf("Accounting of nodes in the hash table: "
-                       "%lu nodes + %lu logically removed.\n",
-                       count, removed);
+                       "%lu nodes.\n",
+                       count);
                printf("Approximation after node accounting: %ld nodes.\n",
                        approx_after);
        }
@@ -484,62 +239,6 @@ void *thr_count(void *arg)
        return NULL;
 }
 
-void *thr_reader(void *_count)
-{
-       unsigned long long *count = _count;
-       struct lfht_test_node *node;
-       struct cds_lfht_iter iter;
-
-       printf_verbose("thread_begin %s, thread id : %lx, tid %lu\n",
-                       "reader", pthread_self(), (unsigned long)gettid());
-
-       set_affinity();
-
-       rcu_register_thread();
-
-       while (!test_go)
-       {
-       }
-       cmm_smp_mb();
-
-       for (;;) {
-               rcu_read_lock();
-               cds_lfht_test_lookup(test_ht,
-                       (void *)(((unsigned long) rand_r(&rand_lookup) % lookup_pool_size) + lookup_pool_offset),
-                       sizeof(void *), &iter);
-               node = cds_lfht_iter_get_test_node(&iter);
-               if (node == NULL) {
-                       if (validate_lookup) {
-                               printf("[ERROR] Lookup cannot find initial node.\n");
-                               exit(-1);
-                       }
-                       lookup_fail++;
-               } else {
-                       lookup_ok++;
-               }
-               debug_yield_read();
-               if (caa_unlikely(rduration))
-                       loop_sleep(rduration);
-               rcu_read_unlock();
-               nr_reads++;
-               if (caa_unlikely(!test_duration_read()))
-                       break;
-               if (caa_unlikely((nr_reads & ((1 << 10) - 1)) == 0))
-                       rcu_quiescent_state();
-       }
-
-       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);
-
-}
-
-static
 void free_node_cb(struct rcu_head *head)
 {
        struct lfht_test_node *node =
@@ -547,162 +246,6 @@ void free_node_cb(struct rcu_head *head)
        free(node);
 }
 
-void *thr_writer(void *_count)
-{
-       struct lfht_test_node *node;
-       struct cds_lfht_node *ret_node;
-       struct cds_lfht_iter iter;
-       struct wr_count *count = _count;
-       int ret;
-
-       printf_verbose("thread_begin %s, thread id : %lx, tid %lu\n",
-                       "writer", pthread_self(), (unsigned long)gettid());
-
-       set_affinity();
-
-       rcu_register_thread();
-
-       while (!test_go)
-       {
-       }
-       cmm_smp_mb();
-
-       for (;;) {
-               if ((addremove == AR_ADD || add_only)
-                               || (addremove == AR_RANDOM && rand_r(&rand_lookup) & 1)) {
-                       node = malloc(sizeof(struct lfht_test_node));
-                       lfht_test_node_init(node,
-                               (void *)(((unsigned long) rand_r(&rand_lookup) % write_pool_size) + write_pool_offset),
-                               sizeof(void *));
-                       rcu_read_lock();
-                       if (add_unique) {
-                               ret_node = cds_lfht_add_unique(test_ht,
-                                       test_hash(node->key, node->key_len, TEST_HASH_SEED),
-                                       test_match, node->key, &node->node);
-                       } else {
-                               if (add_replace)
-                                       ret_node = cds_lfht_add_replace(test_ht,
-                                                       test_hash(node->key, node->key_len, TEST_HASH_SEED),
-                                                       test_match, node->key, &node->node);
-                               else
-                                       cds_lfht_add(test_ht,
-                                               test_hash(node->key, node->key_len, TEST_HASH_SEED),
-                                               &node->node);
-                       }
-                       rcu_read_unlock();
-                       if (add_unique && ret_node != &node->node) {
-                               free(node);
-                               nr_addexist++;
-                       } else {
-                               if (add_replace && ret_node) {
-                                       call_rcu(&to_test_node(ret_node)->head,
-                                                       free_node_cb);
-                                       nr_addexist++;
-                               } else {
-                                       nr_add++;
-                               }
-                       }
-               } else {
-                       /* May delete */
-                       rcu_read_lock();
-                       cds_lfht_test_lookup(test_ht,
-                               (void *)(((unsigned long) rand_r(&rand_lookup) % write_pool_size) + write_pool_offset),
-                               sizeof(void *), &iter);
-                       ret = cds_lfht_del(test_ht, &iter);
-                       rcu_read_unlock();
-                       if (ret == 0) {
-                               node = cds_lfht_iter_get_test_node(&iter);
-                               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 (caa_unlikely(!test_duration_write()))
-                       break;
-               if (caa_unlikely(wdelay))
-                       loop_sleep(wdelay);
-               if (caa_unlikely((nr_writes & ((1 << 10) - 1)) == 0))
-                       rcu_quiescent_state();
-       }
-
-       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);
-}
-
-static int populate_hash(void)
-{
-       struct lfht_test_node *node;
-       struct cds_lfht_node *ret_node;
-
-       if (!init_populate)
-               return 0;
-
-       if ((add_unique || add_replace) && 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) or add_replace (-s) 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 lfht_test_node));
-               lfht_test_node_init(node,
-                       (void *)(((unsigned long) rand_r(&rand_lookup) % init_pool_size) + init_pool_offset),
-                       sizeof(void *));
-               rcu_read_lock();
-               if (add_unique) {
-                       ret_node = cds_lfht_add_unique(test_ht,
-                               test_hash(node->key, node->key_len, TEST_HASH_SEED),
-                               test_match, node->key, &node->node);
-               } else {
-                       if (add_replace)
-                               ret_node = cds_lfht_add_replace(test_ht,
-                                               test_hash(node->key, node->key_len, TEST_HASH_SEED),
-                                               test_match, node->key, &node->node);
-                       else
-                               cds_lfht_add(test_ht,
-                                       test_hash(node->key, node->key_len, TEST_HASH_SEED),
-                                       &node->node);
-               }
-               rcu_read_unlock();
-               if (add_unique && ret_node != &node->node) {
-                       free(node);
-                       nr_addexist++;
-               } else {
-                       if (add_replace && ret_node) {
-                               call_rcu(&to_test_node(ret_node)->head, free_node_cb);
-                               nr_addexist++;
-                       } else {
-                               nr_add++;
-                       }
-               }
-               nr_writes++;
-       }
-       return 0;
-}
-
 static
 void test_delete_all_nodes(struct cds_lfht *ht)
 {
@@ -713,7 +256,7 @@ void test_delete_all_nodes(struct cds_lfht *ht)
        cds_lfht_for_each_entry(ht, &iter, node, node) {
                int ret;
 
-               ret = cds_lfht_del(test_ht, &iter);
+               ret = cds_lfht_del(test_ht, cds_lfht_iter_get_node(&iter));
                assert(!ret);
                call_rcu(&node->head, free_node_cb);
                count++;
@@ -723,7 +266,9 @@ void test_delete_all_nodes(struct cds_lfht *ht)
 
 void show_usage(int argc, char **argv)
 {
-       printf("Usage : %s nr_readers nr_writers duration (s)\n", 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)\n");
 #endif
@@ -731,27 +276,32 @@ void show_usage(int argc, char **argv)
        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 hash table size)\n");
-       printf("        [-m size] (minimum hash alloc size)\n");
-       printf("        [not -u nor -s] Add entries (supports redundant keys).\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 (use with filled init pool, same lookup range, with different write range).\n");
-       printf("\n\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;
@@ -759,33 +309,39 @@ int main(int argc, char **argv)
        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;
+       unsigned long count;
        long approx_before, approx_after;
-       int i, a, ret;
+       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++) {
@@ -803,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;
@@ -813,14 +370,16 @@ 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;
@@ -830,17 +389,27 @@ int main(int argc, char **argv)
                case 'h':
                        if (argc < i + 2) {
                                show_usage(argc, argv);
-                               return -1;
+                               mainret = 1;
+                               goto end;
                        }
                        init_hash_size = atol(argv[++i]);
                        break;
                case 'm':
                        if (argc < i + 2) {
                                show_usage(argc, argv);
-                               return -1;
+                               mainret = 1;
+                               goto end;
                        }
                        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");
@@ -864,6 +433,25 @@ int main(int argc, char **argv)
                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;
@@ -885,55 +473,60 @@ 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;
                }
        }
 
        /* 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: Min hash alloc size %lu is not a power of 2.\n",
+       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);
-               return -1;
+               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");
-               return -1;
+               mainret = 1;
+               goto end;
        }
-       act.sa_handler = sigusr1_handler;
+       act.sa_handler = get_sigusr1_cb();
        act.sa_flags = SA_RESTART;
        ret = sigaction(SIGUSR1, &act, NULL);
        if (ret == -1) {
                perror("sigaction");
-               return -1;
+               mainret = 1;
+               goto end;
        }
 
-       ret = pipe(count_pipe);
-       if (ret == -1) {
-               perror("pipe");
-               return -1;
-       }
-
-       /* spawn counter thread */
-       err = pthread_create(&tid_count, NULL, thr_count,
-                            NULL);
-       if (err != 0)
-               exit(1);
-
-       act.sa_handler = sigusr2_handler;
+       act.sa_handler = get_sigusr2_cb();
        act.sa_flags = SA_RESTART;
        ret = sigaction(SIGUSR2, &act, NULL);
        if (ret == -1) {
                perror("sigaction");
-               return -1;
+               mainret = 1;
+               goto end;
        }
 
        printf_verbose("running test for %lu seconds, %u readers, %u writers.\n",
@@ -943,51 +536,116 @@ int main(int argc, char **argv)
        printf_verbose("Mode:%s%s.\n",
                add_only ? " add only" : " add/remove",
                add_unique ? " uniquify" : ( add_replace ? " replace" : " insert"));
-       printf_verbose("Initial hash table size: %lu buckets.\n", init_hash_size);
-       printf_verbose("Minimum hash alloc size: %lu buckets.\n", min_hash_alloc_size);
+       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("thread %-6s, thread id : %lx, tid %lu\n",
-                       "main", pthread_self(), (unsigned long)gettid());
+       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);
+       if (!count_writer) {
+               mainret = 1;
+               goto end_free_count_reader;
+       }
 
        err = create_all_cpu_call_rcu_data(0);
-        assert(!err);
+       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 creation and population needs to be seen as a RCU reader
+        * Hash Population needs to be seen as a RCU reader
         * thread from the point of view of resize.
         */
        rcu_register_thread();
-       test_ht = cds_lfht_new(init_hash_size, min_hash_alloc_size,
-                       (opt_auto_resize ? CDS_LFHT_AUTO_RESIZE : 0) |
-                       CDS_LFHT_ACCOUNTING, NULL);
-       ret = populate_hash();
+       ret = (get_populate_hash_cb())();
        assert(!ret);
 
        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();
@@ -1001,16 +659,23 @@ int main(int argc, char **argv)
 
        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;
@@ -1022,8 +687,8 @@ int main(int argc, char **argv)
        act.sa_flags = SA_RESTART;
        ret = sigaction(SIGUSR2, &act, NULL);
        if (ret == -1) {
+               mainret = 1;
                perror("sigaction");
-               return -1;
        }
        {
                char msg[1] = { 0x42 };
@@ -1034,35 +699,50 @@ int main(int argc, char **argv)
                } while (ret == -1L && errno == EINTR);
        }
        err = pthread_join(tid_count, &tret);
-       if (err != 0)
-               exit(1);
-
+       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);
+end_online:
        rcu_thread_online();
        rcu_read_lock();
        printf("Counting nodes... ");
-       cds_lfht_count_nodes(test_ht, &approx_before, &count, &removed,
-               &approx_after);
+       cds_lfht_count_nodes(test_ht, &approx_before, &count, &approx_after);
        printf("done.\n");
        test_delete_all_nodes(test_ht);
        rcu_read_unlock();
        rcu_thread_offline();
-       if (count || removed) {
+       if (count) {
                printf("Approximation before node accounting: %ld nodes.\n",
                        approx_before);
                printf("Nodes deleted from hash table before destroy: "
-                       "%lu nodes + %lu logically removed.\n",
-                       count, removed);
+                       "%lu nodes.\n",
+                       count);
                printf("Approximation after node accounting: %ld nodes.\n",
                        approx_after);
        }
+
        ret = cds_lfht_destroy(test_ht, NULL);
-       if (ret)
+       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 nr_reads %12llu nr_writes %12llu nr_ops %12llu "
@@ -1070,12 +750,25 @@ int main(int argc, char **argv)
                argv[0], duration, nr_readers, rduration,
                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);
+               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(tid_reader);
-       free(tid_writer);
-       free(count_reader);
        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);
 }
This page took 0.037225 seconds and 4 git commands to generate.