diff options
| author | Neil Fortner <nfortne2@hdfgroup.org> | 2014-03-21 22:31:09 (GMT) |
|---|---|---|
| committer | Neil Fortner <nfortne2@hdfgroup.org> | 2014-03-21 22:31:09 (GMT) |
| commit | 525ed252e286a9d81f20dc355cf069b93968f8c2 (patch) | |
| tree | 85890d0cc19cb83629c99a537215e06f99e6162c /src/H5Defl.c | |
| parent | a49d7650ac46ef8fdb124176154d0aefdc23629b (diff) | |
| parent | f5689224b5faaf01c02a1a4ae2a0a71b9f46e1d0 (diff) | |
| download | hdf5-525ed252e286a9d81f20dc355cf069b93968f8c2.zip hdf5-525ed252e286a9d81f20dc355cf069b93968f8c2.tar.gz hdf5-525ed252e286a9d81f20dc355cf069b93968f8c2.tar.bz2 | |
[svn-r24863] Merge r24602 through r24792 to multi_rd_wd_coll_io branch
Enable collective I/O for point selections in multi dataset calls
Other minor cleanup
Tested: ummon
Diffstat (limited to 'src/H5Defl.c')
| -rw-r--r-- | src/H5Defl.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/H5Defl.c b/src/H5Defl.c index 14abc28..57c5a3c 100644 --- a/src/H5Defl.c +++ b/src/H5Defl.c @@ -33,7 +33,7 @@ #include "H5Eprivate.h" /* Error handling */ #include "H5Fprivate.h" /* Files */ #include "H5HLprivate.h" /* Local Heaps */ -#include "H5Vprivate.h" /* Vector and array functions */ +#include "H5VMprivate.h" /* Vector and array functions */ /****************/ @@ -429,7 +429,7 @@ done: static herr_t H5D__efl_readvv_cb(hsize_t dst_off, hsize_t src_off, size_t len, void *_udata) { - H5D_efl_readvv_ud_t *udata = (H5D_efl_readvv_ud_t *)_udata; /* User data for H5V_opvv() operator */ + H5D_efl_readvv_ud_t *udata = (H5D_efl_readvv_ud_t *)_udata; /* User data for H5VM_opvv() operator */ herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_STATIC @@ -463,7 +463,7 @@ H5D__efl_readvv(const H5D_io_info_t *io_info, size_t dset_max_nseq, size_t *dset_curr_seq, size_t dset_len_arr[], hsize_t dset_off_arr[], size_t mem_max_nseq, size_t *mem_curr_seq, size_t mem_len_arr[], hsize_t mem_off_arr[]) { - H5D_efl_readvv_ud_t udata; /* User data for H5V_opvv() operator */ + H5D_efl_readvv_ud_t udata; /* User data for H5VM_opvv() operator */ ssize_t ret_value; /* Return value (Total size of sequence in bytes) */ FUNC_ENTER_STATIC @@ -479,12 +479,12 @@ H5D__efl_readvv(const H5D_io_info_t *io_info, HDassert(mem_len_arr); HDassert(mem_off_arr); - /* Set up user data for H5V_opvv() */ + /* Set up user data for H5VM_opvv() */ udata.efl = &(io_info->store->efl); udata.rbuf = (unsigned char *)io_info->u.rbuf; /* Call generic sequence operation routine */ - if((ret_value = H5V_opvv(dset_max_nseq, dset_curr_seq, dset_len_arr, dset_off_arr, + if((ret_value = H5VM_opvv(dset_max_nseq, dset_curr_seq, dset_len_arr, dset_off_arr, mem_max_nseq, mem_curr_seq, mem_len_arr, mem_off_arr, H5D__efl_readvv_cb, &udata)) < 0) HGOTO_ERROR(H5E_DATASET, H5E_CANTOPERATE, FAIL, "can't perform vectorized EFL read") @@ -509,7 +509,7 @@ done: static herr_t H5D__efl_writevv_cb(hsize_t dst_off, hsize_t src_off, size_t len, void *_udata) { - H5D_efl_writevv_ud_t *udata = (H5D_efl_writevv_ud_t *)_udata; /* User data for H5V_opvv() operator */ + H5D_efl_writevv_ud_t *udata = (H5D_efl_writevv_ud_t *)_udata; /* User data for H5VM_opvv() operator */ herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_STATIC @@ -543,7 +543,7 @@ H5D__efl_writevv(const H5D_io_info_t *io_info, size_t dset_max_nseq, size_t *dset_curr_seq, size_t dset_len_arr[], hsize_t dset_off_arr[], size_t mem_max_nseq, size_t *mem_curr_seq, size_t mem_len_arr[], hsize_t mem_off_arr[]) { - H5D_efl_writevv_ud_t udata; /* User data for H5V_opvv() operator */ + H5D_efl_writevv_ud_t udata; /* User data for H5VM_opvv() operator */ ssize_t ret_value; /* Return value (Total size of sequence in bytes) */ FUNC_ENTER_STATIC @@ -559,12 +559,12 @@ H5D__efl_writevv(const H5D_io_info_t *io_info, HDassert(mem_len_arr); HDassert(mem_off_arr); - /* Set up user data for H5V_opvv() */ + /* Set up user data for H5VM_opvv() */ udata.efl = &(io_info->store->efl); udata.wbuf = (const unsigned char *)io_info->u.wbuf; /* Call generic sequence operation routine */ - if((ret_value = H5V_opvv(dset_max_nseq, dset_curr_seq, dset_len_arr, dset_off_arr, + if((ret_value = H5VM_opvv(dset_max_nseq, dset_curr_seq, dset_len_arr, dset_off_arr, mem_max_nseq, mem_curr_seq, mem_len_arr, mem_off_arr, H5D__efl_writevv_cb, &udata)) < 0) HGOTO_ERROR(H5E_DATASET, H5E_CANTOPERATE, FAIL, "can't perform vectorized EFL write") |