summaryrefslogtreecommitdiffstats
path: root/src/H5D.c
diff options
context:
space:
mode:
authorDana Robinson <derobins@hdfgroup.org>2016-06-24 22:19:09 (GMT)
committerDana Robinson <derobins@hdfgroup.org>2016-06-24 22:19:09 (GMT)
commit29cb102f121f79c2a678f036ff211a8bad91517f (patch)
treec72e468f88cc1139c395b2ddf0d87e01cabdc7ac /src/H5D.c
parent75aa26981b4becc6926f4100707d9614e84a041c (diff)
parentf410d5d842edfb8a3b4aea4cd72ff67cb0e5b1aa (diff)
downloadhdf5-29cb102f121f79c2a678f036ff211a8bad91517f.zip
hdf5-29cb102f121f79c2a678f036ff211a8bad91517f.tar.gz
hdf5-29cb102f121f79c2a678f036ff211a8bad91517f.tar.bz2
[svn-r30104] Fixes evict-on-close feature by propagating global
flush flag up the function call stack and not setting it during H5Dclose().
Diffstat (limited to 'src/H5D.c')
-rw-r--r--src/H5D.c10
1 files changed, 8 insertions, 2 deletions
diff --git a/src/H5D.c b/src/H5D.c
index 1ba3829..e389930 100644
--- a/src/H5D.c
+++ b/src/H5D.c
@@ -356,10 +356,16 @@ H5Dclose(hid_t dset_id)
/* Clean up metadata in the metadata cache if evicting on close */
if(evict && H5F_SHARED(file)) {
- if(H5F_flush_tagged_metadata(file, tag, H5AC_ind_read_dxpl_id) < 0)
+// printf("DUMPING CACHE - BEFORE FLUSH\n");
+// H5AC_dump_cache(file);
+ if(H5AC_flush_tagged_metadata(file, tag, H5AC_ind_read_dxpl_id) < 0)
HGOTO_ERROR(H5E_CACHE, H5E_CANTFLUSH, FAIL, "unable to flush tagged metadata")
- if(H5F_evict_tagged_metadata(file, tag, H5AC_ind_read_dxpl_id) < 0)
+// printf("DUMPING CACHE - BETWEEN FLUSH AND EVICT\n");
+// H5AC_dump_cache(file);
+ if(H5AC_evict_tagged_metadata(file, tag, FALSE, H5AC_ind_read_dxpl_id) < 0)
HGOTO_ERROR(H5E_CACHE, H5E_CANTFLUSH, FAIL, "unable to evict tagged metadata")
+// printf("DUMPING CACHE - AFTER EVICT\n");
+// H5AC_dump_cache(file);
} /* end if */
done: