X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvppinfra%2Fpool.h;h=2b8e0581e386e5a91abcd6a0165211fd53c701df;hb=66446b9888e7507929f1665fda0308b86fe7e70b;hp=62d5b54ec0771d8370a0869a97053df9ad345842;hpb=b7f1faa7fbd4575f28766e552a73810c6de0ace3;p=vpp.git

diff --git a/src/vppinfra/pool.h b/src/vppinfra/pool.h
index 62d5b54ec07..2b8e0581e38 100644
--- a/src/vppinfra/pool.h
+++ b/src/vppinfra/pool.h
@@ -190,6 +190,8 @@ do {                                                                    \
   pool_header_t * _pool_var (p) = pool_header (P);                      \
   uword _pool_var (l);                                                  \
                                                                         \
+  STATIC_ASSERT(A==0 || ((A % sizeof(P[0]))==0) || ((sizeof(P[0]) % A) == 0), \
+                "Pool aligned alloc of incorrectly sized object");      \
   _pool_var (l) = 0;                                                    \
   if (P)                                                                \
     _pool_var (l) = vec_len (_pool_var (p)->free_indices);              \
@@ -199,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);                                        \
-      _pool_var (p)->free_bitmap =                                      \
-	clib_bitmap_andnoti (_pool_var (p)->free_bitmap, _pool_var (i)); \
+      _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                                                                  \
@@ -218,7 +221,7 @@ do {                                                                    \
 		       pool_aligned_header_bytes,                       \
 		       /* align */ (A));                                \
       E = vec_end (P) - 1;                                              \
-    }                                                                   \
+    }									\
 } while (0)
 
 /** Allocate an object E from a pool P (unspecified alignment). */
@@ -233,9 +236,10 @@ do {                                                                    \
   _pool_var (l) = 0;                                                    \
   if (P)                                                                \
     {                                                                   \
-    if (_pool_var (p)->max_elts)                                        \
-      return 0;                                                         \
-    _pool_var (l) = vec_len (_pool_var (p)->free_indices);              \
+      if (_pool_var (p)->max_elts)                                      \
+        _pool_var (l) = _pool_var (p)->max_elts;			\
+      else								\
+        _pool_var (l) = vec_len (_pool_var (p)->free_indices);          \
     }                                                                   \
                                                                         \
   /* Free elements, certainly won't expand */                           \
@@ -276,7 +280,9 @@ do {									\
 									\
   /* Add element to free bitmap and to free list. */			\
   _pool_var (p)->free_bitmap =						\
-    clib_bitmap_ori (_pool_var (p)->free_bitmap, _pool_var (l));	\
+    clib_bitmap_ori_notrim (_pool_var (p)->free_bitmap,              	\
+                             _pool_var (l));	                        \
+                                                                        \
   /* Preallocated pool? */                                              \
   if (_pool_var (p)->max_elts)                                          \
     {                                                                   \
@@ -472,6 +478,9 @@ do {									\
     (_pool_var (rv) < vec_len (P) ?                                     \
      clib_bitmap_next_clear (_pool_var (p)->free_bitmap, _pool_var(rv)) \
      : ~0);                                                             \
+  _pool_var(rv) =                                                       \
+    (_pool_var (rv) < vec_len (P) ?                                     \
+     _pool_var (rv) : ~0);						\
   _pool_var(rv);                                                        \
 })