diff options
| author | Dana Robinson <derobins@hdfgroup.org> | 2021-03-25 09:11:45 (GMT) |
|---|---|---|
| committer | Dana Robinson <derobins@hdfgroup.org> | 2021-03-25 09:11:45 (GMT) |
| commit | df685806b2903a0190bb12732f022751754b33d6 (patch) | |
| tree | b190d3e299431d5348862954c8d0ff3e60d07493 /testpar | |
| parent | c0c978e62798a4336f3b368deba164b6d81fdcfd (diff) | |
| download | hdf5-df685806b2903a0190bb12732f022751754b33d6.zip hdf5-df685806b2903a0190bb12732f022751754b33d6.tar.gz hdf5-df685806b2903a0190bb12732f022751754b33d6.tar.bz2 | |
Fixes phdf5
Diffstat (limited to 'testpar')
| -rw-r--r-- | testpar/t_cache.c | 4 | ||||
| -rw-r--r-- | testpar/t_cache_image.c | 4 | ||||
| -rw-r--r-- | testpar/t_file.c | 8 | ||||
| -rw-r--r-- | testpar/testphdf5.h | 2 |
4 files changed, 10 insertions, 8 deletions
diff --git a/testpar/t_cache.c b/testpar/t_cache.c index d0c3bb5..c73d032 100644 --- a/testpar/t_cache.c +++ b/testpar/t_cache.c @@ -2186,7 +2186,7 @@ datum_get_initial_load_size(void *udata_ptr, size_t *image_len_ptr) *------------------------------------------------------------------------- */ static void * -datum_deserialize(const void H5_ATTR_SANITY_CHECK *image_ptr, H5_ATTR_UNUSED size_t len, void *udata_ptr, +datum_deserialize(const void H5_ATTR_NDEBUG_UNUSED *image_ptr, H5_ATTR_UNUSED size_t len, void *udata_ptr, hbool_t *dirty_ptr) { haddr_t addr = *(haddr_t *)udata_ptr; @@ -2289,7 +2289,7 @@ datum_image_len(const void *thing, size_t *image_len) *------------------------------------------------------------------------- */ static herr_t -datum_serialize(const H5F_t *f, void H5_ATTR_SANITY_CHECK *image_ptr, size_t len, void *thing_ptr) +datum_serialize(const H5F_t *f, void H5_ATTR_NDEBUG_UNUSED *image_ptr, size_t len, void *thing_ptr) { herr_t ret_value = SUCCEED; int idx; diff --git a/testpar/t_cache_image.c b/testpar/t_cache_image.c index ec6d0cc..4ca38f7 100644 --- a/testpar/t_cache_image.c +++ b/testpar/t_cache_image.c @@ -1138,12 +1138,12 @@ open_hdf5_file(const hbool_t create_file, const hbool_t mdci_sbem_expected, cons */ if (pass) { - if ((file_ptr->shared->page_buf) && ((!enable_page_buffer) || (l_facc_type == FACC_MPIO))) { + if ((file_ptr->shared->pb_ptr) && ((!enable_page_buffer) || (l_facc_type == FACC_MPIO))) { pass = FALSE; failure_mssg = "page buffer unexepectedly enabled."; } - else if ((file_ptr->shared->page_buf != NULL) && + else if ((file_ptr->shared->pb_ptr != NULL) && ((enable_page_buffer) || (l_facc_type != FACC_MPIO))) { pass = FALSE; diff --git a/testpar/t_file.c b/testpar/t_file.c index 8bef7ae..2c9bd03 100644 --- a/testpar/t_file.c +++ b/testpar/t_file.c @@ -116,6 +116,7 @@ test_split_comm_access(void) VRFY((mrc == MPI_SUCCESS), "final MPI_Barrier succeeded"); } +#if 0 void test_page_buffer_access(void) { @@ -430,6 +431,7 @@ test_page_buffer_access(void) data = NULL; MPI_Barrier(MPI_COMM_WORLD); } +#endif static int create_file(const char *filename, hid_t fcpl, hid_t fapl, int metadata_write_strategy) @@ -637,9 +639,9 @@ open_file(const char *filename, hid_t fapl, int metadata_write_strategy, hsize_t MPI_Barrier(MPI_COMM_WORLD); - VRFY((f->shared->page_buf != NULL), ""); - VRFY((f->shared->page_buf->page_size == page_size), ""); - VRFY((f->shared->page_buf->max_size == page_buffer_size), ""); + VRFY((f->shared->pb_ptr!= NULL), ""); + VRFY((f->shared->pb_ptr->page_size == page_size), ""); + VRFY((f->shared->pb_ptr->max_size == page_buffer_size), ""); grp_id = H5Gopen2(file_id, "GROUP", H5P_DEFAULT); VRFY((grp_id >= 0), ""); diff --git a/testpar/testphdf5.h b/testpar/testphdf5.h index 37f7040..54accc1 100644 --- a/testpar/testphdf5.h +++ b/testpar/testphdf5.h @@ -247,7 +247,7 @@ void collective_group_write(void); void independent_group_read(void); void test_fapl_mpio_dup(void); void test_split_comm_access(void); -void test_page_buffer_access(void); +//void test_page_buffer_access(void); void dataset_atomicity(void); void dataset_writeInd(void); void dataset_writeAll(void); |