Merge pull request #1217 from jrmainzer/selection_io_with_subfiling_vfd

Selection io with subfiling vfd

1 files changed, 91 insertions, 32 deletions

diff --git a/src/H5Tcommit.c b/src/H5Tcommit.c
index d214ca1..d079e71 100644
--- a/src/H5Tcommit.c
+++ b/src/H5Tcommit.c
@@ -218,7 +218,7 @@ H5Tcommit_async(const char *app_file, const char *app_func, unsigned app_line, h
     if (NULL != token)
         /* clang-format off */
         if (H5ES_insert(es_id, vol_obj->connector, token,
-                        H5ARG_TRACE10(FUNC, "*s*sIui*siiiii", app_file, app_func, app_line, loc_id, name, type_id, lcpl_id, tcpl_id, tapl_id, es_id)) < 0)
+                        H5ARG_TRACE10(__func__, "*s*sIui*siiiii", app_file, app_func, app_line, loc_id, name, type_id, lcpl_id, tcpl_id, tapl_id, es_id)) < 0)
             /* clang-format on */
             HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINSERT, FAIL, "can't insert token into event set")
 
@@ -726,7 +726,7 @@ H5Topen_async(const char *app_file, const char *app_func, unsigned app_line, hid
     if (NULL != token)
         /* clang-format off */
         if (H5ES_insert(es_id, vol_obj->connector, token,
-                        H5ARG_TRACE7(FUNC, "*s*sIui*sii", app_file, app_func, app_line, loc_id, name, tapl_id, es_id)) < 0) {
+                        H5ARG_TRACE7(__func__, "*s*sIui*sii", app_file, app_func, app_line, loc_id, name, tapl_id, es_id)) < 0) {
             /* clang-format on */
             if (H5I_dec_app_ref_always_close(ret_value) < 0)
                 HGOTO_ERROR(H5E_DATATYPE, H5E_CANTDEC, H5I_INVALID_HID,
@@ -790,12 +790,19 @@ H5Tget_create_plist(hid_t dtype_id)
     } /* end if */
     /* If the datatype is committed, retrieve further information */
     else {
-        H5VL_object_t *vol_obj = type->vol_obj;
+        H5VL_object_t *          vol_obj = type->vol_obj;
+        H5VL_datatype_get_args_t vol_cb_args; /* Arguments to VOL callback */
+
+        /* Set up VOL callback arguments */
+        vol_cb_args.op_type               = H5VL_DATATYPE_GET_TCPL;
+        vol_cb_args.args.get_tcpl.tcpl_id = H5I_INVALID_HID;
 
         /* Get the property list through the VOL */
-        if (H5VL_datatype_get(vol_obj, H5VL_DATATYPE_GET_TCPL, H5P_DATASET_XFER_DEFAULT, H5_REQUEST_NULL,
-                              &ret_value) < 0)
+        if (H5VL_datatype_get(vol_obj, &vol_cb_args, H5P_DATASET_XFER_DEFAULT, H5_REQUEST_NULL) < 0)
             HGOTO_ERROR(H5E_DATATYPE, H5E_CANTGET, H5I_INVALID_HID, "can't get object creation info")
+
+        /* Set return value */
+        ret_value = vol_cb_args.args.get_tcpl.tcpl_id;
     } /* end else */
 
 done:
@@ -829,15 +836,21 @@ H5Tflush(hid_t type_id)
     if (!H5T_is_named(dt))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a committed datatype")
 
-    /* Set up collective metadata if appropriate */
-    if (H5CX_set_loc(type_id) < 0)
-        HGOTO_ERROR(H5E_DATATYPE, H5E_CANTSET, FAIL, "can't set access property list info")
-
     /* Flush metadata for named datatype */
-    if (dt->vol_obj)
-        if (H5VL_datatype_specific(dt->vol_obj, H5VL_DATATYPE_FLUSH, H5P_DATASET_XFER_DEFAULT,
-                                   H5_REQUEST_NULL, type_id) < 0)
+    if (dt->vol_obj) {
+        H5VL_datatype_specific_args_t vol_cb_args; /* Arguments to VOL callback */
+
+        /* Set up collective metadata if appropriate */
+        if (H5CX_set_loc(type_id) < 0)
+            HGOTO_ERROR(H5E_DATATYPE, H5E_CANTSET, FAIL, "can't set access property list info")
+
+        /* Set up VOL callback arguments */
+        vol_cb_args.op_type            = H5VL_DATATYPE_FLUSH;
+        vol_cb_args.args.flush.type_id = type_id;
+
+        if (H5VL_datatype_specific(dt->vol_obj, &vol_cb_args, H5P_DATASET_XFER_DEFAULT, H5_REQUEST_NULL) < 0)
             HGOTO_ERROR(H5E_DATATYPE, H5E_CANTFLUSH, FAIL, "unable to flush datatype")
+    }
 
 done:
     FUNC_LEAVE_API(ret_value)
@@ -870,15 +883,21 @@ H5Trefresh(hid_t type_id)
     if (!H5T_is_named(dt))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a committed datatype")
 
-    /* Set up collective metadata if appropriate */
-    if (H5CX_set_loc(type_id) < 0)
-        HGOTO_ERROR(H5E_DATATYPE, H5E_CANTSET, FAIL, "can't set access property list info")
-
     /* Refresh the datatype's metadata */
-    if (dt->vol_obj)
-        if (H5VL_datatype_specific(dt->vol_obj, H5VL_DATATYPE_REFRESH, H5P_DATASET_XFER_DEFAULT,
-                                   H5_REQUEST_NULL, type_id) < 0)
+    if (dt->vol_obj) {
+        H5VL_datatype_specific_args_t vol_cb_args; /* Arguments to VOL callback */
+
+        /* Set up collective metadata if appropriate */
+        if (H5CX_set_loc(type_id) < 0)
+            HGOTO_ERROR(H5E_DATATYPE, H5E_CANTSET, FAIL, "can't set access property list info")
+
+        /* Set up VOL callback arguments */
+        vol_cb_args.op_type              = H5VL_DATATYPE_REFRESH;
+        vol_cb_args.args.refresh.type_id = type_id;
+
+        if (H5VL_datatype_specific(dt->vol_obj, &vol_cb_args, H5P_DATASET_XFER_DEFAULT, H5_REQUEST_NULL) < 0)
             HGOTO_ERROR(H5E_DATATYPE, H5E_CANTLOAD, FAIL, "unable to refresh datatype")
+    }
 
 done:
     FUNC_LEAVE_API(ret_value)
@@ -1222,32 +1241,41 @@ H5T_update_shared(H5T_t *dt)
 H5T_t *
 H5T_construct_datatype(H5VL_object_t *vol_obj)
 {
-    ssize_t nalloc;
-    void *  buf       = NULL;
-    H5T_t * dt        = NULL; /* datatype object from VOL connector */
-    H5T_t * ret_value = NULL;
+    H5T_t *                  dt = NULL;        /* Datatype object from VOL connector */
+    H5VL_datatype_get_args_t vol_cb_args;      /* Arguments to VOL callback */
+    size_t                   nalloc    = 0;    /* Size required to store serialized form of datatype */
+    void *                   buf       = NULL; /* Buffer to store serialized datatype */
+    H5T_t *                  ret_value = NULL;
 
     FUNC_ENTER_NOAPI(NULL)
 
-    /* get required buf size for encoding the datatype */
-    if (H5VL_datatype_get(vol_obj, H5VL_DATATYPE_GET_BINARY, H5P_DATASET_XFER_DEFAULT, H5_REQUEST_NULL,
-                          &nalloc, NULL, 0) < 0)
+    /* Set up VOL callback arguments */
+    vol_cb_args.op_type                   = H5VL_DATATYPE_GET_BINARY_SIZE;
+    vol_cb_args.args.get_binary_size.size = &nalloc;
+
+    /* Get required buf size for encoding the datatype */
+    if (H5VL_datatype_get(vol_obj, &vol_cb_args, H5P_DATASET_XFER_DEFAULT, H5_REQUEST_NULL) < 0)
         HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, NULL, "unable to get datatype serialized size")
 
-    /* allocate buffer to store binary description of the datatype */
-    if (NULL == (buf = (void *)H5MM_calloc((size_t)nalloc)))
+    /* Allocate buffer to store binary description of the datatype */
+    if (NULL == (buf = (void *)H5MM_calloc(nalloc)))
         HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "can't allocate space for datatype")
 
+    /* Set up VOL callback arguments */
+    vol_cb_args.op_type                  = H5VL_DATATYPE_GET_BINARY;
+    vol_cb_args.args.get_binary.buf      = buf;
+    vol_cb_args.args.get_binary.buf_size = nalloc;
+
     /* get binary description of the datatype */
-    if (H5VL_datatype_get(vol_obj, H5VL_DATATYPE_GET_BINARY, H5P_DATASET_XFER_DEFAULT, H5_REQUEST_NULL,
-                          &nalloc, buf, (size_t)nalloc) < 0)
+    if (H5VL_datatype_get(vol_obj, &vol_cb_args, H5P_DATASET_XFER_DEFAULT, H5_REQUEST_NULL) < 0)
         HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, NULL, "unable to get serialized datatype")
 
-    if (NULL == (dt = H5T_decode((size_t)nalloc, (const unsigned char *)buf)))
+    /* Construct datatype, from serialized form in buffer */
+    if (NULL == (dt = H5T_decode(nalloc, buf)))
         HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, NULL, "can't decode datatype")
-
     dt->vol_obj = vol_obj;
 
+    /* Set return value */
     ret_value = dt;
 
 done:
@@ -1407,3 +1435,34 @@ H5T_already_vol_managed(const H5T_t *dt)
 
     FUNC_LEAVE_NOAPI(dt->vol_obj != NULL)
 } /* end H5T_already_vol_managed() */
+
+/*-------------------------------------------------------------------------
+ * Function:    H5T_invoke_vol_optional
+ *
+ * Purpose:     Invokes an optional VOL connector-specific operation on a named datatype
+ *
+ * Return:      Success:    Non-negative
+ *              Failure:    Negative
+ *
+ *-------------------------------------------------------------------------
+ */
+herr_t
+H5T_invoke_vol_optional(H5T_t *dt, H5VL_optional_args_t *args, hid_t dxpl_id, void **req,
+                        H5VL_object_t **vol_obj_ptr)
+{
+    herr_t ret_value = SUCCEED; /* Return value */
+
+    FUNC_ENTER_NOAPI(FAIL)
+
+    /* Check that datatype is committed */
+    if (!H5T_is_named(dt))
+        HGOTO_ERROR(H5E_DATATYPE, H5E_BADTYPE, FAIL, "not a committed datatype")
+
+    /* Only invoke callback if VOL object is set for the datatype */
+    if (dt->vol_obj)
+        if (H5VL_datatype_optional_op(dt->vol_obj, args, dxpl_id, req, vol_obj_ptr) < 0)
+            HGOTO_ERROR(H5E_DATATYPE, H5E_CANTOPERATE, FAIL, "unable to execute datatype optional callback")
+
+done:
+    FUNC_LEAVE_NOAPI(ret_value)
+} /* end H5T_invoke_vol_optional() */