diff options
| author | Mohamad Chaarawi <chaarawi@hdfgroup.org> | 2012-05-18 15:34:28 (GMT) |
|---|---|---|
| committer | Mohamad Chaarawi <chaarawi@hdfgroup.org> | 2012-05-18 15:34:28 (GMT) |
| commit | 674f45036710a7bf230ca3dae86aa9ca37ff9ed1 (patch) | |
| tree | 00e6d009398af054454608d96f2ab9c740043cb6 /src/H5Dmpio.c | |
| parent | ca8d4218d2a7b888e04bd40c22cc090fb7cd207d (diff) | |
| download | hdf5-674f45036710a7bf230ca3dae86aa9ca37ff9ed1.zip hdf5-674f45036710a7bf230ca3dae86aa9ca37ff9ed1.tar.gz hdf5-674f45036710a7bf230ca3dae86aa9ca37ff9ed1.tar.bz2 | |
[svn-r22379] make the file and memory MPI datatypes as default properties in the
DXPL so that we don't have to insert and remove them everytime we
perform collective I/O.
Diffstat (limited to 'src/H5Dmpio.c')
| -rw-r--r-- | src/H5Dmpio.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/src/H5Dmpio.c b/src/H5Dmpio.c index 45cf6a1..9b8fa27 100644 --- a/src/H5Dmpio.c +++ b/src/H5Dmpio.c @@ -1542,15 +1542,13 @@ static herr_t H5D__final_collective_io(H5D_io_info_t *io_info, const H5D_type_info_t *type_info, hsize_t mpi_buf_count, MPI_Datatype *mpi_file_type, MPI_Datatype *mpi_buf_type) { - hbool_t plist_is_setup = FALSE; /* Whether the dxpl has been customized */ herr_t ret_value = SUCCEED; FUNC_ENTER_STATIC /* Pass buf type, file type to the file driver. */ - if(H5FD_mpi_setup_collective(io_info->dxpl_id, *mpi_buf_type, *mpi_file_type) < 0) + if(H5FD_mpi_setup_collective(io_info->dxpl_id, mpi_buf_type, mpi_file_type) < 0) HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "can't set MPI-I/O properties") - plist_is_setup = TRUE; if(io_info->op_type == H5D_IO_OP_WRITE) { if((io_info->io_ops.single_write)(io_info, type_info, mpi_buf_count, NULL, NULL) < 0) @@ -1562,11 +1560,6 @@ H5D__final_collective_io(H5D_io_info_t *io_info, const H5D_type_info_t *type_inf } /* end else */ done: - /* Reset the dxpl settings */ - if(plist_is_setup) - if(H5FD_mpi_teardown_collective(io_info->dxpl_id) < 0) - HDONE_ERROR(H5E_DATASPACE, H5E_CANTFREE, FAIL, "unable to reset dxpl values") - #ifdef H5D_DEBUG if(H5DEBUG(D)) HDfprintf(H5DEBUG(D),"ret_value before leaving final_collective_io=%d\n",ret_value); |