summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDana Robinson <derobins@hdfgroup.org>2016-11-21 22:45:46 (GMT)
committerDana Robinson <derobins@hdfgroup.org>2016-11-21 22:45:46 (GMT)
commit88b6f2e24cafcfaffe7d99ab6c5afc2290ce93b4 (patch)
tree8613f431264aeb8a81b6bb1a3218ed09e3c6dcb5
parent4e7b19f8260a7adb0e3b3df30e2d8289fccdcca6 (diff)
downloadhdf5-88b6f2e24cafcfaffe7d99ab6c5afc2290ce93b4.zip
hdf5-88b6f2e24cafcfaffe7d99ab6c5afc2290ce93b4.tar.gz
hdf5-88b6f2e24cafcfaffe7d99ab6c5afc2290ce93b4.tar.bz2
Added the H5F_CLOSING() check that makes valgrind happy in
the evict-on-close code in H5G_close() to H5D_close().
-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)