X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvppinfra%2Fbihash_template.h;h=eb50d32d521199847101dafb904f14689334876e;hb=882fcfe6f019f341e654daafe5afae9e69b64c50;hp=2101d44defe71b3eeb0cd8b4a1c20fbbfc16fea0;hpb=30765e77ac98913abefbdb9e8325a2b3f1e11082;p=vpp.git

diff --git a/src/vppinfra/bihash_template.h b/src/vppinfra/bihash_template.h
index 2101d44defe..eb50d32d521 100644
--- a/src/vppinfra/bihash_template.h
+++ b/src/vppinfra/bihash_template.h
@@ -59,10 +59,10 @@ typedef struct
   {
     struct
     {
-      u32 offset;
-      u8 linear_search;
-      u8 log2_pages;
-      i16 refcnt;
+      u64 offset:37;
+      u64 linear_search:1;
+      u64 log2_pages:8;
+      i64 refcnt:16;
     };
     u64 as_u64;
   };
@@ -72,6 +72,10 @@ typedef struct
 #endif
 } BVT (clib_bihash_bucket);
 
+#if BIHASH_KVP_CACHE_SIZE == 0
+STATIC_ASSERT_SIZEOF (BVT (clib_bihash_bucket), sizeof (u64));
+#endif
+
 typedef struct
 {
   BVT (clib_bihash_value) * values;
@@ -238,6 +242,12 @@ static inline void *BV (clib_bihash_get_value) (BVT (clib_bihash) * h,
   return (void *) vp;
 }
 
+static inline int BV (clib_bihash_bucket_is_empty)
+  (BVT (clib_bihash_bucket) * b)
+{
+  return b->as_u64 == 0;
+}
+
 static inline uword BV (clib_bihash_get_offset) (BVT (clib_bihash) * h,
 						 void *v)
 {
@@ -284,7 +294,7 @@ static inline int BV (clib_bihash_search_inline_with_hash)
   bucket_index = hash & (h->nbuckets - 1);
   b = &h->buckets[bucket_index];
 
-  if (b->offset == 0)
+  if (PREDICT_FALSE (BV (clib_bihash_bucket_is_empty) (b)))
     return -1;
 
 #if BIHASH_KVP_CACHE_SIZE > 0
@@ -373,7 +383,7 @@ static inline void BV (clib_bihash_prefetch_data)
   bucket_index = hash & (h->nbuckets - 1);
   b = &h->buckets[bucket_index];
 
-  if (PREDICT_FALSE (b->offset == 0))
+  if (PREDICT_FALSE (BV (clib_bihash_bucket_is_empty) (b)))
     return;
 
   hash >>= h->log2_nbuckets;
@@ -384,11 +394,10 @@ static inline void BV (clib_bihash_prefetch_data)
   CLIB_PREFETCH (v, CLIB_CACHE_LINE_BYTES, READ);
 }
 
-static inline int BV (clib_bihash_search_inline_2)
+static inline int BV (clib_bihash_search_inline_2_with_hash)
   (BVT (clib_bihash) * h,
-   BVT (clib_bihash_kv) * search_key, BVT (clib_bihash_kv) * valuep)
+   u64 hash, BVT (clib_bihash_kv) * search_key, BVT (clib_bihash_kv) * valuep)
 {
-  u64 hash;
   u32 bucket_index;
   BVT (clib_bihash_value) * v;
   BVT (clib_bihash_bucket) * b;
@@ -399,12 +408,10 @@ static inline int BV (clib_bihash_search_inline_2)
 
   ASSERT (valuep);
 
-  hash = BV (clib_bihash_hash) (search_key);
-
   bucket_index = hash & (h->nbuckets - 1);
   b = &h->buckets[bucket_index];
 
-  if (b->offset == 0)
+  if (PREDICT_FALSE (BV (clib_bihash_bucket_is_empty) (b)))
     return -1;
 
   /* Check the cache, if currently unlocked */
@@ -461,6 +468,19 @@ static inline int BV (clib_bihash_search_inline_2)
   return -1;
 }
 
+static inline int BV (clib_bihash_search_inline_2)
+  (BVT (clib_bihash) * h,
+   BVT (clib_bihash_kv) * search_key, BVT (clib_bihash_kv) * valuep)
+{
+  u64 hash;
+
+  hash = BV (clib_bihash_hash) (search_key);
+
+  return BV (clib_bihash_search_inline_2_with_hash) (h, hash, search_key,
+						     valuep);
+}
+
+
 #endif /* __included_bihash_template_h__ */
 
 /** @endcond */