From d7b828f0cf0e21eebc4ae836668db68971225dd1 Mon Sep 17 00:00:00 2001 From: Dave Barach Date: Wed, 1 Apr 2020 16:54:00 -0400 Subject: [PATCH] vppinfra: fix vppinfra test code build Type: fix Signed-off-by: Dave Barach Change-Id: I921adae4ad797bf80cfcdb05d2a89ace9183a89a --- src/vppinfra/CMakeLists.txt | 2 +- src/vppinfra/test_cuckoo_bihash.c | 2 +- src/vppinfra/test_cuckoo_template.c | 6 ++++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/vppinfra/CMakeLists.txt b/src/vppinfra/CMakeLists.txt index 3128ad31162..fd79aa58cbc 100644 --- a/src/vppinfra/CMakeLists.txt +++ b/src/vppinfra/CMakeLists.txt @@ -75,6 +75,7 @@ set(VPPINFRA_SRCS time.c time_range.c timing_wheel.c + tw_timer_2t_2w_512sl.c tw_timer_16t_1w_2048sl.c tw_timer_16t_2w_512sl.c tw_timer_1t_3w_1024sl_ov.c @@ -165,7 +166,6 @@ set(VPPINFRA_HEADERS time.h time_range.h timing_wheel.h - tw_timer_2t_2w_512sl.c tw_timer_16t_1w_2048sl.h tw_timer_16t_2w_512sl.h tw_timer_1t_3w_1024sl_ov.h diff --git a/src/vppinfra/test_cuckoo_bihash.c b/src/vppinfra/test_cuckoo_bihash.c index 3e63f0bee01..e992e26fa7d 100644 --- a/src/vppinfra/test_cuckoo_bihash.c +++ b/src/vppinfra/test_cuckoo_bihash.c @@ -134,7 +134,7 @@ w_thread (c, { CVT (clib_cuckoo_kv) kv; kv.key = tm->keys[idx]; kv.value = *hash_get (tm->key_hash, kv.key); - CV (clib_cuckoo_add_del) (&tm->ch, &kv, op); + CV (clib_cuckoo_add_del) (&tm->ch, &kv, op, 0); }); /* *INDENT-ON* */ diff --git a/src/vppinfra/test_cuckoo_template.c b/src/vppinfra/test_cuckoo_template.c index 52af38589c8..9619dc2e802 100644 --- a/src/vppinfra/test_cuckoo_template.c +++ b/src/vppinfra/test_cuckoo_template.c @@ -138,7 +138,8 @@ test_cuckoo (test_main_t * tm) kv.key = tm->keys[i]; kv.value = i + 1; - CV (clib_cuckoo_add_del) (h, &kv, 1 /* is_add */ ); + CV (clib_cuckoo_add_del) (h, &kv, 1 /* is_add */ , + 0 /* overwrite */ ); if (tm->verbose > 1) { @@ -207,7 +208,8 @@ test_cuckoo (test_main_t * tm) kv.key = tm->keys[i]; kv.value = (u64) (i + 1); - rv = CV (clib_cuckoo_add_del) (h, &kv, 0 /* is_add */ ); + rv = CV (clib_cuckoo_add_del) (h, &kv, 0 /* is_add */ , + 0 /* dont_overwrite */ ); if (rv < 0) clib_warning ("delete key %lld not ok but should be", tm->keys[i]); -- 2.16.6