diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2000-08-16 20:13:02 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2000-08-16 20:13:02 (GMT) |
| commit | 1d54c2ad20754f7c4c05ef58dd4f15c773ddca89 (patch) | |
| tree | 21dd94f4a6eabf3c29862a3fdb673e06acb6ce00 /src/H5Fistore.c | |
| parent | 4cd9c205ec2a7f2d216b2542c631840f5a24ebe0 (diff) | |
| download | hdf5-1d54c2ad20754f7c4c05ef58dd4f15c773ddca89.zip hdf5-1d54c2ad20754f7c4c05ef58dd4f15c773ddca89.tar.gz hdf5-1d54c2ad20754f7c4c05ef58dd4f15c773ddca89.tar.bz2 | |
[svn-r2476] Added free lists to track various data structures in memory, to reduce malloc
abuse.
Diffstat (limited to 'src/H5Fistore.c')
| -rw-r--r-- | src/H5Fistore.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/H5Fistore.c b/src/H5Fistore.c index b0f7a39..8eb107b 100644 --- a/src/H5Fistore.c +++ b/src/H5Fistore.c @@ -97,6 +97,7 @@ typedef struct H5F_rdcc_ent_t { struct H5F_rdcc_ent_t *next;/*next item in doubly-linked list */ struct H5F_rdcc_ent_t *prev;/*previous item in doubly-linked list */ } H5F_rdcc_ent_t; +typedef H5F_rdcc_ent_t *H5F_rdcc_ent_ptr_t; /* For free lists */ /* Private prototypes */ static size_t H5F_istore_sizeof_rkey(H5F_t *f, const void *_udata); @@ -187,6 +188,9 @@ H5FL_BLK_DEFINE_STATIC(istore_chunk); /* Declare a free list to manage H5F_rdcc_ent_t objects */ H5FL_DEFINE_STATIC(H5F_rdcc_ent_t); +/* Declare a PQ free list to manage the H5F_rdcc_ent_ptr_t array information */ +H5FL_ARR_DEFINE_STATIC(H5F_rdcc_ent_ptr_t,-1); + /*------------------------------------------------------------------------- * Function: H5F_istore_chunk_alloc @@ -900,7 +904,7 @@ H5F_istore_init (H5F_t *f) HDmemset (rdcc, 0, sizeof(H5F_rdcc_t)); if (f->shared->rdcc_nbytes>0 && f->shared->rdcc_nelmts>0) { rdcc->nslots = f->shared->rdcc_nelmts; - rdcc->slot = H5MM_calloc (rdcc->nslots*sizeof(H5F_rdcc_ent_t*)); + rdcc->slot = H5FL_ARR_ALLOC (H5F_rdcc_ent_ptr_t,rdcc->nslots,1); if (NULL==rdcc->slot) { HRETURN_ERROR (H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed"); @@ -1177,7 +1181,7 @@ H5F_istore_dest (H5F_t *f) "unable to flush one or more raw data chunks"); } - H5MM_xfree (rdcc->slot); + H5FL_ARR_FREE (H5F_rdcc_ent_ptr_t,rdcc->slot); HDmemset (rdcc, 0, sizeof(H5F_rdcc_t)); FUNC_LEAVE (SUCCEED); } |