vxlan geneve gtpu: fix short help

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

diff --git a/src/vppinfra/pool.h b/src/vppinfra/pool.h
index 75d4c95..e6ffe1e 100644 (file)
--- a/src/vppinfra/pool.h
+++ b/src/vppinfra/pool.h
@@ -205,6 +205,7 @@ do {                                                                    \
        clib_bitmap_andnoti_notrim (_pool_var (p)->free_bitmap,        \
                                     _pool_var (i));                    \
       _vec_len (_pool_var (p)->free_indices) = _pool_var (l) - 1;       \
+      CLIB_MEM_UNPOISON((E), sizeof((E)[0]));                           \
     }                                                                   \
   else                                                                  \
     {                                                                   \
@@ -285,10 +286,12 @@ do {                                                                    \
 /** Free an object E in pool P. */
 #define pool_put(P,E)                                                  \
 do {                                                                   \
-  pool_header_t * _pool_var (p) = pool_header (P);                     \
-  uword _pool_var (l) = (E) - (P);                                     \
-  ASSERT (vec_is_member (P, E));                                       \
-  ASSERT (! pool_is_free (P, E));                                      \
+  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 =                                         \
@@ -305,6 +308,8 @@ do {                                                                        \
     }                                                                   \
   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. */
@@ -340,6 +345,44 @@ do {                                                                       \
 /** Allocate N more free elements to pool (unspecified alignment). */
 #define pool_alloc(P,N) pool_alloc_aligned(P,N,0)
 
+/**
+ * Return copy of pool with alignment
+ *
+ * @param P pool to copy
+ * @param A alignment (may be zero)
+ * @return copy of pool
+ */
+#define pool_dup_aligned(P,A)                                          \
+({                                                                     \
+  typeof (P) _pool_var (new) = 0;                                      \
+  pool_header_t * _pool_var (ph), * _pool_var (new_ph);                        \
+  u32 _pool_var (n) = pool_len (P);                                    \
+  if ((P))                                                             \
+    {                                                                  \
+      _pool_var (new) = _vec_resize (_pool_var (new), _pool_var (n),   \
+                                     _pool_var (n) * sizeof ((P)[0]),  \
+                                     pool_aligned_header_bytes, (A));  \
+      clib_memcpy_fast (_pool_var (new), (P),                          \
+                        _pool_var (n) * sizeof ((P)[0]));              \
+      _pool_var (ph) = pool_header (P);                                        \
+      _pool_var (new_ph) = pool_header (_pool_var (new));              \
+      _pool_var (new_ph)->free_bitmap =                                \
+        clib_bitmap_dup (_pool_var (ph)->free_bitmap);                 \
+      _pool_var (new_ph)->free_indices =                               \
+        vec_dup (_pool_var (ph)->free_indices);                                \
+      _pool_var (new_ph)->max_elts = _pool_var (ph)->max_elts;         \
+    }                                                                  \
+  _pool_var (new);                                                     \
+})
+
+/**
+ * Return copy of pool without alignment
+ *
+ * @param P pool to copy
+ * @return copy of pool
+ */
+#define pool_dup(P) pool_dup_aligned(P,0)
+
 /** Low-level free pool operator (do not call directly). */
 always_inline void *
 _pool_free (void *v)