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/H5SMcache.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/H5SMcache.c')
| -rw-r--r-- | src/H5SMcache.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/H5SMcache.c b/src/H5SMcache.c index 5feddc5..e82e353 100644 --- a/src/H5SMcache.c +++ b/src/H5SMcache.c @@ -59,14 +59,14 @@ static void *H5SM_table_deserialize(haddr_t addr, size_t len, const void *image, static herr_t H5SM_table_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 H5SM_table_free_icr(haddr_t addr, size_t len, void *thing); +static herr_t H5SM_table_free_icr(void *thing); static void *H5SM_list_deserialize(haddr_t addr, size_t len, const void *image, void *udata, hbool_t *dirty); static herr_t H5SM_list_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 H5SM_list_free_icr(haddr_t addr, size_t len, void *thing); +static herr_t H5SM_list_free_icr(void *thing); /*********************/ @@ -81,7 +81,6 @@ const H5AC_class_t H5AC_SOHM_TABLE[1] = {{ NULL, H5SM_table_serialize, H5SM_table_free_icr, - NULL }}; const H5AC_class_t H5AC_SOHM_LIST[1] = {{ @@ -92,7 +91,6 @@ const H5AC_class_t H5AC_SOHM_LIST[1] = {{ NULL, H5SM_list_serialize, H5SM_list_free_icr, - NULL }}; @@ -330,7 +328,7 @@ H5SM_table_serialize(const H5F_t * f, hid_t UNUSED dxlp_id, haddr_t UNUSED addr, *------------------------------------------------------------------------- */ static herr_t -H5SM_table_free_icr(haddr_t UNUSED addr, size_t UNUSED len, void *thing) +H5SM_table_free_icr(void *thing) { herr_t ret_value = SUCCEED; /* Return value */ @@ -529,7 +527,7 @@ done: *------------------------------------------------------------------------- */ static herr_t -H5SM_list_free_icr(haddr_t UNUSED addr, size_t UNUSED len, void *thing) +H5SM_list_free_icr(void *thing) { herr_t ret_value = SUCCEED; /* Return value */ |