diff options
Diffstat (limited to 'test/accum.c')
| -rw-r--r-- | test/accum.c | 59 |
1 files changed, 31 insertions, 28 deletions
diff --git a/test/accum.c b/test/accum.c index 1fcd051..d134bbc 100644 --- a/test/accum.c +++ b/test/accum.c @@ -45,18 +45,18 @@ H5F_t * f = NULL; /* Function Prototypes */ -unsigned test_write_read(const H5F_io_info_t *fio_info); -unsigned test_write_read_nonacc_front(const H5F_io_info_t *fio_info); -unsigned test_write_read_nonacc_end(const H5F_io_info_t *fio_info); -unsigned test_accum_overlap(const H5F_io_info_t *fio_info); -unsigned test_accum_overlap_clean(const H5F_io_info_t *fio_info); -unsigned test_accum_overlap_size(const H5F_io_info_t *fio_info); -unsigned test_accum_non_overlap_size(const H5F_io_info_t *fio_info); -unsigned test_accum_adjust(const H5F_io_info_t *fio_info); -unsigned test_read_after(const H5F_io_info_t *fio_info); -unsigned test_free(const H5F_io_info_t *fio_info); -unsigned test_big(const H5F_io_info_t *fio_info); -unsigned test_random_write(const H5F_io_info_t *fio_info); +unsigned test_write_read(const H5F_io_info2_t *fio_info); +unsigned test_write_read_nonacc_front(const H5F_io_info2_t *fio_info); +unsigned test_write_read_nonacc_end(const H5F_io_info2_t *fio_info); +unsigned test_accum_overlap(const H5F_io_info2_t *fio_info); +unsigned test_accum_overlap_clean(const H5F_io_info2_t *fio_info); +unsigned test_accum_overlap_size(const H5F_io_info2_t *fio_info); +unsigned test_accum_non_overlap_size(const H5F_io_info2_t *fio_info); +unsigned test_accum_adjust(const H5F_io_info2_t *fio_info); +unsigned test_read_after(const H5F_io_info2_t *fio_info); +unsigned test_free(const H5F_io_info2_t *fio_info); +unsigned test_big(const H5F_io_info2_t *fio_info); +unsigned test_random_write(const H5F_io_info2_t *fio_info); unsigned test_swmr_write_big(hbool_t newest_format); /* Helper Function Prototypes */ @@ -90,7 +90,7 @@ void accum_printf(void); int main(void) { - H5F_io_info_t fio_info; /* I/O info for operation */ + H5F_io_info2_t fio_info; /* I/O info for operation */ unsigned nerrors = 0; /* track errors */ hid_t fid = -1; @@ -109,7 +109,8 @@ main(void) /* Set up I/O info for operation */ fio_info.f = f; - if(NULL == (fio_info.dxpl = (H5P_genplist_t *)H5I_object(H5AC_ind_read_dxpl_id))) FAIL_STACK_ERROR + if(NULL == (fio_info.meta_dxpl = (H5P_genplist_t *)H5I_object(H5AC_ind_read_dxpl_id))) FAIL_STACK_ERROR + if(NULL == (fio_info.raw_dxpl = (H5P_genplist_t *)H5I_object(H5AC_rawdata_dxpl_id))) FAIL_STACK_ERROR /* Reset metadata accumulator for the file */ if(accum_reset(&fio_info) < 0) FAIL_STACK_ERROR @@ -166,7 +167,7 @@ error: *------------------------------------------------------------------------- */ unsigned -test_write_read(const H5F_io_info_t *fio_info) +test_write_read(const H5F_io_info2_t *fio_info) { int i = 0; int *write_buf, *read_buf; @@ -222,7 +223,7 @@ error: *------------------------------------------------------------------------- */ unsigned -test_write_read_nonacc_front(const H5F_io_info_t *fio_info) +test_write_read_nonacc_front(const H5F_io_info2_t *fio_info) { int i = 0; int *write_buf, *read_buf; @@ -281,7 +282,7 @@ error: *------------------------------------------------------------------------- */ unsigned -test_write_read_nonacc_end(const H5F_io_info_t *fio_info) +test_write_read_nonacc_end(const H5F_io_info2_t *fio_info) { int i = 0; int *write_buf, *read_buf; @@ -340,7 +341,7 @@ error: *------------------------------------------------------------------------- */ unsigned -test_free(const H5F_io_info_t *fio_info) +test_free(const H5F_io_info2_t *fio_info) { int i = 0; int32_t *wbuf = NULL; @@ -527,7 +528,7 @@ error: *------------------------------------------------------------------------- */ unsigned -test_accum_overlap(const H5F_io_info_t *fio_info) +test_accum_overlap(const H5F_io_info2_t *fio_info) { int i = 0; int32_t *wbuf, *rbuf; @@ -699,7 +700,7 @@ error: *------------------------------------------------------------------------- */ unsigned -test_accum_overlap_clean(const H5F_io_info_t *fio_info) +test_accum_overlap_clean(const H5F_io_info2_t *fio_info) { int i = 0; int32_t *wbuf, *rbuf; @@ -878,7 +879,7 @@ error: *------------------------------------------------------------------------- */ unsigned -test_accum_non_overlap_size(const H5F_io_info_t *fio_info) +test_accum_non_overlap_size(const H5F_io_info2_t *fio_info) { int i = 0; int32_t *wbuf, *rbuf; @@ -945,7 +946,7 @@ error: *------------------------------------------------------------------------- */ unsigned -test_accum_overlap_size(const H5F_io_info_t *fio_info) +test_accum_overlap_size(const H5F_io_info2_t *fio_info) { int i = 0; int32_t *wbuf, *rbuf; @@ -1023,7 +1024,7 @@ error: *------------------------------------------------------------------------- */ unsigned -test_accum_adjust(const H5F_io_info_t *fio_info) +test_accum_adjust(const H5F_io_info2_t *fio_info) { int i = 0; int s = 1048576; /* size of buffer */ @@ -1279,7 +1280,7 @@ error: *------------------------------------------------------------------------- */ unsigned -test_read_after(const H5F_io_info_t *fio_info) +test_read_after(const H5F_io_info2_t *fio_info) { int i = 0; int s = 128; /* size of buffer */ @@ -1358,7 +1359,7 @@ error: *------------------------------------------------------------------------- */ unsigned -test_big(const H5F_io_info_t *fio_info) +test_big(const H5F_io_info2_t *fio_info) { uint8_t *wbuf, *wbuf2, *rbuf, *zbuf; /* Buffers for reading & writing, etc */ unsigned u; /* Local index variable */ @@ -1666,7 +1667,7 @@ error: *------------------------------------------------------------------------- */ unsigned -test_random_write(const H5F_io_info_t *fio_info) +test_random_write(const H5F_io_info2_t *fio_info) { uint8_t *wbuf, *rbuf; /* Buffers for reading & writing */ unsigned seed = 0; /* Random # seed */ @@ -1820,7 +1821,7 @@ test_swmr_write_big(hbool_t newest_format) pid_t pid; /* Process ID */ #endif /* H5_HAVE_UNISTD_H */ int status; /* Status returned from child process */ - H5F_io_info_t fio_info; /* I/O info for operation */ + H5F_io_info2_t fio_info; /* I/O info for operation */ char *new_argv[] = {NULL}; char *driver = NULL; /* VFD string (from env variable) */ @@ -1877,7 +1878,9 @@ test_swmr_write_big(hbool_t newest_format) /* Set up I/O info for operation */ fio_info.f = rf; - if(NULL == (fio_info.dxpl = (H5P_genplist_t *)H5I_object(H5AC_ind_read_dxpl_id))) + if(NULL == (fio_info.meta_dxpl = (H5P_genplist_t *)H5I_object(H5AC_ind_read_dxpl_id))) + FAIL_STACK_ERROR + if(NULL == (fio_info.raw_dxpl = (H5P_genplist_t *)H5I_object(H5AC_rawdata_dxpl_id))) FAIL_STACK_ERROR /* We'll be writing lots of garbage data, so extend the |