diff options
| -rw-r--r-- | src/H5A.c | 78 | ||||
| -rw-r--r-- | src/H5Adeprec.c | 8 | ||||
| -rw-r--r-- | src/H5D.c | 26 | ||||
| -rw-r--r-- | src/H5Ddeprec.c | 4 | ||||
| -rw-r--r-- | src/H5Dio.c | 4 | ||||
| -rw-r--r-- | src/H5F.c | 32 | ||||
| -rw-r--r-- | src/H5G.c | 20 | ||||
| -rw-r--r-- | src/H5Gdeprec.c | 18 | ||||
| -rw-r--r-- | src/H5L.c | 26 | ||||
| -rw-r--r-- | src/H5O.c | 40 | ||||
| -rw-r--r-- | src/H5Ocopy.c | 2 | ||||
| -rw-r--r-- | src/H5R.c | 12 | ||||
| -rw-r--r-- | src/H5Rdeprec.c | 6 | ||||
| -rw-r--r-- | src/H5T.c | 2 | ||||
| -rw-r--r-- | src/H5Tcommit.c | 4 | ||||
| -rw-r--r-- | src/H5VL.c | 170 | ||||
| -rw-r--r-- | src/H5VLnative.c | 148 | ||||
| -rw-r--r-- | src/H5VLprivate.h | 82 | ||||
| -rw-r--r-- | src/H5VLpublic.h | 72 |
19 files changed, 379 insertions, 375 deletions
@@ -247,7 +247,7 @@ H5Acreate2(hid_t loc_id, const char *attr_name, hid_t type_id, hid_t space_id, HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't set property value for location") /* Create the attribute through the VOL */ - if((ret_value = H5VL_attr_create(loc_id, attr_name, acpl_id, aapl_id)) < 0) + if((ret_value = H5VL_attr_create(loc_id, attr_name, acpl_id, aapl_id, H5_REQUEST_NULL)) < 0) HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "unable to create attribute") done: @@ -309,7 +309,7 @@ H5Acreate_by_name(hid_t loc_id, const char *obj_name, const char *attr_name, HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no attribute name") /* Get the token for the Object location through the VOL */ - if(H5VL_object_lookup(loc_id, H5VL_OBJECT_LOOKUP_BY_NAME, &location, obj_name, lapl_id) < 0) + if(H5VL_object_lookup(loc_id, H5VL_OBJECT_LOOKUP_BY_NAME, H5_REQUEST_NULL, &location, obj_name, lapl_id) < 0) HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "unable to locate object") /* Get correct property list */ @@ -329,7 +329,7 @@ H5Acreate_by_name(hid_t loc_id, const char *obj_name, const char *attr_name, HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't set property value for location") /* Create the attribute through the VOL */ - if((ret_value = H5VL_attr_create(loc_id, attr_name, acpl_id, aapl_id)) < 0) + if((ret_value = H5VL_attr_create(loc_id, attr_name, acpl_id, aapl_id, H5_REQUEST_NULL)) < 0) HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "unable to create attribute") done: @@ -544,7 +544,7 @@ H5Aopen(hid_t loc_id, const char *attr_name, hid_t aapl_id) HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no attribute name") /* Open the attribute through the VOL */ - if((ret_value = H5VL_attr_open(loc_id, NULL, attr_name, aapl_id)) < 0) + if((ret_value = H5VL_attr_open(loc_id, NULL, attr_name, aapl_id, H5_REQUEST_NULL)) < 0) HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "unable to open attribute") done: @@ -598,11 +598,11 @@ H5Aopen_by_name(hid_t loc_id, const char *obj_name, const char *attr_name, HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not link access property list ID") /* Get the token for the Object location through the VOL */ - if(H5VL_object_lookup(loc_id, H5VL_OBJECT_LOOKUP_BY_NAME, &location, obj_name, lapl_id) < 0) + if(H5VL_object_lookup(loc_id, H5VL_OBJECT_LOOKUP_BY_NAME, H5_REQUEST_NULL, &location, obj_name, lapl_id) < 0) HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "unable to locate object") /* Open the attribute through the VOL */ - if((ret_value = H5VL_attr_open(loc_id, location, attr_name, aapl_id)) < 0) + if((ret_value = H5VL_attr_open(loc_id, location, attr_name, aapl_id, H5_REQUEST_NULL)) < 0) HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "unable to open attribute") done: @@ -663,7 +663,7 @@ H5Aopen_by_idx(hid_t loc_id, const char *obj_name, H5_index_t idx_type, if(TRUE != H5P_isa_class(lapl_id, H5P_LINK_ACCESS)) HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not link access property list ID") - if(H5VL_object_generic(loc_id, H5VL_ATTR_OPEN_BY_IDX, &ret_value, + if(H5VL_object_generic(loc_id, H5VL_ATTR_OPEN_BY_IDX, H5_REQUEST_NULL, &ret_value, obj_name, idx_type, order, n, aapl_id, lapl_id) < 0) HGOTO_ERROR(H5E_INTERNAL, H5E_CANTINIT, FAIL, "unable to open attribute") @@ -887,7 +887,7 @@ H5Awrite(hid_t attr_id, hid_t dtype_id, const void *buf) HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "null attribute buffer") /* write the data through the VOL */ - if((ret_value = H5VL_attr_write(attr_id, dtype_id, buf)) < 0) + if((ret_value = H5VL_attr_write(attr_id, dtype_id, buf, H5_REQUEST_NULL)) < 0) HGOTO_ERROR(H5E_ATTR, H5E_READERROR, FAIL, "can't read data") done: @@ -1038,7 +1038,7 @@ H5Aread(hid_t attr_id, hid_t dtype_id, void *buf) HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "null attribute buffer") /* Read the data through the VOL */ - if((ret_value = H5VL_attr_read(attr_id, dtype_id, buf)) < 0) + if((ret_value = H5VL_attr_read(attr_id, dtype_id, buf, H5_REQUEST_NULL)) < 0) HGOTO_ERROR(H5E_ATTR, H5E_READERROR, FAIL, "can't read data") done: @@ -1174,7 +1174,7 @@ H5Aget_space(hid_t attr_id) H5TRACE1("i", "i", attr_id); /* get the dataspace through the VOL */ - if(H5VL_attr_get(attr_id, H5VL_ATTR_GET_SPACE, &ret_value) < 0) + if(H5VL_attr_get(attr_id, H5VL_ATTR_GET_SPACE, H5_REQUEST_NULL, &ret_value) < 0) HGOTO_ERROR(H5E_INTERNAL, H5E_CANTGET, FAIL, "unable to get data space") done: @@ -1247,7 +1247,7 @@ H5Aget_type(hid_t attr_id) H5TRACE1("i", "i", attr_id); /* get the datatype through the VOL */ - if(H5VL_attr_get(attr_id, H5VL_ATTR_GET_TYPE, &ret_value) < 0) + if(H5VL_attr_get(attr_id, H5VL_ATTR_GET_TYPE, H5_REQUEST_NULL, &ret_value) < 0) HGOTO_ERROR(H5E_INTERNAL, H5E_CANTGET, FAIL, "unable to get type") done: @@ -1341,7 +1341,7 @@ H5Aget_create_plist(hid_t attr_id) HDassert(H5P_LST_ATTRIBUTE_CREATE_g != -1); /* get the acpl through the VOL */ - if(H5VL_attr_get(attr_id, H5VL_ATTR_GET_ACPL, &ret_value) < 0) + if(H5VL_attr_get(attr_id, H5VL_ATTR_GET_ACPL, H5_REQUEST_NULL, &ret_value) < 0) HGOTO_ERROR(H5E_INTERNAL, H5E_CANTGET, FAIL, "unable to get acpl") done: @@ -1428,7 +1428,7 @@ H5Aget_name(hid_t attr_id, size_t buf_size, char *buf) HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "invalid buffer") /* get the name through the VOL */ - if(H5VL_attr_get(attr_id, H5VL_ATTR_GET_NAME, &ret_value, buf_size, buf) < 0) + if(H5VL_attr_get(attr_id, H5VL_ATTR_GET_NAME, H5_REQUEST_NULL, &ret_value, buf_size, buf) < 0) HGOTO_ERROR(H5E_INTERNAL, H5E_CANTGET, FAIL, "unable to get name") done: @@ -1527,12 +1527,12 @@ H5Aget_name_by_idx(hid_t loc_id, const char *obj_name, H5_index_t idx_type, if(TRUE != H5P_isa_class(lapl_id, H5P_LINK_ACCESS)) HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not link access property list ID") - if(H5VL_object_generic(loc_id, H5VL_ATTR_OPEN_BY_IDX, &attr_id, + if(H5VL_object_generic(loc_id, H5VL_ATTR_OPEN_BY_IDX, H5_REQUEST_NULL, &attr_id, obj_name, idx_type, order, n, H5P_DEFAULT, lapl_id) < 0) HGOTO_ERROR(H5E_INTERNAL, H5E_CANTINIT, FAIL, "unable to open attribute") /* get the name through the VOL */ - if(H5VL_attr_get(attr_id, H5VL_ATTR_GET_NAME, &ret_value, size, name) < 0) + if(H5VL_attr_get(attr_id, H5VL_ATTR_GET_NAME, H5_REQUEST_NULL, &ret_value, size, name) < 0) HGOTO_ERROR(H5E_INTERNAL, H5E_CANTGET, FAIL, "unable to get name") #if 0 @@ -1553,7 +1553,7 @@ H5Aget_name_by_idx(hid_t loc_id, const char *obj_name, H5_index_t idx_type, done: /* Release resources */ - if(attr_id > 0 && H5VL_attr_close(attr_id) < 0) + if(attr_id > 0 && H5VL_attr_close(attr_id, H5_REQUEST_NULL) < 0) HDONE_ERROR(H5E_ATTR, H5E_CANTFREE, FAIL, "can't close attribute") FUNC_LEAVE_API(ret_value) @@ -1586,7 +1586,7 @@ H5Aget_storage_size(hid_t attr_id) H5TRACE1("h", "i", attr_id); /* get the storage size through the VOL */ - if(H5VL_attr_get(attr_id, H5VL_ATTR_GET_STORAGE_SIZE, &ret_value) < 0) + if(H5VL_attr_get(attr_id, H5VL_ATTR_GET_STORAGE_SIZE, H5_REQUEST_NULL, &ret_value) < 0) HGOTO_ERROR(H5E_INTERNAL, H5E_CANTGET, 0, "unable to get acpl") done: @@ -1616,7 +1616,7 @@ H5Aget_info(hid_t attr_id, H5A_info_t *ainfo) H5TRACE2("e", "i*x", attr_id, ainfo); /* get the attribute info through the VOL */ - if(H5VL_attr_get(attr_id, H5VL_ATTR_GET_INFO, ainfo) < 0) + if(H5VL_attr_get(attr_id, H5VL_ATTR_GET_INFO, H5_REQUEST_NULL, ainfo) < 0) HGOTO_ERROR(H5E_INTERNAL, H5E_CANTGET, FAIL, "unable to get attribute info") done: @@ -1674,19 +1674,19 @@ H5Aget_info_by_name(hid_t loc_id, const char *obj_name, const char *attr_name, #endif /* Get the token for the Object location through the VOL */ - if(H5VL_object_lookup(loc_id, H5VL_OBJECT_LOOKUP_BY_NAME, &location, obj_name, lapl_id) < 0) + if(H5VL_object_lookup(loc_id, H5VL_OBJECT_LOOKUP_BY_NAME, H5_REQUEST_NULL, &location, obj_name, lapl_id) < 0) HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "unable to locate object") /* Open the attribute through the VOL */ - if((attr_id = H5VL_attr_open(loc_id, location, attr_name, H5P_DEFAULT)) < 0) + if((attr_id = H5VL_attr_open(loc_id, location, attr_name, H5P_DEFAULT, H5_REQUEST_NULL)) < 0) HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "unable to open attribute") /* get the attribute info through the VOL */ - if(H5VL_attr_get(attr_id, H5VL_ATTR_GET_INFO, ainfo) < 0) + if(H5VL_attr_get(attr_id, H5VL_ATTR_GET_INFO, H5_REQUEST_NULL, ainfo) < 0) HGOTO_ERROR(H5E_INTERNAL, H5E_CANTGET, FAIL, "unable to get attribute info") done: /* release resources */ - if(attr_id > 0 && H5VL_attr_close(attr_id) < 0) + if(attr_id > 0 && H5VL_attr_close(attr_id, H5_REQUEST_NULL) < 0) HDONE_ERROR(H5E_ATTR, H5E_CANTFREE, FAIL, "can't close attribute") if(NULL != location) { @@ -1750,17 +1750,17 @@ H5Aget_info_by_idx(hid_t loc_id, const char *obj_name, H5_index_t idx_type, #endif /* open the attribute through the VOL */ - if(H5VL_object_generic(loc_id, H5VL_ATTR_OPEN_BY_IDX, &attr_id, + if(H5VL_object_generic(loc_id, H5VL_ATTR_OPEN_BY_IDX, H5_REQUEST_NULL, &attr_id, obj_name, idx_type, order, n, H5P_DEFAULT, lapl_id) < 0) HGOTO_ERROR(H5E_INTERNAL, H5E_CANTINIT, FAIL, "unable to open attribute") /* get the attribute info through the VOL */ - if(H5VL_attr_get(attr_id, H5VL_ATTR_GET_INFO, ainfo) < 0) + if(H5VL_attr_get(attr_id, H5VL_ATTR_GET_INFO, H5_REQUEST_NULL, ainfo) < 0) HGOTO_ERROR(H5E_INTERNAL, H5E_CANTGET, FAIL, "unable to get attribute info") done: /* Release resources */ - if(attr_id && H5VL_attr_close(attr_id) < 0) + if(attr_id && H5VL_attr_close(attr_id, H5_REQUEST_NULL) < 0) HDONE_ERROR(H5E_ATTR, H5E_CANTFREE, FAIL, "can't close attribute") FUNC_LEAVE_API(ret_value) @@ -1839,7 +1839,7 @@ H5Arename(hid_t loc_id, const char *old_name, const char *new_name) /* Avoid thrashing things if the names are the same */ if(HDstrcmp(old_name, new_name)) /* rename the attribute info through the VOL */ - if(H5VL_object_generic(loc_id, H5VL_ATTR_RENAME, NULL, old_name, new_name) < 0) + if(H5VL_object_generic(loc_id, H5VL_ATTR_RENAME, H5_REQUEST_NULL, NULL, old_name, new_name) < 0) HGOTO_ERROR(H5E_ATTR, H5E_CANTRENAME, FAIL, "can't rename attribute") done: @@ -1889,11 +1889,11 @@ H5Arename_by_name(hid_t loc_id, const char *obj_name, const char *old_attr_name, /* Avoid thrashing things if the names are the same */ if(HDstrcmp(old_attr_name, new_attr_name)) { /* Get the token for the Object location through the VOL */ - if(H5VL_object_lookup(loc_id, H5VL_OBJECT_LOOKUP_BY_NAME, &location, obj_name, lapl_id) < 0) + if(H5VL_object_lookup(loc_id, H5VL_OBJECT_LOOKUP_BY_NAME, H5_REQUEST_NULL, &location, obj_name, lapl_id) < 0) HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "unable to locate object") /* get the attribute info through the VOL */ - if(H5VL_object_generic(loc_id, H5VL_ATTR_RENAME, location, old_attr_name, new_attr_name) < 0) + if(H5VL_object_generic(loc_id, H5VL_ATTR_RENAME, H5_REQUEST_NULL, location, old_attr_name, new_attr_name) < 0) HGOTO_ERROR(H5E_INTERNAL, H5E_CANTGET, FAIL, "unable to get attribute info") } /* end if */ @@ -2060,11 +2060,11 @@ H5Aiterate_by_name(hid_t loc_id, const char *obj_name, H5_index_t idx_type, HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not link access property list ID") /* Get the token for the Object location through the VOL */ - if(H5VL_object_lookup (loc_id, H5VL_OBJECT_LOOKUP_BY_NAME, &location, obj_name, lapl_id) < 0) + if(H5VL_object_lookup (loc_id, H5VL_OBJECT_LOOKUP_BY_NAME, H5_REQUEST_NULL, &location, obj_name, lapl_id) < 0) HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "unable to locate object") /* Open the object through the VOL */ - if((obj_loc_id = H5VL_object_open_by_loc(loc_id, location, lapl_id)) < 0) + if((obj_loc_id = H5VL_object_open_by_loc(loc_id, location, lapl_id, H5_REQUEST_NULL)) < 0) HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "unable to open object") /* Build attribute operator info */ @@ -2120,7 +2120,7 @@ H5Adelete(hid_t loc_id, const char *name) HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no name") /* Open the attribute through the VOL */ - if(H5VL_attr_delete(loc_id, NULL, name) < 0) + if(H5VL_attr_delete(loc_id, NULL, name, H5_REQUEST_NULL) < 0) HGOTO_ERROR(H5E_DATASET, H5E_CANTDELETE, FAIL, "unable to delete attribute") done: @@ -2168,11 +2168,11 @@ H5Adelete_by_name(hid_t loc_id, const char *obj_name, const char *attr_name, HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not link access property list ID") /* Get the token for the Object location through the VOL */ - if(H5VL_object_lookup (loc_id, H5VL_OBJECT_LOOKUP_BY_NAME, &location, obj_name, lapl_id) < 0) + if(H5VL_object_lookup (loc_id, H5VL_OBJECT_LOOKUP_BY_NAME, H5_REQUEST_NULL, &location, obj_name, lapl_id) < 0) HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "unable to locate object") /* Open the attribute through the VOL */ - if(H5VL_attr_delete(loc_id, location, attr_name) < 0) + if(H5VL_attr_delete(loc_id, location, attr_name, H5_REQUEST_NULL) < 0) HGOTO_ERROR(H5E_DATASET, H5E_CANTDELETE, FAIL, "unable to delete attribute") done: @@ -2234,11 +2234,11 @@ H5Adelete_by_idx(hid_t loc_id, const char *obj_name, H5_index_t idx_type, HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not link access property list ID") /* Get the token for the Object location through the VOL */ - if(H5VL_object_lookup(loc_id, H5VL_OBJECT_LOOKUP_BY_NAME, &location, obj_name, lapl_id) < 0) + if(H5VL_object_lookup(loc_id, H5VL_OBJECT_LOOKUP_BY_NAME, H5_REQUEST_NULL, &location, obj_name, lapl_id) < 0) HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "unable to locate object") /* get the attribute info through the VOL */ - if(H5VL_object_generic(loc_id, H5VL_ATTR_DELETE_BY_IDX, location, idx_type, order, n) < 0) + if(H5VL_object_generic(loc_id, H5VL_ATTR_DELETE_BY_IDX, H5_REQUEST_NULL, location, idx_type, order, n) < 0) HGOTO_ERROR(H5E_INTERNAL, H5E_CANTGET, FAIL, "unable to get attribute info") done: @@ -2274,7 +2274,7 @@ H5Aclose(hid_t attr_id) H5TRACE1("e", "i", attr_id); /* Close the attribute through the VOL */ - if((ret_value = H5VL_attr_close(attr_id)) < 0) + if((ret_value = H5VL_attr_close(attr_id, H5_REQUEST_NULL)) < 0) HGOTO_ERROR(H5E_DATASET, H5E_CANTRELEASE, FAIL, "unable to close attribute") done: @@ -2576,7 +2576,7 @@ H5Aexists(hid_t obj_id, const char *attr_name) HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no attribute name") /* get the attribute info through the VOL */ - if(H5VL_object_generic(obj_id, H5VL_ATTR_EXISTS, attr_name, NULL, &ret_value) < 0) + if(H5VL_object_generic(obj_id, H5VL_ATTR_EXISTS, H5_REQUEST_NULL, attr_name, NULL, &ret_value) < 0) HGOTO_ERROR(H5E_INTERNAL, H5E_CANTGET, FAIL, "unable to get attribute info") done: @@ -2621,11 +2621,11 @@ H5Aexists_by_name(hid_t loc_id, const char *obj_name, const char *attr_name, HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not link access property list ID") /* Get the token for the Object location through the VOL */ - if(H5VL_object_lookup(loc_id, H5VL_OBJECT_LOOKUP_BY_NAME, &location, obj_name, lapl_id) < 0) + if(H5VL_object_lookup(loc_id, H5VL_OBJECT_LOOKUP_BY_NAME, H5_REQUEST_NULL, &location, obj_name, lapl_id) < 0) HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "unable to locate object") /* get the attribute info through the VOL */ - if(H5VL_object_generic(loc_id, H5VL_ATTR_EXISTS, attr_name, location, &ret_value) < 0) + if(H5VL_object_generic(loc_id, H5VL_ATTR_EXISTS, H5_REQUEST_NULL, attr_name, location, &ret_value) < 0) HGOTO_ERROR(H5E_INTERNAL, H5E_CANTGET, FAIL, "unable to get attribute info") done: diff --git a/src/H5Adeprec.c b/src/H5Adeprec.c index 9ae08a4..437cef8 100644 --- a/src/H5Adeprec.c +++ b/src/H5Adeprec.c @@ -169,7 +169,7 @@ H5Acreate1(hid_t loc_id, const char *name, hid_t type_id, hid_t space_id, HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't set property value for location") /* Create the attribute through the VOL */ - if((ret_value = H5VL_attr_create(loc_id, name, plist_id, H5P_DEFAULT)) < 0) + if((ret_value = H5VL_attr_create(loc_id, name, plist_id, H5P_DEFAULT, H5_REQUEST_NULL)) < 0) HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "unable to create attribute") done: @@ -214,7 +214,7 @@ H5Aopen_name(hid_t loc_id, const char *name) HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no name") /* Open the attribute through the VOL */ - if((ret_value = H5VL_attr_open(loc_id, NULL, name, H5P_DEFAULT)) < 0) + if((ret_value = H5VL_attr_open(loc_id, NULL, name, H5P_DEFAULT, H5_REQUEST_NULL)) < 0) HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "unable to open attribute") done: @@ -256,7 +256,7 @@ H5Aopen_idx(hid_t loc_id, unsigned idx) if(H5I_ATTR_PUBLIC == H5I_get_type(loc_id)) HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "location is not valid for an attribute") - if(H5VL_object_generic(loc_id, H5VL_ATTR_OPEN_BY_IDX, &ret_value, ".", H5_INDEX_CRT_ORDER, + if(H5VL_object_generic(loc_id, H5VL_ATTR_OPEN_BY_IDX, H5_REQUEST_NULL, &ret_value, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, (hsize_t)idx, H5P_DEFAULT, H5P_LINK_ACCESS_DEFAULT) < 0) HGOTO_ERROR(H5E_INTERNAL, H5E_CANTGET, FAIL, "unable to get dataset access properties") @@ -293,7 +293,7 @@ H5Aget_num_attrs(hid_t loc_id) H5TRACE1("Is", "i", loc_id); /* Get the group info through the VOL using the location token */ - if(H5VL_object_get(loc_id, H5VL_OBJECT_GET_INFO, &oinfo, NULL) < 0) + if(H5VL_object_get(loc_id, H5VL_OBJECT_GET_INFO, H5_REQUEST_NULL, &oinfo, NULL) < 0) HGOTO_ERROR(H5E_INTERNAL, H5E_CANTGET, FAIL, "unable to get group info") ret_value = oinfo.num_attrs; @@ -169,7 +169,7 @@ H5Dcreate2(hid_t loc_id, const char *name, hid_t type_id, hid_t space_id, HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't set property value for lcpl id") /* Create the dataset through the VOL */ - if((ret_value = H5VL_dataset_create(loc_id, name, dcpl_id, dapl_id)) < 0) + if((ret_value = H5VL_dataset_create(loc_id, name, dcpl_id, dapl_id, H5_REQUEST_NULL)) < 0) HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "unable to create dataset") done: @@ -248,7 +248,7 @@ H5Dcreate_anon(hid_t loc_id, hid_t type_id, hid_t space_id, hid_t dcpl_id, HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't set property value for space id") /* Create the dataset through the VOL */ - if((ret_value = H5VL_dataset_create(loc_id, NULL, dcpl_id, dapl_id)) < 0) + if((ret_value = H5VL_dataset_create(loc_id, NULL, dcpl_id, dapl_id, H5_REQUEST_NULL)) < 0) HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "unable to create dataset") done: @@ -293,7 +293,7 @@ H5Dopen2(hid_t loc_id, const char *name, hid_t dapl_id) HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not dataset access property list") /* Open the dataset through the VOL */ - if((ret_value = H5VL_dataset_open(loc_id, name, dapl_id)) < 0) + if((ret_value = H5VL_dataset_open(loc_id, name, dapl_id, H5_REQUEST_NULL)) < 0) HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "unable to open dataset") done: @@ -324,7 +324,7 @@ H5Dclose(hid_t dset_id) H5TRACE1("e", "i", dset_id); /* Close the dataset through the VOL */ - if((ret_value = H5VL_dataset_close(dset_id)) < 0) + if((ret_value = H5VL_dataset_close(dset_id, H5_REQUEST_NULL)) < 0) HGOTO_ERROR(H5E_DATASET, H5E_CANTRELEASE, FAIL, "unable to close dataset") done: @@ -357,7 +357,7 @@ H5Dget_space(hid_t dset_id) H5TRACE1("i", "i", dset_id); /* get the dataspace through the VOL */ - if(H5VL_dataset_get(dset_id, H5VL_DATASET_GET_SPACE, &ret_value) < 0) + if(H5VL_dataset_get(dset_id, H5VL_DATASET_GET_SPACE, H5_REQUEST_NULL, &ret_value) < 0) HGOTO_ERROR(H5E_INTERNAL, H5E_CANTGET, FAIL, "unable to get data space") done: FUNC_LEAVE_API(ret_value) @@ -387,7 +387,7 @@ H5Dget_space_status(hid_t dset_id, H5D_space_status_t *allocation) H5TRACE2("e", "i*Ds", dset_id, allocation); /* Read data space address through the VOL and return */ - if((ret_value=H5VL_dataset_get(dset_id, H5VL_DATASET_GET_SPACE_STATUS, allocation)) < 0) + if((ret_value=H5VL_dataset_get(dset_id, H5VL_DATASET_GET_SPACE_STATUS, H5_REQUEST_NULL, allocation)) < 0) HGOTO_ERROR(H5E_INTERNAL, H5E_CANTGET, FAIL, "unable to get space status") done: @@ -420,7 +420,7 @@ H5Dget_type(hid_t dset_id) H5TRACE1("i", "i", dset_id); /* get the datatype through the VOL */ - if(H5VL_dataset_get(dset_id, H5VL_DATASET_GET_TYPE, &ret_value) < 0) + if(H5VL_dataset_get(dset_id, H5VL_DATASET_GET_TYPE, H5_REQUEST_NULL, &ret_value) < 0) HGOTO_ERROR(H5E_INTERNAL, H5E_CANTGET, FAIL, "unable to get datatype") done: @@ -452,7 +452,7 @@ H5Dget_create_plist(hid_t dset_id) FUNC_ENTER_API(FAIL) H5TRACE1("i", "i", dset_id); - if(H5VL_dataset_get(dset_id, H5VL_DATASET_GET_DCPL, &ret_value) < 0) + if(H5VL_dataset_get(dset_id, H5VL_DATASET_GET_DCPL, H5_REQUEST_NULL, &ret_value) < 0) HGOTO_ERROR(H5E_INTERNAL, H5E_CANTGET, FAIL, "unable to get dataset creation properties") done: @@ -501,7 +501,7 @@ H5Dget_access_plist(hid_t dset_id) FUNC_ENTER_API(FAIL) H5TRACE1("i", "i", dset_id); - if(H5VL_dataset_get(dset_id, H5VL_DATASET_GET_DAPL, &ret_value) < 0) + if(H5VL_dataset_get(dset_id, H5VL_DATASET_GET_DAPL, H5_REQUEST_NULL, &ret_value) < 0) HGOTO_ERROR(H5E_INTERNAL, H5E_CANTGET, FAIL, "unable to get dataset access properties") done: @@ -536,7 +536,7 @@ H5Dget_storage_size(hid_t dset_id) H5TRACE1("h", "i", dset_id); /* get storage size through the VOL */ - if(H5VL_dataset_get(dset_id, H5VL_DATASET_GET_STORAGE_SIZE, &ret_value) < 0) + if(H5VL_dataset_get(dset_id, H5VL_DATASET_GET_STORAGE_SIZE, H5_REQUEST_NULL, &ret_value) < 0) HGOTO_ERROR(H5E_INTERNAL, H5E_CANTGET, 0, "unable to get storage size") done: @@ -567,7 +567,7 @@ H5Dget_offset(hid_t dset_id) H5TRACE1("a", "i", dset_id); /* get offset through the VOL */ - if(H5VL_dataset_get(dset_id, H5VL_DATASET_GET_OFFSET, &ret_value) < 0) + if(H5VL_dataset_get(dset_id, H5VL_DATASET_GET_OFFSET, H5_REQUEST_NULL, &ret_value) < 0) HGOTO_ERROR(H5E_INTERNAL, H5E_CANTGET, HADDR_UNDEF, "unable to get offset") done: @@ -763,7 +763,7 @@ H5Dvlen_get_buf_size(hid_t dataset_id, hid_t type_id, hid_t space_id, vlen_bufsize.dataset_id = dataset_id; /* Get a copy of the dataspace ID */ - if(H5VL_dataset_get(dataset_id, H5VL_DATASET_GET_SPACE, &(vlen_bufsize.fspace_id)) < 0) + if(H5VL_dataset_get(dataset_id, H5VL_DATASET_GET_SPACE, H5_REQUEST_NULL, &(vlen_bufsize.fspace_id)) < 0) //if((vlen_bufsize.fspace_id = H5Dget_space(dataset_id)) < 0) HGOTO_ERROR(H5E_DATASPACE, H5E_CANTCOPY, FAIL, "can't copy dataspace") @@ -844,7 +844,7 @@ H5Dset_extent(hid_t dset_id, const hsize_t size[]) HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no size specified") /* set the extent through the VOL */ - if((ret_value = H5VL_dataset_set_extent(dset_id, size)) < 0) + if((ret_value = H5VL_dataset_set_extent(dset_id, size, H5_REQUEST_NULL)) < 0) HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "unable to set extent of dataset") done: diff --git a/src/H5Ddeprec.c b/src/H5Ddeprec.c index 23f68ee..23d9423 100644 --- a/src/H5Ddeprec.c +++ b/src/H5Ddeprec.c @@ -167,7 +167,7 @@ H5Dcreate1(hid_t loc_id, const char *name, hid_t type_id, hid_t space_id, HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't set property value for lcpl id") /* Create the dataset through the VOL */ - if((ret_value = H5VL_dataset_create(loc_id, name, dcpl_id, H5P_DATASET_ACCESS_DEFAULT)) < 0) + if((ret_value = H5VL_dataset_create(loc_id, name, dcpl_id, H5P_DATASET_ACCESS_DEFAULT, -1)) < 0) HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "unable to create dataset") done: @@ -207,7 +207,7 @@ H5Dopen1(hid_t loc_id, const char *name) HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no name") /* Open the dataset through the VOL */ - if((ret_value = H5VL_dataset_open(loc_id, name, dapl_id)) < 0) + if((ret_value = H5VL_dataset_open(loc_id, name, dapl_id, -1)) < 0) HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "unable to open dataset") done: diff --git a/src/H5Dio.c b/src/H5Dio.c index 31dff83..2a1029e 100644 --- a/src/H5Dio.c +++ b/src/H5Dio.c @@ -129,7 +129,7 @@ H5Dread(hid_t dset_id, hid_t mem_type_id, hid_t mem_space_id, /* Read the data through the VOL */ if((ret_value = H5VL_dataset_read(dset_id, mem_type_id, mem_space_id, - file_space_id, plist_id, buf)) < 0) + file_space_id, plist_id, buf, H5_REQUEST_NULL)) < 0) HGOTO_ERROR(H5E_DATASET, H5E_READERROR, FAIL, "can't read data") @@ -190,7 +190,7 @@ H5Dwrite(hid_t dset_id, hid_t mem_type_id, hid_t mem_space_id, /* Write the data through the VOL */ if((ret_value = H5VL_dataset_write(dset_id, mem_type_id, mem_space_id, - file_space_id, dxpl_id, buf)) < 0) + file_space_id, dxpl_id, buf, H5_REQUEST_NULL)) < 0) HGOTO_ERROR(H5E_DATASET, H5E_WRITEERROR, FAIL, "can't write data") done: @@ -190,7 +190,7 @@ H5Fget_create_plist(hid_t uid) FUNC_ENTER_API(FAIL) H5TRACE1("i", "i", uid); - if(H5VL_file_get(uid, H5VL_FILE_GET_FCPL, &ret_value) < 0) + if(H5VL_file_get(uid, H5VL_FILE_GET_FCPL, H5_REQUEST_NULL, &ret_value) < 0) HGOTO_ERROR(H5E_INTERNAL, H5E_CANTGET, FAIL, "unable to get file creation properties") done: @@ -227,7 +227,7 @@ H5Fget_access_plist(hid_t uid) FUNC_ENTER_API(FAIL) H5TRACE1("i", "i", uid); - if(H5VL_file_get(uid, H5VL_FILE_GET_FAPL, &ret_value) < 0) + if(H5VL_file_get(uid, H5VL_FILE_GET_FAPL, H5_REQUEST_NULL, &ret_value) < 0) HGOTO_ERROR(H5E_INTERNAL, H5E_CANTGET, FAIL, "unable to get file creation properties") done: @@ -750,7 +750,7 @@ H5Fget_vfd_handle(hid_t uid, hid_t fapl, void **file_handle) if(!file_handle) HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "invalid file handle pointer") - if((ret_value = H5VL_file_generic(uid, H5VL_FILE_GET_VFD_HANDLE, file_handle, fapl)) < 0) + if((ret_value = H5VL_file_generic(uid, H5VL_FILE_GET_VFD_HANDLE, H5_REQUEST_NULL, file_handle, fapl)) < 0) HGOTO_ERROR(H5E_INTERNAL, H5E_CANTGET, FAIL, "unable to get file handle") done: @@ -1491,7 +1491,7 @@ H5Fcreate(const char *filename, unsigned flags, hid_t fcpl_id, hid_t fapl_id) /* * Create a new file or truncate an existing file. */ - if((ret_value = H5VL_file_create(filename, flags, fcpl_id, fapl_id)) < 0) + if((ret_value = H5VL_file_create(filename, flags, fcpl_id, fapl_id, H5_REQUEST_NULL)) < 0) HGOTO_ERROR(H5E_FILE, H5E_CANTOPENFILE, FAIL, "unable to create file") done: @@ -1561,7 +1561,7 @@ H5Fopen(const char *filename, unsigned flags, hid_t fapl_id) HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not file access property list") /* Open the file */ - if((ret_value = H5VL_file_open(filename, flags, fapl_id))<0) + if((ret_value = H5VL_file_open(filename, flags, fapl_id, H5_REQUEST_NULL))<0) HGOTO_ERROR(H5E_FILE, H5E_CANTOPENFILE, FAIL, "unable to open file") done: @@ -1591,7 +1591,7 @@ H5Fflush(hid_t object_id, H5F_scope_t scope) FUNC_ENTER_API(FAIL) H5TRACE2("e", "iFs", object_id, scope); - if((ret_value = H5VL_file_flush(object_id, scope)) < 0) + if((ret_value = H5VL_file_flush(object_id, scope, H5_REQUEST_NULL)) < 0) HGOTO_ERROR(H5E_FILE, H5E_CANTFLUSH, FAIL, "unable to flush file") done: @@ -1914,7 +1914,7 @@ H5Fclose(hid_t file_id) H5TRACE1("e", "i", file_id); /* Close the file */ - if((ret_value = H5VL_file_close(file_id)) < 0) + if((ret_value = H5VL_file_close(file_id, H5_REQUEST_NULL)) < 0) HGOTO_ERROR(H5E_FILE, H5E_CANTCLOSEFILE, FAIL, "unable to close file") done: @@ -2027,7 +2027,7 @@ H5Fget_intent(hid_t uid, unsigned *intent_flags) /* If no intent flags were passed in, exit quietly */ if(intent_flags) { - if((ret_value = H5VL_file_get(uid, H5VL_FILE_GET_INTENT, intent_flags)) < 0) + if((ret_value = H5VL_file_get(uid, H5VL_FILE_GET_INTENT, H5_REQUEST_NULL, intent_flags)) < 0) HGOTO_ERROR(H5E_INTERNAL, H5E_CANTGET, FAIL, "unable to get file intent") } @@ -2447,7 +2447,7 @@ H5Fget_freespace(hid_t uid) FUNC_ENTER_API(FAIL) H5TRACE1("Hs", "i", uid); - if(H5VL_file_get(uid, H5VL_FILE_GET_FREE_SPACE, &ret_value) < 0) + if(H5VL_file_get(uid, H5VL_FILE_GET_FREE_SPACE, H5_REQUEST_NULL, &ret_value) < 0) HGOTO_ERROR(H5E_INTERNAL, H5E_CANTGET, FAIL, "unable to get file free space") done: @@ -2481,7 +2481,7 @@ H5Fget_filesize(hid_t uid, hsize_t *size) FUNC_ENTER_API(FAIL) H5TRACE2("e", "i*h", uid, size); - if((ret_value = H5VL_file_get(uid, H5VL_FILE_GET_SIZE, size)) < 0) + if((ret_value = H5VL_file_get(uid, H5VL_FILE_GET_SIZE, H5_REQUEST_NULL, size)) < 0) HGOTO_ERROR(H5E_INTERNAL, H5E_CANTGET, FAIL, "unable to get file size") done: @@ -2652,7 +2652,7 @@ H5Fget_mdc_config(hid_t uid, H5AC_cache_config_t *config_ptr) if((NULL == config_ptr) || (config_ptr->version != H5AC__CURR_CACHE_CONFIG_VERSION)) HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "Bad config_ptr") - if((ret_value = H5VL_file_get(uid, H5VL_FILE_GET_MDC_CONF, config_ptr)) < 0) + if((ret_value = H5VL_file_get(uid, H5VL_FILE_GET_MDC_CONF, H5_REQUEST_NULL, config_ptr)) < 0) HGOTO_ERROR(H5E_INTERNAL, H5E_CANTGET, FAIL, "unable to get mdc config") done: @@ -2730,7 +2730,7 @@ H5Fget_mdc_hit_rate(hid_t uid, double *hit_rate_ptr) if(NULL == hit_rate_ptr) HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "NULL hit rate pointer") - if((ret_value = H5VL_file_get(uid, H5VL_FILE_GET_MDC_HR, hit_rate_ptr)) < 0) + if((ret_value = H5VL_file_get(uid, H5VL_FILE_GET_MDC_HR, H5_REQUEST_NULL, hit_rate_ptr)) < 0) HGOTO_ERROR(H5E_INTERNAL, H5E_CANTGET, FAIL, "unable to get MDC hit rate") done: @@ -2765,7 +2765,7 @@ H5Fget_mdc_size(hid_t uid, size_t *max_size_ptr, size_t *min_clean_size_ptr, H5TRACE5("e", "i*z*z*z*Is", uid, max_size_ptr, min_clean_size_ptr, cur_size_ptr, cur_num_entries_ptr); - if((ret_value = H5VL_file_get(uid, H5VL_FILE_GET_MDC_SIZE, max_size_ptr, + if((ret_value = H5VL_file_get(uid, H5VL_FILE_GET_MDC_SIZE, H5_REQUEST_NULL, max_size_ptr, min_clean_size_ptr, cur_size_ptr, cur_num_entries_ptr)) < 0) HGOTO_ERROR(H5E_INTERNAL, H5E_CANTGET, FAIL, "unable to get MDC hit rate") @@ -2856,7 +2856,7 @@ H5Fget_name(hid_t uid, char *name/*out*/, size_t size) if (H5I_FILE_PUBLIC == H5I_get_type(uid) || H5I_GROUP_PUBLIC == H5I_get_type(uid) || H5I_DATATYPE_PUBLIC == H5I_get_type(uid) || H5I_DATASET_PUBLIC == H5I_get_type(uid) || H5I_ATTR_PUBLIC == H5I_get_type(uid)) { - if(H5VL_file_get(uid, H5VL_FILE_GET_NAME, name, &ret_value, size) < 0) + if(H5VL_file_get(uid, H5VL_FILE_GET_NAME, H5_REQUEST_NULL,name, &ret_value, size) < 0) HGOTO_ERROR(H5E_INTERNAL, H5E_CANTGET, FAIL, "unable to get file name") } else { @@ -2924,7 +2924,7 @@ H5Fget_info2(hid_t uid, H5F_info2_t *finfo) if(!finfo) HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no info struct") - if((ret_value = H5VL_file_get(uid, H5VL_FILE_GET_INFO, finfo)) < 0) + if((ret_value = H5VL_file_get(uid, H5VL_FILE_GET_INFO, H5_REQUEST_NULL, finfo)) < 0) HGOTO_ERROR(H5E_INTERNAL, H5E_CANTGET, FAIL, "unable to get file info") done: FUNC_LEAVE_API(ret_value) @@ -2959,7 +2959,7 @@ H5Fget_free_sections(hid_t uid, H5F_mem_t type, size_t nsects, if(sect_info && nsects == 0) HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "nsects must be > 0") - if(H5VL_file_get(uid, H5VL_FILE_GET_FREE_SECTIONS, sect_info, &ret_value, + if(H5VL_file_get(uid, H5VL_FILE_GET_FREE_SECTIONS, H5_REQUEST_NULL, sect_info, &ret_value, type, nsects) < 0) HGOTO_ERROR(H5E_INTERNAL, H5E_CANTGET, FAIL, "unable to get file info") done: @@ -302,7 +302,7 @@ H5Gcreate2(hid_t loc_id, const char *name, hid_t lcpl_id, hid_t gcpl_id, hid_t g HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't set property value for lcpl id") /* Create the group through the VOL */ - if((ret_value = H5VL_group_create(loc_id, name, gcpl_id, gapl_id)) < 0) + if((ret_value = H5VL_group_create(loc_id, name, gcpl_id, gapl_id, H5_REQUEST_NULL)) < 0) HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "unable to create group") done: @@ -368,7 +368,7 @@ H5Gcreate_anon(hid_t loc_id, hid_t gcpl_id, hid_t gapl_id) HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not group access property list") /* Create the group through the VOL */ - if((ret_value = H5VL_group_create(loc_id, NULL, gcpl_id, gapl_id)) < 0) + if((ret_value = H5VL_group_create(loc_id, NULL, gcpl_id, gapl_id, H5_REQUEST_NULL)) < 0) HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "unable to create group") done: @@ -413,7 +413,7 @@ H5Gopen2(hid_t loc_id, const char *name, hid_t gapl_id) HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not group access property list") /* Open the group through the VOL */ - if((ret_value = H5VL_group_open(loc_id, name, gapl_id)) < 0) + if((ret_value = H5VL_group_open(loc_id, name, gapl_id, H5_REQUEST_NULL)) < 0) HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "unable to open group") done: @@ -445,7 +445,7 @@ H5Gget_create_plist(hid_t uid) FUNC_ENTER_API(FAIL) H5TRACE1("i", "i", uid); - if(H5VL_group_get(uid, H5VL_GROUP_GET_GCPL, &ret_value) < 0) + if(H5VL_group_get(uid, H5VL_GROUP_GET_GCPL, H5_REQUEST_NULL, &ret_value) < 0) HGOTO_ERROR(H5E_INTERNAL, H5E_CANTGET, FAIL, "unable to get group creation properties") done: @@ -483,7 +483,7 @@ H5Gget_info(hid_t loc_id, H5G_info_t *grp_info) HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no info struct") /* Get the group info through the VOL using the location token */ - if((ret_value = H5VL_group_get(loc_id, H5VL_GROUP_GET_INFO, grp_info, NULL)) < 0) + if((ret_value = H5VL_group_get(loc_id, H5VL_GROUP_GET_INFO, H5_REQUEST_NULL, grp_info, NULL)) < 0) HGOTO_ERROR(H5E_INTERNAL, H5E_CANTGET, FAIL, "unable to get group info") done: @@ -527,11 +527,11 @@ H5Gget_info_by_name(hid_t loc_id, const char *name, H5G_info_t *grp_info, HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not link access property list ID") /* Get the token for the Object location through the VOL */ - if(H5VL_object_lookup (loc_id, H5VL_OBJECT_LOOKUP_BY_NAME, &location, name, lapl_id) < 0) + if(H5VL_object_lookup (loc_id, H5VL_OBJECT_LOOKUP_BY_NAME, H5_REQUEST_NULL, &location, name, lapl_id) < 0) HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "unable to locate object") /* Get the group info through the VOL using the location token */ - if((ret_value = H5VL_group_get(loc_id, H5VL_GROUP_GET_INFO, grp_info, location)) < 0) + if((ret_value = H5VL_group_get(loc_id, H5VL_GROUP_GET_INFO, H5_REQUEST_NULL, grp_info, location)) < 0) HGOTO_ERROR(H5E_INTERNAL, H5E_CANTGET, FAIL, "unable to get group info") done: @@ -585,12 +585,12 @@ H5Gget_info_by_idx(hid_t loc_id, const char *group_name, H5_index_t idx_type, HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not link access property list ID") /* Get the token for the Object location through the VOL */ - if(H5VL_object_lookup(loc_id, H5VL_OBJECT_LOOKUP_BY_IDX, &location, group_name, + if(H5VL_object_lookup(loc_id, H5VL_OBJECT_LOOKUP_BY_IDX, H5_REQUEST_NULL, &location, group_name, idx_type, order, n, lapl_id) < 0) HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "unable to locate object") /* Get the group info through the VOL using the location token */ - if((ret_value = H5VL_group_get(loc_id, H5VL_GROUP_GET_INFO, grp_info, location)) < 0) + if((ret_value = H5VL_group_get(loc_id, H5VL_GROUP_GET_INFO, H5_REQUEST_NULL, grp_info, location)) < 0) HGOTO_ERROR(H5E_INTERNAL, H5E_CANTGET, FAIL, "unable to get group info") done: @@ -624,7 +624,7 @@ H5Gclose(hid_t group_id) H5TRACE1("e", "i", group_id); /* Close the group through the VOL */ - if(H5VL_group_close(group_id) < 0) + if(H5VL_group_close(group_id, H5_REQUEST_NULL) < 0) HGOTO_ERROR(H5E_SYM, H5E_CANTRELEASE, FAIL, "unable to close group") done: diff --git a/src/H5Gdeprec.c b/src/H5Gdeprec.c index 41d8eb9..a05736b 100644 --- a/src/H5Gdeprec.c +++ b/src/H5Gdeprec.c @@ -251,7 +251,7 @@ H5Gcreate1(hid_t loc_id, const char *name, size_t size_hint) HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get property value for lcpl id") /* Create the group through the VOL */ - if((ret_value = H5VL_group_create(loc_id, name, tmp_gcpl, H5P_GROUP_ACCESS_DEFAULT)) < 0) + if((ret_value = H5VL_group_create(loc_id, name, tmp_gcpl, H5P_GROUP_ACCESS_DEFAULT, H5_REQUEST_NULL)) < 0) HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "unable to create group") done: @@ -293,7 +293,7 @@ H5Gopen1(hid_t loc_id, const char *name) HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no name") /* Open the group through the VOL */ - if((ret_value = H5VL_group_open(loc_id, name, H5P_DEFAULT)) < 0) + if((ret_value = H5VL_group_open(loc_id, name, H5P_DEFAULT, H5_REQUEST_NULL)) < 0) HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "unable to create group") done: @@ -338,7 +338,7 @@ H5Glink(hid_t cur_loc_id, H5G_link_t type, const char *cur_name, const char *new /* Create the link through the VOL */ if((ret_value = H5VL_link_create(H5VL_CREATE_HARD_LINK, H5L_SAME_LOC, new_name, - lcpl_id, H5P_DEFAULT)) < 0) + lcpl_id, H5P_DEFAULT, H5_REQUEST_NULL)) < 0) HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "unable to create link") } /* end if */ else if(type == H5L_TYPE_SOFT) { @@ -348,7 +348,7 @@ H5Glink(hid_t cur_loc_id, H5G_link_t type, const char *cur_name, const char *new /* Create the link through the VOL */ if((ret_value = H5VL_link_create(H5VL_CREATE_SOFT_LINK, cur_loc_id, new_name, - lcpl_id, H5P_DEFAULT)) < 0) + lcpl_id, H5P_DEFAULT, H5_REQUEST_NULL)) < 0) HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "unable to create link") } /* end else if */ else @@ -397,7 +397,7 @@ H5Glink2(hid_t cur_loc_id, const char *cur_name, H5G_link_t type, /* Create the link through the VOL */ if((ret_value = H5VL_link_create(H5VL_CREATE_HARD_LINK, new_loc_id, new_name, - lcpl_id, H5P_DEFAULT)) < 0) + lcpl_id, H5P_DEFAULT, H5_REQUEST_NULL)) < 0) HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "unable to create link") } /* end if */ else if(type == H5L_TYPE_SOFT) { @@ -412,7 +412,7 @@ H5Glink2(hid_t cur_loc_id, const char *cur_name, H5G_link_t type, /* Create the link through the VOL */ if((ret_value = H5VL_link_create(H5VL_CREATE_SOFT_LINK, new_loc_id, new_name, - lcpl_id, H5P_DEFAULT)) < 0) + lcpl_id, H5P_DEFAULT, H5_REQUEST_NULL)) < 0) HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "unable to create link") } /* end else if */ else @@ -494,7 +494,7 @@ H5Gmove(hid_t src_loc_id, const char *src_name, const char *dst_name) /* Create the link through the VOL */ if((ret_value = H5VL_link_move(src_loc_id, src_name, H5L_SAME_LOC, dst_name, - FALSE, H5P_DEFAULT, H5P_DEFAULT)) < 0) + FALSE, H5P_DEFAULT, H5P_DEFAULT, H5_REQUEST_NULL)) < 0) HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "unable to create link") done: @@ -520,7 +520,7 @@ H5Gmove2(hid_t src_loc_id, const char *src_name, hid_t dst_loc_id, /* Create the link through the VOL */ if((ret_value = H5VL_link_move(src_loc_id, src_name, dst_loc_id, dst_name, - FALSE, H5P_DEFAULT, H5P_DEFAULT)) < 0) + FALSE, H5P_DEFAULT, H5P_DEFAULT, H5_REQUEST_NULL)) < 0) HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "unable to create link") done: @@ -604,7 +604,7 @@ H5Gunlink(hid_t loc_id, const char *name) HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no name") /* Delete the link through the VOL */ - if((ret_value = H5VL_link_delete(loc_id, name, NULL, H5P_DEFAULT)) < 0) + if((ret_value = H5VL_link_delete(loc_id, name, NULL, H5P_DEFAULT, H5_REQUEST_NULL)) < 0) HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "unable to create link") done: @@ -330,7 +330,7 @@ H5Lmove(hid_t src_loc_id, const char *src_name, hid_t dst_loc_id, /* Create the link through the VOL */ if((ret_value = H5VL_link_move(src_loc_id, src_name, dst_loc_id, dst_name, - FALSE, lcpl_id, lapl_id)) < 0) + FALSE, lcpl_id, lapl_id, H5_REQUEST_NULL)) < 0) HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "unable to create link") done: @@ -374,7 +374,7 @@ H5Lcopy(hid_t src_loc_id, const char *src_name, hid_t dst_loc_id, /* Create the link through the VOL */ if((ret_value = H5VL_link_move(src_loc_id, src_name, dst_loc_id, dst_name, - TRUE, lcpl_id, lapl_id)) < 0) + TRUE, lcpl_id, lapl_id, H5_REQUEST_NULL)) < 0) HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "unable to create link") done: @@ -434,7 +434,7 @@ H5Lcreate_soft(const char *link_target, /* Create the link through the VOL */ if((ret_value = H5VL_link_create(H5VL_CREATE_SOFT_LINK, link_loc_id, link_name, - lcpl_id, lapl_id)) < 0) + lcpl_id, lapl_id, H5_REQUEST_NULL)) < 0) HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "unable to create link") done: @@ -495,7 +495,7 @@ H5Lcreate_hard(hid_t cur_loc_id, const char *cur_name, /* Create the link through the VOL */ if((ret_value = H5VL_link_create(H5VL_CREATE_HARD_LINK, new_loc_id, new_name, - lcpl_id, lapl_id)) < 0) + lcpl_id, lapl_id, H5_REQUEST_NULL)) < 0) HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "unable to create link") done: @@ -562,7 +562,7 @@ H5Lcreate_ud(hid_t link_loc_id, const char *link_name, H5L_type_t link_type, /* Create the link through the VOL */ if((ret_value = H5VL_link_create(H5VL_CREATE_UD_LINK, link_loc_id, link_name, - lcpl_id, lapl_id)) < 0) + lcpl_id, lapl_id, H5_REQUEST_NULL)) < 0) HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "unable to create link") done: @@ -600,7 +600,7 @@ H5Ldelete(hid_t loc_id, const char *name, hid_t lapl_id) HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no name") /* Delete the link through the VOL */ - if((ret_value = H5VL_link_delete(loc_id, name, NULL, lapl_id)) < 0) + if((ret_value = H5VL_link_delete(loc_id, name, NULL, lapl_id, H5_REQUEST_NULL)) < 0) HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "unable to create link") done: @@ -657,7 +657,7 @@ H5Ldelete_by_idx(hid_t loc_id, const char *group_name, udata.dxpl_id = H5AC_dxpl_id; /* Delete the link through the VOL */ - if((ret_value = H5VL_link_delete(loc_id, group_name, &udata, lapl_id)) < 0) + if((ret_value = H5VL_link_delete(loc_id, group_name, &udata, lapl_id, H5_REQUEST_NULL)) < 0) HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "unable to create link") done: @@ -703,7 +703,7 @@ H5Lget_val(hid_t loc_id, const char *name, void *buf/*out*/, size_t size, HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not link access property list ID") /* Get the link info through the VOL */ - if((ret_value = H5VL_link_get(loc_id, H5VL_LINK_GET_VAL, name, buf, size, NULL, lapl_id)) < 0) + if((ret_value = H5VL_link_get(loc_id, H5VL_LINK_GET_VAL, H5_REQUEST_NULL, name, buf, size, NULL, lapl_id)) < 0) HGOTO_ERROR(H5E_INTERNAL, H5E_CANTGET, FAIL, "unable to get group info") done: @@ -763,7 +763,7 @@ H5Lget_val_by_idx(hid_t loc_id, const char *group_name, H5_index_t idx_type, udata.size = size; /* Get the link info through the VOL */ - if((ret_value = H5VL_link_get(loc_id, H5VL_LINK_GET_VAL, group_name, buf, size, &udata, lapl_id)) < 0) + if((ret_value = H5VL_link_get(loc_id, H5VL_LINK_GET_VAL, H5_REQUEST_NULL, group_name, buf, size, &udata, lapl_id)) < 0) HGOTO_ERROR(H5E_INTERNAL, H5E_CANTGET, FAIL, "unable to get link val") done: @@ -802,7 +802,7 @@ H5Lexists(hid_t loc_id, const char *name, hid_t lapl_id) HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not link access property list ID") /* check link existence through the VOL */ - if(H5VL_link_get(loc_id, H5VL_LINK_EXISTS, name, &ret_value, lapl_id) < 0) + if(H5VL_link_get(loc_id, H5VL_LINK_EXISTS, H5_REQUEST_NULL, name, &ret_value, lapl_id) < 0) HGOTO_ERROR(H5E_INTERNAL, H5E_CANTGET, FAIL, "unable to get link info") done: @@ -842,7 +842,7 @@ H5Lget_info(hid_t loc_id, const char *name, H5L_info_t *linfo /*out*/, HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not link access property list ID") /* Get the link info through the VOL */ - if((ret_value = H5VL_link_get(loc_id, H5VL_LINK_GET_INFO, name, linfo, NULL, lapl_id)) < 0) + if((ret_value = H5VL_link_get(loc_id, H5VL_LINK_GET_INFO, H5_REQUEST_NULL, name, linfo, NULL, lapl_id)) < 0) HGOTO_ERROR(H5E_INTERNAL, H5E_CANTGET, FAIL, "unable to get group info") done: @@ -897,7 +897,7 @@ H5Lget_info_by_idx(hid_t loc_id, const char *group_name, udata.linfo = linfo; /* Get the link info through the VOL */ - if((ret_value = H5VL_link_get(loc_id, H5VL_LINK_GET_INFO, group_name, + if((ret_value = H5VL_link_get(loc_id, H5VL_LINK_GET_INFO, H5_REQUEST_NULL, group_name, linfo, &udata, lapl_id)) < 0) HGOTO_ERROR(H5E_INTERNAL, H5E_CANTGET, FAIL, "unable to get group info") @@ -1085,7 +1085,7 @@ H5Lget_name_by_idx(hid_t loc_id, const char *group_name, udata.name_len = -1; /* Get the link info through the VOL */ - if((ret_value = H5VL_link_get(loc_id, H5VL_LINK_GET_NAME, group_name, &udata, lapl_id)) < 0) + if((ret_value = H5VL_link_get(loc_id, H5VL_LINK_GET_NAME, H5_REQUEST_NULL, group_name, &udata, lapl_id)) < 0) HGOTO_ERROR(H5E_INTERNAL, H5E_CANTGET, FAIL, "unable to get link name") /* Set the return value */ @@ -241,11 +241,11 @@ H5Oopen(hid_t loc_id, const char *name, hid_t lapl_id) HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no name") /* Get the token for the Object location through the VOL */ - if(H5VL_object_lookup (loc_id, H5VL_OBJECT_LOOKUP_BY_NAME, &location, name, lapl_id) < 0) + if(H5VL_object_lookup (loc_id, H5VL_OBJECT_LOOKUP_BY_NAME, H5_REQUEST_NULL, &location, name, lapl_id) < 0) HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "unable to locate object") /* Open the object through the VOL */ - if((ret_value = H5VL_object_open_by_loc(loc_id, location, lapl_id)) < 0) + if((ret_value = H5VL_object_open_by_loc(loc_id, location, lapl_id, H5_REQUEST_NULL)) < 0) HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "unable to open object") done: @@ -305,12 +305,12 @@ H5Oopen_by_idx(hid_t loc_id, const char *group_name, H5_index_t idx_type, HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not link access property list ID") /* Get the token for the Object location through the VOL */ - if(H5VL_object_lookup(loc_id, H5VL_OBJECT_LOOKUP_BY_IDX, &location, group_name, + if(H5VL_object_lookup(loc_id, H5VL_OBJECT_LOOKUP_BY_IDX, H5_REQUEST_NULL, &location, group_name, idx_type, order, n, lapl_id) < 0) HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "unable to locate object") /* Open the object through the VOL */ - if((ret_value = H5VL_object_open_by_loc(loc_id, location, lapl_id)) < 0) + if((ret_value = H5VL_object_open_by_loc(loc_id, location, lapl_id, H5_REQUEST_NULL)) < 0) HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "unable to open object") done: @@ -368,11 +368,11 @@ H5Oopen_by_addr(hid_t loc_id, haddr_t addr) H5TRACE2("i", "ia", loc_id, addr); /* Get the token for the Object location through the VOL */ - if(H5VL_object_lookup (loc_id, H5VL_OBJECT_LOOKUP_BY_ADDR, &location, addr) < 0) + if(H5VL_object_lookup (loc_id, H5VL_OBJECT_LOOKUP_BY_ADDR, H5_REQUEST_NULL, &location, addr) < 0) HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "unable to locate object") /* Open the object through the VOL */ - if((ret_value = H5VL_object_open_by_loc(loc_id, location, lapl_id)) < 0) + if((ret_value = H5VL_object_open_by_loc(loc_id, location, lapl_id, H5_REQUEST_NULL)) < 0) HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "unable to open object") done: @@ -445,7 +445,7 @@ H5Olink(hid_t obj_id, hid_t new_loc_id, const char *new_name, hid_t lcpl_id, /* Create the link through the VOL */ if((ret_value = H5VL_link_create(H5VL_CREATE_HARD_LINK, new_loc_id, new_name, - lcpl_id, lapl_id)) < 0) + lcpl_id, lapl_id, H5_REQUEST_NULL)) < 0) HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "unable to create link") done: @@ -482,7 +482,7 @@ H5Oincr_refcount(hid_t object_id) H5TRACE1("e", "i", object_id); /* change the ref count through the VOL */ - if(H5VL_object_generic(object_id, H5VL_OBJECT_CHANGE_REF_COUNT, 1) < 0) + if(H5VL_object_generic(object_id, H5VL_OBJECT_CHANGE_REF_COUNT, H5_REQUEST_NULL, 1) < 0) HGOTO_ERROR(H5E_OHDR, H5E_LINKCOUNT, FAIL, "modifying object link count failed") done: @@ -519,7 +519,7 @@ H5Odecr_refcount(hid_t object_id) H5TRACE1("e", "i", object_id); /* change the ref count through the VOL */ - if(H5VL_object_generic(object_id, H5VL_OBJECT_CHANGE_REF_COUNT, -1) < 0) + if(H5VL_object_generic(object_id, H5VL_OBJECT_CHANGE_REF_COUNT, H5_REQUEST_NULL, H5_REQUEST_NULL) < 0) HGOTO_ERROR(H5E_OHDR, H5E_LINKCOUNT, FAIL, "modifying object link count failed") done: @@ -558,7 +558,7 @@ H5Oexists_by_name(hid_t loc_id, const char *name, hid_t lapl_id) HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not link access property list ID") /* change the ref count through the VOL */ - if(H5VL_object_generic(loc_id, H5VL_OBJECT_EXISTS, name, lapl_id, &ret_value) < 0) + if(H5VL_object_generic(loc_id, H5VL_OBJECT_EXISTS, H5_REQUEST_NULL, name, lapl_id, &ret_value) < 0) HGOTO_ERROR(H5E_OHDR, H5E_CANTGET, FAIL, "unable to determine if '%s' exists", name) done: @@ -594,7 +594,7 @@ H5Oget_info(hid_t loc_id, H5O_info_t *oinfo) HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no info struct") /* Get the group info through the VOL using the location token */ - if((ret_value = H5VL_object_get(loc_id, H5VL_OBJECT_GET_INFO, oinfo, NULL)) < 0) + if((ret_value = H5VL_object_get(loc_id, H5VL_OBJECT_GET_INFO, H5_REQUEST_NULL, oinfo, NULL)) < 0) HGOTO_ERROR(H5E_INTERNAL, H5E_CANTGET, FAIL, "unable to get group info") done: @@ -641,11 +641,11 @@ H5Oget_info_by_name(hid_t loc_id, const char *name, H5O_info_t *oinfo, hid_t lap HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not link access property list ID") /* Get the token for the Object location through the VOL */ - if(H5VL_object_lookup (loc_id, H5VL_OBJECT_LOOKUP_BY_NAME, &location, name, lapl_id) < 0) + if(H5VL_object_lookup (loc_id, H5VL_OBJECT_LOOKUP_BY_NAME, H5_REQUEST_NULL, &location, name, lapl_id) < 0) HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "unable to locate object") /* Get the group info through the VOL using the location token */ - if((ret_value = H5VL_object_get(loc_id, H5VL_OBJECT_GET_INFO, oinfo, location)) < 0) + if((ret_value = H5VL_object_get(loc_id, H5VL_OBJECT_GET_INFO, H5_REQUEST_NULL, oinfo, location)) < 0) HGOTO_ERROR(H5E_INTERNAL, H5E_CANTGET, FAIL, "unable to get group info") done: @@ -699,12 +699,12 @@ H5Oget_info_by_idx(hid_t loc_id, const char *group_name, H5_index_t idx_type, HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not link access property list ID") /* Get the token for the Object location through the VOL */ - if(H5VL_object_lookup(loc_id, H5VL_OBJECT_LOOKUP_BY_IDX, &location, group_name, + if(H5VL_object_lookup(loc_id, H5VL_OBJECT_LOOKUP_BY_IDX, H5_REQUEST_NULL, &location, group_name, idx_type, order, n, lapl_id) < 0) HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "unable to locate object") /* Get the group info through the VOL using the location token */ - if((ret_value = H5VL_object_get(loc_id, H5VL_OBJECT_GET_INFO, oinfo, location)) < 0) + if((ret_value = H5VL_object_get(loc_id, H5VL_OBJECT_GET_INFO, H5_REQUEST_NULL, oinfo, location)) < 0) HGOTO_ERROR(H5E_INTERNAL, H5E_CANTGET, FAIL, "unable to get group info") done: @@ -742,7 +742,7 @@ H5Oset_comment(hid_t obj_id, const char *comment) H5TRACE2("e", "i*s", obj_id, comment); /* set comment on object through the VOL */ - if(H5VL_object_generic(obj_id, H5VL_OBJECT_SET_COMMENT, ".", comment, H5P_LINK_ACCESS_DEFAULT) < 0) + if(H5VL_object_generic(obj_id, H5VL_OBJECT_SET_COMMENT, H5_REQUEST_NULL, ".", comment, H5P_LINK_ACCESS_DEFAULT) < 0) HGOTO_ERROR(H5E_SYM, H5E_NOTFOUND, FAIL, "object not found") done: @@ -786,7 +786,7 @@ H5Oset_comment_by_name(hid_t loc_id, const char *name, const char *comment, HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not link access property list ID") /* set comment on object through the VOL */ - if(H5VL_object_generic(loc_id, H5VL_OBJECT_SET_COMMENT, name, comment, lapl_id) < 0) + if(H5VL_object_generic(loc_id, H5VL_OBJECT_SET_COMMENT, H5_REQUEST_NULL, name, comment, lapl_id) < 0) HGOTO_ERROR(H5E_SYM, H5E_NOTFOUND, FAIL, "object not found") done: @@ -818,7 +818,7 @@ H5Oget_comment(hid_t loc_id, char *comment, size_t bufsize) FUNC_ENTER_API(FAIL) H5TRACE3("Zs", "i*sz", loc_id, comment, bufsize); - if(H5VL_object_get(loc_id, H5VL_OBJECT_GET_COMMENT, &ret_value, comment, bufsize, + if(H5VL_object_get(loc_id, H5VL_OBJECT_GET_COMMENT, H5_REQUEST_NULL, &ret_value, comment, bufsize, ".", H5P_LINK_ACCESS_DEFAULT) < 0) HGOTO_ERROR(H5E_INTERNAL, H5E_CANTGET, FAIL, "unable to get object info") @@ -861,7 +861,7 @@ H5Oget_comment_by_name(hid_t loc_id, const char *name, char *comment, size_t buf if(TRUE != H5P_isa_class(lapl_id, H5P_LINK_ACCESS)) HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not link access property list ID") - if(H5VL_object_get(loc_id, H5VL_OBJECT_GET_COMMENT, &ret_value, comment, bufsize, + if(H5VL_object_get(loc_id, H5VL_OBJECT_GET_COMMENT, H5_REQUEST_NULL, &ret_value, comment, bufsize, name, lapl_id) < 0) HGOTO_ERROR(H5E_INTERNAL, H5E_CANTGET, FAIL, "unable to get object info") @@ -1021,7 +1021,7 @@ H5Oclose(hid_t object_id) H5TRACE1("e", "i", object_id); /* Close the object through the VOL */ - if(H5VL_object_close(object_id) < 0) + if(H5VL_object_close(object_id, H5_REQUEST_NULL) < 0) HGOTO_ERROR(H5E_SYM, H5E_CANTRELEASE, FAIL, "unable to close object") done: diff --git a/src/H5Ocopy.c b/src/H5Ocopy.c index c1622d8..c4451de 100644 --- a/src/H5Ocopy.c +++ b/src/H5Ocopy.c @@ -229,7 +229,7 @@ H5Ocopy(hid_t src_loc_id, const char *src_name, hid_t dst_loc_id, /* Open the object through the VOL */ if((ret_value = H5VL_object_copy(src_loc_id, src_name, dst_loc_id, dst_name, - ocpypl_id, lcpl_id)) < 0) + ocpypl_id, lcpl_id, H5_REQUEST_NULL)) < 0) HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "unable to open object") done: FUNC_LEAVE_API(ret_value) @@ -318,7 +318,7 @@ H5Rcreate(void *ref, hid_t loc_id, const char *name, H5R_type_t ref_type, hid_t HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "reference region dataspace id must be valid") /* create the ref through the VOL */ - if(H5VL_object_generic(loc_id, H5VL_REF_CREATE, ref, name, ref_type, space_id) < 0) + if(H5VL_object_generic(loc_id, H5VL_REF_CREATE, H5_REQUEST_NULL, ref, name, ref_type, space_id) < 0) HGOTO_ERROR(H5E_OHDR, H5E_LINKCOUNT, FAIL, "modifying object link count failed") done: @@ -527,11 +527,11 @@ H5Rdereference2(hid_t obj_id, hid_t oapl_id, H5R_type_t ref_type, const void *_r HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "invalid reference pointer") /* Get the token for the Object location through the VOL */ - if(H5VL_object_lookup (obj_id, H5VL_OBJECT_LOOKUP_BY_REF, &location, ref_type, _ref) < 0) + if(H5VL_object_lookup (obj_id, H5VL_OBJECT_LOOKUP_BY_REF, H5_REQUEST_NULL, &location, ref_type, _ref) < 0) HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "unable to locate object") /* Open the object through the VOL */ - if((ret_value = H5VL_object_open_by_loc(obj_id, location, oapl_id)) < 0) + if((ret_value = H5VL_object_open_by_loc(obj_id, location, oapl_id, H5_REQUEST_NULL)) < 0) HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "unable to open object") done: @@ -646,7 +646,7 @@ H5Rget_region(hid_t id, H5R_type_t ref_type, const void *ref) HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "invalid reference pointer") /* Get the space id through the VOL */ - if(H5VL_object_get(id, H5VL_REF_GET_REGION, &ret_value, ref_type, ref) < 0) + if(H5VL_object_get(id, H5VL_REF_GET_REGION, H5_REQUEST_NULL, &ret_value, ref_type, ref) < 0) HGOTO_ERROR(H5E_INTERNAL, H5E_CANTGET, FAIL, "unable to get group info") done: @@ -779,7 +779,7 @@ H5Rget_obj_type2(hid_t id, H5R_type_t ref_type, const void *ref, HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "invalid reference pointer") /* get the object type through the VOL */ - if((ret_value = H5VL_object_get(id, H5VL_REF_GET_TYPE, obj_type, ref_type, ref)) < 0) + if((ret_value = H5VL_object_get(id, H5VL_REF_GET_TYPE, H5_REQUEST_NULL, obj_type, ref_type, ref)) < 0) HGOTO_ERROR(H5E_INTERNAL, H5E_CANTGET, FAIL, "unable to get group info") done: @@ -929,7 +929,7 @@ H5Rget_name(hid_t id, H5R_type_t ref_type, const void *_ref, char *name, HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "invalid reference pointer") /* get the object type through the VOL */ - if(H5VL_object_get(id, H5VL_REF_GET_NAME, &ret_value, name, size, ref_type, _ref) < 0) + if(H5VL_object_get(id, H5VL_REF_GET_NAME, H5_REQUEST_NULL, &ret_value, name, size, ref_type, _ref) < 0) HGOTO_ERROR(H5E_INTERNAL, H5E_CANTGET, FAIL, "unable to get group info") done: FUNC_LEAVE_API(ret_value) diff --git a/src/H5Rdeprec.c b/src/H5Rdeprec.c index ca27833..b3838f1 100644 --- a/src/H5Rdeprec.c +++ b/src/H5Rdeprec.c @@ -146,7 +146,7 @@ H5Rget_obj_type1(hid_t id, H5R_type_t ref_type, const void *ref) HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, H5G_UNKNOWN, "invalid reference pointer") /* get the object type through the VOL */ - if((ret_value = H5VL_object_get(id, H5VL_REF_GET_TYPE, &obj_type, ref_type, ref)) < 0) + if((ret_value = H5VL_object_get(id, H5VL_REF_GET_TYPE, H5_REQUEST_NULL, &obj_type, ref_type, ref)) < 0) HGOTO_ERROR(H5E_INTERNAL, H5E_CANTGET, FAIL, "unable to get group info") /* Set return value */ @@ -196,11 +196,11 @@ H5Rdereference1(hid_t obj_id, H5R_type_t ref_type, const void *_ref) HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "invalid reference pointer") /* Get the token for the Object location through the VOL */ - if(H5VL_object_lookup (obj_id, H5VL_OBJECT_LOOKUP_BY_REF, &location, ref_type, _ref) < 0) + if(H5VL_object_lookup (obj_id, H5VL_OBJECT_LOOKUP_BY_REF, H5_REQUEST_NULL, &location, ref_type, _ref) < 0) HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "unable to locate object") /* Open the object through the VOL */ - if((ret_value = H5VL_object_open_by_loc(obj_id, location, H5P_DATASET_ACCESS_DEFAULT)) < 0) + if((ret_value = H5VL_object_open_by_loc(obj_id, location, H5P_DATASET_ACCESS_DEFAULT, H5_REQUEST_NULL)) < 0) HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "unable to open object") done: @@ -1731,7 +1731,7 @@ H5Tclose(hid_t type_id) /* if this is a named datatype, go through the VOL layer */ if (H5I_DATATYPE_PUBLIC == H5I_get_type(type_id)) { - if(H5VL_object_close(type_id) < 0) + if(H5VL_object_close(type_id, H5_REQUEST_NULL) < 0) HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "unable to free datatype") } else { diff --git a/src/H5Tcommit.c b/src/H5Tcommit.c index d8ed7da..9ad67b9 100644 --- a/src/H5Tcommit.c +++ b/src/H5Tcommit.c @@ -153,7 +153,7 @@ H5Tcommit2(hid_t loc_id, const char *name, hid_t type_id, hid_t lcpl_id, HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not datatype access property list") /* commite the datatype through the VOL */ - if((ret_value = H5VL_datatype_commit(loc_id, name, type_id, lcpl_id, tcpl_id, tapl_id)) < 0) + if((ret_value = H5VL_datatype_commit(loc_id, name, type_id, lcpl_id, tcpl_id, tapl_id, H5_REQUEST_NULL)) < 0) HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "unable to open object") done: FUNC_LEAVE_API(ret_value) @@ -561,7 +561,7 @@ H5Topen2(hid_t loc_id, const char *name, hid_t tapl_id) HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not datatype access property list") /* Open the datatype through the VOL */ - if((ret_value = H5VL_datatype_open(loc_id, name, tapl_id)) < 0) + if((ret_value = H5VL_datatype_open(loc_id, name, tapl_id, H5_REQUEST_NULL)) < 0) HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "unable to open datatype") done: @@ -554,7 +554,7 @@ done: *------------------------------------------------------------------------- */ hid_t -H5VL_attr_create(hid_t uid, const char *name, hid_t acpl_id, hid_t aapl_id) +H5VL_attr_create(hid_t uid, const char *name, hid_t acpl_id, hid_t aapl_id, hid_t req) { H5VL_id_wrapper_t *id_wrapper1; /* user id structure of the location where the attr will be created */ H5VL_id_wrapper_t *id_wrapper2; /* user id structure of new created attr*/ @@ -580,7 +580,7 @@ H5VL_attr_create(hid_t uid, const char *name, hid_t acpl_id, hid_t aapl_id) /* call the corresponding VOL create callback */ if((loc_id = (id_wrapper1->vol_plugin->attr_cls.create) - (id_wrapper1->obj_id, name, acpl_id, aapl_id)) < 0) + (id_wrapper1->obj_id, name, acpl_id, aapl_id, req)) < 0) HGOTO_ERROR(H5E_VOL, H5E_CANTINIT, FAIL, "create failed") /* Create a new id that points to a struct that holds the attr id and the VOL plugin */ @@ -614,7 +614,7 @@ done: *------------------------------------------------------------------------- */ hid_t -H5VL_attr_open(hid_t loc_id, void *location, const char *name, hid_t aapl_id) +H5VL_attr_open(hid_t loc_id, void *location, const char *name, hid_t aapl_id, hid_t req) { H5VL_id_wrapper_t *id_wrapper1; /* user id structure of the location where the attr will be opend */ H5VL_id_wrapper_t *id_wrapper2; /* user id structure of new opend attr*/ @@ -642,7 +642,7 @@ H5VL_attr_open(hid_t loc_id, void *location, const char *name, hid_t aapl_id) /* call the corresponding VOL open callback */ if((attr_id = (id_wrapper1->vol_plugin->attr_cls.open) - (id_wrapper1->obj_id, location, name, aapl_id)) < 0) + (id_wrapper1->obj_id, location, name, aapl_id, req)) < 0) HGOTO_ERROR(H5E_VOL, H5E_CANTINIT, FAIL, "open failed") /* Create a new id that points to a struct that holds the attr id and the VOL plugin */ @@ -674,7 +674,7 @@ done: * *------------------------------------------------------------------------- */ -herr_t H5VL_attr_read(hid_t uid, hid_t mem_type_id, void *buf) +herr_t H5VL_attr_read(hid_t uid, hid_t mem_type_id, void *buf, hid_t req) { H5VL_id_wrapper_t *id_wrapper; /* user id structure */ herr_t ret_value = SUCCEED; @@ -692,7 +692,7 @@ herr_t H5VL_attr_read(hid_t uid, hid_t mem_type_id, void *buf) if(NULL == id_wrapper->vol_plugin->attr_cls.read) HGOTO_ERROR(H5E_VOL, H5E_UNSUPPORTED, FAIL, "vol plugin has no `attr read' method") if((ret_value = (id_wrapper->vol_plugin->attr_cls.read) - (id_wrapper->obj_id, mem_type_id, buf)) < 0) + (id_wrapper->obj_id, mem_type_id, buf, req)) < 0) HGOTO_ERROR(H5E_VOL, H5E_CANTRELEASE, FAIL, "read failed") done: @@ -714,7 +714,7 @@ done: * *------------------------------------------------------------------------- */ -herr_t H5VL_attr_write(hid_t uid, hid_t mem_type_id, const void *buf) +herr_t H5VL_attr_write(hid_t uid, hid_t mem_type_id, const void *buf, hid_t req) { H5VL_id_wrapper_t *id_wrapper; /* user id structure */ herr_t ret_value = SUCCEED; @@ -732,7 +732,7 @@ herr_t H5VL_attr_write(hid_t uid, hid_t mem_type_id, const void *buf) if(NULL == id_wrapper->vol_plugin->attr_cls.write) HGOTO_ERROR(H5E_VOL, H5E_UNSUPPORTED, FAIL, "vol plugin has no `attr write' method") if((ret_value = (id_wrapper->vol_plugin->attr_cls.write) - (id_wrapper->obj_id, mem_type_id, buf)) < 0) + (id_wrapper->obj_id, mem_type_id, buf, req)) < 0) HGOTO_ERROR(H5E_VOL, H5E_CANTRELEASE, FAIL, "write failed") done: @@ -755,7 +755,7 @@ done: *------------------------------------------------------------------------- */ herr_t -H5VL_attr_get(hid_t uid, H5VL_attr_get_t get_type, ...) +H5VL_attr_get(hid_t uid, H5VL_attr_get_t get_type, hid_t req, ...) { H5VL_id_wrapper_t *id_wrapper; /* user id structure */ va_list arguments; /* argument list passed from the API call */ @@ -775,7 +775,7 @@ H5VL_attr_get(hid_t uid, H5VL_attr_get_t get_type, ...) HGOTO_ERROR(H5E_VOL, H5E_UNSUPPORTED, FAIL, "vol plugin has no `attr get' method") va_start (arguments, get_type); - if((ret_value = (id_wrapper->vol_plugin->attr_cls.get)(id_wrapper->obj_id, get_type, + if((ret_value = (id_wrapper->vol_plugin->attr_cls.get)(id_wrapper->obj_id, get_type, req, arguments)) < 0) HGOTO_ERROR(H5E_VOL, H5E_CANTGET, FAIL, "get failed") va_end (arguments); @@ -821,7 +821,7 @@ done: *------------------------------------------------------------------------- */ herr_t -H5VL_attr_delete(hid_t loc_id, void *location, const char *attr_name) +H5VL_attr_delete(hid_t loc_id, void *location, const char *attr_name, hid_t req) { H5VL_id_wrapper_t *id_wrapper; /* user id structure */ herr_t ret_value = SUCCEED; @@ -833,7 +833,7 @@ H5VL_attr_delete(hid_t loc_id, void *location, const char *attr_name) HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "invalid user identifier") if((ret_value = (id_wrapper->vol_plugin->attr_cls.delete) - (id_wrapper->obj_id, location, attr_name)) < 0) + (id_wrapper->obj_id, location, attr_name, req)) < 0) HGOTO_ERROR(H5E_VOL, H5E_CANTDELETE, FAIL, "delete failed") done: @@ -856,7 +856,7 @@ done: *------------------------------------------------------------------------- */ herr_t -H5VL_attr_close(hid_t uid) +H5VL_attr_close(hid_t uid, hid_t req) { H5VL_id_wrapper_t *id_wrapper; /* user id structure */ herr_t ret_value = SUCCEED; @@ -874,11 +874,11 @@ H5VL_attr_close(hid_t uid) /* if the VOL class does not implement a specific attr close callback, try the generic object close */ if(NULL == id_wrapper->vol_plugin->attr_cls.close){ - if(H5VL_object_close(uid) < 0) + if(H5VL_object_close(uid, req) < 0) HGOTO_ERROR(H5E_SYM, H5E_CANTRELEASE, FAIL, "unable to close object") } else { - if((ret_value = (id_wrapper->vol_plugin->attr_cls.close)(id_wrapper->obj_id)) < 0) + if((ret_value = (id_wrapper->vol_plugin->attr_cls.close)(id_wrapper->obj_id, req)) < 0) HGOTO_ERROR(H5E_VOL, H5E_CANTRELEASE, FAIL, "close failed") id_wrapper->vol_plugin->nrefs--; @@ -906,7 +906,7 @@ done: */ herr_t H5VL_datatype_commit(hid_t uid, const char *name, hid_t type_id, hid_t lcpl_id, - hid_t tcpl_id, hid_t tapl_id) + hid_t tcpl_id, hid_t tapl_id, hid_t req) { H5VL_id_wrapper_t *id_wrapper1; /* wrapper object of the location where the datatype will be commitd */ herr_t ret_value = SUCCEED; /* Return value */ @@ -923,7 +923,7 @@ H5VL_datatype_commit(hid_t uid, const char *name, hid_t type_id, hid_t lcpl_id, /* call the corresponding VOL commit callback */ if((ret_value = (id_wrapper1->vol_plugin->datatype_cls.commit) - (id_wrapper1->obj_id, name, type_id, lcpl_id, tcpl_id, tapl_id)) < 0) + (id_wrapper1->obj_id, name, type_id, lcpl_id, tcpl_id, tapl_id, req)) < 0) HGOTO_ERROR(H5E_VOL, H5E_CANTINIT, FAIL, "commit failed") #if 0 @@ -962,7 +962,7 @@ done: *------------------------------------------------------------------------- */ hid_t -H5VL_datatype_open(hid_t loc_id, const char *name, hid_t tapl_id) +H5VL_datatype_open(hid_t loc_id, const char *name, hid_t tapl_id, hid_t req) { H5VL_id_wrapper_t *id_wrapper1; /* user id structure of the location where the datatype will be opend */ H5VL_id_wrapper_t *id_wrapper2; /* user id structure of new opend datatype*/ @@ -981,17 +981,17 @@ H5VL_datatype_open(hid_t loc_id, const char *name, hid_t tapl_id) the location of the object */ /* Get the token for the Object location through the VOL */ - if(H5VL_object_lookup (loc_id, H5VL_OBJECT_LOOKUP_BY_NAME, &location, name, tapl_id) < 0) + if(H5VL_object_lookup (loc_id, H5VL_OBJECT_LOOKUP_BY_NAME, req, &location, name, tapl_id) < 0) HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "unable to locate object") /* Open the object through the VOL */ - if((ret_value = H5VL_object_open_by_loc(loc_id, location, tapl_id)) < 0) + if((ret_value = H5VL_object_open_by_loc(loc_id, location, tapl_id, req)) < 0) HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "unable to open object") } else { /* call the corresponding VOL open callback */ if((datatype_id = (id_wrapper1->vol_plugin->datatype_cls.open) - (id_wrapper1->obj_id, name, tapl_id)) < 0) + (id_wrapper1->obj_id, name, tapl_id, req)) < 0) HGOTO_ERROR(H5E_VOL, H5E_CANTINIT, FAIL, "open failed") /* Create a new id that points to a struct that holds the datatype id and the VOL plugin */ @@ -1025,7 +1025,7 @@ done: *------------------------------------------------------------------------- */ hid_t -H5VL_dataset_create(hid_t uid, const char *name, hid_t dcpl_id, hid_t dapl_id) +H5VL_dataset_create(hid_t uid, const char *name, hid_t dcpl_id, hid_t dapl_id, hid_t req) { H5VL_id_wrapper_t *id_wrapper1; /* user id structure of the location where the dataset will be created */ H5VL_id_wrapper_t *id_wrapper2; /* user id structure of new created dataset*/ @@ -1066,7 +1066,7 @@ H5VL_dataset_create(hid_t uid, const char *name, hid_t dcpl_id, hid_t dapl_id) /* call the corresponding VOL create callback */ if((dataset_id = (id_wrapper1->vol_plugin->dataset_cls.create) - (id_wrapper1->obj_id, name, dcpl_id, dapl_id)) < 0) + (id_wrapper1->obj_id, name, dcpl_id, dapl_id, req)) < 0) HGOTO_ERROR(H5E_VOL, H5E_CANTINIT, FAIL, "create failed") /* Create a new id that points to a struct that holds the dataset id and the VOL plugin */ @@ -1100,7 +1100,7 @@ done: *------------------------------------------------------------------------- */ hid_t -H5VL_dataset_open(hid_t loc_id, const char *name, hid_t dapl_id) +H5VL_dataset_open(hid_t loc_id, const char *name, hid_t dapl_id, hid_t req) { H5VL_id_wrapper_t *id_wrapper1; /* user id structure of the location where the dataset will be opend */ H5VL_id_wrapper_t *id_wrapper2; /* user id structure of new opend dataset*/ @@ -1119,17 +1119,17 @@ H5VL_dataset_open(hid_t loc_id, const char *name, hid_t dapl_id) the location of the object */ /* Get the token for the Object location through the VOL */ - if(H5VL_object_lookup (loc_id, H5VL_OBJECT_LOOKUP_BY_NAME, &location, name, dapl_id) < 0) + if(H5VL_object_lookup (loc_id, H5VL_OBJECT_LOOKUP_BY_NAME, req, &location, name, dapl_id) < 0) HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "unable to locate object") /* Open the object through the VOL */ - if((ret_value = H5VL_object_open_by_loc(loc_id, location, dapl_id)) < 0) + if((ret_value = H5VL_object_open_by_loc(loc_id, location, dapl_id, req)) < 0) HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "unable to open object") } else { /* call the corresponding VOL open callback */ if((dataset_id = (id_wrapper1->vol_plugin->dataset_cls.open) - (id_wrapper1->obj_id, name, dapl_id)) < 0) + (id_wrapper1->obj_id, name, dapl_id, req)) < 0) HGOTO_ERROR(H5E_VOL, H5E_CANTINIT, FAIL, "open failed") /* Create a new id that points to a struct that holds the dataset id and the VOL plugin */ @@ -1162,7 +1162,7 @@ done: *------------------------------------------------------------------------- */ herr_t H5VL_dataset_read(hid_t uid, hid_t mem_type_id, hid_t mem_space_id, - hid_t file_space_id, hid_t plist_id, void *buf) + hid_t file_space_id, hid_t plist_id, void *buf, hid_t req) { H5VL_id_wrapper_t *id_wrapper; /* user id structure */ herr_t ret_value = SUCCEED; @@ -1180,8 +1180,8 @@ herr_t H5VL_dataset_read(hid_t uid, hid_t mem_type_id, hid_t mem_space_id, if(NULL == id_wrapper->vol_plugin->dataset_cls.read) HGOTO_ERROR(H5E_VOL, H5E_UNSUPPORTED, FAIL, "vol plugin has no `dataset read' method") if((ret_value = (id_wrapper->vol_plugin->dataset_cls.read) - (id_wrapper->obj_id, mem_type_id, mem_space_id, file_space_id, plist_id, buf)) < 0) - HGOTO_ERROR(H5E_VOL, H5E_CANTRELEASE, FAIL, "read failed") + (id_wrapper->obj_id, mem_type_id, mem_space_id, file_space_id, plist_id, buf, req)) < 0) + HGOTO_ERROR(H5E_VOL, H5E_READERROR, FAIL, "read failed") done: FUNC_LEAVE_NOAPI(ret_value) @@ -1203,7 +1203,7 @@ done: *------------------------------------------------------------------------- */ herr_t H5VL_dataset_write(hid_t uid, hid_t mem_type_id, hid_t mem_space_id, - hid_t file_space_id, hid_t plist_id, const void *buf) + hid_t file_space_id, hid_t plist_id, const void *buf, hid_t req) { H5VL_id_wrapper_t *id_wrapper; /* user id structure */ herr_t ret_value = SUCCEED; @@ -1221,8 +1221,8 @@ herr_t H5VL_dataset_write(hid_t uid, hid_t mem_type_id, hid_t mem_space_id, if(NULL == id_wrapper->vol_plugin->dataset_cls.write) HGOTO_ERROR(H5E_VOL, H5E_UNSUPPORTED, FAIL, "vol plugin has no `dataset write' method") if((ret_value = (id_wrapper->vol_plugin->dataset_cls.write) - (id_wrapper->obj_id, mem_type_id, mem_space_id, file_space_id, plist_id, buf)) < 0) - HGOTO_ERROR(H5E_VOL, H5E_CANTRELEASE, FAIL, "write failed") + (id_wrapper->obj_id, mem_type_id, mem_space_id, file_space_id, plist_id, buf, req)) < 0) + HGOTO_ERROR(H5E_VOL, H5E_WRITEERROR, FAIL, "write failed") done: FUNC_LEAVE_NOAPI(ret_value) @@ -1243,7 +1243,7 @@ done: * *------------------------------------------------------------------------- */ -herr_t H5VL_dataset_set_extent(hid_t uid, const hsize_t size[]) +herr_t H5VL_dataset_set_extent(hid_t uid, const hsize_t size[], hid_t req) { H5VL_id_wrapper_t *id_wrapper; /* user id structure */ herr_t ret_value = SUCCEED; @@ -1260,7 +1260,7 @@ herr_t H5VL_dataset_set_extent(hid_t uid, const hsize_t size[]) if(NULL == id_wrapper->vol_plugin->dataset_cls.set_extent) HGOTO_ERROR(H5E_VOL, H5E_UNSUPPORTED, FAIL, "vol plugin has no `dataset set_extent' method") - if((ret_value = (id_wrapper->vol_plugin->dataset_cls.set_extent)(id_wrapper->obj_id, size)) < 0) + if((ret_value = (id_wrapper->vol_plugin->dataset_cls.set_extent)(id_wrapper->obj_id, size, req)) < 0) HGOTO_ERROR(H5E_VOL, H5E_CANTINIT, FAIL, "set_extent failed") done: @@ -1283,7 +1283,7 @@ done: *------------------------------------------------------------------------- */ herr_t -H5VL_dataset_get(hid_t uid, H5VL_dataset_get_t get_type, ...) +H5VL_dataset_get(hid_t uid, H5VL_dataset_get_t get_type, hid_t req, ...) { H5VL_id_wrapper_t *id_wrapper; /* user id structure */ va_list arguments; /* argument list passed from the API call */ @@ -1303,7 +1303,7 @@ H5VL_dataset_get(hid_t uid, H5VL_dataset_get_t get_type, ...) HGOTO_ERROR(H5E_VOL, H5E_UNSUPPORTED, FAIL, "vol plugin has no `dataset get' method") va_start (arguments, get_type); - if((ret_value = (id_wrapper->vol_plugin->dataset_cls.get)(id_wrapper->obj_id, get_type, + if((ret_value = (id_wrapper->vol_plugin->dataset_cls.get)(id_wrapper->obj_id, get_type, req, arguments)) < 0) HGOTO_ERROR(H5E_VOL, H5E_CANTGET, FAIL, "get failed") va_end (arguments); @@ -1350,7 +1350,7 @@ done: *------------------------------------------------------------------------- */ herr_t -H5VL_dataset_close(hid_t uid) +H5VL_dataset_close(hid_t uid, hid_t req) { H5VL_id_wrapper_t *id_wrapper; /* user id structure */ herr_t ret_value = SUCCEED; @@ -1368,11 +1368,11 @@ H5VL_dataset_close(hid_t uid) /* if the VOL class does not implement a specific dataset close callback, try the generic object close */ if(NULL == id_wrapper->vol_plugin->dataset_cls.close){ - if(H5VL_object_close(uid) < 0) + if(H5VL_object_close(uid, req) < 0) HGOTO_ERROR(H5E_SYM, H5E_CANTRELEASE, FAIL, "unable to close object") } else { - if((ret_value = (id_wrapper->vol_plugin->dataset_cls.close)(id_wrapper->obj_id)) < 0) + if((ret_value = (id_wrapper->vol_plugin->dataset_cls.close)(id_wrapper->obj_id, req)) < 0) HGOTO_ERROR(H5E_VOL, H5E_CANTRELEASE, FAIL, "close failed") id_wrapper->vol_plugin->nrefs--; @@ -1400,7 +1400,7 @@ done: *------------------------------------------------------------------------- */ hid_t -H5VL_file_open(const char *name, unsigned flags, hid_t fapl_id) +H5VL_file_open(const char *name, unsigned flags, hid_t fapl_id, hid_t req) { H5VL_class_t *vol_plugin; /* VOL for file */ H5VL_id_wrapper_t *id_wrapper; /* user id structure */ @@ -1420,7 +1420,7 @@ H5VL_file_open(const char *name, unsigned flags, hid_t fapl_id) if(NULL == vol_plugin->file_cls.open) HGOTO_ERROR(H5E_VOL, H5E_UNSUPPORTED, FAIL, "vol plugin has no `file open' method") /* call the corresponding VOL open callback */ - if((file_id = (vol_plugin->file_cls.open)(name, flags, fapl_id)) < 0) + if((file_id = (vol_plugin->file_cls.open)(name, flags, fapl_id, req)) < 0) HGOTO_ERROR(H5E_VOL, H5E_CANTINIT, FAIL, "open failed") /* Create a new id that points to a struct that holds the file id and the VOL plugin */ @@ -1454,7 +1454,7 @@ done: *------------------------------------------------------------------------- */ hid_t -H5VL_file_create(const char *name, unsigned flags, hid_t fcpl_id, hid_t fapl_id) +H5VL_file_create(const char *name, unsigned flags, hid_t fcpl_id, hid_t fapl_id, hid_t req) { H5VL_class_t *vol_plugin; /* VOL for file */ H5VL_id_wrapper_t *id_wrapper; /* user id structure */ @@ -1474,7 +1474,7 @@ H5VL_file_create(const char *name, unsigned flags, hid_t fcpl_id, hid_t fapl_id) if(NULL == vol_plugin->file_cls.create) HGOTO_ERROR(H5E_VOL, H5E_UNSUPPORTED, FAIL, "vol plugin has no `file create' method") /* call the corresponding VOL create callback */ - if((file_id = (vol_plugin->file_cls.create)(name, flags, fcpl_id, fapl_id)) < 0) + if((file_id = (vol_plugin->file_cls.create)(name, flags, fcpl_id, fapl_id, req)) < 0) HGOTO_ERROR(H5E_VOL, H5E_CANTINIT, FAIL, "create failed") /* Create a new id that points to a struct that holds the file id and the VOL id */ @@ -1508,7 +1508,7 @@ done: *------------------------------------------------------------------------- */ herr_t -H5VL_file_flush(hid_t uid, H5F_scope_t scope) +H5VL_file_flush(hid_t uid, H5F_scope_t scope, hid_t req) { H5VL_id_wrapper_t *id_wrapper; /* user id structure */ herr_t ret_value = SUCCEED; @@ -1525,7 +1525,7 @@ H5VL_file_flush(hid_t uid, H5F_scope_t scope) if(NULL == id_wrapper->vol_plugin->file_cls.flush) HGOTO_ERROR(H5E_VOL, H5E_UNSUPPORTED, FAIL, "vol plugin has no `file flush' method") - if((ret_value = (id_wrapper->vol_plugin->file_cls.flush)(id_wrapper->obj_id, scope)) < 0) + if((ret_value = (id_wrapper->vol_plugin->file_cls.flush)(id_wrapper->obj_id, scope, req)) < 0) HGOTO_ERROR(H5E_VOL, H5E_CANTFLUSH, FAIL, "flush failed") done: @@ -1548,7 +1548,7 @@ done: *------------------------------------------------------------------------- */ herr_t -H5VL_file_get(hid_t uid, H5VL_file_get_t get_type, ...) +H5VL_file_get(hid_t uid, H5VL_file_get_t get_type, hid_t req, ...) { H5VL_id_wrapper_t *id_wrapper; /* user id structure */ va_list arguments; /* argument list passed from the API call */ @@ -1572,7 +1572,8 @@ H5VL_file_get(hid_t uid, H5VL_file_get_t get_type, ...) HGOTO_ERROR(H5E_VOL, H5E_UNSUPPORTED, FAIL, "vol plugin has no `file get' method") va_start(arguments, get_type); - if((ret_value = (id_wrapper->vol_plugin->file_cls.get)(id_wrapper->obj_id, get_type, arguments)) < 0) + if((ret_value = (id_wrapper->vol_plugin->file_cls.get)(id_wrapper->obj_id, get_type, req, + arguments)) < 0) HGOTO_ERROR(H5E_VOL, H5E_CANTGET, FAIL, "get failed") va_end(arguments); @@ -1595,7 +1596,7 @@ done: *------------------------------------------------------------------------- */ herr_t -H5VL_file_generic(hid_t uid, H5VL_file_generic_t generic_type, ...) +H5VL_file_generic(hid_t uid, H5VL_file_generic_t generic_type, hid_t req, ...) { H5VL_id_wrapper_t *id_wrapper; /* user id structure */ va_list arguments; /* argument list passed from the API call */ @@ -1619,7 +1620,7 @@ H5VL_file_generic(hid_t uid, H5VL_file_generic_t generic_type, ...) HGOTO_ERROR(H5E_VOL, H5E_UNSUPPORTED, FAIL, "vol plugin has no `file generic' method") va_start (arguments, generic_type); - if((ret_value = (id_wrapper->vol_plugin->file_cls.generic)(id_wrapper->obj_id, generic_type, + if((ret_value = (id_wrapper->vol_plugin->file_cls.generic)(id_wrapper->obj_id, generic_type, req, arguments)) < 0) HGOTO_ERROR(H5E_VOL, H5E_CANTGET, FAIL, "generic failed") va_end (arguments); @@ -1644,7 +1645,7 @@ done: *------------------------------------------------------------------------- */ herr_t -H5VL_file_close(hid_t uid) +H5VL_file_close(hid_t uid, hid_t req) { H5VL_id_wrapper_t *id_wrapper; /* user id structure */ herr_t ret_value = SUCCEED; @@ -1661,7 +1662,7 @@ H5VL_file_close(hid_t uid) if(NULL == id_wrapper->vol_plugin->file_cls.close) HGOTO_ERROR(H5E_VOL, H5E_UNSUPPORTED, FAIL, "vol plugin has no `file close' method") - if((ret_value = (id_wrapper->vol_plugin->file_cls.close)(id_wrapper->obj_id)) < 0) + if((ret_value = (id_wrapper->vol_plugin->file_cls.close)(id_wrapper->obj_id, req)) < 0) HGOTO_ERROR(H5E_VOL, H5E_CANTCLOSEFILE, FAIL, "close failed") id_wrapper->vol_plugin->nrefs--; @@ -1689,7 +1690,7 @@ done: *------------------------------------------------------------------------- */ hid_t -H5VL_group_create(hid_t uid, const char *name, hid_t gcpl_id, hid_t gapl_id) +H5VL_group_create(hid_t uid, const char *name, hid_t gcpl_id, hid_t gapl_id, hid_t req) { H5VL_id_wrapper_t *id_wrapper1; /* user id structure of the location where the group will be created */ H5VL_id_wrapper_t *id_wrapper2; /* user id structure of new created group*/ @@ -1708,7 +1709,7 @@ H5VL_group_create(hid_t uid, const char *name, hid_t gcpl_id, hid_t gapl_id) /* call the corresponding VOL create callback */ if((group_id = (id_wrapper1->vol_plugin->group_cls.create) - (id_wrapper1->obj_id, name, gcpl_id, gapl_id)) < 0) + (id_wrapper1->obj_id, name, gcpl_id, gapl_id, req)) < 0) HGOTO_ERROR(H5E_VOL, H5E_CANTINIT, FAIL, "create failed") /* Create a new id that points to a struct that holds the group id and the VOL plugin */ @@ -1742,7 +1743,7 @@ done: *------------------------------------------------------------------------- */ hid_t -H5VL_group_open(hid_t loc_id, const char *name, hid_t gapl_id) +H5VL_group_open(hid_t loc_id, const char *name, hid_t gapl_id, hid_t req) { H5VL_id_wrapper_t *id_wrapper1; /* user id structure of the location where the group will be opend */ H5VL_id_wrapper_t *id_wrapper2; /* user id structure of new opend group*/ @@ -1761,17 +1762,17 @@ H5VL_group_open(hid_t loc_id, const char *name, hid_t gapl_id) the location of the object */ /* Get the token for the Object location through the VOL */ - if(H5VL_object_lookup (loc_id, H5VL_OBJECT_LOOKUP_BY_NAME, &location, name, gapl_id) < 0) + if(H5VL_object_lookup (loc_id, H5VL_OBJECT_LOOKUP_BY_NAME, &location, name, gapl_id, req) < 0) HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "unable to locate object") /* Open the object through the VOL */ - if((ret_value = H5VL_object_open_by_loc(loc_id, location, gapl_id)) < 0) + if((ret_value = H5VL_object_open_by_loc(loc_id, location, gapl_id, req)) < 0) HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "unable to open object") } else { /* call the corresponding VOL open callback */ if((group_id = (id_wrapper1->vol_plugin->group_cls.open) - (id_wrapper1->obj_id, name, gapl_id)) < 0) + (id_wrapper1->obj_id, name, gapl_id, req)) < 0) HGOTO_ERROR(H5E_VOL, H5E_CANTINIT, FAIL, "open failed") /* Create a new id that points to a struct that holds the group id and the VOL plugin */ @@ -1804,7 +1805,7 @@ done: *------------------------------------------------------------------------- */ herr_t -H5VL_group_get(hid_t uid, H5VL_group_get_t get_type, ...) +H5VL_group_get(hid_t uid, H5VL_group_get_t get_type, hid_t req, ...) { H5VL_id_wrapper_t *id_wrapper; /* user id structure */ va_list arguments; /* argument list passed from the API call */ @@ -1827,7 +1828,7 @@ H5VL_group_get(hid_t uid, H5VL_group_get_t get_type, ...) va_start (arguments, get_type); if((ret_value = (id_wrapper->vol_plugin->group_cls.get) - (id_wrapper->obj_id, get_type, arguments)) < 0) + (id_wrapper->obj_id, get_type, req, arguments)) < 0) HGOTO_ERROR(H5E_VOL, H5E_CANTGET, FAIL, "get failed") va_end (arguments); @@ -1851,7 +1852,7 @@ done: *------------------------------------------------------------------------- */ herr_t -H5VL_group_close(hid_t uid) +H5VL_group_close(hid_t uid, hid_t req) { H5VL_id_wrapper_t *id_wrapper; /* user id structure */ herr_t ret_value = SUCCEED; @@ -1869,11 +1870,11 @@ H5VL_group_close(hid_t uid) /* if the VOL class does not implement a specific group close callback, try the generic object close */ if(NULL == id_wrapper->vol_plugin->group_cls.close) { - if(H5VL_object_close(uid) < 0) + if(H5VL_object_close(uid, req) < 0) HGOTO_ERROR(H5E_SYM, H5E_CANTRELEASE, FAIL, "unable to close object") } else { - if((ret_value = (id_wrapper->vol_plugin->group_cls.close)(id_wrapper->obj_id)) < 0) + if((ret_value = (id_wrapper->vol_plugin->group_cls.close)(id_wrapper->obj_id, req)) < 0) HGOTO_ERROR(H5E_VOL, H5E_CANTRELEASE, FAIL, "close failed") id_wrapper->vol_plugin->nrefs--; @@ -1900,7 +1901,7 @@ done: */ herr_t H5VL_link_create(H5VL_link_create_type_t create_type, hid_t loc_id, const char *new_name, - hid_t lcpl_id, hid_t lapl_id) + hid_t lcpl_id, hid_t lapl_id, hid_t req) { H5VL_class_t *vol_plugin = NULL; /* VOL plugin */ hid_t new_id; /* unwrapped IDs */ @@ -1960,7 +1961,7 @@ H5VL_link_create(H5VL_link_create_type_t create_type, hid_t loc_id, const char * /* call the corresponding VOL create callback */ if((ret_value = (vol_plugin->link_cls.create) - (create_type, new_id, new_name, lcpl_id, lapl_id)) < 0) + (create_type, new_id, new_name, lcpl_id, lapl_id, req)) < 0) HGOTO_ERROR(H5E_VOL, H5E_CANTINIT, FAIL, "link create failed") done: @@ -1980,8 +1981,9 @@ done: * *------------------------------------------------------------------------- */ -H5_DLL herr_t H5VL_link_move(hid_t src_loc_id, const char *src_name, hid_t dst_loc_id, - const char *dst_name, hbool_t copy_flag, hid_t lcpl_id, hid_t lapl_id) +H5_DLL herr_t H5VL_link_move(hid_t src_loc_id, const char *src_name, hid_t dst_loc_id, + const char *dst_name, hbool_t copy_flag, + hid_t lcpl_id, hid_t lapl_id, hid_t req) { H5VL_class_t *vol_plugin = NULL; /* VOL plugin */ H5VL_id_wrapper_t *id_wrapper; @@ -2021,7 +2023,7 @@ H5_DLL herr_t H5VL_link_move(hid_t src_loc_id, const char *src_name, hid_t dst_l /* call the corresponding VOL move callback */ if((ret_value = (vol_plugin->link_cls.move) - (new_src_id, src_name, new_dst_id, dst_name, copy_flag, lcpl_id, lapl_id)) < 0) + (new_src_id, src_name, new_dst_id, dst_name, copy_flag, lcpl_id, lapl_id, req)) < 0) HGOTO_ERROR(H5E_VOL, H5E_CANTINIT, FAIL, "link move failed") done: @@ -2044,7 +2046,7 @@ done: *------------------------------------------------------------------------- */ herr_t -H5VL_link_get(hid_t uid, H5VL_link_get_t get_type, ...) +H5VL_link_get(hid_t uid, H5VL_link_get_t get_type, hid_t req, ...) { H5VL_id_wrapper_t *id_wrapper; /* user id structure */ va_list arguments; /* argument list passed from the API call */ @@ -2061,7 +2063,7 @@ H5VL_link_get(hid_t uid, H5VL_link_get_t get_type, ...) va_start (arguments, get_type); if((ret_value = (id_wrapper->vol_plugin->link_cls.get) - (id_wrapper->obj_id, get_type, arguments)) < 0) + (id_wrapper->obj_id, get_type, req, arguments)) < 0) HGOTO_ERROR(H5E_VOL, H5E_CANTGET, FAIL, "get failed") va_end (arguments); @@ -2082,7 +2084,7 @@ done: * *------------------------------------------------------------------------- */ -H5_DLL herr_t H5VL_link_delete(hid_t loc_id, const char *name, void *udata, hid_t lapl_id) +H5_DLL herr_t H5VL_link_delete(hid_t loc_id, const char *name, void *udata, hid_t lapl_id, hid_t req) { H5VL_id_wrapper_t *id_wrapper; herr_t ret_value = SUCCEED; /* Return value */ @@ -2098,7 +2100,7 @@ H5_DLL herr_t H5VL_link_delete(hid_t loc_id, const char *name, void *udata, hid_ /* call the corresponding VOL delete callback */ if((ret_value = (id_wrapper->vol_plugin->link_cls.delete) - (id_wrapper->obj_id, name, udata, lapl_id)) < 0) + (id_wrapper->obj_id, name, udata, lapl_id, req)) < 0) HGOTO_ERROR(H5E_VOL, H5E_CANTINIT, FAIL, "link delete failed") done: @@ -2122,7 +2124,7 @@ done: *------------------------------------------------------------------------- */ hid_t -H5VL_object_open_by_loc(hid_t uid, void *obj_loc, hid_t lapl_id) +H5VL_object_open_by_loc(hid_t uid, void *obj_loc, hid_t lapl_id, hid_t req) { H5VL_id_wrapper_t *id_wrapper1; /* user id structure of the location where the object will be opend */ H5VL_id_wrapper_t *id_wrapper2; /* user id structure of new opend object*/ @@ -2142,7 +2144,7 @@ H5VL_object_open_by_loc(hid_t uid, void *obj_loc, hid_t lapl_id) /* call the corresponding VOL open callback */ if((object_id = (id_wrapper1->vol_plugin->object_cls.open) - (id_wrapper1->obj_id, obj_loc, lapl_id)) < 0) + (id_wrapper1->obj_id, obj_loc, lapl_id, req)) < 0) HGOTO_ERROR(H5E_VOL, H5E_CANTINIT, FAIL, "open failed") /* Create a new id that points to a struct that holds the object id and the VOL plugin */ @@ -2190,7 +2192,7 @@ done: */ herr_t H5VL_object_copy(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 ) + const char *dst_name, hid_t ocpypl_id, hid_t lcpl_id, hid_t req) { H5VL_id_wrapper_t *id_wrapper1; /* user id structure of the location where the object will be opend */ H5VL_id_wrapper_t *id_wrapper2; /* user id structure of new opend object*/ @@ -2210,7 +2212,7 @@ H5VL_object_copy(hid_t src_loc_id, const char *src_name, hid_t dst_loc_id, if(NULL == id_wrapper1->vol_plugin->object_cls.copy) HGOTO_ERROR(H5E_VOL, H5E_UNSUPPORTED, FAIL, "vol plugin has no `object copy' method") if((ret_value = (id_wrapper1->vol_plugin->object_cls.copy) - (id_wrapper1->obj_id, src_name, id_wrapper2->obj_id, dst_name, ocpypl_id, lcpl_id)) < 0) + (id_wrapper1->obj_id, src_name, id_wrapper2->obj_id, dst_name, ocpypl_id, lcpl_id, req)) < 0) HGOTO_ERROR(H5E_VOL, H5E_CANTRELEASE, FAIL, "copy failed") done: @@ -2233,7 +2235,7 @@ done: *------------------------------------------------------------------------- */ herr_t -H5VL_object_lookup(hid_t uid, H5VL_object_lookup_t lookup_type, ...) +H5VL_object_lookup(hid_t uid, H5VL_object_lookup_t lookup_type, hid_t req, ...) { H5VL_id_wrapper_t *id_wrapper; /* user id structure */ va_list arguments; /* argument list passed from the API call */ @@ -2257,7 +2259,7 @@ H5VL_object_lookup(hid_t uid, H5VL_object_lookup_t lookup_type, ...) HGOTO_ERROR(H5E_VOL, H5E_UNSUPPORTED, FAIL, "vol plugin has no `object lookup' method") va_start (arguments, lookup_type); - if((ret_value = (id_wrapper->vol_plugin->object_cls.lookup)(id_wrapper->obj_id, lookup_type, + if((ret_value = (id_wrapper->vol_plugin->object_cls.lookup)(id_wrapper->obj_id, lookup_type, req, arguments)) < 0) HGOTO_ERROR(H5E_VOL, H5E_CANTGET, FAIL, "lookup of object location failed") va_end (arguments); @@ -2281,7 +2283,7 @@ done: *------------------------------------------------------------------------- */ herr_t -H5VL_object_get(hid_t uid, H5VL_object_get_t get_type, ...) +H5VL_object_get(hid_t uid, H5VL_object_get_t get_type, hid_t req, ...) { H5VL_id_wrapper_t *id_wrapper; /* user id structure */ va_list arguments; /* argument list passed from the API call */ @@ -2305,7 +2307,7 @@ H5VL_object_get(hid_t uid, H5VL_object_get_t get_type, ...) HGOTO_ERROR(H5E_VOL, H5E_UNSUPPORTED, FAIL, "vol plugin has no `object get' method") va_start (arguments, get_type); - if((ret_value = (id_wrapper->vol_plugin->object_cls.get)(id_wrapper->obj_id, get_type, + if((ret_value = (id_wrapper->vol_plugin->object_cls.get)(id_wrapper->obj_id, get_type, req, arguments)) < 0) HGOTO_ERROR(H5E_VOL, H5E_CANTGET, FAIL, "get failed") va_end (arguments); @@ -2328,7 +2330,7 @@ done: *------------------------------------------------------------------------- */ herr_t -H5VL_object_generic(hid_t uid, H5VL_object_generic_t generic_type, ...) +H5VL_object_generic(hid_t uid, H5VL_object_generic_t generic_type, hid_t req, ...) { H5VL_id_wrapper_t *id_wrapper; /* user id structure */ va_list arguments; /* argument list passed from the API call */ @@ -2352,7 +2354,7 @@ H5VL_object_generic(hid_t uid, H5VL_object_generic_t generic_type, ...) HGOTO_ERROR(H5E_VOL, H5E_UNSUPPORTED, FAIL, "vol plugin has no `object generic' method") va_start (arguments, generic_type); - if((ret_value = (id_wrapper->vol_plugin->object_cls.generic)(id_wrapper->obj_id, generic_type, + if((ret_value = (id_wrapper->vol_plugin->object_cls.generic)(id_wrapper->obj_id, generic_type, req, arguments)) < 0) HGOTO_ERROR(H5E_VOL, H5E_CANTGET, FAIL, "generic failed") va_end (arguments); @@ -2395,7 +2397,7 @@ done: *------------------------------------------------------------------------- */ herr_t -H5VL_object_close(hid_t uid) +H5VL_object_close(hid_t uid, hid_t req) { H5VL_id_wrapper_t *id_wrapper; /* user id structure */ H5I_type_t id_type; @@ -2428,7 +2430,7 @@ H5VL_object_close(hid_t uid) if(NULL == id_wrapper->vol_plugin->object_cls.close) HGOTO_ERROR(H5E_VOL, H5E_UNSUPPORTED, FAIL, "vol plugin has no `object close' method") - if((ret_value = (id_wrapper->vol_plugin->object_cls.close)(id_wrapper->obj_id)) < 0) + if((ret_value = (id_wrapper->vol_plugin->object_cls.close)(id_wrapper->obj_id, req)) < 0) HGOTO_ERROR(H5E_VOL, H5E_CANTRELEASE, FAIL, "close failed") id_wrapper->vol_plugin->nrefs--; diff --git a/src/H5VLnative.c b/src/H5VLnative.c index 57710d9..0582bc5 100644 --- a/src/H5VLnative.c +++ b/src/H5VLnative.c @@ -64,54 +64,54 @@ static hid_t H5VL_NATIVE_g = 0; /* Prototypes */ static herr_t H5VL_native_term(void); -static hid_t H5VL_native_attr_create(hid_t loc_id, const char *attr_name, hid_t acpl_id, hid_t aapl_id); -static hid_t H5VL_native_attr_open(hid_t loc_id, void *location, const char *attr_name, hid_t aapl_id); -static herr_t H5VL_native_attr_read(hid_t attr_id, hid_t dtype_id, void *buf); -static herr_t H5VL_native_attr_write(hid_t attr_id, hid_t dtype_id, const void *buf); -static herr_t H5VL_native_attr_get(hid_t id, H5VL_attr_get_t get_type, va_list arguments); -static herr_t H5VL_native_attr_delete(hid_t loc_id, void *location, const char *attr_name); -static herr_t H5VL_native_attr_close(hid_t attr_id); +static hid_t H5VL_native_attr_create(hid_t loc_id, const char *attr_name, hid_t acpl_id, hid_t aapl_id, hid_t req); +static hid_t H5VL_native_attr_open(hid_t loc_id, void *location, const char *attr_name, hid_t aapl_id, hid_t req); +static herr_t H5VL_native_attr_read(hid_t attr_id, hid_t dtype_id, void *buf, hid_t req); +static herr_t H5VL_native_attr_write(hid_t attr_id, hid_t dtype_id, const void *buf, hid_t req); +static herr_t H5VL_native_attr_get(hid_t id, H5VL_attr_get_t get_type, hid_t req, va_list arguments); +static herr_t H5VL_native_attr_delete(hid_t loc_id, void *location, const char *attr_name, hid_t req); +static herr_t H5VL_native_attr_close(hid_t attr_id, hid_t req); static herr_t H5VL_native_datatype_commit(hid_t loc_id, const char *name, hid_t type_id, - hid_t lcpl_id, hid_t tcpl_id, hid_t tapl_id); -static hid_t H5VL_native_datatype_open(hid_t loc_id, const char *name, hid_t tapl_id); + hid_t lcpl_id, hid_t tcpl_id, hid_t tapl_id, hid_t req); +static hid_t H5VL_native_datatype_open(hid_t loc_id, const char *name, hid_t tapl_id, hid_t req); -static hid_t H5VL_native_dataset_create(hid_t loc_id, const char *name, hid_t dcpl_id, hid_t dapl_id); -static hid_t H5VL_native_dataset_open(hid_t loc_id, const char *name, hid_t dapl_id); +static hid_t H5VL_native_dataset_create(hid_t loc_id, const char *name, hid_t dcpl_id, hid_t dapl_id, hid_t req); +static hid_t H5VL_native_dataset_open(hid_t loc_id, const char *name, hid_t dapl_id, hid_t req); static herr_t H5VL_native_dataset_read(hid_t dset_id, hid_t mem_type_id, hid_t mem_space_id, - hid_t file_space_id, hid_t plist_id, void *buf); + hid_t file_space_id, hid_t plist_id, void *buf, hid_t req); static herr_t H5VL_native_dataset_write(hid_t dset_id, hid_t mem_type_id, hid_t mem_space_id, - hid_t file_space_id, hid_t plist_id, const void *buf); -static herr_t H5VL_native_dataset_set_extent(hid_t dset_id, const hsize_t size[]); -static herr_t H5VL_native_dataset_get(hid_t id, H5VL_dataset_get_t get_type, va_list arguments); -static herr_t H5VL_native_dataset_close(hid_t dataset_id); - -static hid_t H5VL_native_file_create(const char *name, unsigned flags, hid_t fcpl_id, hid_t fapl_id); -static hid_t H5VL_native_file_open(const char *name, unsigned flags, hid_t fapl_id); -static herr_t H5VL_native_file_flush(hid_t fid, H5F_scope_t scope); -static herr_t H5VL_native_file_get(hid_t file_id, H5VL_file_get_t get_type, va_list arguments); -static herr_t H5VL_native_file_generic(hid_t loc_id, H5VL_file_generic_t generic_type, va_list arguments); -static herr_t H5VL_native_file_close(hid_t fid); - -static hid_t H5VL_native_group_create(hid_t loc_id, const char *name, hid_t gcpl_id, hid_t gapl_id); -static hid_t H5VL_native_group_open(hid_t loc_id, const char *name, hid_t gapl_id); -static herr_t H5VL_native_group_get(hid_t obj_id, H5VL_group_get_t get_type, va_list arguments); -static herr_t H5VL_native_group_close(hid_t group_id); + hid_t file_space_id, hid_t plist_id, const void *buf, hid_t req); +static herr_t H5VL_native_dataset_set_extent(hid_t dset_id, const hsize_t size[], hid_t req); +static herr_t H5VL_native_dataset_get(hid_t id, H5VL_dataset_get_t get_type, hid_t req, va_list arguments); +static herr_t H5VL_native_dataset_close(hid_t dataset_id, hid_t req); + +static hid_t H5VL_native_file_create(const char *name, unsigned flags, hid_t fcpl_id, hid_t fapl_id, hid_t req); +static hid_t H5VL_native_file_open(const char *name, unsigned flags, hid_t fapl_id, hid_t req); +static herr_t H5VL_native_file_flush(hid_t fid, H5F_scope_t scope, hid_t req); +static herr_t H5VL_native_file_get(hid_t file_id, H5VL_file_get_t get_type, hid_t req, va_list arguments); +static herr_t H5VL_native_file_generic(hid_t loc_id, H5VL_file_generic_t generic_type, hid_t req, va_list arguments); +static herr_t H5VL_native_file_close(hid_t fid, hid_t req); + +static hid_t H5VL_native_group_create(hid_t loc_id, const char *name, hid_t gcpl_id, hid_t gapl_id, hid_t req); +static hid_t H5VL_native_group_open(hid_t loc_id, const char *name, hid_t gapl_id, hid_t req); +static herr_t H5VL_native_group_get(hid_t obj_id, H5VL_group_get_t get_type, hid_t req, va_list arguments); +static herr_t H5VL_native_group_close(hid_t group_id, hid_t req); static herr_t H5VL_native_link_create(H5VL_link_create_type_t create_type, hid_t loc_id, - const char *link_name, hid_t lcpl_id, hid_t lapl_id); + const char *link_name, hid_t lcpl_id, hid_t lapl_id, hid_t req); static herr_t H5VL_native_link_move(hid_t src_loc_id, const char *src_name, hid_t dst_loc_id, - const char *dst_name, hbool_t copy_flag, hid_t lcpl_id, hid_t lapl_id); -static herr_t H5VL_native_link_get(hid_t loc_id, H5VL_link_get_t get_type, va_list arguments); -static herr_t H5VL_native_link_delete(hid_t loc_id, const char *name, void *udata, hid_t lapl_id); + const char *dst_name, hbool_t copy_flag, hid_t lcpl_id, hid_t lapl_id, hid_t req); +static herr_t H5VL_native_link_get(hid_t loc_id, H5VL_link_get_t get_type, hid_t req, va_list arguments); +static herr_t H5VL_native_link_delete(hid_t loc_id, const char *name, void *udata, hid_t lapl_id, hid_t req); -static hid_t H5VL_native_object_open(hid_t loc_id, void *location, hid_t lapl_id); +static hid_t H5VL_native_object_open(hid_t loc_id, void *location, hid_t lapl_id, hid_t req); static herr_t H5VL_native_object_copy(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 ); -static herr_t H5VL_native_object_lookup(hid_t loc_id, H5VL_object_lookup_t lookup_type, va_list arguments); -static herr_t H5VL_native_object_get(hid_t id, H5VL_object_get_t get_type, va_list arguments); -static herr_t H5VL_native_object_generic(hid_t id, H5VL_object_generic_t generic_type, va_list arguments); -static herr_t H5VL_native_object_close(hid_t object_id); + const char *dst_name, hid_t ocpypl_id, hid_t lcpl_id, hid_t req); +static herr_t H5VL_native_object_lookup(hid_t loc_id, H5VL_object_lookup_t lookup_type, hid_t req, va_list arguments); +static herr_t H5VL_native_object_get(hid_t id, H5VL_object_get_t get_type, hid_t req, va_list arguments); +static herr_t H5VL_native_object_generic(hid_t id, H5VL_object_generic_t generic_type, hid_t req, va_list arguments); +static herr_t H5VL_native_object_close(hid_t object_id, hid_t req); H5VL_class_t H5VL_native_g = { "native", /* name */ @@ -292,7 +292,7 @@ done: *------------------------------------------------------------------------- */ static hid_t -H5VL_native_attr_create(hid_t loc_id, const char *attr_name, hid_t acpl_id, hid_t UNUSED aapl_id) +H5VL_native_attr_create(hid_t loc_id, const char *attr_name, hid_t acpl_id, hid_t UNUSED aapl_id, hid_t UNUSED req) { H5G_loc_t loc; /* Object location */ H5P_genplist_t *plist; /* Property list pointer */ @@ -360,7 +360,7 @@ done: *------------------------------------------------------------------------- */ static hid_t -H5VL_native_attr_open(hid_t loc_id, void *location, const char *attr_name, hid_t UNUSED aapl_id) +H5VL_native_attr_open(hid_t loc_id, void *location, const char *attr_name, hid_t UNUSED aapl_id, hid_t UNUSED req) { H5G_loc_t loc; /* Object location */ H5A_t *attr = NULL; /* Attribute opened */ @@ -422,7 +422,7 @@ done: *------------------------------------------------------------------------- */ static herr_t -H5VL_native_attr_read(hid_t attr_id, hid_t dtype_id, void *buf) +H5VL_native_attr_read(hid_t attr_id, hid_t dtype_id, void *buf, hid_t UNUSED req) { H5A_t *attr; /* Attribute object for ID */ H5T_t *mem_type; /* Memory datatype */ @@ -457,7 +457,7 @@ done: *------------------------------------------------------------------------- */ static herr_t -H5VL_native_attr_write(hid_t attr_id, hid_t dtype_id, const void *buf) +H5VL_native_attr_write(hid_t attr_id, hid_t dtype_id, const void *buf, hid_t UNUSED req) { H5A_t *attr; /* Attribute object for ID */ H5T_t *mem_type; /* Memory datatype */ @@ -493,7 +493,7 @@ done: *------------------------------------------------------------------------- */ static herr_t -H5VL_native_attr_get(hid_t attr_id, H5VL_attr_get_t get_type, va_list arguments) +H5VL_native_attr_get(hid_t attr_id, H5VL_attr_get_t get_type, hid_t UNUSED req, va_list arguments) { H5A_t *attr; herr_t ret_value = SUCCEED; /* Return value */ @@ -587,7 +587,7 @@ done: *------------------------------------------------------------------------- */ static herr_t -H5VL_native_attr_delete(hid_t loc_id, void *location, const char *attr_name) +H5VL_native_attr_delete(hid_t loc_id, void *location, const char *attr_name, hid_t UNUSED req) { H5G_loc_t loc; /* Object location */ herr_t ret_value = SUCCEED; /* Return value */ @@ -631,7 +631,7 @@ done: *------------------------------------------------------------------------- */ static herr_t -H5VL_native_attr_close(hid_t attr_id) +H5VL_native_attr_close(hid_t attr_id, hid_t UNUSED req) { herr_t ret_value = SUCCEED; /* Return value */ @@ -665,7 +665,7 @@ done: */ static herr_t H5VL_native_datatype_commit(hid_t loc_id, const char *name, hid_t type_id, hid_t lcpl_id, - hid_t tcpl_id, hid_t tapl_id) + hid_t tcpl_id, hid_t tapl_id, hid_t UNUSED req) { H5G_loc_t loc; /* Location to commit datatype */ H5T_t *type; /* Datatype for ID */ @@ -703,7 +703,7 @@ done: *------------------------------------------------------------------------- */ static hid_t -H5VL_native_datatype_open(hid_t loc_id, const char *name, hid_t tapl_id) +H5VL_native_datatype_open(hid_t loc_id, const char *name, hid_t tapl_id, hid_t UNUSED req) { H5T_t *type = NULL; /* Datatype opened in file */ H5G_loc_t loc; /* Group location of object to open */ @@ -774,7 +774,7 @@ done: *------------------------------------------------------------------------- */ static hid_t -H5VL_native_dataset_create(hid_t loc_id, const char *name, hid_t dcpl_id, hid_t dapl_id) +H5VL_native_dataset_create(hid_t loc_id, const char *name, hid_t dcpl_id, hid_t dapl_id, hid_t UNUSED req) { H5P_genplist_t *plist; /* Property list pointer */ H5G_loc_t loc; /* Object location to insert dataset into */ @@ -861,7 +861,7 @@ done: *------------------------------------------------------------------------- */ static hid_t -H5VL_native_dataset_open(hid_t loc_id, const char *name, hid_t dapl_id) +H5VL_native_dataset_open(hid_t loc_id, const char *name, hid_t dapl_id, hid_t UNUSED req) { H5D_t *dset = NULL; H5G_loc_t loc; /* Object location of group */ @@ -933,7 +933,7 @@ done: */ static herr_t H5VL_native_dataset_read(hid_t dset_id, hid_t mem_type_id, hid_t mem_space_id, - hid_t file_space_id, hid_t plist_id, void *buf/*out*/) + hid_t file_space_id, hid_t plist_id, void *buf, hid_t UNUSED req) { H5D_t *dset = NULL; const H5S_t *mem_space = NULL; @@ -999,7 +999,7 @@ done: */ static herr_t H5VL_native_dataset_write(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) + hid_t file_space_id, hid_t dxpl_id, const void *buf, hid_t UNUSED req) { H5D_t *dset = NULL; const H5S_t *mem_space = NULL; @@ -1064,7 +1064,7 @@ done: *------------------------------------------------------------------------- */ static herr_t -H5VL_native_dataset_set_extent(hid_t dset_id, const hsize_t size[]) +H5VL_native_dataset_set_extent(hid_t dset_id, const hsize_t size[], hid_t UNUSED req) { H5D_t *dset = NULL; herr_t ret_value = SUCCEED; /* Return value */ @@ -1098,7 +1098,7 @@ done: *------------------------------------------------------------------------- */ static herr_t -H5VL_native_dataset_get(hid_t id, H5VL_dataset_get_t get_type, va_list arguments) +H5VL_native_dataset_get(hid_t id, H5VL_dataset_get_t get_type, hid_t UNUSED req, va_list arguments) { H5D_t *dset = NULL; herr_t ret_value = SUCCEED; /* Return value */ @@ -1205,7 +1205,7 @@ done: *------------------------------------------------------------------------- */ static herr_t -H5VL_native_dataset_close(hid_t dset_id) +H5VL_native_dataset_close(hid_t dset_id, hid_t UNUSED req) { herr_t ret_value = SUCCEED; /* Return value */ @@ -1245,7 +1245,7 @@ done: *------------------------------------------------------------------------- */ static hid_t -H5VL_native_file_create(const char *name, unsigned flags, hid_t fcpl_id, hid_t fapl_id) +H5VL_native_file_create(const char *name, unsigned flags, hid_t fcpl_id, hid_t fapl_id, hid_t UNUSED req) { H5F_t *new_file; /* file struct */ hid_t ret_value; @@ -1297,7 +1297,7 @@ done: *------------------------------------------------------------------------- */ static hid_t -H5VL_native_file_open(const char *name, unsigned flags, hid_t fapl_id) +H5VL_native_file_open(const char *name, unsigned flags, hid_t fapl_id, hid_t UNUSED req) { H5F_t *new_file; /* file struct */ hid_t ret_value; @@ -1340,7 +1340,7 @@ done: *------------------------------------------------------------------------- */ static herr_t -H5VL_native_file_flush(hid_t object_id, H5F_scope_t scope) +H5VL_native_file_flush(hid_t object_id, H5F_scope_t scope, hid_t UNUSED req) { H5F_t *f = NULL; /* File to flush */ H5O_loc_t *oloc = NULL; /* Object location for ID */ @@ -1455,7 +1455,7 @@ done: *------------------------------------------------------------------------- */ static herr_t -H5VL_native_file_get(hid_t obj_id, H5VL_file_get_t get_type, va_list arguments) +H5VL_native_file_get(hid_t obj_id, H5VL_file_get_t get_type, hid_t UNUSED req, va_list arguments) { H5F_t *f = NULL; /* File struct */ herr_t ret_value = SUCCEED; /* Return value */ @@ -1668,7 +1668,7 @@ done: *------------------------------------------------------------------------- */ static herr_t -H5VL_native_file_generic(hid_t loc_id, H5VL_file_generic_t generic_type, va_list arguments) +H5VL_native_file_generic(hid_t loc_id, H5VL_file_generic_t generic_type, hid_t UNUSED req, va_list arguments) { H5F_t *file = NULL; /* File */ herr_t ret_value = SUCCEED; /* Return value */ @@ -1724,7 +1724,7 @@ done: *------------------------------------------------------------------------- */ static herr_t -H5VL_native_file_close(hid_t file_id) +H5VL_native_file_close(hid_t file_id, hid_t UNUSED req) { int nref; H5F_t *f; @@ -1778,7 +1778,7 @@ done: *------------------------------------------------------------------------- */ static hid_t -H5VL_native_group_create(hid_t loc_id, const char *name, hid_t gcpl_id, hid_t gapl_id) +H5VL_native_group_create(hid_t loc_id, const char *name, hid_t gcpl_id, hid_t gapl_id, hid_t UNUSED req) { H5P_genplist_t *plist; /* Property list pointer */ H5G_loc_t loc; /* Location to create group */ @@ -1859,7 +1859,7 @@ done: *------------------------------------------------------------------------- */ static hid_t -H5VL_native_group_open(hid_t loc_id, const char *name, hid_t gapl_id) +H5VL_native_group_open(hid_t loc_id, const char *name, hid_t gapl_id, hid_t UNUSED req) { H5G_loc_t loc; /* Location to open group */ H5G_t *grp = NULL; /* New group opend */ @@ -1901,7 +1901,7 @@ done: *------------------------------------------------------------------------- */ static herr_t -H5VL_native_group_get(hid_t obj_id, H5VL_group_get_t get_type, va_list arguments) +H5VL_native_group_get(hid_t obj_id, H5VL_group_get_t get_type, hid_t UNUSED req, va_list arguments) { herr_t ret_value = SUCCEED; /* Return value */ @@ -1972,7 +1972,7 @@ done: *------------------------------------------------------------------------- */ static herr_t -H5VL_native_group_close(hid_t group_id) +H5VL_native_group_close(hid_t group_id, hid_t UNUSED req) { herr_t ret_value = SUCCEED; /* Return value */ @@ -2008,7 +2008,7 @@ done: */ static herr_t H5VL_native_link_create(H5VL_link_create_type_t create_type, hid_t loc_id, const char *link_name, - hid_t lcpl_id, hid_t lapl_id) + hid_t lcpl_id, hid_t lapl_id, hid_t UNUSED req) { H5P_genplist_t *plist; /* Property list pointer */ @@ -2130,7 +2130,7 @@ done: */ static herr_t H5VL_native_link_move(hid_t src_loc_id, const char *src_name, hid_t dst_loc_id, - const char *dst_name, hbool_t copy_flag, hid_t lcpl_id, hid_t lapl_id) + const char *dst_name, hbool_t copy_flag, hid_t lcpl_id, hid_t lapl_id, hid_t UNUSED req) { H5G_loc_t src_loc, *src_loc_p; H5G_loc_t dst_loc, *dst_loc_p; @@ -2175,7 +2175,7 @@ done: *------------------------------------------------------------------------- */ static herr_t -H5VL_native_link_get(hid_t loc_id, H5VL_link_get_t get_type, va_list arguments) +H5VL_native_link_get(hid_t loc_id, H5VL_link_get_t get_type, hid_t UNUSED req, va_list arguments) { H5G_loc_t loc; herr_t ret_value = SUCCEED; /* Return value */ @@ -2280,7 +2280,7 @@ done: *------------------------------------------------------------------------- */ static herr_t -H5VL_native_link_delete(hid_t loc_id, const char *name, void *udata, hid_t lapl_id) +H5VL_native_link_delete(hid_t loc_id, const char *name, void *udata, hid_t lapl_id, hid_t UNUSED req) { H5G_loc_t loc; /* Object location */ herr_t ret_value = SUCCEED; @@ -2319,7 +2319,7 @@ done: *------------------------------------------------------------------------- */ static hid_t -H5VL_native_object_open(hid_t loc_id, void *location, hid_t lapl_id) +H5VL_native_object_open(hid_t loc_id, void *location, hid_t lapl_id, hid_t UNUSED req) { H5G_loc_t loc; H5G_loc_t *obj_loc = (H5G_loc_t *)location; @@ -2361,7 +2361,7 @@ done: */ static herr_t H5VL_native_object_copy(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 ) + const char *dst_name, hid_t ocpypl_id, hid_t lcpl_id, hid_t UNUSED req) { H5G_loc_t src_loc; /* Source object group location */ H5G_loc_t dst_loc; /* Destination group location */ @@ -2397,7 +2397,7 @@ done: *------------------------------------------------------------------------- */ static herr_t -H5VL_native_object_lookup(hid_t loc_id, H5VL_object_lookup_t lookup_type, va_list arguments) +H5VL_native_object_lookup(hid_t loc_id, H5VL_object_lookup_t lookup_type, hid_t UNUSED req, va_list arguments) { H5G_loc_t loc; H5G_loc_t *obj_loc; @@ -2536,7 +2536,7 @@ done: *------------------------------------------------------------------------- */ static herr_t -H5VL_native_object_generic(hid_t loc_id, H5VL_object_generic_t generic_type, va_list arguments) +H5VL_native_object_generic(hid_t loc_id, H5VL_object_generic_t generic_type, hid_t UNUSED req, va_list arguments) { herr_t ret_value = SUCCEED; /* Return value */ H5A_t *attr = NULL; /* Attribute opened */ @@ -2734,7 +2734,7 @@ done: *------------------------------------------------------------------------- */ static herr_t -H5VL_native_object_get(hid_t id, H5VL_object_get_t get_type, va_list arguments) +H5VL_native_object_get(hid_t id, H5VL_object_get_t get_type, hid_t UNUSED req, va_list arguments) { herr_t ret_value = SUCCEED; /* Return value */ H5G_loc_t loc; /* Location of group */ @@ -2853,7 +2853,7 @@ done: *------------------------------------------------------------------------- */ static herr_t -H5VL_native_object_close(hid_t object_id) +H5VL_native_object_close(hid_t object_id, hid_t UNUSED req) { herr_t ret_value = SUCCEED; /* Return value */ diff --git a/src/H5VLprivate.h b/src/H5VLprivate.h index 2aacc2f..84e21fd 100644 --- a/src/H5VLprivate.h +++ b/src/H5VLprivate.h @@ -29,6 +29,8 @@ /****************************/ /* Library Private Typedefs */ /****************************/ +#define H5_REQUEST_NULL -1 + /* type of the ID passed to users */ typedef struct H5VL_id_wrapper_t { hid_t obj_id; /* actual id for object */ @@ -55,51 +57,51 @@ H5_DLL hid_t H5VL_register(const void *cls, size_t size, hbool_t app_ref); H5_DLL herr_t H5VL_replace_with_uids(hid_t *oid_list, ssize_t num_ids); H5_DLL int H5VL_inc_ref_uid(hid_t fid, hbool_t app_ref); -H5_DLL hid_t H5VL_attr_create(hid_t loc_id, const char *attr_name, hid_t acpl_id, hid_t aapl_id); -H5_DLL hid_t H5VL_attr_open(hid_t loc_id, void *location, const char *name, hid_t aapl_id); -H5_DLL herr_t H5VL_attr_read(hid_t attr_id, hid_t dtype_id, void *buf); -H5_DLL herr_t H5VL_attr_write(hid_t attr_id, hid_t dtype_id, const void *buf); -H5_DLL herr_t H5VL_attr_get(hid_t id, H5VL_attr_get_t get_type, ...); -H5_DLL herr_t H5VL_attr_delete(hid_t loc_id, void *location, const char *attr_name); -H5_DLL herr_t H5VL_attr_close(hid_t attr_id); - -H5_DLL hid_t H5VL_dataset_create(hid_t uid, const char *name, hid_t dcpl_id, hid_t dapl_id); -H5_DLL hid_t H5VL_dataset_open(hid_t uid, const char *name, hid_t dapl_id); -H5_DLL herr_t H5VL_dataset_close(hid_t uid); -H5_DLL herr_t H5VL_dataset_read(hid_t dset_id, hid_t mem_type_id, hid_t mem_space_id, hid_t file_space_id, hid_t plist_id, void *buf); -H5_DLL herr_t H5VL_dataset_write(hid_t dset_id, hid_t mem_type_id, hid_t mem_space_id, hid_t file_space_id, hid_t plist_id, const void *buf); -H5_DLL herr_t H5VL_dataset_set_extent(hid_t uid, const hsize_t size[]); -H5_DLL herr_t H5VL_dataset_get(hid_t uid, H5VL_dataset_get_t get_type, ...); - -H5_DLL herr_t H5VL_datatype_commit(hid_t loc_id, const char *name, hid_t type_id, hid_t lcpl_id, hid_t tcpl_id, hid_t tapl_id); -H5_DLL hid_t H5VL_datatype_open(hid_t loc_id, const char *name, hid_t tapl_id); - -H5_DLL hid_t H5VL_file_open(const char *name, unsigned flags, hid_t fapl_id); -H5_DLL hid_t H5VL_file_create(const char *name, unsigned flags, hid_t fcpl_id, hid_t fapl_id); -H5_DLL herr_t H5VL_file_close(hid_t file_id); -H5_DLL herr_t H5VL_file_flush(hid_t file_id, H5F_scope_t scope); -H5_DLL herr_t H5VL_file_generic(hid_t loc_id, H5VL_file_generic_t generic_type, ...); -H5_DLL herr_t H5VL_file_get(hid_t uid, H5VL_file_get_t get_type, ...); - -H5_DLL hid_t H5VL_group_create(hid_t uid, const char *name, hid_t gcpl_id, hid_t gapl_id); -H5_DLL hid_t H5VL_group_open(hid_t uid, const char *name, hid_t gapl_id); -H5_DLL herr_t H5VL_group_close(hid_t uid); -H5_DLL herr_t H5VL_group_get(hid_t uid, H5VL_group_get_t get_type, ...); +H5_DLL hid_t H5VL_attr_create(hid_t loc_id, const char *attr_name, hid_t acpl_id, hid_t aapl_id, hid_t req); +H5_DLL hid_t H5VL_attr_open(hid_t loc_id, void *location, const char *name, hid_t aapl_id, hid_t req); +H5_DLL herr_t H5VL_attr_read(hid_t attr_id, hid_t dtype_id, void *buf, hid_t req); +H5_DLL herr_t H5VL_attr_write(hid_t attr_id, hid_t dtype_id, const void *buf, hid_t req); +H5_DLL herr_t H5VL_attr_get(hid_t id, H5VL_attr_get_t get_type, hid_t req, ...); +H5_DLL herr_t H5VL_attr_delete(hid_t loc_id, void *location, const char *attr_name, hid_t req); +H5_DLL herr_t H5VL_attr_close(hid_t attr_id, hid_t req); + +H5_DLL hid_t H5VL_dataset_create(hid_t uid, const char *name, hid_t dcpl_id, hid_t dapl_id, hid_t req); +H5_DLL hid_t H5VL_dataset_open(hid_t uid, const char *name, hid_t dapl_id, hid_t req); +H5_DLL herr_t H5VL_dataset_close(hid_t uid, hid_t req); +H5_DLL herr_t H5VL_dataset_read(hid_t dset_id, hid_t mem_type_id, hid_t mem_space_id, hid_t file_space_id, hid_t plist_id, void *buf, hid_t req); +H5_DLL herr_t H5VL_dataset_write(hid_t dset_id, hid_t mem_type_id, hid_t mem_space_id, hid_t file_space_id, hid_t plist_id, const void *buf, hid_t req); +H5_DLL herr_t H5VL_dataset_set_extent(hid_t uid, const hsize_t size[], hid_t req); +H5_DLL herr_t H5VL_dataset_get(hid_t uid, H5VL_dataset_get_t get_type, hid_t req, ...); + +H5_DLL herr_t H5VL_datatype_commit(hid_t loc_id, const char *name, hid_t type_id, hid_t lcpl_id, hid_t tcpl_id, hid_t tapl_id, hid_t req); +H5_DLL hid_t H5VL_datatype_open(hid_t loc_id, const char *name, hid_t tapl_id, hid_t req); + +H5_DLL hid_t H5VL_file_open(const char *name, unsigned flags, hid_t fapl_id, hid_t req); +H5_DLL hid_t H5VL_file_create(const char *name, unsigned flags, hid_t fcpl_id, hid_t fapl_id, hid_t req); +H5_DLL herr_t H5VL_file_close(hid_t file_id, hid_t req); +H5_DLL herr_t H5VL_file_flush(hid_t file_id, H5F_scope_t scope, hid_t req); +H5_DLL herr_t H5VL_file_generic(hid_t loc_id, H5VL_file_generic_t generic_type, hid_t req, ...); +H5_DLL herr_t H5VL_file_get(hid_t uid, H5VL_file_get_t get_type, hid_t req, ...); + +H5_DLL hid_t H5VL_group_create(hid_t uid, const char *name, hid_t gcpl_id, hid_t gapl_id, hid_t req); +H5_DLL hid_t H5VL_group_open(hid_t uid, const char *name, hid_t gapl_id, hid_t req); +H5_DLL herr_t H5VL_group_close(hid_t uid, hid_t req); +H5_DLL herr_t H5VL_group_get(hid_t uid, H5VL_group_get_t get_type, hid_t req, ...); H5_DLL herr_t H5VL_link_create(H5VL_link_create_type_t create_type, hid_t loc_id, - const char *link_name, hid_t lcpl_id, hid_t lapl_id); + const char *link_name, hid_t lcpl_id, hid_t lapl_id, hid_t req); H5_DLL herr_t H5VL_link_move(hid_t src_loc_id, const char *src_name, hid_t dst_loc_id, - const char *dst_name, hbool_t copy_flag, hid_t lcpl_id, hid_t lapl_id); -H5_DLL herr_t H5VL_link_get(hid_t loc_id, H5VL_link_get_t get_type, ...); -H5_DLL herr_t H5VL_link_delete(hid_t loc_id, const char *name, void *udata, hid_t lapl_id); + const char *dst_name, hbool_t copy_flag, hid_t lcpl_id, hid_t lapl_id, hid_t req); +H5_DLL herr_t H5VL_link_get(hid_t loc_id, H5VL_link_get_t get_type, hid_t req, ...); +H5_DLL herr_t H5VL_link_delete(hid_t loc_id, const char *name, void *udata, hid_t lapl_id, hid_t req); -H5_DLL hid_t H5VL_object_open_by_loc(hid_t uid, void *obj_loc, hid_t lapl_id); +H5_DLL hid_t H5VL_object_open_by_loc(hid_t uid, void *obj_loc, hid_t lapl_id, hid_t req); H5_DLL herr_t H5VL_object_copy(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 ); -H5_DLL herr_t H5VL_object_get(hid_t uid, H5VL_object_get_t get_type, ...); -H5_DLL herr_t H5VL_object_generic(hid_t id, H5VL_object_generic_t generic_type, ...); -H5_DLL herr_t H5VL_object_lookup(hid_t uid, H5VL_object_lookup_t lookup_type, ...); -H5_DLL herr_t H5VL_object_close(hid_t uid); + const char *dst_name, hid_t ocpypl_id, hid_t lcpl_id, hid_t req); +H5_DLL herr_t H5VL_object_get(hid_t uid, H5VL_object_get_t get_type, hid_t req, ...); +H5_DLL herr_t H5VL_object_generic(hid_t id, H5VL_object_generic_t generic_type, hid_t req, ...); +H5_DLL herr_t H5VL_object_lookup(hid_t uid, H5VL_object_lookup_t lookup_type, hid_t req, ...); +H5_DLL herr_t H5VL_object_close(hid_t uid, hid_t req); H5_DLL herr_t H5VL_fapl_open(struct H5P_genplist_t *plist, H5VL_class_t *vol_cls); H5_DLL herr_t H5VL_fapl_close(H5VL_class_t *vol_cls); diff --git a/src/H5VLpublic.h b/src/H5VLpublic.h index 8c9302b..047ba99 100644 --- a/src/H5VLpublic.h +++ b/src/H5VLpublic.h @@ -126,72 +126,72 @@ typedef enum H5VL_object_lookup_t { /* H5A routines */ typedef struct H5VL_attr_class_t { - hid_t (*create)(hid_t loc_id, const char *attr_name, hid_t acpl_id, hid_t aapl_id); - hid_t (*open) (hid_t loc_id, void *location, const char *attr_name, hid_t aapl_id); - herr_t (*read) (hid_t attr_id, hid_t mem_type_id, void *buf); - herr_t (*write) (hid_t attr_id, hid_t mem_type_id, const void *buf); - herr_t (*get) (hid_t file_id, H5VL_attr_get_t get_type, va_list arguments); - herr_t (*delete)(hid_t loc_id, void *location, const char *attr_name); - herr_t (*close) (hid_t attr_id); + hid_t (*create)(hid_t loc_id, const char *attr_name, hid_t acpl_id, hid_t aapl_id, hid_t req); + hid_t (*open) (hid_t loc_id, void *location, const char *attr_name, hid_t aapl_id, hid_t req); + herr_t (*read) (hid_t attr_id, hid_t mem_type_id, void *buf, hid_t req); + herr_t (*write) (hid_t attr_id, hid_t mem_type_id, const void *buf, hid_t req); + herr_t (*get) (hid_t file_id, H5VL_attr_get_t get_type, hid_t req, va_list arguments); + herr_t (*delete)(hid_t loc_id, void *location, const char *attr_name, hid_t req); + herr_t (*close) (hid_t attr_id, hid_t req); } H5VL_attr_class_t; /* H5T routines*/ typedef struct H5VL_datatype_class_t { herr_t (*commit)(hid_t loc_id, const char *name, hid_t type_id, - hid_t lcpl_id, hid_t tcpl_id, hid_t tapl_id); - hid_t (*open) (hid_t loc_id, const char * name, hid_t tapl_id); + hid_t lcpl_id, hid_t tcpl_id, hid_t tapl_id, hid_t req); + hid_t (*open) (hid_t loc_id, const char * name, hid_t tapl_id, hid_t req); }H5VL_datatype_class_t; /* H5D routines */ typedef struct H5VL_dataset_class_t { - hid_t (*create)(hid_t loc_id, const char *name, hid_t dcpl_id, hid_t dapl_id); - hid_t (*open) (hid_t loc_id, const char *name, hid_t dapl_id); + hid_t (*create)(hid_t loc_id, const char *name, hid_t dcpl_id, hid_t dapl_id, hid_t req); + hid_t (*open) (hid_t loc_id, const char *name, hid_t dapl_id, hid_t req); herr_t (*read) (hid_t dataset_id, hid_t mem_type_id, hid_t mem_space_id, hid_t file_space_id, - hid_t xfer_plist_id, void * buf); + hid_t xfer_plist_id, void * buf, hid_t req); herr_t (*write) (hid_t dataset_id, hid_t mem_type_id, hid_t mem_space_id, hid_t file_space_id, - hid_t xfer_plist_id, const void * buf ); - herr_t (*set_extent) (hid_t uid, const hsize_t size[]); - herr_t (*get) (hid_t file_id, H5VL_dataset_get_t get_type, va_list arguments); - herr_t (*close) (hid_t dataset_id); + hid_t xfer_plist_id, const void * buf, hid_t req); + herr_t (*set_extent) (hid_t uid, const hsize_t size[], hid_t req); + herr_t (*get) (hid_t file_id, H5VL_dataset_get_t get_type, hid_t req, va_list arguments); + herr_t (*close) (hid_t dataset_id, hid_t req); } H5VL_dataset_class_t; /* H5F routines */ typedef struct H5VL_file_class_t { - hid_t (*create)(const char *name, unsigned flags, hid_t fcpl_id, hid_t fapl_id); - hid_t (*open) (const char *name, unsigned flags, hid_t fapl_id); - herr_t (*flush) (hid_t file_id, H5F_scope_t scope); - herr_t (*get) (hid_t file_id, H5VL_file_get_t get_type, va_list arguments); - herr_t (*generic)(hid_t loc_id, H5VL_file_generic_t generic_type, va_list arguments); - herr_t (*close) (hid_t file_id); + hid_t (*create)(const char *name, unsigned flags, hid_t fcpl_id, hid_t fapl_id, hid_t req); + hid_t (*open) (const char *name, unsigned flags, hid_t fapl_id, hid_t req); + herr_t (*flush) (hid_t file_id, H5F_scope_t scope, hid_t req); + herr_t (*get) (hid_t file_id, H5VL_file_get_t get_type, hid_t req, va_list arguments); + herr_t (*generic)(hid_t loc_id, H5VL_file_generic_t generic_type, hid_t req, va_list arguments); + herr_t (*close) (hid_t file_id, hid_t req); } H5VL_file_class_t; /* H5G routines */ typedef struct H5VL_group_class_t { - hid_t (*create)(hid_t loc_id, const char *name, hid_t gcpl_id, hid_t gapl_id); - hid_t (*open) (hid_t loc_id, const char *name, hid_t gapl_id); - herr_t (*get) (hid_t file_id, H5VL_group_get_t get_type, va_list arguments); - herr_t (*close) (hid_t group_id); + hid_t (*create)(hid_t loc_id, const char *name, hid_t gcpl_id, hid_t gapl_id, hid_t req); + hid_t (*open) (hid_t loc_id, const char *name, hid_t gapl_id, hid_t req); + herr_t (*get) (hid_t file_id, H5VL_group_get_t get_type, hid_t req, va_list arguments); + herr_t (*close) (hid_t group_id, hid_t req); } H5VL_group_class_t; /* H5L routines */ typedef struct H5VL_link_class_t { herr_t (*create)(H5VL_link_create_type_t create_type, hid_t link_loc_id, const char *link_name, - hid_t lcpl_id, hid_t lapl_id); + hid_t lcpl_id, hid_t lapl_id, hid_t req); herr_t (*move) (hid_t src_loc_id, const char *src_name, hid_t dst_loc_id, - const char *dest_name, hbool_t copy_flag, hid_t lcpl, hid_t lapl); - herr_t (*get) (hid_t loc_id, H5VL_link_get_t get_type, va_list arguments); - herr_t (*delete)(hid_t loc_id, const char *name, void *udata, hid_t lapl_id); + const char *dest_name, hbool_t copy_flag, hid_t lcpl, hid_t lapl, hid_t req); + herr_t (*get) (hid_t loc_id, H5VL_link_get_t get_type, hid_t req, va_list arguments); + herr_t (*delete)(hid_t loc_id, const char *name, void *udata, hid_t lapl_id, hid_t req); } H5VL_link_class_t; /* H5O routines */ typedef struct H5VL_object_class_t { - hid_t (*open) (hid_t loc_id, void *obj_loc, hid_t lapl_id); + hid_t (*open) (hid_t loc_id, void *obj_loc, hid_t lapl_id, hid_t req); herr_t (*copy) (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 ); - herr_t (*lookup)(hid_t loc_id, H5VL_object_lookup_t lookup_type, va_list arguments); - herr_t (*get) (hid_t loc_id, H5VL_object_get_t get_type, va_list arguments); - herr_t (*generic)(hid_t id, H5VL_object_generic_t generic_type, va_list arguments); - herr_t (*close) (hid_t obj_id); + hid_t ocpypl_id, hid_t lcpl_id, hid_t req); + herr_t (*lookup)(hid_t loc_id, H5VL_object_lookup_t lookup_type, hid_t req, va_list arguments); + herr_t (*get) (hid_t loc_id, H5VL_object_get_t get_type, hid_t req, va_list arguments); + herr_t (*generic)(hid_t id, H5VL_object_generic_t generic_type, hid_t req, va_list arguments); + herr_t (*close) (hid_t obj_id, hid_t req); } H5VL_object_class_t; /* Class information for each VOL driver */ |