X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvppinfra%2Fpool.h;h=75d4c95ce11cdc20d6e2f44ac8a606e314ae7e05;hb=2152e1cf8b3420d94ba31fe25853977ad945f35a;hp=d1a2be9ddcde1822cdadef68c8810a45ca02b52b;hpb=0654dcc7b9370be6472f306d0a7b5ba9bf2b7962;p=vpp.git

diff --git a/src/vppinfra/pool.h b/src/vppinfra/pool.h
index d1a2be9ddcd..75d4c95ce11 100644
--- a/src/vppinfra/pool.h
+++ b/src/vppinfra/pool.h
@@ -185,7 +185,7 @@ pool_free_elts (void *v)
 
    First search free list.  If nothing is free extend vector of objects.
 */
-#define pool_get_aligned(P,E,A)                                         \
+#define _pool_get_aligned_internal(P,E,A,Z)                             \
 do {                                                                    \
   pool_header_t * _pool_var (p) = pool_header (P);                      \
   uword _pool_var (l);                                                  \
@@ -201,8 +201,9 @@ do {                                                                    \
       /* Return free element from free list. */                         \
       uword _pool_var (i) = _pool_var (p)->free_indices[_pool_var (l) - 1]; \
       (E) = (P) + _pool_var (i);                                        \
-      clib_bitmap_set_no_check (_pool_var (p)->free_bitmap,             \
-                                _pool_var (i), 0);                      \
+      _pool_var (p)->free_bitmap =					\
+	clib_bitmap_andnoti_notrim (_pool_var (p)->free_bitmap,        \
+	                             _pool_var (i));	               	\
       _vec_len (_pool_var (p)->free_indices) = _pool_var (l) - 1;       \
     }                                                                   \
   else                                                                  \
@@ -220,13 +221,23 @@ do {                                                                    \
 		       pool_aligned_header_bytes,                       \
 		       /* align */ (A));                                \
       E = vec_end (P) - 1;                                              \
-      pool_validate_index (P, vec_len(P)-1);                            \
     }									\
+  if (Z)                                                                \
+    memset(E, 0, sizeof(*E));						\
 } while (0)
 
+/** Allocate an object E from a pool P with alignment A */
+#define pool_get_aligned(P,E,A) _pool_get_aligned_internal(P,E,A,0)
+
+/** Allocate an object E from a pool P with alignment A and zero it */
+#define pool_get_aligned_zero(P,E,A) _pool_get_aligned_internal(P,E,A,1)
+
 /** Allocate an object E from a pool P (unspecified alignment). */
 #define pool_get(P,E) pool_get_aligned(P,E,0)
 
+/** Allocate an object E from a pool P and zero it */
+#define pool_get_zero(P,E) pool_get_aligned_zero(P,E,0)
+
 /** See if pool_get will expand the pool or not */
 #define pool_get_aligned_will_expand(P,YESNO,A)                         \
 do {                                                                    \
@@ -257,6 +268,7 @@ do {                                                                    \
     }                                                                   \
 } while (0)
 
+/** Tell the caller if pool get will expand the pool */
 #define pool_get_will_expand(P,YESNO) pool_get_aligned_will_expand(P,YESNO,0)
 
 /** Use free bitmap to query whether given element is free. */
@@ -264,7 +276,7 @@ do {                                                                    \
 ({									\
   pool_header_t * _pool_var (p) = pool_header (P);			\
   uword _pool_var (i) = (E) - (P);					\
-  (_pool_var (i) < vec_len (P)) ? clib_bitmap_get_no_check (_pool_var (p)->free_bitmap, _pool_i) : 1; \
+  (_pool_var (i) < vec_len (P)) ? clib_bitmap_get (_pool_var (p)->free_bitmap, _pool_i) : 1; \
 })
 
 /** Use free bitmap to query whether given index is free */
@@ -279,8 +291,9 @@ do {									\
   ASSERT (! pool_is_free (P, E));					\
 									\
   /* Add element to free bitmap and to free list. */			\
-  clib_bitmap_set_no_check (_pool_var (p)->free_bitmap,                 \
-                            _pool_var (l), 1);                          \
+  _pool_var (p)->free_bitmap =						\
+    clib_bitmap_ori_notrim (_pool_var (p)->free_bitmap,              	\
+                             _pool_var (l));	                        \
                                                                         \
   /* Preallocated pool? */                                              \
   if (_pool_var (p)->max_elts)                                          \
@@ -492,7 +505,7 @@ do {									\
     }
 
 /**
- * @brief Remove all elemenets from a pool in a safe way
+ * @brief Remove all elements from a pool in a safe way
  *
  * @param VAR each element in the pool
  * @param POOL The pool to flush