diff options
Diffstat (limited to 'src/H5FF.c')
-rw-r--r-- | src/H5FF.c | 159 |
1 files changed, 107 insertions, 52 deletions
@@ -343,7 +343,7 @@ done: */ hid_t H5Gcreate_ff(hid_t loc_id, const char *name, hid_t lcpl_id, hid_t gcpl_id, hid_t gapl_id, - uint64_t trans, hid_t eq_id) + hid_t trans_id, hid_t eq_id) { void *grp = NULL; /* dset token from VOL plugin */ void *obj = NULL; /* object token of loc_id */ @@ -353,6 +353,8 @@ H5Gcreate_ff(hid_t loc_id, const char *name, hid_t lcpl_id, hid_t gcpl_id, hid_t hid_t ret_value; /* Return value */ FUNC_ENTER_API(FAIL) + H5TRACE7("i", "i*siiiii", loc_id, name, lcpl_id, gcpl_id, gapl_id, trans_id, + eq_id); /* Check arguments */ if(!name || !*name) @@ -432,7 +434,7 @@ done: */ hid_t H5Gopen_ff(hid_t loc_id, const char *name, hid_t gapl_id, - uint64_t trans, hid_t eq_id) + hid_t rcxt_id, hid_t eq_id) { void *grp = NULL; /* dset token from VOL plugin */ void *obj = NULL; /* object token of loc_id */ @@ -441,6 +443,7 @@ H5Gopen_ff(hid_t loc_id, const char *name, hid_t gapl_id, hid_t ret_value; /* Return value */ FUNC_ENTER_API(FAIL) + H5TRACE5("i", "i*siii", loc_id, name, gapl_id, rcxt_id, eq_id); /* Check args */ if(!name || !*name) @@ -541,7 +544,7 @@ done: */ hid_t H5Dcreate_ff(hid_t loc_id, const char *name, hid_t type_id, hid_t space_id, - hid_t lcpl_id, hid_t dcpl_id, hid_t dapl_id, uint64_t trans, hid_t eq_id) + hid_t lcpl_id, hid_t dcpl_id, hid_t dapl_id, hid_t trans_id, hid_t eq_id) { void *dset = NULL; /* dset token from VOL plugin */ void *obj = NULL; /* object token of loc_id */ @@ -551,6 +554,8 @@ H5Dcreate_ff(hid_t loc_id, const char *name, hid_t type_id, hid_t space_id, hid_t ret_value; /* Return value */ FUNC_ENTER_API(FAIL) + H5TRACE9("i", "i*siiiiiii", loc_id, name, type_id, space_id, lcpl_id, dcpl_id, + dapl_id, trans_id, eq_id); if(!name || !*name) HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no name") @@ -633,7 +638,7 @@ done: *------------------------------------------------------------------------- */ hid_t -H5Dopen_ff(hid_t loc_id, const char *name, hid_t dapl_id, uint64_t trans, hid_t eq_id) +H5Dopen_ff(hid_t loc_id, const char *name, hid_t dapl_id, hid_t rcxt_id, hid_t eq_id) { void *dset = NULL; /* dset token from VOL plugin */ void *obj = NULL; /* object token of loc_id */ @@ -642,6 +647,7 @@ H5Dopen_ff(hid_t loc_id, const char *name, hid_t dapl_id, uint64_t trans, hid_t hid_t ret_value; /* Return value */ FUNC_ENTER_API(FAIL) + H5TRACE5("i", "i*siii", loc_id, name, dapl_id, rcxt_id, eq_id); /* Check args */ if(!name || !*name) @@ -699,13 +705,15 @@ done: herr_t H5Dwrite_ff(hid_t dset_id, hid_t mem_type_id, hid_t mem_space_id, hid_t file_space_id, hid_t dxpl_id, const void *buf, - uint64_t trans, hid_t eq_id) + hid_t trans_id, hid_t eq_id) { H5VL_t *vol_plugin; void *dset; herr_t ret_value; /* Return value */ FUNC_ENTER_API(FAIL) + H5TRACE8("e", "iiiii*xii", dset_id, mem_type_id, mem_space_id, file_space_id, + dxpl_id, buf, trans_id, eq_id); /* check arguments */ if(!dset_id) @@ -751,13 +759,15 @@ done: herr_t H5Dread_ff(hid_t dset_id, hid_t mem_type_id, hid_t mem_space_id, hid_t file_space_id, hid_t dxpl_id, void *buf/*out*/, - uint64_t trans, hid_t eq_id) + hid_t rcxt_id, hid_t eq_id) { H5VL_t *vol_plugin; void *dset; herr_t ret_value; /* Return value */ FUNC_ENTER_API(FAIL) + H5TRACE8("e", "iiiiixii", dset_id, mem_type_id, mem_space_id, file_space_id, + dxpl_id, buf, rcxt_id, eq_id); if(mem_space_id < 0 || file_space_id < 0) HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a data space") @@ -800,14 +810,14 @@ done: *------------------------------------------------------------------------- */ herr_t -H5Dset_extent_ff(hid_t dset_id, const hsize_t size[], uint64_t trans, hid_t eq_id) +H5Dset_extent_ff(hid_t dset_id, const hsize_t size[], hid_t trans_id, hid_t eq_id) { H5VL_t *vol_plugin; void *dset; herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE3("e", "i*hi", dset_id, size, eq_id); + H5TRACE4("e", "i*hii", dset_id, size, trans_id, eq_id); if(!size) HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no size specified") @@ -893,7 +903,7 @@ done: */ herr_t H5Tcommit_ff(hid_t loc_id, const char *name, hid_t type_id, hid_t lcpl_id, - hid_t tcpl_id, hid_t tapl_id, uint64_t trans, hid_t eq_id) + hid_t tcpl_id, hid_t tapl_id, hid_t trans_id, hid_t eq_id) { void *dt = NULL; H5T_t *type = NULL; @@ -903,6 +913,8 @@ H5Tcommit_ff(hid_t loc_id, const char *name, hid_t type_id, hid_t lcpl_id, herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) + H5TRACE8("e", "i*siiiiii", loc_id, name, type_id, lcpl_id, tcpl_id, tapl_id, + trans_id, eq_id); /* Check arguments */ if (H5Tcommitted(type_id)) @@ -978,7 +990,7 @@ done: *------------------------------------------------------------------------- */ hid_t -H5Topen_ff(hid_t loc_id, const char *name, hid_t tapl_id, uint64_t trans, hid_t eq_id) +H5Topen_ff(hid_t loc_id, const char *name, hid_t tapl_id, hid_t rcxt_id, hid_t eq_id) { void *vol_dt = NULL; /* datatype token from VOL plugin */ void *obj = NULL; /* object token of loc_id */ @@ -988,6 +1000,7 @@ H5Topen_ff(hid_t loc_id, const char *name, hid_t tapl_id, uint64_t trans, hid_t hid_t ret_value = FAIL; /* Return value */ FUNC_ENTER_API(FAIL) + H5TRACE5("i", "i*siii", loc_id, name, tapl_id, rcxt_id, eq_id); /* Check args */ if(!name || !*name) @@ -1085,7 +1098,7 @@ done: --------------------------------------------------------------------------*/ hid_t H5Acreate_ff(hid_t loc_id, const char *attr_name, hid_t type_id, hid_t space_id, - hid_t acpl_id, hid_t aapl_id, uint64_t trans, hid_t eq_id) + hid_t acpl_id, hid_t aapl_id, hid_t trans_id, hid_t eq_id) { void *attr = NULL; /* attr token from VOL plugin */ void *obj = NULL; /* object token of loc_id */ @@ -1095,6 +1108,8 @@ H5Acreate_ff(hid_t loc_id, const char *attr_name, hid_t type_id, hid_t space_id, hid_t ret_value; /* Return value */ FUNC_ENTER_API(FAIL) + H5TRACE8("i", "i*siiiiii", loc_id, attr_name, type_id, space_id, acpl_id, + aapl_id, trans_id, eq_id); /* check arguments */ if(H5I_ATTR == H5I_get_type(loc_id)) @@ -1154,7 +1169,7 @@ done: hid_t H5Acreate_by_name_ff(hid_t loc_id, const char *obj_name, const char *attr_name, hid_t type_id, hid_t space_id, hid_t acpl_id, hid_t aapl_id, - hid_t lapl_id, uint64_t trans, hid_t eq_id) + hid_t lapl_id, hid_t trans_id, hid_t eq_id) { void *attr = NULL; /* attr token from VOL plugin */ void *obj = NULL; /* object token of loc_id */ @@ -1164,6 +1179,8 @@ H5Acreate_by_name_ff(hid_t loc_id, const char *obj_name, const char *attr_name, hid_t ret_value; /* Return value */ FUNC_ENTER_API(FAIL) + H5TRACE10("i", "i*s*siiiiiii", loc_id, obj_name, attr_name, type_id, space_id, + acpl_id, aapl_id, lapl_id, trans_id, eq_id); /* check arguments */ if(H5I_ATTR == H5I_get_type(loc_id)) @@ -1227,7 +1244,7 @@ done: --------------------------------------------------------------------------*/ hid_t H5Aopen_ff(hid_t loc_id, const char *attr_name, hid_t aapl_id, - uint64_t trans, hid_t eq_id) + hid_t rcxt_id, hid_t eq_id) { void *attr = NULL; /* attr token from VOL plugin */ void *obj = NULL; /* object token of loc_id */ @@ -1236,6 +1253,7 @@ H5Aopen_ff(hid_t loc_id, const char *attr_name, hid_t aapl_id, hid_t ret_value; FUNC_ENTER_API(FAIL) + H5TRACE5("i", "i*siii", loc_id, attr_name, aapl_id, rcxt_id, eq_id); /* check arguments */ if(H5I_ATTR == H5I_get_type(loc_id)) @@ -1280,7 +1298,7 @@ done: --------------------------------------------------------------------------*/ hid_t H5Aopen_by_name_ff(hid_t loc_id, const char *obj_name, const char *attr_name, - hid_t aapl_id, hid_t lapl_id, uint64_t trans, hid_t eq_id) + hid_t aapl_id, hid_t lapl_id, hid_t rcxt_id, hid_t eq_id) { void *attr = NULL; /* attr token from VOL plugin */ void *obj = NULL; /* object token of loc_id */ @@ -1289,6 +1307,8 @@ H5Aopen_by_name_ff(hid_t loc_id, const char *obj_name, const char *attr_name, hid_t ret_value; FUNC_ENTER_API(FAIL) + H5TRACE7("i", "i*s*siiii", loc_id, obj_name, attr_name, aapl_id, lapl_id, + rcxt_id, eq_id); /* check arguments */ if(H5I_ATTR == H5I_get_type(loc_id)) @@ -1341,13 +1361,14 @@ done: Non-negative on success/Negative on failure --------------------------------------------------------------------------*/ herr_t -H5Awrite_ff(hid_t attr_id, hid_t dtype_id, const void *buf, uint64_t trans, hid_t eq_id) +H5Awrite_ff(hid_t attr_id, hid_t dtype_id, const void *buf, hid_t trans_id, hid_t eq_id) { H5VL_t *vol_plugin; void *attr; herr_t ret_value; /* Return value */ FUNC_ENTER_API(FAIL) + H5TRACE5("e", "ii*xii", attr_id, dtype_id, buf, trans_id, eq_id); /* check arguments */ if(NULL == buf) @@ -1378,13 +1399,14 @@ done: Non-negative on success/Negative on failure --------------------------------------------------------------------------*/ herr_t -H5Aread_ff(hid_t attr_id, hid_t dtype_id, void *buf, uint64_t trans, hid_t eq_id) +H5Aread_ff(hid_t attr_id, hid_t dtype_id, void *buf, hid_t rcxt_id, hid_t eq_id) { H5VL_t *vol_plugin; void *attr; herr_t ret_value; /* Return value */ FUNC_ENTER_API(FAIL) + H5TRACE5("e", "ii*xii", attr_id, dtype_id, buf, rcxt_id, eq_id); /* check arguments */ if(NULL == buf) @@ -1421,11 +1443,12 @@ done: */ herr_t H5Arename_ff(hid_t loc_id, const char *old_name, const char *new_name, - uint64_t trans, hid_t eq_id) + hid_t trans_id, hid_t eq_id) { herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) + H5TRACE5("e", "i*s*sii", loc_id, old_name, new_name, trans_id, eq_id); /* check arguments */ if(!old_name || !new_name) @@ -1474,11 +1497,13 @@ done: */ herr_t H5Arename_by_name_ff(hid_t loc_id, const char *obj_name, const char *old_attr_name, - const char *new_attr_name, hid_t lapl_id, uint64_t trans, hid_t eq_id) + const char *new_attr_name, hid_t lapl_id, hid_t trans_id, hid_t eq_id) { herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) + H5TRACE7("e", "i*s*s*siii", loc_id, obj_name, old_attr_name, new_attr_name, + lapl_id, trans_id, eq_id); /* check arguments */ if(H5I_ATTR == H5I_get_type(loc_id)) @@ -1533,7 +1558,7 @@ done: Non-negative on success/Negative on failure --------------------------------------------------------------------------*/ herr_t -H5Adelete_ff(hid_t loc_id, const char *name, uint64_t trans, hid_t eq_id) +H5Adelete_ff(hid_t loc_id, const char *name, hid_t trans_id, hid_t eq_id) { H5VL_t *vol_plugin; void *obj; @@ -1541,6 +1566,7 @@ H5Adelete_ff(hid_t loc_id, const char *name, uint64_t trans, hid_t eq_id) herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) + H5TRACE4("e", "i*sii", loc_id, name, trans_id, eq_id); /* check arguments */ if(H5I_ATTR == H5I_get_type(loc_id)) @@ -1579,7 +1605,7 @@ done: --------------------------------------------------------------------------*/ herr_t H5Adelete_by_name_ff(hid_t loc_id, const char *obj_name, const char *attr_name, - hid_t lapl_id, uint64_t trans, hid_t eq_id) + hid_t lapl_id, hid_t trans_id, hid_t eq_id) { H5VL_t *vol_plugin; void *obj; @@ -1587,6 +1613,7 @@ H5Adelete_by_name_ff(hid_t loc_id, const char *obj_name, const char *attr_name, herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) + H5TRACE6("e", "i*s*siii", loc_id, obj_name, attr_name, lapl_id, trans_id, eq_id); /* check arguments */ if(H5I_ATTR == H5I_get_type(loc_id)) @@ -1637,7 +1664,7 @@ done: *------------------------------------------------------------------------- */ herr_t -H5Aexists_ff(hid_t obj_id, const char *attr_name, htri_t *ret, uint64_t trans, hid_t eq_id) +H5Aexists_ff(hid_t obj_id, const char *attr_name, htri_t *ret, hid_t rcxt_id, hid_t eq_id) { H5VL_t *vol_plugin; void *obj; @@ -1645,6 +1672,7 @@ H5Aexists_ff(hid_t obj_id, const char *attr_name, htri_t *ret, uint64_t trans, h herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) + H5TRACE5("e", "i*s*tii", obj_id, attr_name, ret, rcxt_id, eq_id); /* check arguments */ if(H5I_ATTR == H5I_get_type(obj_id)) @@ -1687,7 +1715,7 @@ done: */ herr_t H5Aexists_by_name_ff(hid_t loc_id, const char *obj_name, const char *attr_name, - hid_t lapl_id, htri_t *ret, uint64_t trans, hid_t eq_id) + hid_t lapl_id, htri_t *ret, hid_t rcxt_id, hid_t eq_id) { H5VL_t *vol_plugin; void *obj; @@ -1695,6 +1723,8 @@ H5Aexists_by_name_ff(hid_t loc_id, const char *obj_name, const char *attr_name, herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) + H5TRACE7("e", "i*s*si*tii", loc_id, obj_name, attr_name, lapl_id, ret, rcxt_id, + eq_id); /* check arguments */ if(H5I_ATTR == H5I_get_type(loc_id)) @@ -1791,7 +1821,7 @@ done: */ herr_t H5Lmove_ff(hid_t src_loc_id, const char *src_name, hid_t dst_loc_id, - const char *dst_name, hid_t lcpl_id, hid_t lapl_id, uint64_t trans, hid_t eq_id) + const char *dst_name, hid_t lcpl_id, hid_t lapl_id, hid_t trans_id, hid_t eq_id) { void *obj1 = NULL; /* object token of src_id */ H5VL_t *vol_plugin1; /* VOL plugin information */ @@ -1802,6 +1832,8 @@ H5Lmove_ff(hid_t src_loc_id, const char *src_name, hid_t dst_loc_id, herr_t ret_value=SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) + H5TRACE8("e", "i*si*siiii", src_loc_id, src_name, dst_loc_id, dst_name, + lcpl_id, lapl_id, trans_id, eq_id); /* Check arguments */ if(src_loc_id == H5L_SAME_LOC && dst_loc_id == H5L_SAME_LOC) @@ -1880,7 +1912,7 @@ done: */ herr_t H5Lcopy_ff(hid_t src_loc_id, const char *src_name, hid_t dst_loc_id, - const char *dst_name, hid_t lcpl_id, hid_t lapl_id, uint64_t trans, hid_t eq_id) + const char *dst_name, hid_t lcpl_id, hid_t lapl_id, hid_t trans_id, hid_t eq_id) { void *obj1 = NULL; /* object token of src_id */ H5VL_t *vol_plugin1; /* VOL plugin information */ @@ -1891,6 +1923,8 @@ H5Lcopy_ff(hid_t src_loc_id, const char *src_name, hid_t dst_loc_id, herr_t ret_value=SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) + H5TRACE8("e", "i*si*siiii", src_loc_id, src_name, dst_loc_id, dst_name, + lcpl_id, lapl_id, trans_id, eq_id); /* Check arguments */ if(src_loc_id == H5L_SAME_LOC && dst_loc_id == H5L_SAME_LOC) @@ -1972,7 +2006,7 @@ done: */ herr_t H5Lcreate_soft_ff(const char *link_target, hid_t link_loc_id, const char *link_name, - hid_t lcpl_id, hid_t lapl_id, uint64_t trans, hid_t eq_id) + hid_t lcpl_id, hid_t lapl_id, hid_t trans_id, hid_t eq_id) { void *obj = NULL; /* object token of loc_id */ H5VL_t *vol_plugin; /* VOL plugin information */ @@ -1981,6 +2015,8 @@ H5Lcreate_soft_ff(const char *link_target, hid_t link_loc_id, const char *link_n herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) + H5TRACE7("e", "*si*siiii", link_target, link_loc_id, link_name, lcpl_id, + lapl_id, trans_id, eq_id); /* Check arguments */ if(link_loc_id == H5L_SAME_LOC) @@ -2048,7 +2084,7 @@ done: herr_t H5Lcreate_hard_ff(hid_t cur_loc_id, const char *cur_name, hid_t new_loc_id, const char *new_name, hid_t lcpl_id, hid_t lapl_id, - uint64_t trans, hid_t eq_id) + hid_t trans_id, hid_t eq_id) { void *obj1 = NULL; /* object token of loc_id */ void *obj2 = NULL; /* object token of loc_id */ @@ -2060,6 +2096,8 @@ H5Lcreate_hard_ff(hid_t cur_loc_id, const char *cur_name, hid_t new_loc_id, herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) + H5TRACE8("e", "i*si*siiii", cur_loc_id, cur_name, new_loc_id, new_name, + lcpl_id, lapl_id, trans_id, eq_id); /* Check arguments */ if(cur_loc_id == H5L_SAME_LOC && new_loc_id == H5L_SAME_LOC) @@ -2149,7 +2187,7 @@ done: *------------------------------------------------------------------------- */ herr_t -H5Ldelete_ff(hid_t loc_id, const char *name, hid_t lapl_id, uint64_t trans, hid_t eq_id) +H5Ldelete_ff(hid_t loc_id, const char *name, hid_t lapl_id, hid_t trans_id, hid_t eq_id) { void *obj = NULL; /* object token of loc_id */ H5VL_t *vol_plugin; /* VOL plugin information */ @@ -2157,6 +2195,7 @@ H5Ldelete_ff(hid_t loc_id, const char *name, hid_t lapl_id, uint64_t trans, hid_ herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) + H5TRACE5("e", "i*siii", loc_id, name, lapl_id, trans_id, eq_id); /* Check arguments */ if(!name || !*name) @@ -2199,7 +2238,7 @@ done: */ herr_t H5Lexists_ff(hid_t loc_id, const char *name, hid_t lapl_id, htri_t *ret, - uint64_t trans, hid_t eq_id) + hid_t rcxt_id, hid_t eq_id) { void *obj = NULL; /* object token of loc_id */ H5VL_t *vol_plugin; /* VOL plugin information */ @@ -2207,6 +2246,7 @@ H5Lexists_ff(hid_t loc_id, const char *name, hid_t lapl_id, htri_t *ret, herr_t ret_value = SUCCEED; FUNC_ENTER_API(FAIL) + H5TRACE6("e", "i*si*tii", loc_id, name, lapl_id, ret, rcxt_id, eq_id); /* Check arguments */ if(!name || !*name) @@ -2254,7 +2294,7 @@ done: */ herr_t H5Lget_info_ff(hid_t loc_id, const char *name, H5L_ff_info_t *linfo /*out*/, - hid_t lapl_id, uint64_t trans, hid_t eq_id) + hid_t lapl_id, hid_t rcxt_id, hid_t eq_id) { void *obj = NULL; /* object token of loc_id */ H5VL_t *vol_plugin; /* VOL plugin information */ @@ -2262,7 +2302,7 @@ H5Lget_info_ff(hid_t loc_id, const char *name, H5L_ff_info_t *linfo /*out*/, herr_t ret_value = SUCCEED; FUNC_ENTER_API(FAIL) - H5TRACE4("e", "i*sxi", loc_id, name, linfo, lapl_id); + H5TRACE6("e", "i*sxiii", loc_id, name, linfo, lapl_id, rcxt_id, eq_id); if(!name || !*name) HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no name specified") @@ -2315,7 +2355,7 @@ done: */ herr_t H5Lget_val_ff(hid_t loc_id, const char *name, void *buf/*out*/, size_t size, - hid_t lapl_id, uint64_t trans, hid_t eq_id) + hid_t lapl_id, hid_t rcxt_id, hid_t eq_id) { void *obj = NULL; /* object token of loc_id */ H5VL_t *vol_plugin; /* VOL plugin information */ @@ -2323,7 +2363,7 @@ H5Lget_val_ff(hid_t loc_id, const char *name, void *buf/*out*/, size_t size, herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE5("e", "i*sxzi", loc_id, name, buf, size, lapl_id); + H5TRACE7("e", "i*sxziii", loc_id, name, buf, size, lapl_id, rcxt_id, eq_id); /* Check arguments */ if(!name || !*name) @@ -2380,7 +2420,7 @@ done: *------------------------------------------------------------------------- */ hid_t -H5Oopen_ff(hid_t loc_id, const char *name, hid_t lapl_id, uint64_t trans, hid_t eq_id) +H5Oopen_ff(hid_t loc_id, const char *name, hid_t lapl_id, hid_t rcxt_id, hid_t eq_id) { void *obj = NULL; /* object token of loc_id */ H5VL_t *vol_plugin; /* VOL plugin information */ @@ -2390,6 +2430,7 @@ H5Oopen_ff(hid_t loc_id, const char *name, hid_t lapl_id, uint64_t trans, hid_t hid_t ret_value = FAIL; FUNC_ENTER_API(FAIL) + H5TRACE5("i", "i*siii", loc_id, name, lapl_id, rcxt_id, eq_id); if(!name || !*name) HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no name") @@ -2439,7 +2480,7 @@ done: */ hid_t H5Oopen_by_addr_ff(hid_t loc_id, haddr_ff_t addr, H5O_type_t type, - uint64_t trans, hid_t eq_id) + hid_t rcxt_id, hid_t eq_id) { void *obj = NULL; /* object token of loc_id */ H5VL_t *vol_plugin; /* VOL plugin information */ @@ -2506,7 +2547,7 @@ done: */ herr_t H5Olink_ff(hid_t obj_id, hid_t new_loc_id, const char *new_name, hid_t lcpl_id, - hid_t lapl_id, uint64_t trans, hid_t eq_id) + hid_t lapl_id, hid_t trans_id, hid_t eq_id) { void *obj1 = NULL; /* object token of loc_id */ void *obj2 = NULL; /* object token of loc_id */ @@ -2518,6 +2559,8 @@ H5Olink_ff(hid_t obj_id, hid_t new_loc_id, const char *new_name, hid_t lcpl_id, herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) + H5TRACE7("e", "ii*siiii", obj_id, new_loc_id, new_name, lcpl_id, lapl_id, + trans_id, eq_id); /* Check arguments */ if(new_loc_id == H5L_SAME_LOC) @@ -2602,7 +2645,7 @@ done: */ herr_t H5Oexists_by_name_ff(hid_t loc_id, const char *name, htri_t *ret, hid_t lapl_id, - uint64_t trans, hid_t eq_id) + hid_t rcxt_id, hid_t eq_id) { void *obj = NULL; /* object token of loc_id */ H5VL_t *vol_plugin; /* VOL plugin information */ @@ -2610,6 +2653,7 @@ H5Oexists_by_name_ff(hid_t loc_id, const char *name, htri_t *ret, hid_t lapl_id, herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) + H5TRACE6("e", "i*s*tiii", loc_id, name, ret, lapl_id, rcxt_id, eq_id); /* Check args */ if(!name || !*name) @@ -2660,7 +2704,7 @@ done: *------------------------------------------------------------------------- */ herr_t -H5Oset_comment_ff(hid_t obj_id, const char *comment, uint64_t trans, hid_t eq_id) +H5Oset_comment_ff(hid_t obj_id, const char *comment, hid_t trans_id, hid_t eq_id) { void *obj = NULL; /* object token of loc_id */ H5VL_t *vol_plugin; /* VOL plugin information */ @@ -2668,6 +2712,7 @@ H5Oset_comment_ff(hid_t obj_id, const char *comment, uint64_t trans, hid_t eq_id herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) + H5TRACE4("e", "i*sii", obj_id, comment, trans_id, eq_id); loc_params.type = H5VL_OBJECT_BY_SELF; loc_params.obj_type = H5I_get_type(obj_id); @@ -2708,7 +2753,7 @@ done: */ herr_t H5Oset_comment_by_name_ff(hid_t loc_id, const char *name, const char *comment, - hid_t lapl_id, uint64_t trans, hid_t eq_id) + hid_t lapl_id, hid_t trans_id, hid_t eq_id) { void *obj = NULL; /* object token of loc_id */ H5VL_t *vol_plugin; /* VOL plugin information */ @@ -2716,6 +2761,7 @@ H5Oset_comment_by_name_ff(hid_t loc_id, const char *name, const char *comment, herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) + H5TRACE6("e", "i*s*siii", loc_id, name, comment, lapl_id, trans_id, eq_id); /* Check args */ if(!name || !*name) @@ -2762,7 +2808,7 @@ done: */ herr_t H5Oget_comment_ff(hid_t loc_id, char *comment, size_t bufsize, ssize_t *ret, - uint64_t trans, hid_t eq_id) + hid_t rcxt_id, hid_t eq_id) { void *obj = NULL; /* object token of loc_id */ H5VL_t *vol_plugin; /* VOL plugin information */ @@ -2770,6 +2816,7 @@ H5Oget_comment_ff(hid_t loc_id, char *comment, size_t bufsize, ssize_t *ret, herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) + H5TRACE6("e", "i*sz*Zsii", loc_id, comment, bufsize, ret, rcxt_id, eq_id); loc_params.type = H5VL_OBJECT_BY_SELF; loc_params.obj_type = H5I_get_type(loc_id); @@ -2804,7 +2851,7 @@ done: */ herr_t H5Oget_comment_by_name_ff(hid_t loc_id, const char *name, char *comment, size_t bufsize, - ssize_t *ret, hid_t lapl_id, uint64_t trans, hid_t eq_id) + ssize_t *ret, hid_t lapl_id, hid_t rcxt_id, hid_t eq_id) { void *obj = NULL; /* object token of loc_id */ H5VL_t *vol_plugin; /* VOL plugin information */ @@ -2812,6 +2859,8 @@ H5Oget_comment_by_name_ff(hid_t loc_id, const char *name, char *comment, size_t herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) + H5TRACE8("e", "i*s*sz*Zsiii", loc_id, name, comment, bufsize, ret, lapl_id, + rcxt_id, eq_id); /* Check args */ if(!name || !*name) @@ -2862,7 +2911,7 @@ done: herr_t H5Ocopy_ff(hid_t src_loc_id, const char *src_name, hid_t dst_loc_id, const char *dst_name, hid_t ocpypl_id, hid_t lcpl_id, - uint64_t trans, hid_t eq_id) + hid_t trans_id, hid_t eq_id) { void *obj1 = NULL; /* object token of src_id */ H5VL_t *vol_plugin1; /* VOL plugin information */ @@ -2873,6 +2922,8 @@ H5Ocopy_ff(hid_t src_loc_id, const char *src_name, hid_t dst_loc_id, herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) + H5TRACE8("e", "i*si*siiii", src_loc_id, src_name, dst_loc_id, dst_name, + ocpypl_id, lcpl_id, trans_id, eq_id); /* Get correct property lists */ if(H5P_DEFAULT == lcpl_id) @@ -2930,7 +2981,7 @@ done: *------------------------------------------------------------------------- */ herr_t -H5Oget_info_ff(hid_t loc_id, H5O_ff_info_t *oinfo, uint64_t trans, hid_t eq_id) +H5Oget_info_ff(hid_t loc_id, H5O_ff_info_t *oinfo, hid_t rcxt_id, hid_t eq_id) { void *obj = NULL; /* object token of loc_id */ H5VL_t *vol_plugin; /* VOL plugin information */ @@ -2979,7 +3030,7 @@ done: */ herr_t H5Oget_info_by_name_ff(hid_t loc_id, const char *name, H5O_ff_info_t *oinfo, - hid_t lapl_id, uint64_t trans, hid_t eq_id) + hid_t lapl_id, hid_t rcxt_id, hid_t eq_id) { void *obj = NULL; /* object token of loc_id */ H5VL_t *vol_plugin; /* VOL plugin information */ @@ -3078,6 +3129,8 @@ H5Oclose_ff(hid_t object_id, hid_t eq_id) case H5I_VFL: case H5I_VOL: case H5I_EQ: + case H5I_RC: + case H5I_TR: case H5I_GENPROP_CLS: case H5I_GENPROP_LST: case H5I_ERROR_CLASS: @@ -3370,7 +3423,7 @@ done: herr_t H5DOappend_ff(hid_t dset_id, hid_t dxpl_id, unsigned axis, size_t extension, - hid_t memtype, const void *buf, uint64_t trans, hid_t eq_id) + hid_t memtype, const void *buf, hid_t trans_id, hid_t eq_id) { hsize_t size[H5S_MAX_RANK]; hsize_t start[H5S_MAX_RANK]; @@ -3421,7 +3474,7 @@ herr_t H5DOappend_ff(hid_t dset_id, hid_t dxpl_id, unsigned axis, size_t extensi HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "extend size is smaller than current size of axis"); /* set the extent of the dataset to the new dimension */ - if(H5Dset_extent_ff(dset_id, size, trans, eq_id) < 0) + if(H5Dset_extent_ff(dset_id, size, trans_id, eq_id) < 0) HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "unable to set extent of dataset"); /* get the new dataspace of the dataset */ @@ -3448,7 +3501,7 @@ herr_t H5DOappend_ff(hid_t dset_id, hid_t dxpl_id, unsigned axis, size_t extensi mem_space_id = H5Screate_simple(1, &nelmts, NULL); /* Write the data */ - if(H5Dwrite_ff(dset_id, memtype, mem_space_id, new_space_id, dxpl_id, buf, trans, eq_id) < 0) + if(H5Dwrite_ff(dset_id, memtype, mem_space_id, new_space_id, dxpl_id, buf, trans_id, eq_id) < 0) HGOTO_ERROR(H5E_DATASET, H5E_WRITEERROR, FAIL, "can't write data") done: @@ -3469,7 +3522,7 @@ done: herr_t H5DOsequence_ff(hid_t dset_id, hid_t dxpl_id, unsigned axis, hsize_t start_off, - size_t sequence, hid_t memtype, void *buf, uint64_t trans, hid_t eq_id) + size_t sequence, hid_t memtype, void *buf, hid_t rcxt_id, hid_t eq_id) { hsize_t size[H5S_MAX_RANK]; hsize_t start[H5S_MAX_RANK]; @@ -3483,6 +3536,8 @@ H5DOsequence_ff(hid_t dset_id, hid_t dxpl_id, unsigned axis, hsize_t start_off, herr_t ret_value = SUCCEED; FUNC_ENTER_API(FAIL) + H5TRACE9("e", "iiIuhzi*xii", dset_id, dxpl_id, axis, start_off, sequence, + memtype, buf, rcxt_id, eq_id); /* check arguments */ if(!dset_id) @@ -3530,7 +3585,7 @@ H5DOsequence_ff(hid_t dset_id, hid_t dxpl_id, unsigned axis, hsize_t start_off, mem_space_id = H5Screate_simple(1, &nelmts, NULL); /* Read the data */ - if(H5Dread_ff(dset_id, memtype, mem_space_id, space_id, dxpl_id, buf, trans, eq_id) < 0) + if(H5Dread_ff(dset_id, memtype, mem_space_id, space_id, dxpl_id, buf, rcxt_id, eq_id) < 0) HGOTO_ERROR(H5E_DATASET, H5E_WRITEERROR, FAIL, "can't write data") done: @@ -3546,7 +3601,7 @@ done: }/* end H5DOsequence_ff */ herr_t H5DOset_ff(hid_t dset_id, hid_t dxpl_id, const hsize_t coord[], - hid_t memtype, const void *buf, uint64_t trans, hid_t eq_id) + hid_t memtype, const void *buf, hid_t trans_id, hid_t eq_id) { hid_t space_id = FAIL; /* old File space */ hid_t mem_space_id = FAIL; /* memory space for data buffer */ @@ -3577,7 +3632,7 @@ herr_t H5DOset_ff(hid_t dset_id, hid_t dxpl_id, const hsize_t coord[], mem_space_id = H5Screate_simple(1, &nelmts, NULL); /* Write the data */ - if(H5Dwrite_ff(dset_id, memtype, mem_space_id, space_id, dxpl_id, buf, trans, eq_id) < 0) + if(H5Dwrite_ff(dset_id, memtype, mem_space_id, space_id, dxpl_id, buf, trans_id, eq_id) < 0) HGOTO_ERROR(H5E_DATASET, H5E_WRITEERROR, FAIL, "can't write data") done: @@ -3593,7 +3648,7 @@ done: }/* end H5DOset_ff */ herr_t H5DOget_ff(hid_t dset_id, hid_t dxpl_id, const hsize_t coord[], - hid_t memtype, void *buf, uint64_t trans, hid_t eq_id) + hid_t memtype, void *buf, hid_t rcxt_id, hid_t eq_id) { hid_t space_id = FAIL; /* old File space */ hid_t mem_space_id = FAIL; /* memory space for data buffer */ @@ -3624,7 +3679,7 @@ herr_t H5DOget_ff(hid_t dset_id, hid_t dxpl_id, const hsize_t coord[], mem_space_id = H5Screate_simple(1, &nelmts, NULL); /* Write the data */ - if(H5Dread_ff(dset_id, memtype, mem_space_id, space_id, dxpl_id, buf, trans, eq_id) < 0) + if(H5Dread_ff(dset_id, memtype, mem_space_id, space_id, dxpl_id, buf, rcxt_id, eq_id) < 0) HGOTO_ERROR(H5E_DATASET, H5E_WRITEERROR, FAIL, "can't write data") done: |