diff options
Diffstat (limited to 'src/H5Atest.c')
| -rw-r--r-- | src/H5Atest.c | 29 |
1 files changed, 19 insertions, 10 deletions
diff --git a/src/H5Atest.c b/src/H5Atest.c index b923637..31fbe8e 100644 --- a/src/H5Atest.c +++ b/src/H5Atest.c @@ -36,6 +36,7 @@ #include "H5private.h" /* Generic Functions */ #include "H5Apkg.h" /* Attributes */ #include "H5ACprivate.h" /* Metadata cache */ +#include "H5CXprivate.h" /* API Contexts */ #include "H5Eprivate.h" /* Error handling */ #include "H5Iprivate.h" /* IDs */ #include "H5SMprivate.h" /* Shared object header messages */ @@ -77,7 +78,7 @@ /*------------------------------------------------------------------------- - * Function: H5A_is_shared_test + * Function: H5A__is_shared_test * * Purpose: Check if an attribute is shared * @@ -90,12 +91,12 @@ *------------------------------------------------------------------------- */ htri_t -H5A_is_shared_test(hid_t attr_id) +H5A__is_shared_test(hid_t attr_id) { H5A_t *attr; /* Attribute object for ID */ htri_t ret_value = FAIL; /* Return value */ - FUNC_ENTER_NOAPI_NOINIT + FUNC_ENTER_PACKAGE /* Check arguments */ if(NULL == (attr = (H5A_t *)H5I_object_verify(attr_id, H5I_ATTR))) @@ -106,11 +107,11 @@ H5A_is_shared_test(hid_t attr_id) done: FUNC_LEAVE_NOAPI(ret_value) -} /* end H5A_is_shared_test() */ +} /* end H5A__is_shared_test() */ /*------------------------------------------------------------------------- - * Function: H5A_get_shared_rc_test + * Function: H5A__get_shared_rc_test * * Purpose: Retrieve the refcount for a shared attribute * @@ -123,26 +124,34 @@ done: *------------------------------------------------------------------------- */ herr_t -H5A_get_shared_rc_test(hid_t attr_id, hsize_t *ref_count) +H5A__get_shared_rc_test(hid_t attr_id, hsize_t *ref_count) { H5A_t *attr; /* Attribute object for ID */ + hbool_t api_ctx_pushed = FALSE; /* Whether API context pushed */ herr_t ret_value = SUCCEED; /* Return value */ - FUNC_ENTER_NOAPI_NOINIT + FUNC_ENTER_PACKAGE /* Check arguments */ if(NULL == (attr = (H5A_t *)H5I_object_verify(attr_id, H5I_ATTR))) HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not an attribute") + /* Push API context */ + if(H5CX_push() < 0) + HGOTO_ERROR(H5E_ATTR, H5E_CANTSET, FAIL, "can't set API context") + api_ctx_pushed = TRUE; + /* Sanity check */ HDassert(H5O_msg_is_shared(H5O_ATTR_ID, attr)); /* Retrieve ref count for shared or shareable attribute */ - if(H5SM_get_refcount(attr->oloc.file, H5AC_ind_read_dxpl_id, H5O_ATTR_ID, - &attr->sh_loc, ref_count) < 0) + if(H5SM_get_refcount(attr->oloc.file, H5O_ATTR_ID, &attr->sh_loc, ref_count) < 0) HGOTO_ERROR(H5E_ATTR, H5E_CANTGET, FAIL, "can't retrieve shared message ref count") done: + if(api_ctx_pushed && H5CX_pop() < 0) + HDONE_ERROR(H5E_ATTR, H5E_CANTRESET, FAIL, "can't reset API context") + FUNC_LEAVE_NOAPI(ret_value) -} /* end H5A_get_shared_rc_test() */ +} /* end H5A__get_shared_rc_test() */ |