diff options
author | Mike McGreevy <mamcgree@hdfgroup.org> | 2010-06-15 19:58:26 (GMT) |
---|---|---|
committer | Mike McGreevy <mamcgree@hdfgroup.org> | 2010-06-15 19:58:26 (GMT) |
commit | 9b4163af53d4d4c463a4a3b25c220ea9454f9651 (patch) | |
tree | cb9689131fdd3cdad9eeaba77d262a465557b1a1 /src/H5Aint.c | |
parent | ca7fc8e96a70b06b08e1db21040056ae17a51906 (diff) | |
download | hdf5-9b4163af53d4d4c463a4a3b25c220ea9454f9651.zip hdf5-9b4163af53d4d4c463a4a3b25c220ea9454f9651.tar.gz hdf5-9b4163af53d4d4c463a4a3b25c220ea9454f9651.tar.bz2 |
[svn-r19004] Purpose:
Commit metadata tagging framework.
Description:
This check-in contains a new framework whose goal is to apply
a tag value to each new entry in the metadata cache as it is created.
This tag value is such that it relates each piece of metadata to the
HDF5 object that it belongs to (dataset, group, et cetera).
This changeset includes the framework that applies the tags as
well as a suite of tests to verify correct tag application, though does
not yet make use of the tag values to flush/evict individual objects.
Please refer to the "flush/evict individual objects" RFC for further
discussion of these changes.
Tested:
jam, amani, linew (h5committest)
liberty, abe, blue print
Diffstat (limited to 'src/H5Aint.c')
-rw-r--r-- | src/H5Aint.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/H5Aint.c b/src/H5Aint.c index 81b5c60..ba30506 100644 --- a/src/H5Aint.c +++ b/src/H5Aint.c @@ -688,7 +688,7 @@ H5A_get_ainfo(H5F_t *f, hid_t dxpl_id, H5O_t *oh, H5O_ainfo_t *ainfo) H5B2_t *bt2_name = NULL; /* v2 B-tree handle for name index */ htri_t ret_value; /* Return value */ - FUNC_ENTER_NOAPI(H5A_get_ainfo, FAIL) + FUNC_ENTER_NOAPI_TAG(H5A_get_ainfo, dxpl_id, oh->cache_info.addr, FAIL) /* check arguments */ HDassert(f); @@ -727,7 +727,7 @@ done: if(bt2_name && H5B2_close(bt2_name, dxpl_id) < 0) HDONE_ERROR(H5E_ATTR, H5E_CLOSEERROR, FAIL, "can't close v2 B-tree for name index") - FUNC_LEAVE_NOAPI(ret_value) + FUNC_LEAVE_NOAPI_TAG(ret_value, FAIL) } /* end H5A_get_ainfo() */ @@ -1157,10 +1157,16 @@ H5A_dense_copy_file_cb(const H5A_t *attr_src, void *_udata) if(H5O_msg_reset_share(H5O_ATTR_ID, attr_dst) < 0) HGOTO_ERROR(H5E_OHDR, H5E_CANTINIT, FAIL, "unable to reset attribute sharing") + /* Set COPIED tag for destination object's metadata */ + H5_BEGIN_TAG(udata->dxpl_id, H5AC__COPIED_TAG, H5_ITER_ERROR); + /* Insert attribute into dense storage */ if(H5A_dense_insert(udata->file, udata->dxpl_id, udata->ainfo, attr_dst) < 0) HGOTO_ERROR(H5E_OHDR, H5E_CANTINSERT, H5_ITER_ERROR, "unable to add to dense storage") + /* Reset metadata tag */ + H5_END_TAG(H5_ITER_ERROR); + done: if(attr_dst) { (void)H5A_free(attr_dst); |