summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorDana Robinson <derobins@hdfgroup.org>2016-09-30 09:04:11 (GMT)
committerDana Robinson <derobins@hdfgroup.org>2016-09-30 09:04:11 (GMT)
commit5088217e4256aa2ba5b7590b7de91aeae415a1ce (patch)
tree968748ffb7501310c4678b00a6b9d5700900eeee /src
parent77e7c43bf02f2e8f8ec834da7aca0c3e9599c5c0 (diff)
downloadhdf5-5088217e4256aa2ba5b7590b7de91aeae415a1ce.zip
hdf5-5088217e4256aa2ba5b7590b7de91aeae415a1ce.tar.gz
hdf5-5088217e4256aa2ba5b7590b7de91aeae415a1ce.tar.bz2
- Removed non-implemented code from H5Gint.c
- Removed commented-out debug code from H5Dint.c - Added blank lines to eliminate delta in a fortran file.
Diffstat (limited to 'src')
-rw-r--r--src/H5Dint.c8
-rw-r--r--src/H5Gint.c19
2 files changed, 0 insertions, 27 deletions
diff --git a/src/H5Dint.c b/src/H5Dint.c
index 5ae3bd3..7f90f16 100644
--- a/src/H5Dint.c
+++ b/src/H5Dint.c
@@ -1920,17 +1920,10 @@ H5D_close(H5D_t *dataset)
/* Evict dataset metadata if evicting on close */
if(H5F_SHARED(dataset->oloc.file) && H5F_EVICT_ON_CLOSE(dataset->oloc.file)) {
-// printf("EVICTING DATASET (TAG: 0x%3llx)\n", dataset->oloc.addr);
-// printf("DUMPING CACHE - BEFORE FLUSH\n");
-// H5AC_dump_cache(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")
-// printf("DUMPING CACHE - BETWEEN FLUSH AND EVICT\n");
-// H5AC_dump_cache(dataset->oloc.file);
if(H5AC_evict_tagged_metadata(dataset->oloc.file, dataset->oloc.addr, 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(dataset->oloc.file);
} /* end if */
/*
@@ -2672,7 +2665,6 @@ H5D__vlen_get_buf_size(void H5_ATTR_UNUSED *elem, hid_t type_id, unsigned H5_ATT
/* Read in the point (with the custom VL memory allocator) */
if(H5D__read(vlen_bufsize->dset, type_id, vlen_bufsize->mspace, vlen_bufsize->fspace, vlen_bufsize->xfer_pid, vlen_bufsize->fl_tbuf) < 0)
- HGOTO_ERROR(H5E_DATASET, H5E_READERROR, FAIL, "can't read point")
done:
FUNC_LEAVE_NOAPI(ret_value)
diff --git a/src/H5Gint.c b/src/H5Gint.c
index 4b34015..a0e06f3 100644
--- a/src/H5Gint.c
+++ b/src/H5Gint.c
@@ -501,25 +501,6 @@ H5G_close(H5G_t *grp)
if(H5O_close(&(grp->oloc)) < 0)
HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "unable to close")
-#ifdef DER
- /* XXX - NOT IMPLEMENTED */
- /* Evict group metadata if evicting on close */
- if(H5F_SHARED(grp->oloc.file) && H5F_EVICT_ON_CLOSE(grp->oloc.file)) {
- /* I've left in the cache dump code for now - DER */
- printf("EVICTING GROUP (TAG: 0x%3llx)\n", grp->oloc.addr);
- printf("DUMPING CACHE - BEFORE FLUSH\n");
- H5AC_dump_cache(grp->oloc.file);
- if(H5AC_flush_tagged_metadata(grp->oloc.file, grp->oloc.addr, H5AC_ind_read_dxpl_id) < 0)
- HGOTO_ERROR(H5E_CACHE, H5E_CANTFLUSH, FAIL, "unable to flush tagged metadata")
- printf("DUMPING CACHE - BETWEEN FLUSH AND EVICT\n");
- H5AC_dump_cache(grp->oloc.file);
- if(H5AC_evict_tagged_metadata(grp->oloc.file, grp->oloc.addr, 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(grp->oloc.file);
- } /* end if */
-#endif /* DER */
-
/* Free memory */
grp->shared = H5FL_FREE(H5G_shared_t, grp->shared);
} else {