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++;
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;
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);
}