From e5349f14eb17689316ab5a85a7d4ffbb740ec93c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20Foucault?= Date: Mon, 13 May 2019 15:57:03 +0200 Subject: BLI_memblock: Add more options - Use int instead of uint for safety and less conversions. - Add free callback - Add cleared alloc option --- source/blender/blenlib/BLI_memblock.h | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'source/blender/blenlib/BLI_memblock.h') diff --git a/source/blender/blenlib/BLI_memblock.h b/source/blender/blenlib/BLI_memblock.h index 375cb22c415..81dd2100362 100644 --- a/source/blender/blenlib/BLI_memblock.h +++ b/source/blender/blenlib/BLI_memblock.h @@ -33,16 +33,18 @@ extern "C" { struct BLI_memblock; typedef struct BLI_memblock BLI_memblock; +typedef void (*MemblockValFreeFP)(void *val); -BLI_memblock *BLI_memblock_create(uint elem_size) ATTR_MALLOC ATTR_WARN_UNUSED_RESULT; +BLI_memblock *BLI_memblock_create(uint elem_size, + const bool clear_alloc) ATTR_MALLOC ATTR_WARN_UNUSED_RESULT; void *BLI_memblock_alloc(BLI_memblock *mblk) ATTR_MALLOC ATTR_WARN_UNUSED_RESULT ATTR_NONNULL(1); -void BLI_memblock_clear(BLI_memblock *mblk) ATTR_NONNULL(1); -void BLI_memblock_destroy(BLI_memblock *mblk) ATTR_NONNULL(1); +void BLI_memblock_clear(BLI_memblock *mblk, MemblockValFreeFP valfreefp) ATTR_NONNULL(1); +void BLI_memblock_destroy(BLI_memblock *mblk, MemblockValFreeFP free_callback) ATTR_NONNULL(1); typedef struct BLI_memblock_iter { BLI_memblock *mblk; - uint current_index; - uint elem_per_chunk; + int current_index; + int elem_per_chunk; } BLI_memblock_iter; void BLI_memblock_iternew(BLI_memblock *pool, BLI_memblock_iter *iter) ATTR_NONNULL(); -- cgit v1.2.3