diff options
Diffstat (limited to 'test/cache_common.c')
-rw-r--r-- | test/cache_common.c | 54 |
1 files changed, 30 insertions, 24 deletions
diff --git a/test/cache_common.c b/test/cache_common.c index f387f05..daf9777 100644 --- a/test/cache_common.c +++ b/test/cache_common.c @@ -128,37 +128,37 @@ static herr_t monster_image_len(const void *thing, size_t *image_len_ptr); static herr_t variable_image_len(const void *thing, size_t *image_len_ptr); static herr_t notify_image_len(const void *thing, size_t *image_len_ptr); -static herr_t pico_pre_serialize(const H5F_t *f, hid_t dxpl_id, void *thing, +static herr_t pico_pre_serialize(H5F_t *f, hid_t dxpl_id, void *thing, haddr_t addr, size_t len, haddr_t *new_addr_ptr, size_t *new_len_ptr, unsigned *flags_ptr); -static herr_t nano_pre_serialize(const H5F_t *f, hid_t dxpl_id, void *thing, +static herr_t nano_pre_serialize(H5F_t *f, hid_t dxpl_id, void *thing, haddr_t addr, size_t len, haddr_t *new_addr_ptr, size_t *new_len_ptr, unsigned *flags_ptr); -static herr_t micro_pre_serialize(const H5F_t *f, hid_t dxpl_id, void *thing, +static herr_t micro_pre_serialize(H5F_t *f, hid_t dxpl_id, void *thing, haddr_t addr, size_t len, haddr_t *new_addr_ptr, size_t *new_len_ptr, unsigned *flags_ptr); -static herr_t tiny_pre_serialize(const H5F_t *f, hid_t dxpl_id, void *thing, +static herr_t tiny_pre_serialize(H5F_t *f, hid_t dxpl_id, void *thing, haddr_t addr, size_t len, haddr_t *new_addr_ptr, size_t *new_len_ptr, unsigned *flags_ptr); -static herr_t small_pre_serialize(const H5F_t *f, hid_t dxpl_id, void *thing, +static herr_t small_pre_serialize(H5F_t *f, hid_t dxpl_id, void *thing, haddr_t addr, size_t len, haddr_t *new_addr_ptr, size_t *new_len_ptr, unsigned *flags_ptr); -static herr_t medium_pre_serialize(const H5F_t *f, hid_t dxpl_id, void *thing, +static herr_t medium_pre_serialize(H5F_t *f, hid_t dxpl_id, void *thing, haddr_t addr, size_t len, haddr_t *new_addr_ptr, size_t *new_len_ptr, unsigned *flags_ptr); -static herr_t large_pre_serialize(const H5F_t *f, hid_t dxpl_id, void *thing, +static herr_t large_pre_serialize(H5F_t *f, hid_t dxpl_id, void *thing, haddr_t addr, size_t len, haddr_t *new_addr_ptr, size_t *new_len_ptr, unsigned *flags_ptr); -static herr_t huge_pre_serialize(const H5F_t *f, hid_t dxpl_id, void *thing, +static herr_t huge_pre_serialize(H5F_t *f, hid_t dxpl_id, void *thing, haddr_t addr, size_t len, haddr_t *new_addr_ptr, size_t *new_len_ptr, unsigned *flags_ptr); -static herr_t monster_pre_serialize(const H5F_t *f, hid_t dxpl_id, void *thing, +static herr_t monster_pre_serialize(H5F_t *f, hid_t dxpl_id, void *thing, haddr_t addr, size_t len, haddr_t *new_addr_ptr, size_t *new_len_ptr, unsigned *flags_ptr); -static herr_t variable_pre_serialize(const H5F_t *f, hid_t dxpl_id, void *thing, +static herr_t variable_pre_serialize(H5F_t *f, hid_t dxpl_id, void *thing, haddr_t addr, size_t len, haddr_t *new_addr_ptr, size_t *new_len_ptr, unsigned *flags_ptr); -static herr_t notify_pre_serialize(const H5F_t *f, hid_t dxpl_id, void *thing, +static herr_t notify_pre_serialize(H5F_t *f, hid_t dxpl_id, void *thing, haddr_t addr, size_t len, haddr_t *new_addr_ptr, size_t *new_len_ptr, unsigned *flags_ptr); @@ -211,7 +211,7 @@ static herr_t get_final_load_size(const void *image, size_t image_len, static void *deserialize(const void *image_ptr, size_t len, void *udata_ptr, hbool_t *dirty_ptr, int32_t entry_type); static herr_t image_len(const void *thing, size_t *image_len_ptr, int32_t entry_type); -static herr_t pre_serialize(const H5F_t *f, hid_t dxpl_id, void *thing, +static herr_t pre_serialize(H5F_t *f, hid_t dxpl_id, void *thing, haddr_t addr, size_t len, haddr_t *new_addr_ptr, size_t *new_len_ptr, unsigned *flags_ptr); static herr_t serialize(const H5F_t *f, void *image_ptr, size_t len, @@ -1114,7 +1114,7 @@ notify_image_len(const void *thing, size_t *image_length) *------------------------------------------------------------------------- */ herr_t -pre_serialize(const H5F_t *f, +pre_serialize(H5F_t *f, hid_t H5_ATTR_UNUSED dxpl_id, void *thing, haddr_t addr, @@ -1199,7 +1199,7 @@ pre_serialize(const H5F_t *f, } /* pre_serialize() */ herr_t -pico_pre_serialize(const H5F_t *f, +pico_pre_serialize(H5F_t *f, hid_t dxpl_id, void *thing, haddr_t addr, @@ -1213,7 +1213,7 @@ pico_pre_serialize(const H5F_t *f, } herr_t -nano_pre_serialize(const H5F_t *f, +nano_pre_serialize(H5F_t *f, hid_t dxpl_id, void *thing, haddr_t addr, @@ -1227,7 +1227,7 @@ nano_pre_serialize(const H5F_t *f, } herr_t -micro_pre_serialize(const H5F_t *f, +micro_pre_serialize(H5F_t *f, hid_t dxpl_id, void *thing, haddr_t addr, @@ -1241,7 +1241,7 @@ micro_pre_serialize(const H5F_t *f, } herr_t -tiny_pre_serialize(const H5F_t *f, +tiny_pre_serialize(H5F_t *f, hid_t dxpl_id, void *thing, haddr_t addr, @@ -1255,7 +1255,7 @@ tiny_pre_serialize(const H5F_t *f, } herr_t -small_pre_serialize(const H5F_t *f, +small_pre_serialize(H5F_t *f, hid_t dxpl_id, void *thing, haddr_t addr, @@ -1269,7 +1269,7 @@ small_pre_serialize(const H5F_t *f, } herr_t -medium_pre_serialize(const H5F_t *f, +medium_pre_serialize(H5F_t *f, hid_t dxpl_id, void *thing, haddr_t addr, @@ -1283,7 +1283,7 @@ medium_pre_serialize(const H5F_t *f, } herr_t -large_pre_serialize(const H5F_t *f, +large_pre_serialize(H5F_t *f, hid_t dxpl_id, void *thing, haddr_t addr, @@ -1297,7 +1297,7 @@ large_pre_serialize(const H5F_t *f, } herr_t -huge_pre_serialize(const H5F_t *f, +huge_pre_serialize(H5F_t *f, hid_t dxpl_id, void *thing, haddr_t addr, @@ -1311,7 +1311,7 @@ huge_pre_serialize(const H5F_t *f, } herr_t -monster_pre_serialize(const H5F_t *f, +monster_pre_serialize(H5F_t *f, hid_t dxpl_id, void *thing, haddr_t addr, @@ -1325,7 +1325,7 @@ monster_pre_serialize(const H5F_t *f, } herr_t -variable_pre_serialize(const H5F_t *f, +variable_pre_serialize(H5F_t *f, hid_t dxpl_id, void *thing, haddr_t addr, @@ -1339,7 +1339,7 @@ variable_pre_serialize(const H5F_t *f, } herr_t -notify_pre_serialize(const H5F_t *f, +notify_pre_serialize(H5F_t *f, hid_t dxpl_id, void *thing, haddr_t addr, @@ -3408,6 +3408,12 @@ takedown_cache(H5F_t * file_ptr, H5C_stats(cache_ptr, "test cache", dump_detailed_stats); } + if ( H5C_prep_for_file_close(file_ptr, H5P_DATASET_XFER_DEFAULT) < 0 ) { + + pass = FALSE; + failure_mssg = "unexpected failure of prep for file close.\n"; + } + flush_cache(file_ptr, TRUE, FALSE, FALSE); H5C_dest(file_ptr, H5AC_ind_read_dxpl_id); |