diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2006-08-17 19:26:42 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2006-08-17 19:26:42 (GMT) |
| commit | 4eb07936c7c2a852ebf1ad641d50a5767d3b2bb1 (patch) | |
| tree | 42b2e453bbe72c5c05f212069472e9f1e65ef4d0 /src/H5Dio.c | |
| parent | 49d1901fdde7e3c4ebb2db7f13214793832cba42 (diff) | |
| download | hdf5-4eb07936c7c2a852ebf1ad641d50a5767d3b2bb1.zip hdf5-4eb07936c7c2a852ebf1ad641d50a5767d3b2bb1.tar.gz hdf5-4eb07936c7c2a852ebf1ad641d50a5767d3b2bb1.tar.bz2 | |
[svn-r12593] Description:
Clean up some of the parallel chunk I/O compiler warnings and other minor
code rearrangement.
Tested on:
FreeBSD 4.11 (sleipnir) w/paralllel
h5committest
Diffstat (limited to 'src/H5Dio.c')
| -rw-r--r-- | src/H5Dio.c | 24 |
1 files changed, 14 insertions, 10 deletions
diff --git a/src/H5Dio.c b/src/H5Dio.c index 28bc617..b615f44 100644 --- a/src/H5Dio.c +++ b/src/H5Dio.c @@ -1505,16 +1505,18 @@ H5D_chunk_read(H5D_io_info_t *io_info, hsize_t nelmts, || dataset->shared->layout.type==H5D_COMPACT); #ifdef H5_HAVE_PARALLEL + /* Check whether the collective mode can be turned off globally*/ +#ifndef H5_MPI_SPECIAL_COLLECTIVE_IO_WORKS if(io_info->dxpl_cache->xfer_mode == H5FD_MPIO_COLLECTIVE) { - if(H5D_mpio_chunk_adjust_iomode(io_info,&fm)) - HGOTO_ERROR(H5E_DATASET,H5E_CANTGET,FAIL,"can't adjust collective I/O") + if(H5D_mpio_chunk_adjust_iomode(io_info,&fm)) + HGOTO_ERROR(H5E_DATASET,H5E_CANTGET,FAIL,"can't adjust collective I/O") } +#endif /* H5_MPI_SPECIAL_COLLECTIVE_IO_WORKS */ /* Temporarily shut down collective IO for chunking */ if(io_info->dxpl_cache->xfer_mode == H5FD_MPIO_COLLECTIVE) { - if(H5D_chunk_collective_io(io_info,&fm,buf,FALSE)<0) - HGOTO_ERROR(H5E_DATASET, H5E_CANTGET, FAIL, "chunked read failed in collective mode"); + if(H5D_chunk_collective_io(io_info,&fm,buf,FALSE) < 0) + HGOTO_ERROR(H5E_DATASET, H5E_CANTGET, FAIL, "chunked read failed in collective mode"); } - else {/* sequential or independent read */ #endif /* Get first node in chunk skip list */ @@ -1827,14 +1829,16 @@ H5D_chunk_write(H5D_io_info_t *io_info, hsize_t nelmts, #ifdef H5_HAVE_PARALLEL /* Check whether the collective mode can be turned off globally*/ - +#ifndef H5_MPI_SPECIAL_COLLECTIVE_IO_WORKS if(io_info->dxpl_cache->xfer_mode == H5FD_MPIO_COLLECTIVE) { - if(H5D_mpio_chunk_adjust_iomode(io_info,&fm)) - HGOTO_ERROR(H5E_DATASET,H5E_CANTGET,FAIL,"can't adjust collective I/O") + if(H5D_mpio_chunk_adjust_iomode(io_info,&fm)) + HGOTO_ERROR(H5E_DATASET,H5E_CANTGET,FAIL,"can't adjust collective I/O") } +#endif /* H5_MPI_SPECIAL_COLLECTIVE_IO_WORKS */ + /* Temporarily shut down collective IO for chunking */ if(io_info->dxpl_cache->xfer_mode == H5FD_MPIO_COLLECTIVE) { - if(H5D_chunk_collective_io(io_info,&fm,buf,TRUE)<0) - HGOTO_ERROR(H5E_DATASET, H5E_CANTGET, FAIL, "chunked write failed in collective mode"); + if(H5D_chunk_collective_io(io_info,&fm,buf,TRUE) < 0) + HGOTO_ERROR(H5E_DATASET, H5E_CANTGET, FAIL, "chunked write failed in collective mode"); } else {/* sequential or independent write */ #endif /* H5_HAVE_PARALLEL */ |