mirror/hdf5
2
0
Fork 0
mirror of https://github.com/HDFGroup/hdf5.git synced 2024-11-21 01:04:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

[svn-r7742] Purpose:

Browse Source 
Code cleanup

Description:
    Clean up setup code for collective I/O transfers to make the logic more
obvious.

Platforms tested:
    FreeBSD 4.9 (sleipnir)
    too minor for h5committest
This commit is contained in:
Quincey Koziol 2003-10-27 11:32:05 -05:00
parent d8b497ecef
commit 3c7887424f
1 changed files with 43 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

119
src/H5Dio.c
View File

@ -80,26 +80,26 @@ static herr_t H5D_write(H5D_t *dataset, const H5T_t *mem_type,
static herr_t static herr_t
H5D_contig_read(hsize_t nelmts, H5D_t *dataset, const H5T_t *mem_type, const H5S_t *mem_space, H5D_contig_read(hsize_t nelmts, H5D_t *dataset, const H5T_t *mem_type, const H5S_t *mem_space,
const H5S_t *file_space, H5T_path_t *tpath, H5S_conv_t *sconv, H5P_genplist_t *dc_plist, const H5S_t *file_space, H5T_path_t *tpath, H5S_conv_t *sconv, H5P_genplist_t *dc_plist,
H5P_genplist_t *dx_plist, hid_t dxpl_id, hbool_t doing_mpio, H5FD_mpio_xfer_t xfer_mode, H5P_genplist_t *dx_plist, hid_t dxpl_id, H5FD_mpio_xfer_t xfer_mode,
hid_t src_id, hid_t dst_id, void *buf/*out*/); hid_t src_id, hid_t dst_id, void *buf/*out*/);
static herr_t static herr_t
H5D_contig_write(hsize_t nelmts, H5D_t *dataset, const H5T_t *mem_type, const H5S_t *mem_space, H5D_contig_write(hsize_t nelmts, H5D_t *dataset, const H5T_t *mem_type, const H5S_t *mem_space,
const H5S_t *file_space, H5T_path_t *tpath, H5S_conv_t *sconv, H5P_genplist_t *dc_plist, const H5S_t *file_space, H5T_path_t *tpath, H5S_conv_t *sconv, H5P_genplist_t *dc_plist,
H5P_genplist_t *dx_plist, hid_t dxpl_id, hbool_t doing_mpio, H5FD_mpio_xfer_t xfer_mode, H5P_genplist_t *dx_plist, hid_t dxpl_id, H5FD_mpio_xfer_t xfer_mode,
hid_t src_id, hid_t dst_id, const void *buf); hid_t src_id, hid_t dst_id, const void *buf);
static herr_t static herr_t
H5D_chunk_read(hsize_t nelmts, H5D_t *dataset, const H5T_t *mem_type, const H5S_t *mem_space, H5D_chunk_read(hsize_t nelmts, H5D_t *dataset, const H5T_t *mem_type, const H5S_t *mem_space,
const H5S_t *file_space, H5T_path_t *tpath, H5S_conv_t *sconv, H5P_genplist_t *dc_plist, const H5S_t *file_space, H5T_path_t *tpath, H5S_conv_t *sconv, H5P_genplist_t *dc_plist,
H5P_genplist_t *dx_plist, hid_t dxpl_id, hbool_t doing_mpio, H5FD_mpio_xfer_t xfer_mode, H5P_genplist_t *dx_plist, hid_t dxpl_id, H5FD_mpio_xfer_t xfer_mode,
hid_t src_id, hid_t dst_id, void *buf/*out*/); hid_t src_id, hid_t dst_id, void *buf/*out*/);
static herr_t static herr_t
H5D_chunk_write(hsize_t nelmts, H5D_t *dataset, const H5T_t *mem_type, const H5S_t *mem_space, H5D_chunk_write(hsize_t nelmts, H5D_t *dataset, const H5T_t *mem_type, const H5S_t *mem_space,
const H5S_t *file_space, H5T_path_t *tpath, H5S_conv_t *sconv, H5P_genplist_t *dc_plist, const H5S_t *file_space, H5T_path_t *tpath, H5S_conv_t *sconv, H5P_genplist_t *dc_plist,
H5P_genplist_t *dx_plist, hid_t dxpl_id, hbool_t doing_mpio, H5FD_mpio_xfer_t xfer_mode, H5P_genplist_t *dx_plist, hid_t dxpl_id, H5FD_mpio_xfer_t xfer_mode,
hid_t src_id, hid_t dst_id, const void *buf); hid_t src_id, hid_t dst_id, const void *buf);
#ifdef H5_HAVE_PARALLEL #ifdef H5_HAVE_PARALLEL
static herr_t static herr_t
H5D_io_assist_mpio(H5P_genplist_t *dx_plist, hbool_t doing_mpio, H5FD_mpio_xfer_t xfer_mode, H5D_io_assist_mpio(H5P_genplist_t *dx_plist, H5FD_mpio_xfer_t xfer_mode,
hbool_t *xfer_mode_changed); hbool_t *xfer_mode_changed);
#endif /*H5_HAVE_PARALLEL*/ #endif /*H5_HAVE_PARALLEL*/
static herr_t H5D_create_chunk_map(H5D_t *dataset, const H5T_t *mem_type, static herr_t H5D_create_chunk_map(H5D_t *dataset, const H5T_t *mem_type,
@ -514,7 +514,6 @@ H5D_read(H5D_t *dataset, const H5T_t *mem_type, const H5S_t *mem_space,
hid_t src_id = -1, dst_id = -1;/*temporary type atoms */ hid_t src_id = -1, dst_id = -1;/*temporary type atoms */
H5S_conv_t *sconv=NULL; /*space conversion funcs*/ H5S_conv_t *sconv=NULL; /*space conversion funcs*/
H5FD_mpio_xfer_t xfer_mode=H5FD_MPIO_INDEPENDENT; /*xfer_mode for this request */ H5FD_mpio_xfer_t xfer_mode=H5FD_MPIO_INDEPENDENT; /*xfer_mode for this request */
hbool_t doing_mpio=0; /*This is an MPIO access */
H5P_genplist_t *dx_plist=NULL; /* Data transfer property list */ H5P_genplist_t *dx_plist=NULL; /* Data transfer property list */
H5P_genplist_t *dc_plist; /* Dataset creation roperty list */ H5P_genplist_t *dc_plist; /* Dataset creation roperty list */
unsigned sconv_flags=0; /* Flags for the space conversion */ unsigned sconv_flags=0; /* Flags for the space conversion */
@ -545,23 +544,16 @@ H5D_read(H5D_t *dataset, const H5T_t *mem_type, const H5S_t *mem_space,
#ifdef H5_HAVE_PARALLEL #ifdef H5_HAVE_PARALLEL
/* Collect Parallel I/O information for possible later use */ /* Collect Parallel I/O information for possible later use */
if (H5FD_MPIO==H5P_peek_hid_t(dx_plist,H5D_XFER_VFL_ID_NAME)) { xfer_mode=(H5FD_mpio_xfer_t)H5P_peek_unsigned(dx_plist, H5D_XFER_IO_XFER_MODE_NAME);
doing_mpio++;
xfer_mode=(H5FD_mpio_xfer_t)H5P_peek_unsigned(dx_plist, H5D_XFER_IO_XFER_MODE_NAME);
} /* end if */
/* Collective access is not permissible without a MPI based VFD */
if (doing_mpio && xfer_mode==H5FD_MPIO_COLLECTIVE && !IS_H5FD_MPI(dataset->ent.file))
HGOTO_ERROR (H5E_DATASET, H5E_UNSUPPORTED, FAIL, "collective access for MPIO & MPIPOSIX drivers only")
/* Set the "parallel I/O possible" flag, for H5S_find() */ /* Collective access is not permissible without a MPI based VFD */
if (H5S_mpi_opt_types_g && IS_H5FD_MPIO(dataset->ent.file)) { if (xfer_mode==H5FD_MPIO_COLLECTIVE && !IS_H5FD_MPI(dataset->ent.file))
/* Only collective write should call this since it eventually HGOTO_ERROR (H5E_DATASET, H5E_UNSUPPORTED, FAIL, "collective access for MPI-based drivers only")
* calls MPI_File_set_view which is a collective call.
* See H5S_mpio_spaces_xfer() for details. /* Set the "parallel I/O possible" flag, for H5S_find(), if we are doing collective I/O */
*/ /* (Don't set the parallel I/O possible flag for the MPI-posix driver, since it doesn't do real collective I/O) */
if (doing_mpio && xfer_mode==H5FD_MPIO_COLLECTIVE) if (H5S_mpi_opt_types_g && xfer_mode==H5FD_MPIO_COLLECTIVE && !IS_H5FD_MPIPOSIX(dataset->ent.file))
sconv_flags |= H5S_CONV_PAR_IO_POSSIBLE; sconv_flags |= H5S_CONV_PAR_IO_POSSIBLE;
} /* end if */
#endif /*H5_HAVE_PARALLEL*/ #endif /*H5_HAVE_PARALLEL*/
/* Make certain that the number of elements in each selection is the same */ /* Make certain that the number of elements in each selection is the same */
@ -648,12 +640,12 @@ H5D_read(H5D_t *dataset, const H5T_t *mem_type, const H5S_t *mem_space,
/* Determine correct I/O routine to invoke */ /* Determine correct I/O routine to invoke */
if(dataset->layout.type!=H5D_CHUNKED) { if(dataset->layout.type!=H5D_CHUNKED) {
if(H5D_contig_read(nelmts, dataset, mem_type, mem_space, file_space, tpath, sconv, dc_plist, if(H5D_contig_read(nelmts, dataset, mem_type, mem_space, file_space, tpath, sconv, dc_plist,
dx_plist, dxpl_id, doing_mpio, xfer_mode, src_id, dst_id, buf)<0) dx_plist, dxpl_id, xfer_mode, src_id, dst_id, buf)<0)
HGOTO_ERROR(H5E_DATASET, H5E_READERROR, FAIL, "can't read data") HGOTO_ERROR(H5E_DATASET, H5E_READERROR, FAIL, "can't read data")
} /* end if */ } /* end if */
else { else {
if(H5D_chunk_read(nelmts, dataset, mem_type, mem_space, file_space, tpath, sconv, dc_plist, if(H5D_chunk_read(nelmts, dataset, mem_type, mem_space, file_space, tpath, sconv, dc_plist,
dx_plist, dxpl_id, doing_mpio, xfer_mode, src_id, dst_id, buf)<0) dx_plist, dxpl_id, xfer_mode, src_id, dst_id, buf)<0)
HGOTO_ERROR(H5E_DATASET, H5E_READERROR, FAIL, "can't read data") HGOTO_ERROR(H5E_DATASET, H5E_READERROR, FAIL, "can't read data")
} /* end else */ } /* end else */
@ -725,7 +717,6 @@ H5D_write(H5D_t *dataset, const H5T_t *mem_type, const H5S_t *mem_space,
hid_t src_id = -1, dst_id = -1;/*temporary type atoms */ hid_t src_id = -1, dst_id = -1;/*temporary type atoms */
H5S_conv_t *sconv=NULL; /*space conversion funcs*/ H5S_conv_t *sconv=NULL; /*space conversion funcs*/
H5FD_mpio_xfer_t xfer_mode=H5FD_MPIO_INDEPENDENT; /*xfer_mode for this request */ H5FD_mpio_xfer_t xfer_mode=H5FD_MPIO_INDEPENDENT; /*xfer_mode for this request */
hbool_t doing_mpio=0; /*This is an MPIO access */
H5P_genplist_t *dx_plist=NULL; /* Data transfer property list */ H5P_genplist_t *dx_plist=NULL; /* Data transfer property list */
H5P_genplist_t *dc_plist; /* Dataset creation roperty list */ H5P_genplist_t *dc_plist; /* Dataset creation roperty list */
unsigned sconv_flags=0; /* Flags for the space conversion */ unsigned sconv_flags=0; /* Flags for the space conversion */
@ -776,24 +767,16 @@ H5D_write(H5D_t *dataset, const H5T_t *mem_type, const H5S_t *mem_space,
#ifdef H5_HAVE_PARALLEL #ifdef H5_HAVE_PARALLEL
/* Collect Parallel I/O information for possible later use */ /* Collect Parallel I/O information for possible later use */
if (H5FD_MPIO==H5P_peek_hid_t(dx_plist,H5D_XFER_VFL_ID_NAME)) { xfer_mode=(H5FD_mpio_xfer_t)H5P_peek_unsigned(dx_plist, H5D_XFER_IO_XFER_MODE_NAME);
doing_mpio++;
xfer_mode=(H5FD_mpio_xfer_t)H5P_peek_unsigned(dx_plist, H5D_XFER_IO_XFER_MODE_NAME);
} /* end if */
/* Collective access is not permissible without a MPI based VFD */ /* Collective access is not permissible without a MPI based VFD */
if (doing_mpio && xfer_mode==H5FD_MPIO_COLLECTIVE && !IS_H5FD_MPI(dataset->ent.file)) if (xfer_mode==H5FD_MPIO_COLLECTIVE && !IS_H5FD_MPI(dataset->ent.file))
HGOTO_ERROR (H5E_DATASET, H5E_UNSUPPORTED, FAIL, "collective access for MPIO driver only") HGOTO_ERROR (H5E_DATASET, H5E_UNSUPPORTED, FAIL, "collective access for MPI-based driver only")
/* Set the "parallel I/O possible" flag, for H5S_find() */ /* Set the "parallel I/O possible" flag, for H5S_find(), if we are doing collective I/O */
if (H5S_mpi_opt_types_g && IS_H5FD_MPIO(dataset->ent.file)) { /* (Don't set the parallel I/O possible flag for the MPI-posix driver, since it doesn't do real collective I/O) */
/* Only collective write should call this since it eventually if (H5S_mpi_opt_types_g && xfer_mode==H5FD_MPIO_COLLECTIVE && !IS_H5FD_MPIPOSIX(dataset->ent.file))
* calls MPI_File_set_view which is a collective call. sconv_flags |= H5S_CONV_PAR_IO_POSSIBLE;
* See H5S_mpio_spaces_xfer() for details.
*/
if (doing_mpio && xfer_mode==H5FD_MPIO_COLLECTIVE)
sconv_flags |= H5S_CONV_PAR_IO_POSSIBLE;
} /* end if */
#endif /*H5_HAVE_PARALLEL*/ #endif /*H5_HAVE_PARALLEL*/
/* Make certain that the number of elements in each selection is the same */ /* Make certain that the number of elements in each selection is the same */
@ -858,12 +841,12 @@ H5D_write(H5D_t *dataset, const H5T_t *mem_type, const H5S_t *mem_space,
/* Determine correct I/O routine to invoke */ /* Determine correct I/O routine to invoke */
if(dataset->layout.type!=H5D_CHUNKED) { if(dataset->layout.type!=H5D_CHUNKED) {
if(H5D_contig_write(nelmts, dataset, mem_type, mem_space, file_space, tpath, sconv, dc_plist, if(H5D_contig_write(nelmts, dataset, mem_type, mem_space, file_space, tpath, sconv, dc_plist,
dx_plist, dxpl_id, doing_mpio, xfer_mode, src_id, dst_id, buf)<0) dx_plist, dxpl_id, xfer_mode, src_id, dst_id, buf)<0)
HGOTO_ERROR(H5E_DATASET, H5E_WRITEERROR, FAIL, "can't write data") HGOTO_ERROR(H5E_DATASET, H5E_WRITEERROR, FAIL, "can't write data")
} /* end if */ } /* end if */
else { else {
if(H5D_chunk_write(nelmts, dataset, mem_type, mem_space, file_space, tpath, sconv, dc_plist, if(H5D_chunk_write(nelmts, dataset, mem_type, mem_space, file_space, tpath, sconv, dc_plist,
dx_plist, dxpl_id, doing_mpio, xfer_mode, src_id, dst_id, buf)<0) dx_plist, dxpl_id, xfer_mode, src_id, dst_id, buf)<0)
HGOTO_ERROR(H5E_DATASET, H5E_WRITEERROR, FAIL, "can't write data") HGOTO_ERROR(H5E_DATASET, H5E_WRITEERROR, FAIL, "can't write data")
} /* end else */ } /* end else */
@ -917,11 +900,7 @@ static herr_t
H5D_contig_read(hsize_t nelmts, H5D_t *dataset, const H5T_t *mem_type, H5D_contig_read(hsize_t nelmts, H5D_t *dataset, const H5T_t *mem_type,
const H5S_t *mem_space, const H5S_t *file_space, H5T_path_t *tpath, const H5S_t *mem_space, const H5S_t *file_space, H5T_path_t *tpath,
H5S_conv_t *sconv, H5P_genplist_t *dc_plist, H5P_genplist_t *dx_plist, H5S_conv_t *sconv, H5P_genplist_t *dc_plist, H5P_genplist_t *dx_plist,
hid_t dxpl_id, hbool_t hid_t dxpl_id, H5FD_mpio_xfer_t
#ifndef H5_HAVE_PARALLEL
UNUSED
#endif /*H5_HAVE_PARALLEL*/
doing_mpio, H5FD_mpio_xfer_t
#ifndef H5_HAVE_PARALLEL #ifndef H5_HAVE_PARALLEL
UNUSED UNUSED
#endif /*H5_HAVE_PARALLEL*/ #endif /*H5_HAVE_PARALLEL*/
@ -948,7 +927,7 @@ H5D_contig_read(hsize_t nelmts, H5D_t *dataset, const H5T_t *mem_type,
hsize_t smine_start; /*strip mine start loc */ hsize_t smine_start; /*strip mine start loc */
hsize_t n, smine_nelmts; /*elements per strip */ hsize_t n, smine_nelmts; /*elements per strip */
#ifdef H5_HAVE_PARALLEL #ifdef H5_HAVE_PARALLEL
hbool_t xfer_mode_changed; /* Whether the transfer mode was changed */ hbool_t xfer_mode_changed=FALSE; /* Whether the transfer mode was changed */
#endif /*H5_HAVE_PARALLEL*/ #endif /*H5_HAVE_PARALLEL*/
herr_t ret_value = SUCCEED; /*return value */ herr_t ret_value = SUCCEED; /*return value */
@ -987,7 +966,7 @@ H5D_contig_read(hsize_t nelmts, H5D_t *dataset, const H5T_t *mem_type,
*/ */
#ifdef H5_HAVE_PARALLEL #ifdef H5_HAVE_PARALLEL
H5D_io_assist_mpio(dx_plist, doing_mpio, xfer_mode, &xfer_mode_changed); H5D_io_assist_mpio(dx_plist, xfer_mode, &xfer_mode_changed);
#endif /*H5_HAVE_PARALLEL*/ #endif /*H5_HAVE_PARALLEL*/
/* Compute element sizes and other parameters */ /* Compute element sizes and other parameters */
@ -1119,7 +1098,7 @@ H5D_contig_read(hsize_t nelmts, H5D_t *dataset, const H5T_t *mem_type,
done: done:
#ifdef H5_HAVE_PARALLEL #ifdef H5_HAVE_PARALLEL
/* restore xfer_mode due to the kludge */ /* restore xfer_mode due to the kludge */
if (doing_mpio && xfer_mode_changed) { if (xfer_mode_changed) {
#ifdef H5D_DEBUG #ifdef H5D_DEBUG
if (H5DEBUG(D)) if (H5DEBUG(D))
fprintf (H5DEBUG(D), "H5D: dx->xfer_mode was COLLECTIVE, restored to INDEPENDENT\n"); fprintf (H5DEBUG(D), "H5D: dx->xfer_mode was COLLECTIVE, restored to INDEPENDENT\n");
@ -1173,11 +1152,7 @@ done:
static herr_t static herr_t
H5D_contig_write(hsize_t nelmts, H5D_t *dataset, const H5T_t *mem_type, const H5S_t *mem_space, H5D_contig_write(hsize_t nelmts, H5D_t *dataset, const H5T_t *mem_type, const H5S_t *mem_space,
const H5S_t *file_space, H5T_path_t *tpath, H5S_conv_t *sconv, H5P_genplist_t *dc_plist, const H5S_t *file_space, H5T_path_t *tpath, H5S_conv_t *sconv, H5P_genplist_t *dc_plist,
H5P_genplist_t *dx_plist, hid_t dxpl_id, hbool_t H5P_genplist_t *dx_plist, hid_t dxpl_id, H5FD_mpio_xfer_t
#ifndef H5_HAVE_PARALLEL
UNUSED
#endif /*H5_HAVE_PARALLEL*/
doing_mpio, H5FD_mpio_xfer_t
#ifndef H5_HAVE_PARALLEL #ifndef H5_HAVE_PARALLEL
UNUSED UNUSED
#endif /*H5_HAVE_PARALLEL*/ #endif /*H5_HAVE_PARALLEL*/
@ -1204,7 +1179,7 @@ H5D_contig_write(hsize_t nelmts, H5D_t *dataset, const H5T_t *mem_type, const H5
hsize_t smine_start; /*strip mine start loc */ hsize_t smine_start; /*strip mine start loc */
hsize_t n, smine_nelmts; /*elements per strip */ hsize_t n, smine_nelmts; /*elements per strip */
#ifdef H5_HAVE_PARALLEL #ifdef H5_HAVE_PARALLEL
hbool_t xfer_mode_changed; /* Whether the transfer mode was changed */ hbool_t xfer_mode_changed=FALSE; /* Whether the transfer mode was changed */
#endif /*H5_HAVE_PARALLEL*/ #endif /*H5_HAVE_PARALLEL*/
herr_t ret_value = SUCCEED; /*return value */ herr_t ret_value = SUCCEED; /*return value */
@ -1240,7 +1215,7 @@ H5D_contig_write(hsize_t nelmts, H5D_t *dataset, const H5T_t *mem_type, const H5
*/ */
#ifdef H5_HAVE_PARALLEL #ifdef H5_HAVE_PARALLEL
H5D_io_assist_mpio(dx_plist, doing_mpio, xfer_mode, &xfer_mode_changed); H5D_io_assist_mpio(dx_plist, xfer_mode, &xfer_mode_changed);
#endif /*H5_HAVE_PARALLEL*/ #endif /*H5_HAVE_PARALLEL*/
/* Compute element sizes and other parameters */ /* Compute element sizes and other parameters */
@ -1374,7 +1349,7 @@ H5D_contig_write(hsize_t nelmts, H5D_t *dataset, const H5T_t *mem_type, const H5
done: done:
#ifdef H5_HAVE_PARALLEL #ifdef H5_HAVE_PARALLEL
/* restore xfer_mode due to the kludge */ /* restore xfer_mode due to the kludge */
if (doing_mpio && xfer_mode_changed) { if (xfer_mode_changed) {
#ifdef H5D_DEBUG #ifdef H5D_DEBUG
if (H5DEBUG(D)) if (H5DEBUG(D))
fprintf (H5DEBUG(D), "H5D: dx->xfer_mode was COLLECTIVE, restored to INDEPENDENT\n"); fprintf (H5DEBUG(D), "H5D: dx->xfer_mode was COLLECTIVE, restored to INDEPENDENT\n");
@ -1432,11 +1407,7 @@ UNUSED
#endif /* NDEBUG */ #endif /* NDEBUG */
nelmts, H5D_t *dataset, const H5T_t *mem_type, const H5S_t *mem_space, nelmts, H5D_t *dataset, const H5T_t *mem_type, const H5S_t *mem_space,
const H5S_t *file_space, H5T_path_t *tpath, H5S_conv_t *sconv, H5P_genplist_t *dc_plist, const H5S_t *file_space, H5T_path_t *tpath, H5S_conv_t *sconv, H5P_genplist_t *dc_plist,
H5P_genplist_t *dx_plist, hid_t dxpl_id, hbool_t H5P_genplist_t *dx_plist, hid_t dxpl_id, H5FD_mpio_xfer_t
#ifndef H5_HAVE_PARALLEL
UNUSED
#endif /*H5_HAVE_PARALLEL*/
doing_mpio, H5FD_mpio_xfer_t
#ifndef H5_HAVE_PARALLEL #ifndef H5_HAVE_PARALLEL
UNUSED UNUSED
#endif /*H5_HAVE_PARALLEL*/ #endif /*H5_HAVE_PARALLEL*/
@ -1467,14 +1438,14 @@ UNUSED
uint8_t *bkg_buf = NULL; /*background buffer */ uint8_t *bkg_buf = NULL; /*background buffer */
H5D_storage_t store; /*union of EFL and chunk pointer in file space */ H5D_storage_t store; /*union of EFL and chunk pointer in file space */
#ifdef H5_HAVE_PARALLEL #ifdef H5_HAVE_PARALLEL
hbool_t xfer_mode_changed; /* Whether the transfer mode was changed */ hbool_t xfer_mode_changed=FALSE; /* Whether the transfer mode was changed */
#endif /*H5_HAVE_PARALLEL*/ #endif /*H5_HAVE_PARALLEL*/
herr_t ret_value = SUCCEED; /*return value */ herr_t ret_value = SUCCEED; /*return value */
FUNC_ENTER_NOINIT(H5D_chunk_read) FUNC_ENTER_NOINIT(H5D_chunk_read)
#ifdef H5_HAVE_PARALLEL #ifdef H5_HAVE_PARALLEL
H5D_io_assist_mpio(dx_plist, doing_mpio, xfer_mode, &xfer_mode_changed); H5D_io_assist_mpio(dx_plist, xfer_mode, &xfer_mode_changed);
#endif /*H5_HAVE_PARALLEL*/ #endif /*H5_HAVE_PARALLEL*/
/* Map elements between file and memory for each chunk*/ /* Map elements between file and memory for each chunk*/
@ -1711,7 +1682,7 @@ UNUSED
done: done:
#ifdef H5_HAVE_PARALLEL #ifdef H5_HAVE_PARALLEL
/* restore xfer_mode due to the kludge */ /* restore xfer_mode due to the kludge */
if (doing_mpio && xfer_mode_changed) { if (xfer_mode_changed) {
#ifdef H5D_DEBUG #ifdef H5D_DEBUG
if (H5DEBUG(D)) if (H5DEBUG(D))
fprintf (H5DEBUG(D), "H5D: dx->xfer_mode was COLLECTIVE, restored to INDEPENDENT\n"); fprintf (H5DEBUG(D), "H5D: dx->xfer_mode was COLLECTIVE, restored to INDEPENDENT\n");
@ -1774,11 +1745,7 @@ UNUSED
#endif /* NDEBUG */ #endif /* NDEBUG */
nelmts, H5D_t *dataset, const H5T_t *mem_type, const H5S_t *mem_space, nelmts, H5D_t *dataset, const H5T_t *mem_type, const H5S_t *mem_space,
const H5S_t *file_space, H5T_path_t *tpath, H5S_conv_t *sconv, H5P_genplist_t *dc_plist, const H5S_t *file_space, H5T_path_t *tpath, H5S_conv_t *sconv, H5P_genplist_t *dc_plist,
H5P_genplist_t *dx_plist, hid_t dxpl_id, hbool_t H5P_genplist_t *dx_plist, hid_t dxpl_id, H5FD_mpio_xfer_t
#ifndef H5_HAVE_PARALLEL
UNUSED
#endif /*H5_HAVE_PARALLEL*/
doing_mpio, H5FD_mpio_xfer_t
#ifndef H5_HAVE_PARALLEL #ifndef H5_HAVE_PARALLEL
UNUSED UNUSED
#endif /*H5_HAVE_PARALLEL*/ #endif /*H5_HAVE_PARALLEL*/
@ -1809,14 +1776,14 @@ nelmts, H5D_t *dataset, const H5T_t *mem_type, const H5S_t *mem_space,
uint8_t *bkg_buf = NULL; /*background buffer */ uint8_t *bkg_buf = NULL; /*background buffer */
H5D_storage_t store; /*union of EFL and chunk pointer in file space */ H5D_storage_t store; /*union of EFL and chunk pointer in file space */
#ifdef H5_HAVE_PARALLEL #ifdef H5_HAVE_PARALLEL
hbool_t xfer_mode_changed; /* Whether the transfer mode was changed */ hbool_t xfer_mode_changed=FALSE; /* Whether the transfer mode was changed */
#endif /*H5_HAVE_PARALLEL*/ #endif /*H5_HAVE_PARALLEL*/
herr_t ret_value = SUCCEED; /*return value */ herr_t ret_value = SUCCEED; /*return value */
FUNC_ENTER_NOINIT(H5D_chunk_write) FUNC_ENTER_NOINIT(H5D_chunk_write)
#ifdef H5_HAVE_PARALLEL #ifdef H5_HAVE_PARALLEL
H5D_io_assist_mpio(dx_plist, doing_mpio, xfer_mode, &xfer_mode_changed); H5D_io_assist_mpio(dx_plist, xfer_mode, &xfer_mode_changed);
#endif /*H5_HAVE_PARALLEL*/ #endif /*H5_HAVE_PARALLEL*/
#ifdef QAK #ifdef QAK
@ -2096,7 +2063,7 @@ nelmts, H5D_t *dataset, const H5T_t *mem_type, const H5S_t *mem_space,
done: done:
#ifdef H5_HAVE_PARALLEL #ifdef H5_HAVE_PARALLEL
/* restore xfer_mode due to the kludge */ /* restore xfer_mode due to the kludge */
if (doing_mpio && xfer_mode_changed) { if (xfer_mode_changed) {
#ifdef H5D_DEBUG #ifdef H5D_DEBUG
if (H5DEBUG(D)) if (H5DEBUG(D))
fprintf (H5DEBUG(D), "H5D: dx->xfer_mode was COLLECTIVE, restored to INDEPENDENT\n"); fprintf (H5DEBUG(D), "H5D: dx->xfer_mode was COLLECTIVE, restored to INDEPENDENT\n");
@ -2154,7 +2121,7 @@ done:
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
static herr_t static herr_t
H5D_io_assist_mpio(H5P_genplist_t *dx_plist, hbool_t doing_mpio, H5FD_mpio_xfer_t xfer_mode, H5D_io_assist_mpio(H5P_genplist_t *dx_plist, H5FD_mpio_xfer_t xfer_mode,
hbool_t *xfer_mode_changed) hbool_t *xfer_mode_changed)
{ {
herr_t ret_value = SUCCEED; /*return value */ herr_t ret_value = SUCCEED; /*return value */
@ -2166,7 +2133,7 @@ H5D_io_assist_mpio(H5P_genplist_t *dx_plist, hbool_t doing_mpio, H5FD_mpio_xfer_
* request according to the MPI collective specification. * request according to the MPI collective specification.
* Do the collective request via independent mode. * Do the collective request via independent mode.
*/ */
if (doing_mpio && xfer_mode==H5FD_MPIO_COLLECTIVE) { if (xfer_mode==H5FD_MPIO_COLLECTIVE) {
/* Kludge: change the xfer_mode to independent, handle the request, /* Kludge: change the xfer_mode to independent, handle the request,
* then xfer_mode before return. * then xfer_mode before return.
* Better way is to get a temporary data_xfer property with * Better way is to get a temporary data_xfer property with