diff options
author | Mohamad Chaarawi <chaarawi@hdfgroup.org> | 2012-04-20 20:40:23 (GMT) |
---|---|---|
committer | Mohamad Chaarawi <chaarawi@hdfgroup.org> | 2012-04-20 20:40:23 (GMT) |
commit | 8f0cec6ac74b908b83bf2235799e79bdebd74898 (patch) | |
tree | 7c6de3069361bf433cded2b36f59521552e2f166 /src/H5VLpublic.h | |
parent | 25f759d15adae9665b1608cb1d9e5dcead721d8d (diff) | |
download | hdf5-8f0cec6ac74b908b83bf2235799e79bdebd74898.zip hdf5-8f0cec6ac74b908b83bf2235799e79bdebd74898.tar.gz hdf5-8f0cec6ac74b908b83bf2235799e79bdebd74898.tar.bz2 |
[svn-r22306] add a request id to each of the VOL callbacks and update the native
plugin to pass a NULL request
Diffstat (limited to 'src/H5VLpublic.h')
-rw-r--r-- | src/H5VLpublic.h | 72 |
1 files changed, 36 insertions, 36 deletions
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 */ |