session: use llist in session node evt handling

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

diff --git a/src/vppinfra/pool.h b/src/vppinfra/pool.h
index 47bae07..747a717 100644 (file)
--- a/src/vppinfra/pool.h
+++ b/src/vppinfra/pool.h
@@ -352,18 +352,21 @@ do {                                                                      \
   typeof (P) _pool_var (new) = 0;                                      \
   pool_header_t * _pool_var (ph), * _pool_var (new_ph);                        \
   u32 _pool_var (n) = pool_len (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;             \
+  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);                                                     \
 })
 
@@ -373,7 +376,7 @@ do {                                                                        \
  * @param P pool to copy
  * @return copy of pool
  */
-#define pool_dup(P) pool_dup_aligned(P, 0)
+#define pool_dup(P) pool_dup_aligned(P,0)
 
 /** Low-level free pool operator (do not call directly). */
 always_inline void *