diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2010-05-05 19:18:32 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2010-05-05 19:18:32 (GMT) |
| commit | b60f90da91886edc2afaaca9bf1587d7591051e1 (patch) | |
| tree | 9f0c5f09e65af4c1b45e3e0577c2310df8242b7b /src/H5HLcache.c | |
| parent | b05a1c671317403994e4bff5564563f41d348eea (diff) | |
| download | hdf5-b60f90da91886edc2afaaca9bf1587d7591051e1.zip hdf5-b60f90da91886edc2afaaca9bf1587d7591051e1.tar.gz hdf5-b60f90da91886edc2afaaca9bf1587d7591051e1.tar.bz2 | |
[svn-r18711] Description:
More changes to move metadata journaling code closer to trunk:
- Retire old (H5AC1) cache code & tests
- Remove 'clear_dirty_bits' callback from client class struct
- Eliminate 'addr' & 'len' parameters from 'free_icr' client callbacks
Tested on:
Mac OS X/32 10.6.3 (amazon) debug & production
Linux/64-amd64 2.6 (abe) w/parallel, w/FORTRAN, in production mode
Diffstat (limited to 'src/H5HLcache.c')
| -rw-r--r-- | src/H5HLcache.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/H5HLcache.c b/src/H5HLcache.c index 42f29c9..77e9bc3 100644 --- a/src/H5HLcache.c +++ b/src/H5HLcache.c @@ -71,14 +71,14 @@ static herr_t H5HL_prfx_image_len(const void *thing, size_t *image_len_ptr); static herr_t H5HL_prfx_serialize(const H5F_t *f, hid_t dxpl_id, haddr_t addr, size_t len, void *image, void *thing, unsigned *flags, haddr_t *new_addr, size_t *new_len, void **new_image); -static herr_t H5HL_prfx_free_icr(haddr_t addr, size_t len, void *thing); +static herr_t H5HL_prfx_free_icr(void *thing); static void *H5HL_dblk_deserialize(haddr_t addr, size_t len, const void *image, void *udata, hbool_t *dirty); static herr_t H5HL_dblk_serialize(const H5F_t *f, hid_t dxpl_id, haddr_t addr, size_t len, void *image, void *thing, unsigned *flags, haddr_t *new_addr, size_t *new_len, void **new_image); -static herr_t H5HL_dblk_free_icr(haddr_t addr, size_t len, void *thing); +static herr_t H5HL_dblk_free_icr(void *thing); /*********************/ @@ -96,7 +96,6 @@ const H5AC_class_t H5AC_LHEAP_PRFX[1] = {{ H5HL_prfx_image_len, H5HL_prfx_serialize, H5HL_prfx_free_icr, - NULL, }}; /* @@ -110,7 +109,6 @@ const H5AC_class_t H5AC_LHEAP_DBLK[1] = {{ NULL, H5HL_dblk_serialize, H5HL_dblk_free_icr, - NULL, }}; @@ -474,7 +472,7 @@ H5HL_prfx_serialize(const H5F_t UNUSED *f, hid_t UNUSED dxpl_id, haddr_t UNUSED *------------------------------------------------------------------------- */ static herr_t -H5HL_prfx_free_icr(haddr_t UNUSED addr, size_t UNUSED len, void *thing) +H5HL_prfx_free_icr(void *thing) { H5HL_prfx_t *prfx = (H5HL_prfx_t *)thing; /* Local heap prefix to destroy */ herr_t ret_value = SUCCEED; /* Return value */ @@ -616,7 +614,7 @@ H5HL_dblk_serialize(const H5F_t UNUSED *f, hid_t UNUSED dxpl_id, haddr_t UNUSED *------------------------------------------------------------------------- */ static herr_t -H5HL_dblk_free_icr(haddr_t UNUSED addr, size_t UNUSED len, void *thing) +H5HL_dblk_free_icr(void *thing) { H5HL_dblk_t *dblk = (H5HL_dblk_t *)thing; /* Local heap data block to destroy */ herr_t ret_value = SUCCEED; /* Return value */ |