vppinfra: fix sock init netns

[vpp.git] / src / vppinfra / pool.h

diff --git a/src/vppinfra/pool.h b/src/vppinfra/pool.h
index d7be8cb..6f16e61 100644 (file)
--- a/src/vppinfra/pool.h
+++ b/src/vppinfra/pool.h
@@ -173,8 +173,12 @@ pool_free_elts (void *v)
     {
       n_free += vec_len (p->free_indices);
 
-      /* Space left at end of vector? */
-      n_free += vec_capacity (v, sizeof (p[0])) - vec_len (v);
+      /*
+       * Space left at end of vector?
+       * Fixed-size pools have max_elts set non-zero,
+       */
+      if (p->max_elts == 0)
+       n_free += vec_capacity (v, sizeof (p[0])) - vec_len (v);
     }
 
   return n_free;
@@ -298,33 +302,36 @@ do {                                                                    \
 #define pool_is_free_index(P,I) pool_is_free((P),(P)+(I))
 
 /** Free an object E in pool P. */
-#define pool_put(P,E)                                                  \
-do {                                                                   \
-  typeof (P) _pool_var(p__) = (P);                                     \
-  typeof (E) _pool_var(e__) = (E);                                     \
-  pool_header_t * _pool_var (p) = pool_header (_pool_var(p__));                \
-  uword _pool_var (l) = _pool_var(e__) - _pool_var(p__);               \
-  ASSERT (vec_is_member (_pool_var(p__), _pool_var(e__)));             \
-  ASSERT (! pool_is_free (_pool_var(p__), _pool_var(e__)));            \
-                                                                       \
-  /* Add element to free bitmap and to free list. */                   \
-  _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)                                          \
-    {                                                                   \
-      ASSERT(_pool_var(l) < _pool_var (p)->max_elts);                   \
-      _pool_var(p)->free_indices[_vec_len(_pool_var(p)->free_indices)] = \
-                                 _pool_var(l);                          \
-      _vec_len(_pool_var(p)->free_indices) += 1;                        \
-    }                                                                   \
-  else                                                                  \
-    vec_add1 (_pool_var (p)->free_indices, _pool_var (l));             \
-                                                                        \
-  CLIB_MEM_POISON(_pool_var(e__), sizeof(_pool_var(e__)[0]));                                 \
-} while (0)
+#define pool_put(P, E)                                                        \
+  do                                                                          \
+    {                                                                         \
+      typeof (P) _pool_var (p__) = (P);                                       \
+      typeof (E) _pool_var (e__) = (E);                                       \
+      pool_header_t *_pool_var (p) = pool_header (_pool_var (p__));           \
+      uword _pool_var (l) = _pool_var (e__) - _pool_var (p__);                \
+      if (_pool_var (p)->max_elts == 0)                                       \
+       ASSERT (vec_is_member (_pool_var (p__), _pool_var (e__)));            \
+      ASSERT (!pool_is_free (_pool_var (p__), _pool_var (e__)));              \
+                                                                              \
+      /* Add element to free bitmap and to free list. */                      \
+      _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)                                            \
+       {                                                                     \
+         ASSERT (_pool_var (l) < _pool_var (p)->max_elts);                   \
+         _pool_var (p)                                                       \
+           ->free_indices[_vec_len (_pool_var (p)->free_indices)] =          \
+           _pool_var (l);                                                    \
+         _vec_len (_pool_var (p)->free_indices) += 1;                        \
+       }                                                                     \
+      else                                                                    \
+       vec_add1 (_pool_var (p)->free_indices, _pool_var (l));                \
+                                                                              \
+      CLIB_MEM_POISON (_pool_var (e__), sizeof (_pool_var (e__)[0]));         \
+    }                                                                         \
+  while (0)
 
 /** Free pool element with given index. */
 #define pool_put_index(p,i)                    \
@@ -524,16 +531,12 @@ do {                                                                      \
     vec_foreach() (or plain for-loop) to walk the active index vector.
  */
 
-#define pool_foreach2(VAR,POOL)                                                \
+#define pool_foreach(VAR,POOL)                                         \
   if (POOL)                                                            \
     for (VAR = POOL + pool_get_first_index (POOL);                     \
         VAR < vec_end (POOL);                                          \
         VAR = POOL + pool_get_next_index (POOL, VAR - POOL))
 
-#define pool_foreach(VAR,POOL,BODY)                                    \
-  pool_foreach2(VAR,POOL)                                              \
-   { BODY; }
-
 /** Returns pointer to element at given index.
 
     ASSERTs that the supplied index is valid.
@@ -566,17 +569,12 @@ do {                                                                      \
   _pool_var(rv);                                                        \
 })
 
-#define pool_foreach_index2(i,v)               \
+#define pool_foreach_index(i,v)                \
   if (v)                                       \
     for (i = pool_get_first_index (v);         \
         i < vec_len (v);                       \
         i = pool_get_next_index (v, i))        \
 
-/** Iterate pool by index. */
-#define pool_foreach_index(i,v,body)           \
-  pool_foreach_index2 (i,v)                    \
-       { body; }
-
 /**
  * @brief Remove all elements from a pool in a safe way
  *
@@ -589,10 +587,10 @@ do {                                                                      \
 {                                                       \
   uword *_pool_var(ii), *_pool_var(dv) = NULL;          \
                                                         \
-  pool_foreach((VAR), (POOL),                           \
-  ({                                                    \
+  pool_foreach((VAR), (POOL))                          \
+  {                                                     \
     vec_add1(_pool_var(dv), (VAR) - (POOL));            \
-  }));                                                  \
+  }                                                     \
   vec_foreach(_pool_var(ii), _pool_var(dv))             \
   {                                                     \
     (VAR) = pool_elt_at_index((POOL), *_pool_var(ii));  \