diff options
Diffstat (limited to 'src/vppinfra/test_bihash_template.c')
| -rw-r--r-- | src/vppinfra/test_bihash_template.c | 72 |
1 files changed, 68 insertions, 4 deletions
diff --git a/src/vppinfra/test_bihash_template.c b/src/vppinfra/test_bihash_template.c index ffed5c73287..17cc05629ae 100644 --- a/src/vppinfra/test_bihash_template.c +++ b/src/vppinfra/test_bihash_template.c @@ -247,6 +247,59 @@ test_bihash_threads (test_main_t * tm) return 0; } +static clib_error_t * +test_bihash_vanilla_overwrite (test_main_t *tm) +{ + int i; + BVT (clib_bihash) * h; + BVT (clib_bihash_kv) kv; + + h = &tm->hash; + +#if BIHASH_32_64_SVM + BV (clib_bihash_initiator_init_svm) + (h, "test", tm->nbuckets, 0x30000000 /* base_addr */, tm->hash_memory_size); +#else + BV (clib_bihash_init) (h, "test", tm->nbuckets, tm->hash_memory_size); +#endif + + for (i = 0; i < 100; i++) + { + kv.key = 12345; + kv.value = i; + + BV (clib_bihash_add_del) (h, &kv, 1 /* is_add */); + } + + fformat (stdout, "End of run, should one item...\n"); + fformat (stdout, "%U", BV (format_bihash), h, 0 /* very verbose */); + BV (clib_bihash_free) (h); + return 0; +} + +static clib_error_t * +test_bihash_value_assert (test_main_t *tm) +{ + BVT (clib_bihash) * h; + BVT (clib_bihash_kv) kv; + + h = &tm->hash; + +#if BIHASH_32_64_SVM + BV (clib_bihash_initiator_init_svm) + (h, "test", tm->nbuckets, 0x30000000 /* base_addr */, tm->hash_memory_size); +#else + BV (clib_bihash_init) (h, "test", tm->nbuckets, tm->hash_memory_size); +#endif + + kv.key = 12345; + kv.value = 0xFEEDFACE8BADF00DULL; + + fformat (stderr, "The following add should ASSERT...\n"); + BV (clib_bihash_add_del) (h, &kv, 1 /* is_add */); + + return 0; +} static clib_error_t * test_bihash (test_main_t * tm) @@ -338,7 +391,7 @@ test_bihash (test_main_t * tm) for (i = 0; i < tm->nitems; i++) { /* Prefetch buckets 8 iterations ahead */ - if (1 && (i < (tm->nitems - 8))) + if (1 && (i < ((i64) tm->nitems - 8))) { BVT (clib_bihash_kv) pref_kv; u64 pref_hash; @@ -422,7 +475,7 @@ test_bihash (test_main_t * tm) for (j = 0; j < tm->nitems; j++) { /* Prefetch buckets 8 iterations ahead */ - if (1 && (j < (tm->nitems - 8))) + if (1 && (j < ((i64) tm->nitems - 8))) { BVT (clib_bihash_kv) pref_kv; u64 pref_hash; @@ -514,6 +567,10 @@ test_bihash_main (test_main_t * tm) tm->verbose = 1; else if (unformat (i, "stale-overwrite")) which = 3; + else if (unformat (i, "overwrite")) + which = 4; + else if (unformat (i, "value-assert")) + which = 5; else return clib_error_return (0, "unknown input '%U'", format_unformat_error, i); @@ -522,8 +579,7 @@ test_bihash_main (test_main_t * tm) /* Preallocate hash table, key vector */ tm->key_hash = hash_create (tm->nitems, sizeof (uword)); vec_validate (tm->keys, tm->nitems - 1); - _vec_len (tm->keys) = 0; - + vec_set_len (tm->keys, 0); switch (which) { @@ -543,6 +599,14 @@ test_bihash_main (test_main_t * tm) error = test_bihash_stale_overwrite (tm); break; + case 4: + error = test_bihash_vanilla_overwrite (tm); + break; + + case 5: + error = test_bihash_value_assert (tm); + break; + default: return clib_error_return (0, "no such test?"); } |