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); \
/* 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 \
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 { \
} \
} 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. */
({ \
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 */
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) \
}
/**
- * @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