rculfhash,test: add max_hash_buckets_size argument

[urcu.git] / tests / test_urcu_hash.c

diff --git a/tests/test_urcu_hash.c b/tests/test_urcu_hash.c
index 87c4ad13781393a1d3aeb522f0e8c4406e52d037..035e2eedf508433abd203030fe450d1e951e89bd 100644 (file)
--- a/tests/test_urcu_hash.c
+++ b/tests/test_urcu_hash.c
@@ -147,6 +147,7 @@ static unsigned long rduration;
 
 static unsigned long init_hash_size = DEFAULT_HASH_SIZE;
 static unsigned long min_hash_alloc_size = DEFAULT_MIN_ALLOC_SIZE;
+static unsigned long max_hash_buckets_size = (1UL << 20);
 static unsigned long init_populate;
 static int opt_auto_resize;
 static int add_only, add_unique, add_replace;
@@ -384,7 +385,7 @@ void hashword2(
 
 #if (CAA_BITS_PER_LONG == 32)
 static
-unsigned long test_hash(void *_key, size_t length, unsigned long seed)
+unsigned long test_hash(const void *_key, size_t length, unsigned long seed)
 {
        unsigned int key = (unsigned int) _key;
 
@@ -393,7 +394,7 @@ unsigned long test_hash(void *_key, size_t length, unsigned long seed)
 }
 #else
 static
-unsigned long test_hash(void *_key, size_t length, unsigned long seed)
+unsigned long test_hash(const void *_key, size_t length, unsigned long seed)
 {
        union {
                uint64_t v64;
@@ -413,8 +414,8 @@ unsigned long test_hash(void *_key, size_t length, unsigned long seed)
 #endif
 
 static
-unsigned long test_compare(void *key1, size_t key1_len,
-                           void *key2, size_t key2_len)
+unsigned long test_compare(const void *key1, size_t key1_len,
+                           const void *key2, size_t key2_len)
 {
        if (caa_unlikely(key1_len != key2_len))
                return -1;
@@ -426,7 +427,7 @@ unsigned long test_compare(void *key1, size_t key1_len,
 }
 
 static
-int test_match(struct cds_lfht_node *node, void *key)
+int test_match(struct cds_lfht_node *node, const void *key)
 {
        struct lfht_test_node *test_node = to_test_node(node);
 
@@ -434,15 +435,14 @@ int test_match(struct cds_lfht_node *node, void *key)
                        key, sizeof(unsigned long));
 }
 
-static
+static inline
 void cds_lfht_test_lookup(struct cds_lfht *ht, void *key, size_t key_len,
                struct cds_lfht_iter *iter)
 {
        assert(key_len == sizeof(unsigned long));
 
-       cds_lfht_lookup(ht, test_match,
-                       test_hash(key, key_len, TEST_HASH_SEED),
-                       key, iter);
+       cds_lfht_lookup(ht, test_hash(key, key_len, TEST_HASH_SEED),
+                       test_match, key, iter);
 }
 
 void *thr_count(void *arg)
@@ -577,14 +577,14 @@ void *thr_writer(void *_count)
                                sizeof(void *));
                        rcu_read_lock();
                        if (add_unique) {
-                               ret_node = cds_lfht_add_unique(test_ht, test_match, node->key,
+                               ret_node = cds_lfht_add_unique(test_ht,
                                        test_hash(node->key, node->key_len, TEST_HASH_SEED),
-                                       &node->node);
+                                       test_match, node->key, &node->node);
                        } else {
                                if (add_replace)
-                                       ret_node = cds_lfht_add_replace(test_ht, test_match, node->key,
+                                       ret_node = cds_lfht_add_replace(test_ht,
                                                        test_hash(node->key, node->key_len, TEST_HASH_SEED),
-                                                       &node->node);
+                                                       test_match, node->key, &node->node);
                                else
                                        cds_lfht_add(test_ht,
                                                test_hash(node->key, node->key_len, TEST_HASH_SEED),
@@ -674,14 +674,14 @@ static int populate_hash(void)
                        sizeof(void *));
                rcu_read_lock();
                if (add_unique) {
-                       ret_node = cds_lfht_add_unique(test_ht, test_match, node->key,
+                       ret_node = cds_lfht_add_unique(test_ht,
                                test_hash(node->key, node->key_len, TEST_HASH_SEED),
-                               &node->node);
+                               test_match, node->key, &node->node);
                } else {
                        if (add_replace)
-                               ret_node = cds_lfht_add_replace(test_ht, test_match, node->key,
+                               ret_node = cds_lfht_add_replace(test_ht,
                                                test_hash(node->key, node->key_len, TEST_HASH_SEED),
-                                               &node->node);
+                                               test_match, node->key, &node->node);
                        else
                                cds_lfht_add(test_ht,
                                        test_hash(node->key, node->key_len, TEST_HASH_SEED),
@@ -711,14 +711,12 @@ void test_delete_all_nodes(struct cds_lfht *ht)
        struct lfht_test_node *node;
        unsigned long count = 0;
 
-       cds_lfht_first(ht, &iter);
-       while ((node = cds_lfht_iter_get_test_node(&iter)) != NULL) {
+       cds_lfht_for_each_entry(ht, &iter, node, node) {
                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);
@@ -734,8 +732,9 @@ void show_usage(int argc, char **argv)
        printf("        [-c duration] (reader C.S. duration (in loops))\n");
        printf("        [-v] (verbose output)\n");
        printf("        [-a cpu#] [-a cpu#]... (affinity)\n");
-       printf("        [-h size] (initial hash table size)\n");
-       printf("        [-m size] (minimum hash alloc size)\n");
+       printf("        [-h size] (initial number of buckets)\n");
+       printf("        [-m size] (minimum number of allocated buckets)\n");
+       printf("        [-n size] (maximum number of buckets)\n");
        printf("        [not -u nor -s] Add entries (supports redundant keys).\n");
        printf("        [-u] Uniquify add (no redundant keys).\n");
        printf("        [-s] Replace (swap) entries.\n");
@@ -844,6 +843,13 @@ int main(int argc, char **argv)
                        }
                        min_hash_alloc_size = atol(argv[++i]);
                        break;
+               case 'n':
+                       if (argc < i + 2) {
+                               show_usage(argc, argv);
+                               return -1;
+                       }
+                       max_hash_buckets_size = atol(argv[++i]);
+                       break;
                case 'u':
                        if (add_replace) {
                                printf("Please specify at most one of -s or -u.\n");
@@ -894,17 +900,23 @@ int main(int argc, char **argv)
 
        /* Check if hash size is power of 2 */
        if (init_hash_size && init_hash_size & (init_hash_size - 1)) {
-               printf("Error: Hash table size %lu is not a power of 2.\n",
+               printf("Error: Initial number of buckets (%lu) is not a power of 2.\n",
                        init_hash_size);
                return -1;
        }
 
-       if (min_hash_alloc_size && min_hash_alloc_size * (min_hash_alloc_size - 1)) {
-               printf("Error: Min hash alloc size %lu is not a power of 2.\n",
+       if (min_hash_alloc_size && min_hash_alloc_size & (min_hash_alloc_size - 1)) {
+               printf("Error: Minimum number of allocated buckets (%lu) is not a power of 2.\n",
                        min_hash_alloc_size);
                return -1;
        }
 
+       if (max_hash_buckets_size && max_hash_buckets_size & (max_hash_buckets_size - 1)) {
+               printf("Error: Maximum number of buckets (%lu) is not a power of 2.\n",
+                       max_hash_buckets_size);
+               return -1;
+       }
+
        memset(&act, 0, sizeof(act));
        ret = sigemptyset(&act.sa_mask);
        if (ret == -1) {
@@ -946,8 +958,9 @@ int main(int argc, char **argv)
        printf_verbose("Mode:%s%s.\n",
                add_only ? " add only" : " add/remove",
                add_unique ? " uniquify" : ( add_replace ? " replace" : " insert"));
-       printf_verbose("Initial hash table size: %lu buckets.\n", init_hash_size);
-       printf_verbose("Minimum hash alloc size: %lu buckets.\n", min_hash_alloc_size);
+       printf_verbose("Initial number of buckets: %lu buckets.\n", init_hash_size);
+       printf_verbose("Minimum number of allocated buckets: %lu buckets.\n", min_hash_alloc_size);
+       printf_verbose("Maximum number of buckets: %lu buckets.\n", max_hash_buckets_size);
        printf_verbose("Init pool size offset %lu size %lu.\n",
                init_pool_offset, init_pool_size);
        printf_verbose("Lookup pool size offset %lu size %lu.\n",
@@ -971,6 +984,7 @@ int main(int argc, char **argv)
         */
        rcu_register_thread();
        test_ht = cds_lfht_new(init_hash_size, min_hash_alloc_size,
+                       max_hash_buckets_size,
                        (opt_auto_resize ? CDS_LFHT_AUTO_RESIZE : 0) |
                        CDS_LFHT_ACCOUNTING, NULL);
        ret = populate_hash();