diff options
| -rw-r--r-- | src/H5C.c | 6 | ||||
| -rw-r--r-- | testpar/t_cache.c | 24 |
2 files changed, 8 insertions, 22 deletions
@@ -966,6 +966,12 @@ H5C_expunge_entry(H5F_t *f, hid_t dxpl_id, const H5C_class_t *type, HGOTO_ERROR(H5E_CACHE, H5E_CANTEXPUNGE, FAIL, "Target entry is protected.") if(entry_ptr->is_pinned) HGOTO_ERROR(H5E_CACHE, H5E_CANTEXPUNGE, FAIL, "Target entry is pinned.") +#ifdef H5_HAVE_PARALLEL + if(entry_ptr->coll_access) { + entry_ptr->coll_access = FALSE; + H5C__REMOVE_FROM_COLL_LIST(cache_ptr, entry_ptr, FAIL) + } +#endif /* H5_HAVE_PARALLEL */ /* If we get this far, call H5C__flush_single_entry() with the * H5C__FLUSH_INVALIDATE_FLAG and the H5C__FLUSH_CLEAR_ONLY_FLAG. diff --git a/testpar/t_cache.c b/testpar/t_cache.c index 8072215..191cd87 100644 --- a/testpar/t_cache.c +++ b/testpar/t_cache.c @@ -7561,14 +7561,6 @@ main(int argc, char **argv) world_mpi_rank, FUNC); } } - if ( H5Pset_coll_metadata_read(fapl, 1) < 0 ) { - - nerrors++; - if ( verbose ) { - HDfprintf(stdout, "%d:%s: H5Pset_coll_metadata_read() failed 1.\n", - world_mpi_rank, FUNC); - } - } } setup_rand(); @@ -7599,18 +7591,6 @@ main(int argc, char **argv) smoke_check_2(H5AC_METADATA_WRITE_STRATEGY__PROCESS_0_ONLY); smoke_check_2(H5AC_METADATA_WRITE_STRATEGY__DISTRIBUTED); #endif - /* MSC - smoke check 3 and 4 do independent reads, so we disable - the collective metadata read property here */ - if ( world_mpi_rank != world_server_mpi_rank ) { - if ( H5Pset_coll_metadata_read(fapl, 0) < 0 ) { - - nerrors++; - if ( verbose ) { - HDfprintf(stdout, "%d:%s: H5Pset_coll_metadata_read() failed 1.\n", - world_mpi_rank, FUNC); - } - } - } #if 1 smoke_check_3(H5AC_METADATA_WRITE_STRATEGY__PROCESS_0_ONLY); smoke_check_3(H5AC_METADATA_WRITE_STRATEGY__DISTRIBUTED); @@ -7619,9 +7599,9 @@ main(int argc, char **argv) smoke_check_4(H5AC_METADATA_WRITE_STRATEGY__PROCESS_0_ONLY); smoke_check_4(H5AC_METADATA_WRITE_STRATEGY__DISTRIBUTED); #endif - /* re-enable the collective metadata read property */ + /* enable the collective metadata read property */ if ( world_mpi_rank != world_server_mpi_rank ) { - if ( H5Pset_coll_metadata_read(fapl, 0) < 0 ) { + if ( H5Pset_coll_metadata_read(fapl, 1) < 0 ) { nerrors++; if ( verbose ) { |