diff options
author | Dana Robinson <derobins@hdfgroup.org> | 2021-03-25 09:11:45 (GMT) |
---|---|---|
committer | Dana Robinson <derobins@hdfgroup.org> | 2021-03-25 09:11:45 (GMT) |
commit | df685806b2903a0190bb12732f022751754b33d6 (patch) | |
tree | b190d3e299431d5348862954c8d0ff3e60d07493 /src | |
parent | c0c978e62798a4336f3b368deba164b6d81fdcfd (diff) | |
download | hdf5-df685806b2903a0190bb12732f022751754b33d6.zip hdf5-df685806b2903a0190bb12732f022751754b33d6.tar.gz hdf5-df685806b2903a0190bb12732f022751754b33d6.tar.bz2 |
Fixes phdf5
Diffstat (limited to 'src')
-rw-r--r-- | src/H5ACmpio.c | 5 | ||||
-rw-r--r-- | src/H5C.c | 43 | ||||
-rw-r--r-- | src/H5CX.c | 2 | ||||
-rw-r--r-- | src/H5Dchunk.c | 2 |
4 files changed, 12 insertions, 40 deletions
diff --git a/src/H5ACmpio.c b/src/H5ACmpio.c index a18b658..1ae6cc4 100644 --- a/src/H5ACmpio.c +++ b/src/H5ACmpio.c @@ -15,7 +15,7 @@ * * Created: H5ACmpio.c * Jun 20 2015 - * Quincey Koziol <koziol@hdfgroup.org> + * Quincey Koziol * * Purpose: Functions in this file implement support for parallel * I/O cache functionality @@ -482,7 +482,8 @@ done: *------------------------------------------------------------------------- */ static herr_t -H5AC__construct_candidate_list(H5AC_t *cache_ptr, H5AC_aux_t H5_ATTR_SANITY_CHECK *aux_ptr, int sync_point_op) +H5AC__construct_candidate_list(H5AC_t *cache_ptr, H5AC_aux_t H5_ATTR_NDEBUG_UNUSED *aux_ptr, + int sync_point_op) { herr_t ret_value = SUCCEED; /* Return value */ @@ -1792,7 +1792,6 @@ H5C_insert_entry(H5F_t *f, const H5C_class_t *type, haddr_t addr, void *thing, u */ if (H5C__make_space_in_cache(f, space_needed, write_permitted) < 0) - HGOTO_ERROR(H5E_CACHE, H5E_CANTINS, FAIL, "H5C__make_space_in_cache failed") } /* end if */ @@ -1821,45 +1820,18 @@ H5C_insert_entry(H5F_t *f, const H5C_class_t *type, haddr_t addr, void *thing, u H5C__UPDATE_STATS_FOR_INSERTION(cache_ptr, entry_ptr) #ifdef H5_HAVE_PARALLEL - if (H5F_HAS_FEATURE(f, H5FD_FEAT_HAS_MPI)) { - - coll_access = (H5P_USER_TRUE == f->coll_md_read ? TRUE : FALSE); - - /* If not explicitly disabled, get the cmdr setting from the - * API context - */ - if (!coll_access && H5P_FORCE_FALSE != f->coll_md_read) { - - coll_access = H5CX_get_coll_metadata_read(); - } - } /* end if */ + if (H5F_HAS_FEATURE(f, H5FD_FEAT_HAS_MPI)) + coll_access = H5CX_get_coll_metadata_read(); entry_ptr->coll_access = coll_access; - if (coll_access) { H5C__INSERT_IN_COLL_LIST(cache_ptr, entry_ptr, FAIL) - /* Make sure the size of the collective entries in the cache - * remain in check - */ - if (H5P_USER_TRUE == f->coll_md_read) { - - if (cache_ptr->max_cache_size * 80 < cache_ptr->coll_list_size * 100) { - - if (H5C_clear_coll_entries(cache_ptr, TRUE) < 0) - - HGOTO_ERROR(H5E_CACHE, H5E_CANTFLUSH, FAIL, "can't clear collective metadata entries") - } /* end if */ - } /* end if */ - else { - if (cache_ptr->max_cache_size * 40 < cache_ptr->coll_list_size * 100) { - - if (H5C_clear_coll_entries(cache_ptr, TRUE) < 0) - - HGOTO_ERROR(H5E_CACHE, H5E_CANTFLUSH, FAIL, "can't clear collective metadata entries") - } /* end if */ - } /* end else */ - } /* end if */ + /* Make sure the size of the collective entries in the cache remain in check */ + if (cache_ptr->max_cache_size * 80 < cache_ptr->coll_list_size * 100) + if (H5C_clear_coll_entries(cache_ptr, TRUE) < 0) + HGOTO_ERROR(H5E_CACHE, H5E_CANTFLUSH, FAIL, "can't clear collective metadata entries") + } /* end if */ #endif done: @@ -1874,7 +1846,6 @@ done: HDONE_ERROR(H5E_CACHE, H5E_CANTREMOVE, FAIL, "can't remove entry from tag list") FUNC_LEAVE_NOAPI(ret_value) - } /* H5C_insert_entry() */ /*------------------------------------------------------------------------- @@ -11,7 +11,7 @@ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /* - * Programmer: Quincey Koziol <koziol@lbl.gov> + * Programmer: Quincey Koziol * Monday, February 19, 2018 * * Purpose: diff --git a/src/H5Dchunk.c b/src/H5Dchunk.c index 362fe1e..5783a72 100644 --- a/src/H5Dchunk.c +++ b/src/H5Dchunk.c @@ -5694,7 +5694,7 @@ H5D__chunk_addrmap_cb(const H5D_chunk_rec_t *chunk_rec, void *_udata) /* Set it in the userdata to return */ udata->chunk_addr[chunk_index] = chunk_rec->chunk_addr; - FUNC_LEAVE_NOAPI(ret_value) + FUNC_LEAVE_NOAPI(H5_ITER_CONT) } /* H5D__chunk_addrmap_cb() */ /*------------------------------------------------------------------------- |