From d149d812fd91191a95726b781ff24d3959166c86 Mon Sep 17 00:00:00 2001 From: Mathieu Desnoyers Date: Sun, 4 Sep 2011 12:39:23 -0400 Subject: [PATCH] hash table tests: Add initial hash population to glib hash table test Signed-off-by: Mathieu Desnoyers --- tests/test_glib_hash.c | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/tests/test_glib_hash.c b/tests/test_glib_hash.c index 7fed39b..3043557 100644 --- a/tests/test_glib_hash.c +++ b/tests/test_glib_hash.c @@ -175,6 +175,7 @@ pthread_mutex_t rcu_copy_mutex = PTHREAD_MUTEX_INITIALIZER; void rcu_copy_mutex_lock(void) { int ret; + ret = pthread_mutex_lock(&rcu_copy_mutex); if (ret) { perror("Error in pthread mutex lock"); @@ -483,13 +484,20 @@ void *thr_writer(void *_count) return ((void*)2); } -static void populate_hash(void) +static int populate_hash(void) { struct cds_lfht_node *node, *lookup_node; void *key; if (!init_populate) - return; + 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(1); @@ -514,6 +522,7 @@ static void populate_hash(void) } nr_writes++; } + return 0; } static @@ -666,7 +675,8 @@ int main(int argc, char **argv) count_writer = malloc(sizeof(*count_writer) * nr_writers); test_ht = g_hash_table_new_full(test_hash_fct, test_compare_fct, NULL, free); - populate_hash(); + ret = populate_hash(); + assert(!ret); err = create_all_cpu_call_rcu_data(0); assert(!err); -- 2.34.1