mirror/hdf5
2
0
Fork 0
mirror of https://github.com/HDFGroup/hdf5.git synced 2024-12-09 07:32:32 +08:00
Code Issues Packages Projects Releases Wiki Activity

[svn-r30105] Datatypes and Groups now support evict-on-close.

Browse Source
This commit is contained in:
Dana Robinson 2016-06-25 08:30:11 -05:00
parent 29cb102f12
commit f9312d49d5
2 changed files with 59 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/H5G.c
View File

@ -715,15 +715,29 @@ done:
herr_t
H5Gclose(hid_t group_id)
{
herr_t ret_value = SUCCEED; /* Return value */
H5G_t *grp = NULL; /* Group */
H5F_t *file = NULL; /* File */
hbool_t evict = FALSE; /* Evict metadata on close? */
haddr_t tag = HADDR_UNDEF; /* Metadata tag for evictions */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_API(FAIL)
H5TRACE1("e", "i", group_id);
/* Check args */
if(NULL == H5I_object_verify(group_id,H5I_GROUP))
if(NULL == (grp = (H5G_t *)H5I_object_verify(group_id,H5I_GROUP)))
HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a group")
/* Check if this is the last object reference and we'll be evicting
* on close. We need to cache this info since it will be gone after the
* decrement call frees the struct.
*/
file = grp->oloc.file;
if(1 == grp->shared->fo_count && H5F_EVICT_ON_CLOSE(file)) {
evict = TRUE;
tag = grp->oloc.addr;
} /* end if */
/*
* Decrement the counter on the group atom. It will be freed if the count
* reaches zero.
@ -731,6 +745,20 @@ H5Gclose(hid_t group_id)
if(H5I_dec_app_ref(group_id) < 0)
HGOTO_ERROR(H5E_SYM, H5E_CANTRELEASE, FAIL, "unable to close group")
/* Clean up metadata in the metadata cache if evicting on close */
if(evict && H5F_SHARED(file)) {
// 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")
// 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:
FUNC_LEAVE_API(ret_value)
} /* end H5Gclose() */

31
src/H5T.c
View File

@ -1712,8 +1712,11 @@ done:
herr_t
H5Tclose(hid_t type_id)
{
H5T_t *dt; /* Pointer to datatype to close */
herr_t ret_value = SUCCEED; /* Return value */
H5T_t *dt; /* Pointer to datatype to close */
H5F_t *file = NULL; /* File */
hbool_t evict = FALSE; /* Evict metadata on close? */
haddr_t tag = HADDR_UNDEF; /* Metadata tag for evictions */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_API(FAIL)
H5TRACE1("e", "i", type_id);
@ -1724,10 +1727,34 @@ H5Tclose(hid_t type_id)
if(H5T_STATE_IMMUTABLE == dt->shared->state)
HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "immutable datatype")
/* Check if this is the last object reference and we'll be evicting
* on close. We need to cache this info since it will be gone after the
* decrement call frees the struct.
*/
file = dt->oloc.file;
if(file && 1 == dt->shared->fo_count && H5F_EVICT_ON_CLOSE(file)) {
evict = TRUE;
tag = dt->oloc.addr;
} /* end if */
/* When the reference count reaches zero the resources are freed */
if(H5I_dec_app_ref(type_id) < 0)
HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, FAIL, "problem freeing id")
/* Clean up metadata in the metadata cache if evicting on close */
if(evict && H5F_SHARED(file)) {
// 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")
// 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:
FUNC_LEAVE_API(ret_value)
} /* end H5Tclose() */