Add API context interface and use it throughout the library.

1 files changed, 57 insertions, 5 deletions

diff --git a/src/H5I.c b/src/H5I.c
index 99f944d..915c13c 100644
--- a/src/H5I.c
+++ b/src/H5I.c
@@ -30,8 +30,9 @@
 
 #include "H5private.h"          /* Generic Functions                        */
 #include "H5ACprivate.h"        /* Metadata cache                           */
-#include "H5Eprivate.h"		    /* Error handling                           */
-#include "H5FLprivate.h"	    /* Free Lists                               */
+#include "H5CXprivate.h"        /* API Contexts                             */
+#include "H5Eprivate.h"		/* Error handling                           */
+#include "H5FLprivate.h"	/* Free Lists                               */
 #include "H5Ipkg.h"             /* IDs                                      */
 #include "H5MMprivate.h"        /* Memory management                        */
 #include "H5Oprivate.h"         /* Object headers                           */
@@ -126,6 +127,7 @@ static void *H5I__remove_common(H5I_id_type_t *type_ptr, hid_t id);
 static int H5I__inc_type_ref(H5I_type_t type);
 static int H5I__get_type_ref(H5I_type_t type);
 static H5I_id_info_t *H5I__find_id(hid_t id);
+static ssize_t H5I__get_name(const H5G_loc_t *loc, char *name, size_t size);
 #ifdef H5I_DEBUG_OUTPUT
 static herr_t H5I__debug(H5I_type_t type);
 #endif /* H5I_DEBUG_OUTPUT */
@@ -1199,6 +1201,7 @@ done:
 int
 H5Idec_ref(hid_t id)
 {
+hbool_t     api_ctx_pushed = FALSE;             /* Whether API context pushed */
     int ret_value = 0;          /* Return value */
 
     FUNC_ENTER_API(FAIL)
@@ -1207,12 +1210,18 @@ H5Idec_ref(hid_t id)
     /* Check arguments */
     if(id < 0)
         HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, FAIL, "invalid ID")
+/* Set API context */
+if(H5CX_push() < 0)
+    HGOTO_ERROR(H5E_FILE, H5E_CANTSET, FAIL, "can't set API context")
+api_ctx_pushed = TRUE;
 
     /* Do actual decrement operation */
     if((ret_value = H5I_dec_app_ref(id)) < 0)
         HGOTO_ERROR(H5E_ATOM, H5E_CANTDEC, FAIL, "can't decrement ID ref count")
 
 done:
+if(api_ctx_pushed && H5CX_pop() < 0)
+    HDONE_ERROR(H5E_FILE, H5E_CANTRESET, FAIL, "can't reset API context")
     FUNC_LEAVE_API(ret_value)
 } /* end H5Idec_ref() */
 
@@ -2016,25 +2025,68 @@ ssize_t
 H5Iget_name(hid_t id, char *name/*out*/, size_t size)
 {
     H5G_loc_t     loc;          /* Object location */
+hbool_t     api_ctx_pushed = FALSE;             /* Whether API context pushed */
     ssize_t       ret_value;    /* Return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE3("Zs", "ixz", id, name, size);
 
     /* Get object location */
-    if (H5G_loc(id, &loc) < 0)
+    if(H5G_loc(id, &loc) < 0)
         HGOTO_ERROR(H5E_ATOM, H5E_CANTGET, FAIL, "can't retrieve object location")
 
-    /* Call internal group routine to retrieve object's name */
-    if ((ret_value = H5G_get_name(&loc, name, size, NULL, H5P_DEFAULT, H5AC_ind_read_dxpl_id)) < 0)
+/* Set API context */
+if(H5CX_push() < 0)
+    HGOTO_ERROR(H5E_ATOM, H5E_CANTSET, FAIL, "can't set API context")
+api_ctx_pushed = TRUE;
+
+    /* Call internal routine to retrieve object's name */
+    if((ret_value = H5I__get_name(&loc, name, size)) < 0)
         HGOTO_ERROR(H5E_ATOM, H5E_CANTGET, FAIL, "can't retrieve object name")
 
 done:
+if(api_ctx_pushed && H5CX_pop() < 0)
+    HDONE_ERROR(H5E_SYM, H5E_CANTRESET, FAIL, "can't reset API context")
     FUNC_LEAVE_API(ret_value)
 } /* end H5Iget_name() */
 
 
 /*-------------------------------------------------------------------------
+ * Function:    H5I__get_name
+ *
+ * Purpose:     Internal routine to retrieve the name for an object
+ *
+ * Note:        This routine is needed so that there's a non-API routine
+ *              that can set up VOL / SWMR info (which need a DXPL).
+ *
+ * Return:      Success:    The length of the name
+ *              Failure:    -1
+ *
+ * Programmer:	Quincey Koziol
+ *		January 9, 2018
+ *
+ *-------------------------------------------------------------------------
+ */
+static ssize_t
+H5I__get_name(const H5G_loc_t *loc, char *name, size_t size)
+{
+    ssize_t ret_value = FAIL;   /* Return value */
+
+    FUNC_ENTER_STATIC_VOL
+
+    /* Check arguments */
+    HDassert(loc);
+
+    /* Retrieve object's name */
+    if((ret_value = H5G_get_name(loc, name, size, NULL)) < 0)
+        HGOTO_ERROR(H5E_ATOM, H5E_CANTGET, FAIL, "can't retrieve object name")
+
+done:
+    FUNC_LEAVE_NOAPI_VOL(ret_value)
+} /* end H5I__get_name() */
+
+
+/*-------------------------------------------------------------------------
  * Function:    H5Iget_file_id
  *
  * Purpose:     The public version of H5I_get_file_id(), obtains the file