diff options
| author | Dana Robinson <derobins@hdfgroup.org> | 2017-04-20 20:33:09 (GMT) |
|---|---|---|
| committer | Dana Robinson <derobins@hdfgroup.org> | 2017-04-20 20:33:09 (GMT) |
| commit | 5fefc12bd84843c295096330d5884dc0a1e043b0 (patch) | |
| tree | 27aa293f46eefbad7c00a0f7738075cdbc401068 /src | |
| parent | 05628b46873fa594ee769af0196728970c705082 (diff) | |
| parent | 5ed622b9ca432f1b440e8903680695ac83e28301 (diff) | |
| download | hdf5-5fefc12bd84843c295096330d5884dc0a1e043b0.zip hdf5-5fefc12bd84843c295096330d5884dc0a1e043b0.tar.gz hdf5-5fefc12bd84843c295096330d5884dc0a1e043b0.tar.bz2 | |
Merge pull request #443 in HDFFV/hdf5 from ~DEROBINS/hdf5_der:eoc_parallel_prevent to develop
* commit '5ed622b9ca432f1b440e8903680695ac83e28301':
The cache_image test shows a skipped message about EoC in parallel.
Added code to disable the evict-on-close feature in the parallel library.
Diffstat (limited to 'src')
| -rw-r--r-- | src/H5Pfapl.c | 20 |
1 files changed, 18 insertions, 2 deletions
diff --git a/src/H5Pfapl.c b/src/H5Pfapl.c index 7865fdf..e47a4b0 100644 --- a/src/H5Pfapl.c +++ b/src/H5Pfapl.c @@ -4381,7 +4381,19 @@ H5P_facc_mdc_log_location_close(const char H5_ATTR_UNUSED *name, size_t H5_ATTR_ *------------------------------------------------------------------------- */ herr_t -H5Pset_evict_on_close(hid_t fapl_id, hbool_t evict_on_close) +H5Pset_evict_on_close( +#if defined(H5_HAVE_PARALLEL) && !defined(H5_DEBUG_BUILD) + hid_t H5_ATTR_UNUSED fapl_id, +#else + hid_t fapl_id, +#endif /* H5_HAVE_PARALLEL and !H5_DEBUG_BUILD */ + +#ifdef H5_HAVE_PARALLEL + hbool_t H5_ATTR_UNUSED evict_on_close +#else + hbool_t evict_on_close +#endif /* H5_HAVE_PARALLEL */ +) { H5P_genplist_t *plist; /* property list pointer */ herr_t ret_value = SUCCEED; /* return value */ @@ -4397,9 +4409,13 @@ H5Pset_evict_on_close(hid_t fapl_id, hbool_t evict_on_close) if(NULL == (plist = (H5P_genplist_t *)H5I_object(fapl_id))) HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, FAIL, "can't find object for ID") - /* Set values */ +#ifndef H5_HAVE_PARALLEL + /* Set value */ if(H5P_set(plist, H5F_ACS_EVICT_ON_CLOSE_FLAG_NAME, &evict_on_close) < 0) HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "can't set evict on close property") +#else + HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "evict on close is currently not supported in parallel HDF5") +#endif /* H5_HAVE_PARALLEL */ done: FUNC_LEAVE_API(ret_value) |