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/H5Fquery.c | |
| 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/H5Fquery.c')
| -rw-r--r-- | src/H5Fquery.c | 28 |
1 files changed, 27 insertions, 1 deletions
diff --git a/src/H5Fquery.c b/src/H5Fquery.c index 7fcd0f1..2ffe766 100644 --- a/src/H5Fquery.c +++ b/src/H5Fquery.c @@ -860,7 +860,8 @@ H5F_get_fc_degree(const H5F_t *f) /*------------------------------------------------------------------------- * Function: H5F_get_evict_on_close * - * Purpose: Retrieve the 'file close degree' for the file. + * Purpose: Checks if evict-on-close is desired for objects in the + * file. * * Return: Success: Flag indicating whether the evict-on-close * property was set for the file. @@ -885,6 +886,31 @@ H5F_get_evict_on_close(const H5F_t *f) /*------------------------------------------------------------------------- + * Function: H5F_get_closing + * + * Purpose: Checks if the file is in the process of being closed. + * + * Return: Success: Flag indicating whether the file is closing. + * Failure: (can't happen) + * + * Programmer: Dana Robinson + * Fall 2016 + * + *------------------------------------------------------------------------- + */ +hbool_t +H5F_get_closing(const H5F_t *f) +{ + /* Use FUNC_ENTER_NOAPI_NOINIT_NOERR here to avoid performance issues */ + FUNC_ENTER_NOAPI_NOINIT_NOERR + + HDassert(f); + + FUNC_LEAVE_NOAPI(f->closing) +} /* end H5F_get_closing() */ + + +/*------------------------------------------------------------------------- * Function: H5F_store_msg_crt_idx * * Purpose: Retrieve the 'store message creation index' flag for the file. |