*/
#define _GNU_SOURCE
+#include "../config.h"
#include <stdio.h>
#include <pthread.h>
#include <stdlib.h>
#include <assert.h>
#include <sched.h>
#include <errno.h>
+#include <signal.h>
#ifdef __linux__
#include <syscall.h>
#define DEFAULT_MIN_ALLOC_SIZE 1
#define DEFAULT_RAND_POOL 1000000
+/*
+ * Note: the hash seed should be a random value for hash tables
+ * targeting production environments to provide protection against
+ * denial of service attacks. We keep it a static value within this test
+ * program to compare identical benchmark runs.
+ */
#define TEST_HASH_SEED 0x42UL
/* Make this big enough to include the POWER5+ L3 cacheline size of 256B */
static unsigned long init_hash_size = DEFAULT_HASH_SIZE;
static unsigned long min_hash_alloc_size = DEFAULT_MIN_ALLOC_SIZE;
+static unsigned long max_hash_buckets_size = (1UL << 20);
static unsigned long init_populate;
static int opt_auto_resize;
static int add_only, add_unique, add_replace;
+static const struct cds_lfht_mm_type *memory_backend;
static unsigned long init_pool_offset, lookup_pool_offset, write_pool_offset;
static unsigned long init_pool_size = DEFAULT_RAND_POOL,
pthread_mutex_t affinity_mutex = PTHREAD_MUTEX_INITIALIZER;
+#ifndef HAVE_CPU_SET_T
+typedef unsigned long cpu_set_t;
+# define CPU_ZERO(cpuset) do { *(cpuset) = 0; } while(0)
+# define CPU_SET(cpu, cpuset) do { *(cpuset) |= (1UL << (cpu)); } while(0)
+#endif
+
static void set_affinity(void)
{
cpu_set_t mask;
if (!use_affinity)
return;
+#if HAVE_SCHED_SETAFFINITY
ret = pthread_mutex_lock(&affinity_mutex);
if (ret) {
perror("Error in pthread mutex lock");
}
CPU_ZERO(&mask);
CPU_SET(cpu, &mask);
- sched_setaffinity(0, sizeof(mask), &mask);
+#if SCHED_SETAFFINITY_ARGS == 2
+ sched_setaffinity(0, &mask);
+#else
+ sched_setaffinity(0, sizeof(mask), &mask);
+#endif
+#endif /* HAVE_SCHED_SETAFFINITY */
}
static enum {
key, sizeof(unsigned long));
}
-static
+static inline
void cds_lfht_test_lookup(struct cds_lfht *ht, void *key, size_t key_len,
struct cds_lfht_iter *iter)
{
rcu_register_thread();
for (;;) {
- unsigned long count, removed;
+ unsigned long count;
long approx_before, approx_after;
ssize_t len;
char buf[1];
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);
}
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);
+ ret = cds_lfht_del(test_ht, cds_lfht_iter_get_node(&iter));
rcu_read_unlock();
if (ret == 0) {
node = cds_lfht_iter_get_test_node(&iter);
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++;
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(" [-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");
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;
struct sigaction act;
}
min_hash_alloc_size = atol(argv[++i]);
break;
+ case 'n':
+ if (argc < i + 2) {
+ show_usage(argc, argv);
+ return -1;
+ }
+ max_hash_buckets_size = atol(argv[++i]);
+ break;
case 'u':
if (add_replace) {
printf("Please specify at most one of -s or -u.\n");
case 'A':
opt_auto_resize = 1;
break;
+ case 'B':
+ if (argc < i + 2) {
+ show_usage(argc, argv);
+ return -1;
+ }
+ 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");
+ exit(-1);
+ }
+ break;
case 'R':
lookup_pool_offset = 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;
}
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",
+ printf("Error: Minimum number of allocated buckets (%lu) is not a power of 2.\n",
min_hash_alloc_size);
return -1;
}
+ 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);
+ return -1;
+ }
+
memset(&act, 0, sizeof(act));
ret = sigemptyset(&act.sa_mask);
if (ret == -1) {
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",
count_writer = malloc(sizeof(*count_writer) * nr_writers);
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);
+ }
/*
- * 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, (1UL << 18),
- (opt_auto_resize ? CDS_LFHT_AUTO_RESIZE : 0) |
- CDS_LFHT_ACCOUNTING, NULL);
ret = populate_hash();
assert(!ret);
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);
}
projects / urcu.git / blobdiff