summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorDana Robinson <derobins@hdfgroup.org>2016-11-22 14:54:47 (GMT)
committerDana Robinson <derobins@hdfgroup.org>2016-11-22 14:54:47 (GMT)
commitfff898558e3c828070abe81b4147bd959ed37ccb (patch)
treece7c2c0d2521159df9413205649797cabfb0d4b0 /src
parenta44d7b87546a7e1ecfdcfb845c4ef36ff57a8c3b (diff)
parent88b6f2e24cafcfaffe7d99ab6c5afc2290ce93b4 (diff)
downloadhdf5-fff898558e3c828070abe81b4147bd959ed37ccb.zip
hdf5-fff898558e3c828070abe81b4147bd959ed37ccb.tar.gz
hdf5-fff898558e3c828070abe81b4147bd959ed37ccb.tar.bz2
Merge pull request #167 in HDFFV/hdf5 from ~DEROBINS/hdf5_der:eoc_valgrind_bugfix to develop
Applied the evict-on-close "check for file closing" change that was successful for groups to datasets. * commit '88b6f2e24cafcfaffe7d99ab6c5afc2290ce93b4': Added the H5F_CLOSING() check that makes valgrind happy in the evict-on-close code in H5G_close() to H5D_close().
Diffstat (limited to 'src')
-rw-r--r--src/H5Dint.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/H5Dint.c b/src/H5Dint.c
index 59fe3e9..1f34c81 100644
--- a/src/H5Dint.c
+++ b/src/H5Dint.c
@@ -1919,7 +1919,7 @@ H5D_close(H5D_t *dataset)
HGOTO_ERROR(H5E_DATASET, H5E_CLOSEERROR, FAIL, "unable to release object header")
/* Evict dataset metadata if evicting on close */
- if(H5F_SHARED(dataset->oloc.file) && H5F_EVICT_ON_CLOSE(dataset->oloc.file)) {
+ if(!H5F_CLOSING(dataset->oloc.file) && H5F_SHARED(dataset->oloc.file) && H5F_EVICT_ON_CLOSE(dataset->oloc.file)) {
if(H5AC_flush_tagged_metadata(dataset->oloc.file, dataset->oloc.addr, H5AC_ind_read_dxpl_id) < 0)
HGOTO_ERROR(H5E_CACHE, H5E_CANTFLUSH, FAIL, "unable to flush tagged metadata")
if(H5AC_evict_tagged_metadata(dataset->oloc.file, dataset->oloc.addr, FALSE, H5AC_ind_read_dxpl_id) < 0)