diff options
| author | jhendersonHDF <jhenderson@hdfgroup.org> | 2021-11-09 14:05:08 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-09 14:05:08 (GMT) |
| commit | b736d442ae5dda49e691f4c9b3150c00fcfa2371 (patch) | |
| tree | fb98f9e7b379d18b48b4832fef1351a97ae88e80 /src/H5Dchunk.c | |
| parent | a0445d806c480529e127d79fda257aa8bf70d594 (diff) | |
| download | hdf5-b736d442ae5dda49e691f4c9b3150c00fcfa2371.zip hdf5-b736d442ae5dda49e691f4c9b3150c00fcfa2371.tar.gz hdf5-b736d442ae5dda49e691f4c9b3150c00fcfa2371.tar.bz2 | |
Re-enable collective metadata reads after disabling for chunk lookup (#1173)
Diffstat (limited to 'src/H5Dchunk.c')
| -rw-r--r-- | src/H5Dchunk.c | 28 |
1 files changed, 21 insertions, 7 deletions
diff --git a/src/H5Dchunk.c b/src/H5Dchunk.c index 9a9121a..8d32744 100644 --- a/src/H5Dchunk.c +++ b/src/H5Dchunk.c @@ -3166,11 +3166,14 @@ H5D__chunk_hash_val(const H5D_shared_t *shared, const hsize_t *scaled) herr_t H5D__chunk_lookup(const H5D_t *dset, const hsize_t *scaled, H5D_chunk_ud_t *udata) { - H5D_rdcc_ent_t * ent = NULL; /* Cache entry */ - H5O_storage_chunk_t *sc = &(dset->shared->layout.storage.u.chunk); - unsigned idx = 0; /* Index of chunk in cache, if present */ - hbool_t found = FALSE; /* In cache? */ - herr_t ret_value = SUCCEED; /* Return value */ + H5D_rdcc_ent_t * ent = NULL; /* Cache entry */ + H5O_storage_chunk_t *sc = &(dset->shared->layout.storage.u.chunk); + unsigned idx = 0; /* Index of chunk in cache, if present */ + hbool_t found = FALSE; /* In cache? */ +#ifdef H5_HAVE_PARALLEL + hbool_t reenable_coll_md_reads = FALSE; +#endif + herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_PACKAGE @@ -3241,8 +3244,13 @@ H5D__chunk_lookup(const H5D_t *dset, const hsize_t *scaled, H5D_chunk_ud_t *udat * highly unlikely that users would read the same chunks from all * processes. */ - if (H5F_HAS_FEATURE(idx_info.f, H5FD_FEAT_HAS_MPI)) - H5CX_set_coll_metadata_read(FALSE); + if (H5F_HAS_FEATURE(idx_info.f, H5FD_FEAT_HAS_MPI)) { + hbool_t do_coll_md_reads = H5CX_get_coll_metadata_read(); + if (do_coll_md_reads) { + H5CX_set_coll_metadata_read(FALSE); + reenable_coll_md_reads = TRUE; + } + } #endif /* H5_HAVE_PARALLEL */ /* Go get the chunk information */ @@ -3285,6 +3293,12 @@ H5D__chunk_lookup(const H5D_t *dset, const hsize_t *scaled, H5D_chunk_ud_t *udat } /* end else */ done: +#ifdef H5_HAVE_PARALLEL + /* Re-enable collective metadata reads if we disabled them */ + if (reenable_coll_md_reads) + H5CX_set_coll_metadata_read(TRUE); +#endif /* H5_HAVE_PARALLEL */ + FUNC_LEAVE_NOAPI(ret_value) } /* H5D__chunk_lookup() */ |