#endif
#define DEFAULT_HASH_SIZE 32
+#define DEFAULT_MIN_ALLOC_SIZE 1
#define DEFAULT_RAND_POOL 1000000
/* Make this big enough to include the POWER5+ L3 cacheline size of 256B */
static unsigned long rduration;
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;
void sigusr2_handler(int signo)
{
char msg[1] = { 0x42 };
- write(count_pipe[1], msg, 1); /* wakeup thread */
+ ssize_t ret;
+
+ do {
+ ret = write(count_pipe[1], msg, 1); /* wakeup thread */
+ } while (ret == -1L && errno == EINTR);
}
/*
static
unsigned long test_hash(void *_key, size_t length, unsigned long seed)
{
- unsigned long key = (unsigned long) _key;
- unsigned long v;
+ unsigned int key = (unsigned int) _key;
- assert(length == sizeof(unsigned long));
- return hash_u32(&v, 1, seed);
+ assert(length == sizeof(unsigned int));
+ return hash_u32(&key, 1, seed);
}
#else
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)
rcu_register_thread();
for (;;) {
- unsigned long count, removed, approx_before, approx_after;
+ unsigned long count, removed;
+ 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 (unlikely(!test_duration_read()))
+ if (caa_unlikely(!test_duration_read()))
break;
if (len != 1)
continue;
&approx_after);
rcu_read_unlock();
printf("done.\n");
- printf("Approximation before node accounting: %lu nodes.\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);
- printf("Approximation after node accounting: %lu nodes.\n",
+ printf("Approximation after node accounting: %ld nodes.\n",
approx_after);
}
rcu_unregister_thread();
lookup_ok++;
}
debug_yield_read();
- if (unlikely(rduration))
+ if (caa_unlikely(rduration))
loop_sleep(rduration);
rcu_read_unlock();
nr_reads++;
- if (unlikely(!test_duration_read()))
+ if (caa_unlikely(!test_duration_read()))
break;
- if (unlikely((nr_reads & ((1 << 10) - 1)) == 0))
+ if (caa_unlikely((nr_reads & ((1 << 10) - 1)) == 0))
rcu_quiescent_state();
}
if ((addremove == AR_ADD || add_only)
|| (addremove == AR_RANDOM && 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) % write_pool_size) + write_pool_offset),
sizeof(void *));
+ rcu_read_lock();
if (add_unique) {
ret_node = cds_lfht_add_unique(test_ht, node);
} else {
if (add_replace)
- ret_node = cds_lfht_replace(test_ht, node);
+ ret_node = cds_lfht_add_replace(test_ht, node);
else
cds_lfht_add(test_ht, node);
}
cds_lfht_lookup(test_ht,
(void *)(((unsigned long) rand_r(&rand_lookup) % write_pool_size) + write_pool_offset),
sizeof(void *), &iter);
- node = cds_lfht_iter_get_node(&iter);
- if (node)
- ret = cds_lfht_del(test_ht, node);
- else
- ret = -ENOENT;
+ ret = cds_lfht_del(test_ht, &iter);
rcu_read_unlock();
if (ret == 0) {
+ node = cds_lfht_iter_get_node(&iter);
call_rcu(&node->head, free_node_cb);
nr_del++;
} else
}
#endif //0
nr_writes++;
- if (unlikely(!test_duration_write()))
+ if (caa_unlikely(!test_duration_write()))
break;
- if (unlikely(wdelay))
+ if (caa_unlikely(wdelay))
loop_sleep(wdelay);
- if (unlikely((nr_writes & ((1 << 10) - 1)) == 0))
+ if (caa_unlikely((nr_writes & ((1 << 10) - 1)) == 0))
rcu_quiescent_state();
}
ret_node = cds_lfht_add_unique(test_ht, node);
} else {
if (add_replace)
- ret_node = cds_lfht_replace(test_ht, node);
+ ret_node = cds_lfht_add_replace(test_ht, node);
else
cds_lfht_add(test_ht, node);
}
return 0;
}
+static
+void test_delete_all_nodes(struct cds_lfht *ht)
+{
+ struct cds_lfht_iter iter;
+ struct cds_lfht_node *node;
+ unsigned long count = 0;
+
+ cds_lfht_first(ht, &iter);
+ while ((node = cds_lfht_iter_get_node(&iter)) != NULL) {
+ int ret;
+
+ ret = cds_lfht_del(test_ht, &iter);
+ assert(!ret);
+ call_rcu(&node->head, free_node_cb);
+ cds_lfht_next(ht, &iter);
+ count++;
+ }
+ printf("deleted %lu nodes.\n", count);
+}
+
void show_usage(int argc, char **argv)
{
printf("Usage : %s nr_readers nr_writers duration (s)\n", argv[0]);
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(" [-u] Uniquify add (no redundant keys).\n");
printf(" [-s] Replace (swap) entries.\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, approx_before, approx_after;
+ unsigned long count, removed;
+ long approx_before, approx_after;
int i, a, ret;
struct sigaction act;
unsigned int remain;
}
init_hash_size = atol(argv[++i]);
break;
+ case 'm':
+ if (argc < i + 2) {
+ show_usage(argc, argv);
+ return -1;
+ }
+ min_hash_alloc_size = atol(argv[++i]);
+ break;
case 'u':
if (add_replace) {
printf("Please specify at most one of -s or -u.\n");
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",
+ min_hash_alloc_size);
+ return -1;
+ }
+
memset(&act, 0, sizeof(act));
ret = sigemptyset(&act.sa_mask);
if (ret == -1) {
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("Init pool size offset %lu size %lu.\n",
init_pool_offset, init_pool_size);
printf_verbose("Lookup pool size offset %lu size %lu.\n",
*/
rcu_register_thread();
test_ht = cds_lfht_new(test_hash, test_compare, 0x42UL,
- init_hash_size,
- opt_auto_resize ? CDS_LFHT_AUTO_RESIZE : 0, NULL);
+ init_hash_size, min_hash_alloc_size,
+ (opt_auto_resize ? CDS_LFHT_AUTO_RESIZE : 0) |
+ CDS_LFHT_ACCOUNTING, NULL);
ret = populate_hash();
assert(!ret);
- rcu_unregister_thread();
+
+ rcu_thread_offline();
next_aff = 0;
}
{
char msg[1] = { 0x42 };
- write(count_pipe[1], msg, 1); /* wakeup thread */
+ 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)
exit(1);
- printf("Counting nodes... ");
fflush(stdout);
+ rcu_thread_online();
+ rcu_read_lock();
+ printf("Counting nodes... ");
cds_lfht_count_nodes(test_ht, &approx_before, &count, &removed,
&approx_after);
printf("done.\n");
+ test_delete_all_nodes(test_ht);
+ rcu_read_unlock();
+ rcu_thread_offline();
if (count || removed) {
- printf("Approximation before node accounting: %lu nodes.\n",
+ printf("Approximation before node accounting: %ld nodes.\n",
approx_before);
- printf("WARNING: nodes left in the hash table upon destroy: "
+ printf("Nodes deleted from hash table before destroy: "
"%lu nodes + %lu logically removed.\n",
count, removed);
- printf("Approximation after node accounting: %lu nodes.\n",
+ printf("Approximation after node accounting: %ld nodes.\n",
approx_after);
}
ret = cds_lfht_destroy(test_ht, NULL);
-
if (ret)
printf_verbose("final delete aborted\n");
else
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);
+ rcu_unregister_thread();
free_all_cpu_call_rcu_data();
free(tid_reader);
free(tid_writer);
projects / urcu.git / blobdiff