X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvppinfra%2Ftest_bihash_template.c;h=c1a446919667df4a1a8b75d455f57f0e54036c9a;hb=8c8acc0;hp=80e11511f62d20f665ec88821b9ec4e20d4a4b53;hpb=508498f74d2df98e70a961d030cf0128a63a926d;p=vpp.git

diff --git a/src/vppinfra/test_bihash_template.c b/src/vppinfra/test_bihash_template.c
index 80e11511f62..c1a44691966 100644
--- a/src/vppinfra/test_bihash_template.c
+++ b/src/vppinfra/test_bihash_template.c
@@ -35,6 +35,7 @@ typedef struct
   u32 ncycles;
   u32 report_every_n;
   u32 search_iter;
+  u32 noverwritten;
   int careful_delete_tests;
   int verbose;
   int non_random_keys;
@@ -71,7 +72,13 @@ test_bihash_vec64 (test_main_t * tm)
 
   h = &tm->hash;
 
+#if BIHASH_32_64_SVM
+  BV (clib_bihash_master_init_svm) (h, "test", user_buckets,
+				    0x30000000 /* base_addr */ ,
+				    user_memory_size);
+#else
   BV (clib_bihash_init) (h, "test", user_buckets, user_memory_size);
+#endif
 
   before = clib_time_now (&tm->clib_time);
 
@@ -95,6 +102,50 @@ test_bihash_vec64 (test_main_t * tm)
   return 0;
 }
 
+static int
+stale_cb (BVT (clib_bihash_kv) * kv, void *ctx)
+{
+  test_main_t *tm = ctx;
+
+  tm->noverwritten++;
+
+  return 1;
+}
+
+static clib_error_t *
+test_bihash_stale_overwrite (test_main_t * tm)
+{
+  BVT (clib_bihash) * h;
+  BVT (clib_bihash_kv) kv;
+  int i;
+  tm->noverwritten = 0;
+
+  h = &tm->hash;
+
+#if BIHASH_32_64_SVM
+  BV (clib_bihash_master_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
+
+  fformat (stdout, "Add %d items to %d buckets\n", tm->nitems, tm->nbuckets);
+
+  for (i = 0; i < tm->nitems; i++)
+    {
+      kv.key = i;
+      kv.value = 1;
+
+      BV (clib_bihash_add_or_overwrite_stale) (h, &kv, stale_cb, tm);
+    }
+
+  fformat (stdout, "%d items overwritten\n", tm->noverwritten);
+  fformat (stdout, "%U", BV (format_bihash), h, 0);
+
+  return 0;
+}
+
 void *
 test_bihash_thread_fn (void *arg)
 {
@@ -156,7 +207,13 @@ test_bihash_threads (test_main_t * tm)
 
   h = &tm->hash;
 
+#if BIHASH_32_64_SVM
+  BV (clib_bihash_master_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
 
   tm->thread_barrier = 1;
 
@@ -204,7 +261,13 @@ test_bihash (test_main_t * tm)
 
   h = &tm->hash;
 
+#if BIHASH_32_64_SVM
+  BV (clib_bihash_master_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 (acycle = 0; acycle < tm->ncycles; acycle++)
     {
@@ -381,6 +444,9 @@ test_bihash (test_main_t * tm)
   fformat (stdout, "End of run, should be empty...\n");
 
   fformat (stdout, "%U", BV (format_bihash), h, 0 /* very verbose */ );
+
+  BV (clib_bihash_free) (h);
+
   return 0;
 }
 
@@ -392,7 +458,7 @@ test_bihash_main (test_main_t * tm)
   int which = 0;
 
   tm->report_every_n = 1;
-  tm->hash_memory_size = 4095ULL << 20;
+  tm->hash_memory_size = 1ULL << 30;
 
   while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
     {
@@ -424,6 +490,8 @@ test_bihash_main (test_main_t * tm)
 	which = 2;
       else if (unformat (i, "verbose"))
 	tm->verbose = 1;
+      else if (unformat (i, "stale-overwrite"))
+	which = 3;
       else
 	return clib_error_return (0, "unknown input '%U'",
 				  format_unformat_error, i);
@@ -449,6 +517,10 @@ test_bihash_main (test_main_t * tm)
       error = test_bihash_threads (tm);
       break;
 
+    case 3:
+      error = test_bihash_stale_overwrite (tm);
+      break;
+
     default:
       return clib_error_return (0, "no such test?");
     }