VFD SWMR: Normalization with develop (#1078)

Brings many changes from develop, particularly VOL changes for async

1 files changed, 96 insertions, 50 deletions

diff --git a/src/H5Ldeprec.c b/src/H5Ldeprec.c
index df4c384..01e77f9 100644
--- a/src/H5Ldeprec.c
+++ b/src/H5Ldeprec.c
@@ -141,12 +141,13 @@ herr_t
 H5Literate1(hid_t group_id, H5_index_t idx_type, H5_iter_order_t order, hsize_t *idx_p, H5L_iterate1_t op,
             void *op_data)
 {
-    H5VL_object_t *   vol_obj = NULL; /* Object of loc_id */
-    H5VL_loc_params_t loc_params;
-    H5I_type_t        id_type; /* Type of ID */
-    H5L_shim_data_t   shim_data;
-    hbool_t           is_native_vol_obj;
-    herr_t            ret_value; /* Return value */
+    H5VL_object_t *           vol_obj = NULL; /* Object of loc_id */
+    H5VL_link_specific_args_t vol_cb_args;    /* Arguments to VOL callback */
+    H5VL_loc_params_t         loc_params;
+    H5I_type_t                id_type; /* Type of ID */
+    H5L_shim_data_t           shim_data;
+    hbool_t                   is_native_vol_obj;
+    herr_t                    ret_value; /* Return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE6("e", "iIiIo*hLi*x", group_id, idx_type, order, idx_p, op, op_data);
@@ -181,10 +182,18 @@ H5Literate1(hid_t group_id, H5_index_t idx_type, H5_iter_order_t order, hsize_t
     shim_data.real_op      = op;
     shim_data.real_op_data = op_data;
 
+    /* Set up VOL callback arguments */
+    vol_cb_args.op_type                = H5VL_LINK_ITER;
+    vol_cb_args.args.iterate.recursive = FALSE;
+    vol_cb_args.args.iterate.idx_type  = idx_type;
+    vol_cb_args.args.iterate.order     = order;
+    vol_cb_args.args.iterate.idx_p     = idx_p;
+    vol_cb_args.args.iterate.op        = H5L__iterate2_shim;
+    vol_cb_args.args.iterate.op_data   = &shim_data;
+
     /* Iterate over the links */
-    if ((ret_value = H5VL_link_specific(vol_obj, &loc_params, H5VL_LINK_ITER, H5P_DATASET_XFER_DEFAULT,
-                                        H5_REQUEST_NULL, (unsigned)FALSE, (int)idx_type, (int)order, idx_p,
-                                        H5L__iterate2_shim, (void *)&shim_data)) < 0)
+    if ((ret_value = H5VL_link_specific(vol_obj, &loc_params, &vol_cb_args, H5P_DATASET_XFER_DEFAULT,
+                                        H5_REQUEST_NULL)) < 0)
         HGOTO_ERROR(H5E_LINK, H5E_BADITER, FAIL, "link iteration failed")
 
 done:
@@ -219,11 +228,12 @@ herr_t
 H5Literate_by_name1(hid_t loc_id, const char *group_name, H5_index_t idx_type, H5_iter_order_t order,
                     hsize_t *idx_p, H5L_iterate1_t op, void *op_data, hid_t lapl_id)
 {
-    H5VL_object_t *   vol_obj = NULL; /* Object of loc_id */
-    H5VL_loc_params_t loc_params;
-    H5L_shim_data_t   shim_data;
-    hbool_t           is_native_vol_obj;
-    herr_t            ret_value; /* Return value */
+    H5VL_object_t *           vol_obj = NULL; /* Object of loc_id */
+    H5VL_link_specific_args_t vol_cb_args;    /* Arguments to VOL callback */
+    H5VL_loc_params_t         loc_params;
+    H5L_shim_data_t           shim_data;
+    hbool_t                   is_native_vol_obj;
+    herr_t                    ret_value; /* Return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE8("e", "i*sIiIo*hLi*xi", loc_id, group_name, idx_type, order, idx_p, op, op_data, lapl_id);
@@ -265,10 +275,18 @@ H5Literate_by_name1(hid_t loc_id, const char *group_name, H5_index_t idx_type, H
     shim_data.real_op      = op;
     shim_data.real_op_data = op_data;
 
+    /* Set up VOL callback arguments */
+    vol_cb_args.op_type                = H5VL_LINK_ITER;
+    vol_cb_args.args.iterate.recursive = FALSE;
+    vol_cb_args.args.iterate.idx_type  = idx_type;
+    vol_cb_args.args.iterate.order     = order;
+    vol_cb_args.args.iterate.idx_p     = idx_p;
+    vol_cb_args.args.iterate.op        = H5L__iterate2_shim;
+    vol_cb_args.args.iterate.op_data   = &shim_data;
+
     /* Iterate over the links */
-    if ((ret_value = H5VL_link_specific(vol_obj, &loc_params, H5VL_LINK_ITER, H5P_DATASET_XFER_DEFAULT,
-                                        H5_REQUEST_NULL, FALSE, idx_type, order, idx_p, H5L__iterate2_shim,
-                                        (void *)&shim_data)) < 0)
+    if ((ret_value = H5VL_link_specific(vol_obj, &loc_params, &vol_cb_args, H5P_DATASET_XFER_DEFAULT,
+                                        H5_REQUEST_NULL)) < 0)
         HGOTO_ERROR(H5E_LINK, H5E_BADITER, FAIL, "link iteration failed")
 
 done:
@@ -293,11 +311,12 @@ done:
 herr_t
 H5Lget_info1(hid_t loc_id, const char *name, H5L_info1_t *linfo /*out*/, hid_t lapl_id)
 {
-    H5VL_object_t *   vol_obj = NULL; /* object of loc_id */
-    H5VL_loc_params_t loc_params;
-    H5L_info2_t       linfo2; /* New-style link info */
-    hbool_t           is_native_vol_obj;
-    herr_t            ret_value = SUCCEED; /* Return value */
+    H5VL_object_t *      vol_obj = NULL; /* object of loc_id */
+    H5VL_link_get_args_t vol_cb_args;    /* Arguments to VOL callback */
+    H5VL_loc_params_t    loc_params;
+    H5L_info2_t          linfo2; /* New-style link info */
+    hbool_t              is_native_vol_obj;
+    herr_t               ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE4("e", "i*sxi", loc_id, name, linfo, lapl_id);
@@ -310,12 +329,13 @@ H5Lget_info1(hid_t loc_id, const char *name, H5L_info1_t *linfo /*out*/, hid_t l
     if (H5CX_set_apl(&lapl_id, H5P_CLS_LACC, loc_id, TRUE) < 0)
         HGOTO_ERROR(H5E_LINK, H5E_CANTSET, FAIL, "can't set access property list info")
 
+    /* Set up location struct */
     loc_params.type                         = H5VL_OBJECT_BY_NAME;
     loc_params.obj_type                     = H5I_get_type(loc_id);
     loc_params.loc_data.loc_by_name.name    = name;
     loc_params.loc_data.loc_by_name.lapl_id = lapl_id;
 
-    /* get the location object */
+    /* Get the location object */
     if (NULL == (vol_obj = (H5VL_object_t *)H5I_object(loc_id)))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "invalid location identifier")
 
@@ -326,9 +346,12 @@ H5Lget_info1(hid_t loc_id, const char *name, H5L_info1_t *linfo /*out*/, hid_t l
         HGOTO_ERROR(H5E_LINK, H5E_BADVALUE, FAIL,
                     "H5Lget_info1 is only meant to be used with the native VOL connector")
 
+    /* Set up VOL callback arguments */
+    vol_cb_args.op_type             = H5VL_LINK_GET_INFO;
+    vol_cb_args.args.get_info.linfo = &linfo2;
+
     /* Get the link information */
-    if (H5VL_link_get(vol_obj, &loc_params, H5VL_LINK_GET_INFO, H5P_DATASET_XFER_DEFAULT, H5_REQUEST_NULL,
-                      &linfo2) < 0)
+    if (H5VL_link_get(vol_obj, &loc_params, &vol_cb_args, H5P_DATASET_XFER_DEFAULT, H5_REQUEST_NULL) < 0)
         HGOTO_ERROR(H5E_LINK, H5E_CANTGET, FAIL, "unable to get link info")
 
     /* Copy the new-style members into the old-style struct */
@@ -376,11 +399,12 @@ herr_t
 H5Lget_info_by_idx1(hid_t loc_id, const char *group_name, H5_index_t idx_type, H5_iter_order_t order,
                     hsize_t n, H5L_info1_t *linfo /*out*/, hid_t lapl_id)
 {
-    H5VL_object_t *   vol_obj = NULL; /* object of loc_id */
-    H5VL_loc_params_t loc_params;
-    H5L_info2_t       linfo2; /* New-style link info */
-    hbool_t           is_native_vol_obj;
-    herr_t            ret_value = SUCCEED; /* Return value */
+    H5VL_object_t *      vol_obj = NULL; /* object of loc_id */
+    H5VL_link_get_args_t vol_cb_args;    /* Arguments to VOL callback */
+    H5VL_loc_params_t    loc_params;
+    H5L_info2_t          linfo2; /* New-style link info */
+    hbool_t              is_native_vol_obj;
+    herr_t               ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE7("e", "i*sIiIohxi", loc_id, group_name, idx_type, order, n, linfo, lapl_id);
@@ -397,6 +421,7 @@ H5Lget_info_by_idx1(hid_t loc_id, const char *group_name, H5_index_t idx_type, H
     if (H5CX_set_apl(&lapl_id, H5P_CLS_LACC, loc_id, FALSE) < 0)
         HGOTO_ERROR(H5E_LINK, H5E_CANTSET, FAIL, "can't set access property list info")
 
+    /* Set up location struct */
     loc_params.type                         = H5VL_OBJECT_BY_IDX;
     loc_params.loc_data.loc_by_idx.name     = group_name;
     loc_params.loc_data.loc_by_idx.idx_type = idx_type;
@@ -405,7 +430,7 @@ H5Lget_info_by_idx1(hid_t loc_id, const char *group_name, H5_index_t idx_type, H
     loc_params.loc_data.loc_by_idx.lapl_id  = lapl_id;
     loc_params.obj_type                     = H5I_get_type(loc_id);
 
-    /* get the location object */
+    /* Get the location object */
     if (NULL == (vol_obj = (H5VL_object_t *)H5I_object(loc_id)))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "invalid location identifier")
 
@@ -416,9 +441,12 @@ H5Lget_info_by_idx1(hid_t loc_id, const char *group_name, H5_index_t idx_type, H
         HGOTO_ERROR(H5E_LINK, H5E_BADVALUE, FAIL,
                     "H5Lget_info_by_idx1 is only meant to be used with the native VOL connector")
 
+    /* Set up VOL callback arguments */
+    vol_cb_args.op_type             = H5VL_LINK_GET_INFO;
+    vol_cb_args.args.get_info.linfo = &linfo2;
+
     /* Get the link information */
-    if (H5VL_link_get(vol_obj, &loc_params, H5VL_LINK_GET_INFO, H5P_DATASET_XFER_DEFAULT, H5_REQUEST_NULL,
-                      &linfo2) < 0)
+    if (H5VL_link_get(vol_obj, &loc_params, &vol_cb_args, H5P_DATASET_XFER_DEFAULT, H5_REQUEST_NULL) < 0)
         HGOTO_ERROR(H5E_LINK, H5E_CANTGET, FAIL, "unable to get link info")
 
     /* Copy the new-style members into the old-style struct */
@@ -479,12 +507,13 @@ done:
 herr_t
 H5Lvisit1(hid_t group_id, H5_index_t idx_type, H5_iter_order_t order, H5L_iterate1_t op, void *op_data)
 {
-    H5VL_object_t *   vol_obj = NULL; /* Object of loc_id */
-    H5VL_loc_params_t loc_params;
-    H5I_type_t        id_type; /* Type of ID */
-    H5L_shim_data_t   shim_data;
-    hbool_t           is_native_vol_obj;
-    herr_t            ret_value; /* Return value */
+    H5VL_object_t *           vol_obj = NULL; /* Object of loc_id */
+    H5VL_link_specific_args_t vol_cb_args;    /* Arguments to VOL callback */
+    H5VL_loc_params_t         loc_params;
+    H5I_type_t                id_type; /* Type of ID */
+    H5L_shim_data_t           shim_data;
+    hbool_t                   is_native_vol_obj;
+    herr_t                    ret_value; /* Return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE5("e", "iIiIoLi*x", group_id, idx_type, order, op, op_data);
@@ -519,10 +548,18 @@ H5Lvisit1(hid_t group_id, H5_index_t idx_type, H5_iter_order_t order, H5L_iterat
     shim_data.real_op      = op;
     shim_data.real_op_data = op_data;
 
+    /* Set up VOL callback arguments */
+    vol_cb_args.op_type                = H5VL_LINK_ITER;
+    vol_cb_args.args.iterate.recursive = TRUE;
+    vol_cb_args.args.iterate.idx_type  = idx_type;
+    vol_cb_args.args.iterate.order     = order;
+    vol_cb_args.args.iterate.idx_p     = NULL;
+    vol_cb_args.args.iterate.op        = H5L__iterate2_shim;
+    vol_cb_args.args.iterate.op_data   = &shim_data;
+
     /* Iterate over the links */
-    if ((ret_value = H5VL_link_specific(vol_obj, &loc_params, H5VL_LINK_ITER, H5P_DATASET_XFER_DEFAULT,
-                                        H5_REQUEST_NULL, TRUE, idx_type, order, NULL, H5L__iterate2_shim,
-                                        (void *)&shim_data)) < 0)
+    if ((ret_value = H5VL_link_specific(vol_obj, &loc_params, &vol_cb_args, H5P_DATASET_XFER_DEFAULT,
+                                        H5_REQUEST_NULL)) < 0)
         HGOTO_ERROR(H5E_LINK, H5E_BADITER, FAIL, "link visitation failed")
 
 done:
@@ -563,11 +600,12 @@ herr_t
 H5Lvisit_by_name1(hid_t loc_id, const char *group_name, H5_index_t idx_type, H5_iter_order_t order,
                   H5L_iterate1_t op, void *op_data, hid_t lapl_id)
 {
-    H5VL_object_t *   vol_obj = NULL; /* Object of loc_id */
-    H5VL_loc_params_t loc_params;
-    H5L_shim_data_t   shim_data;
-    hbool_t           is_native_vol_obj;
-    herr_t            ret_value; /* Return value */
+    H5VL_object_t *           vol_obj = NULL; /* Object of loc_id */
+    H5VL_link_specific_args_t vol_cb_args;    /* Arguments to VOL callback */
+    H5VL_loc_params_t         loc_params;
+    H5L_shim_data_t           shim_data;
+    hbool_t                   is_native_vol_obj;
+    herr_t                    ret_value; /* Return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE7("e", "i*sIiIoLi*xi", loc_id, group_name, idx_type, order, op, op_data, lapl_id);
@@ -609,10 +647,18 @@ H5Lvisit_by_name1(hid_t loc_id, const char *group_name, H5_index_t idx_type, H5_
     shim_data.real_op      = op;
     shim_data.real_op_data = op_data;
 
+    /* Set up VOL callback arguments */
+    vol_cb_args.op_type                = H5VL_LINK_ITER;
+    vol_cb_args.args.iterate.recursive = TRUE;
+    vol_cb_args.args.iterate.idx_type  = idx_type;
+    vol_cb_args.args.iterate.order     = order;
+    vol_cb_args.args.iterate.idx_p     = NULL;
+    vol_cb_args.args.iterate.op        = H5L__iterate2_shim;
+    vol_cb_args.args.iterate.op_data   = &shim_data;
+
     /* Visit the links */
-    if ((ret_value = H5VL_link_specific(vol_obj, &loc_params, H5VL_LINK_ITER, H5P_DATASET_XFER_DEFAULT,
-                                        H5_REQUEST_NULL, TRUE, idx_type, order, NULL, H5L__iterate2_shim,
-                                        (void *)&shim_data)) < 0)
+    if ((ret_value = H5VL_link_specific(vol_obj, &loc_params, &vol_cb_args, H5P_DATASET_XFER_DEFAULT,
+                                        H5_REQUEST_NULL)) < 0)
         HGOTO_ERROR(H5E_LINK, H5E_BADITER, FAIL, "link visitation failed")
 
 done: