commit d7b828f0cf0e21eebc4ae836668db68971225dd1
author Dave Barach <dave@barachs.net> Wed Apr 01 16:54:00 2020 -0400
committer Florin Coras <florin.coras@gmail.com> Wed Apr 01 22:47:07 2020 +0000
tree 4699083e94f1f62d89944f2626efddc944a44243
parent 0a1e183e5aa45fb0050eb03e1c8ebdb9f426a374

vppinfra: fix vppinfra test code build

Type: fix
Signed-off-by: Dave Barach <dave@barachs.net>
Change-Id: I921adae4ad797bf80cfcdb05d2a89ace9183a89a

src/vppinfra/CMakeLists.txt

diff --git a/src/vppinfra/CMakeLists.txt b/src/vppinfra/CMakeLists.txt
index 3128ad3..fd79aa5 100644
--- a/src/vppinfra/CMakeLists.txt
+++ b/src/vppinfra/CMakeLists.txt
@@ -75,6 +75,7 @@
   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 @@
   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

src/vppinfra/test_cuckoo_bihash.c

diff --git a/src/vppinfra/test_cuckoo_bihash.c b/src/vppinfra/test_cuckoo_bihash.c
index 3e63f0b..e992e26 100644
--- a/src/vppinfra/test_cuckoo_bihash.c
+++ b/src/vppinfra/test_cuckoo_bihash.c
@@ -134,7 +134,7 @@
   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* */
 

src/vppinfra/test_cuckoo_template.c

diff --git a/src/vppinfra/test_cuckoo_template.c b/src/vppinfra/test_cuckoo_template.c
index 52af385..9619dc2 100644
--- a/src/vppinfra/test_cuckoo_template.c
+++ b/src/vppinfra/test_cuckoo_template.c
@@ -138,7 +138,8 @@
       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 @@
 
       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]);