diff options
| author | Dana Robinson <derobins@hdfgroup.org> | 2016-11-21 18:28:48 (GMT) |
|---|---|---|
| committer | Dana Robinson <derobins@hdfgroup.org> | 2016-11-21 18:28:48 (GMT) |
| commit | a44d7b87546a7e1ecfdcfb845c4ef36ff57a8c3b (patch) | |
| tree | f316b7c04d92665563f95acbc6740a88ece1a4ee /src/H5Fprivate.h | |
| parent | cbd05409c5192901c11bf1a908941959eb960bb1 (diff) | |
| parent | 4e7b19f8260a7adb0e3b3df30e2d8289fccdcca6 (diff) | |
| download | hdf5-a44d7b87546a7e1ecfdcfb845c4ef36ff57a8c3b.zip hdf5-a44d7b87546a7e1ecfdcfb845c4ef36ff57a8c3b.tar.gz hdf5-a44d7b87546a7e1ecfdcfb845c4ef36ff57a8c3b.tar.bz2 | |
Merge pull request #166 in HDFFV/hdf5 from ~DEROBINS/hdf5_der:eoc_valgrind_bugfix to develop
Two minor evict-on-close changes:
* Fix for a valgrind-reported issue where invoking EoC behavior when the file is closing leads to garbage file data being passed to downstream calls. The solution is to ignore EoC when the file is closing anyway.
* Added brackets so an infinite loop that arises when evicting tagged entries (due to pinned entries preventing progress) raises an error instead.
* commit '4e7b19f8260a7adb0e3b3df30e2d8289fccdcca6':
Two minor cache changes:
Diffstat (limited to 'src/H5Fprivate.h')
| -rw-r--r-- | src/H5Fprivate.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/H5Fprivate.h b/src/H5Fprivate.h index 2aac18f..ee8a845 100644 --- a/src/H5Fprivate.h +++ b/src/H5Fprivate.h @@ -305,6 +305,7 @@ #define H5F_FCPL(F) ((F)->shared->fcpl_id) #define H5F_GET_FC_DEGREE(F) ((F)->shared->fc_degree) #define H5F_EVICT_ON_CLOSE(F) ((F)->shared->evict_on_close) +#define H5F_CLOSING(F) ((F)->closing) #define H5F_RDCC_NSLOTS(F) ((F)->shared->rdcc_nslots) #define H5F_RDCC_NBYTES(F) ((F)->shared->rdcc_nbytes) #define H5F_RDCC_W0(F) ((F)->shared->rdcc_w0) @@ -355,6 +356,7 @@ #define H5F_FCPL(F) (H5F_get_fcpl(F)) #define H5F_GET_FC_DEGREE(F) (H5F_get_fc_degree(F)) #define H5F_EVICT_ON_CLOSE(F) (H5F_get_evict_on_close(F)) +#define H5F_CLOSING(F) (H5F_get_closing(F)) #define H5F_RDCC_NSLOTS(F) (H5F_rdcc_nslots(F)) #define H5F_RDCC_NBYTES(F) (H5F_rdcc_nbytes(F)) #define H5F_RDCC_W0(F) (H5F_rdcc_w0(F)) @@ -684,6 +686,7 @@ H5_DLL herr_t H5F_set_sohm_nindexes(H5F_t *f, unsigned nindexes); H5_DLL hid_t H5F_get_fcpl(const H5F_t *f); H5_DLL H5F_close_degree_t H5F_get_fc_degree(const H5F_t *f); H5_DLL hbool_t H5F_get_evict_on_close(const H5F_t *f); +H5_DLL hbool_t H5F_get_closing(const H5F_t *f); H5_DLL size_t H5F_rdcc_nbytes(const H5F_t *f); H5_DLL size_t H5F_rdcc_nslots(const H5F_t *f); H5_DLL double H5F_rdcc_w0(const H5F_t *f); |