diff options
Diffstat (limited to 'src/H5FLprivate.h')
| -rw-r--r-- | src/H5FLprivate.h | 38 |
1 files changed, 29 insertions, 9 deletions
diff --git a/src/H5FLprivate.h b/src/H5FLprivate.h index 35b3555..72e28d8 100644 --- a/src/H5FLprivate.h +++ b/src/H5FLprivate.h @@ -66,7 +66,10 @@ typedef struct H5FL_reg_head_t { #define H5FL_DEFINE_STATIC(t) static H5FL_DEFINE(t) /* Allocate an object of type 't' */ -#define H5FL_ALLOC(t,clr) H5FL_reg_alloc(&(t##_free_list),clr) +#define H5FL_MALLOC(t) H5FL_reg_malloc(&(t##_free_list)) + +/* Allocate an object of type 't' and clear it to all zeros */ +#define H5FL_CALLOC(t) H5FL_reg_calloc(&(t##_free_list)) /* Free an object of type 't' */ #define H5FL_FREE(t,obj) H5FL_reg_free(&(t##_free_list),obj) @@ -80,7 +83,8 @@ typedef struct H5FL_reg_head_t { #define H5FL_DEFINE(t) int t##_reg_free_list_placeholder #define H5FL_EXTERN(t) extern int t##_reg_free_list_placeholder #define H5FL_DEFINE_STATIC(t) static H5FL_DEFINE(t) -#define H5FL_ALLOC(t,clr) (clr ? H5MM_calloc(sizeof(t)) : H5MM_malloc(sizeof(t))) +#define H5FL_MALLOC(t) H5MM_malloc(sizeof(t)) +#define H5FL_CALLOC(t) H5MM_calloc(sizeof(t)) #define H5FL_FREE(t,obj) H5MM_xfree(obj) #endif /* H5_NO_REG_FREE_LISTS */ @@ -124,7 +128,10 @@ typedef struct H5FL_blk_head_t { #define H5FL_BLK_DEFINE_STATIC(t) static H5FL_BLK_DEFINE(t) /* Allocate an block of type 't' */ -#define H5FL_BLK_ALLOC(t,size,clr) H5FL_blk_alloc(&(t##_pq),size,clr) +#define H5FL_BLK_MALLOC(t,size) H5FL_blk_malloc(&(t##_pq),size) + +/* Allocate an block of type 't' and clear it to zeros */ +#define H5FL_BLK_CALLOC(t,size) H5FL_blk_calloc(&(t##_pq),size) /* Free a block of type 't' */ #define H5FL_BLK_FREE(t,blk) H5FL_blk_free(&(t##_pq),blk) @@ -132,13 +139,18 @@ typedef struct H5FL_blk_head_t { /* Re-allocate a block of type 't' */ #define H5FL_BLK_REALLOC(t,blk,new_size) H5FL_blk_realloc(&(t##_pq),blk,new_size) +/* Check if there is a free block available to re-use */ +#define H5FL_BLK_AVAIL(t,size) H5FL_blk_free_block_avail(&(t##_pq),size) + #else /* H5_NO_BLK_FREE_LISTS */ #define H5FL_BLK_DEFINE(t) int t##_blk_free_list_placeholder #define H5FL_BLK_EXTERN(t) extern int t##_blk_free_list_placeholder #define H5FL_BLK_DEFINE_STATIC(t) static H5FL_BLK_DEFINE(t) -#define H5FL_BLK_ALLOC(t,size,clr) (clr ? H5MM_calloc(size) : H5MM_malloc(size)) +#define H5FL_BLK_MALLOC(t,size) H5MM_malloc(size) +#define H5FL_BLK_CALLOC(t,size) H5MM_calloc(size) #define H5FL_BLK_FREE(t,blk) H5MM_xfree(blk) #define H5FL_BLK_REALLOC(t,blk,new_size) H5MM_realloc(blk,new_size) +#define H5FL_BLK_AVAIL(t,size) (FALSE) #endif /* H5_NO_BLK_FREE_LISTS */ /* Data structure to store each array in free list */ @@ -178,7 +190,10 @@ typedef struct H5FL_arr_head_t { #define H5FL_ARR_DEFINE_STATIC(t,m) static H5FL_ARR_DEFINE(t,m) /* Allocate an array of type 't' */ -#define H5FL_ARR_ALLOC(t,elem,clr) H5FL_arr_alloc(&(t##_arr_free_list),elem,clr) +#define H5FL_ARR_MALLOC(t,elem) H5FL_arr_malloc(&(t##_arr_free_list),elem) + +/* Allocate an array of type 't' and clear it to all zeros */ +#define H5FL_ARR_CALLOC(t,elem) H5FL_arr_calloc(&(t##_arr_free_list),elem) /* Free an array of type 't' */ #define H5FL_ARR_FREE(t,obj) H5FL_arr_free(&(t##_arr_free_list),obj) @@ -190,7 +205,8 @@ typedef struct H5FL_arr_head_t { #define H5FL_ARR_DEFINE(t,m) int t##_arr_free_list_placeholder #define H5FL_ARR_EXTERN(t) extern int t##_arr_free_list_placeholder #define H5FL_ARR_DEFINE_STATIC(t,m) static H5FL_ARR_DEFINE(t,m) -#define H5FL_ARR_ALLOC(t,elem,clr) (clr ? H5MM_calloc(elem*sizeof(t)) : H5MM_malloc(elem*sizeof(t))) +#define H5FL_ARR_MALLOC(t,elem) H5MM_malloc(elem*sizeof(t)) +#define H5FL_ARR_CALLOC(t,elem) H5MM_calloc(elem*sizeof(t)) #define H5FL_ARR_FREE(t,obj) H5MM_xfree(obj) #define H5FL_ARR_REALLOC(t,obj,new_elem) H5MM_realloc(obj,new_elem*sizeof(t)) #endif /* H5_NO_ARR_FREE_LISTS */ @@ -198,12 +214,16 @@ typedef struct H5FL_arr_head_t { /* * Library prototypes. */ -H5_DLL void * H5FL_blk_alloc(H5FL_blk_head_t *head, size_t size, unsigned clear); +H5_DLL void * H5FL_blk_malloc(H5FL_blk_head_t *head, size_t size); +H5_DLL void * H5FL_blk_calloc(H5FL_blk_head_t *head, size_t size); H5_DLL void * H5FL_blk_free(H5FL_blk_head_t *head, void *block); H5_DLL void * H5FL_blk_realloc(H5FL_blk_head_t *head, void *block, size_t new_size); -H5_DLL void * H5FL_reg_alloc(H5FL_reg_head_t *head, unsigned clear); +H5_DLL htri_t H5FL_blk_free_block_avail(H5FL_blk_head_t *head, size_t size); +H5_DLL void * H5FL_reg_malloc(H5FL_reg_head_t *head); +H5_DLL void * H5FL_reg_calloc(H5FL_reg_head_t *head); H5_DLL void * H5FL_reg_free(H5FL_reg_head_t *head, void *obj); -H5_DLL void * H5FL_arr_alloc(H5FL_arr_head_t *head, size_t elem, unsigned clear); +H5_DLL void * H5FL_arr_malloc(H5FL_arr_head_t *head, size_t elem); +H5_DLL void * H5FL_arr_calloc(H5FL_arr_head_t *head, size_t elem); H5_DLL void * H5FL_arr_free(H5FL_arr_head_t *head, void *obj); H5_DLL void * H5FL_arr_realloc(H5FL_arr_head_t *head, void *obj, size_t new_elem); H5_DLL herr_t H5FL_garbage_coll(void); |