write_pool_size = DEFAULT_RAND_POOL;
static int validate_lookup;
+static int count_pipe[2];
+
static inline void loop_sleep(unsigned long l)
{
while(l-- != 0)
}
}
+static
+void sigusr2_handler(int signo)
+{
+ char msg[1] = { 0x42 };
+ write(count_pipe[1], msg, 1); /* wakeup thread */
+}
+
/*
* returns 0 if test should end.
*/
unsigned long test_hash(void *_key, size_t length, unsigned long seed)
{
unsigned long key = (unsigned long) _key;
- unsigned long v;
assert(length == sizeof(unsigned long));
- return hash_u32(&v, 1, seed);
+ return hash_u32(&key, 1, seed);
}
#else
static
return 1;
}
+void *thr_count(void *arg)
+{
+ printf_verbose("thread_begin %s, thread id : %lx, tid %lu\n",
+ "counter", pthread_self(), (unsigned long)gettid());
+
+ rcu_register_thread();
+
+ for (;;) {
+ 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()))
+ break;
+ if (len != 1)
+ continue;
+ /* Accounting */
+ printf("Counting nodes... ");
+ fflush(stdout);
+ rcu_read_lock();
+ cds_lfht_count_nodes(test_ht, &approx_before, &count, &removed,
+ &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);
+ printf("Approximation after node accounting: %ld nodes.\n",
+ approx_after);
+ }
+ rcu_unregister_thread();
+ return NULL;
+}
+
void *thr_reader(void *_count)
{
unsigned long long *count = _count;
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]);
{
int err;
pthread_t *tid_reader, *tid_writer;
+ pthread_t tid_count;
void *tret;
unsigned long long *count_reader;
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;
+ long approx_before, approx_after;
int i, a, ret;
struct sigaction act;
unsigned int remain;
return -1;
}
+ 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_flags = SA_RESTART;
+ ret = sigaction(SIGUSR2, &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);
opt_auto_resize ? CDS_LFHT_AUTO_RESIZE : 0, NULL);
ret = populate_hash();
assert(!ret);
- rcu_unregister_thread();
+
+ rcu_thread_offline();
next_aff = 0;
tot_add_exist += count_writer[i].add_exist;
tot_remove += count_writer[i].remove;
}
- printf("Counting nodes... ");
+
+ /* teardown counter thread */
+ act.sa_handler = SIG_IGN;
+ act.sa_flags = SA_RESTART;
+ ret = sigaction(SIGUSR2, &act, NULL);
+ if (ret == -1) {
+ perror("sigaction");
+ return -1;
+ }
+ {
+ char msg[1] = { 0x42 };
+ write(count_pipe[1], msg, 1); /* wakeup thread */
+ }
+ err = pthread_join(tid_count, &tret);
+ if (err != 0)
+ exit(1);
+
fflush(stdout);
- cds_lfht_count_nodes(test_ht, &count, &removed);
+ rcu_thread_online();
+ rcu_read_lock();
+ printf("Counting nodes... ");
+ cds_lfht_count_nodes(test_ht, &approx_before, &count, &removed,
+ &approx_after);
printf("done.\n");
- if (count || removed)
- printf("WARNING: nodes left in the hash table upon destroy: "
- "%lu nodes + %lu logically removed.\n", count, removed);
+ test_delete_all_nodes(test_ht);
+ rcu_read_unlock();
+ rcu_thread_offline();
+ if (count || removed) {
+ 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);
+ 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