/*
- * test_ht.c
+ * test_urcu_hash.c
*
* Userspace RCU library - test program
*
#else
#define debug_yield_read()
#endif
-#include <urcu.h>
+#include <urcu-qsbr.h>
#include <urcu/rculfhash.h>
#include <urcu-call-rcu.h>
static unsigned long rduration;
static unsigned long init_hash_size = DEFAULT_HASH_SIZE;
+static unsigned long init_populate;
static unsigned long rand_pool = DEFAULT_RAND_POOL;
static int add_only, add_unique;
nr_reads++;
if (unlikely(!test_duration_read()))
break;
+ if (unlikely((nr_reads & ((1 << 10) - 1)) == 0))
+ rcu_quiescent_state();
}
rcu_unregister_thread();
break;
if (unlikely(wdelay))
loop_sleep(wdelay);
+ if (unlikely((nr_writes & ((1 << 10) - 1)) == 0))
+ rcu_quiescent_state();
}
rcu_unregister_thread();
return ((void*)2);
}
+static int populate_hash(void)
+{
+ struct cds_lfht_node *node, *ret_node;
+
+ if (!init_populate)
+ return 0;
+
+ if (add_unique && init_populate * 10 > rand_pool) {
+ printf("WARNING: required to populate %lu nodes (-k), but random "
+"pool is quite small (%lu values) and we are in add_unique (-u) mode. Try with a "
+"larger random pool (-p option).\n", init_populate, rand_pool);
+ return -1;
+ }
+
+ while (nr_add < init_populate) {
+ node = malloc(sizeof(struct cds_lfht_node));
+ cds_lfht_node_init(node,
+ (void *)(unsigned long)(rand_r(&rand_lookup) % rand_pool),
+ sizeof(void *));
+ if (add_unique)
+ ret_node = cds_lfht_add_unique(test_ht, node);
+ else
+ cds_lfht_add(test_ht, node);
+ if (add_unique && ret_node != node) {
+ free(node);
+ nr_addexist++;
+ } else
+ nr_add++;
+ nr_writes++;
+ }
+ return 0;
+}
+
void show_usage(int argc, char **argv)
{
printf("Usage : %s nr_readers nr_writers duration (s)", argv[0]);
printf(" [-h size] (initial hash table size)");
printf(" [-u] Uniquify add.");
printf(" [-i] Add only (no removal).");
+ printf(" [-k nr_nodes] Number of nodes to insert initially.");
printf("\n");
}
case 'i':
add_only = 1;
break;
+ case 'k':
+ init_populate = atol(argv[++i]);
+ break;
}
}
count_writer = malloc(sizeof(*count_writer) * nr_writers);
test_ht = cds_lfht_new(test_hash, test_compare, 0x42UL,
init_hash_size, call_rcu);
-
+ ret = populate_hash();
+ assert(!ret);
err = create_all_cpu_call_rcu_data(0);
assert(!err);
printf("SUMMARY %-25s testdur %4lu nr_readers %3u rdur %6lu "
"nr_writers %3u "
"wdelay %6lu rand_pool %12llu nr_reads %12llu nr_writes %12llu nr_ops %12llu "
- "nr_add %12llu nr_add_fail %12llu nr_remove %12llu nr_leaked %12llu\n",
+ "nr_add %12llu nr_add_fail %12llu nr_remove %12llu nr_leaked %12lld\n",
argv[0], duration, nr_readers, rduration,
nr_writers, wdelay, rand_pool, tot_reads, tot_writes,
tot_reads + tot_writes, tot_add, tot_add_exist, tot_remove,
- tot_add - tot_remove - count);
+ (long long) tot_add + init_populate - tot_remove - count);
free(tid_reader);
free(tid_writer);
free(count_reader);