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
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
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]);
}
{
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();
- printf("done.\n");
if (count || removed) {
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: %ld nodes.\n",