diff options
author | Mohamad Chaarawi <chaarawi@hdfgroup.org> | 2012-03-28 15:00:47 (GMT) |
---|---|---|
committer | Mohamad Chaarawi <chaarawi@hdfgroup.org> | 2012-03-28 15:00:47 (GMT) |
commit | ae5da182009bb5fc2faba40ef3a109870c9573e8 (patch) | |
tree | 080e33dccdaa622befe607495de6065130bb97f5 /src | |
parent | 31623a4916da61e72417ccacf7d8cea6466a769e (diff) | |
download | hdf5-ae5da182009bb5fc2faba40ef3a109870c9573e8.zip hdf5-ae5da182009bb5fc2faba40ef3a109870c9573e8.tar.gz hdf5-ae5da182009bb5fc2faba40ef3a109870c9573e8.tar.bz2 |
[svn-r22165] reorder the callbacks in the VOL struct to have create, open, ..., close ordering
Diffstat (limited to 'src')
-rw-r--r-- | src/H5VLdummy.c | 6 | ||||
-rw-r--r-- | src/H5VLnative.c | 34 | ||||
-rw-r--r-- | src/H5VLpublic.h | 21 |
3 files changed, 27 insertions, 34 deletions
diff --git a/src/H5VLdummy.c b/src/H5VLdummy.c index b4fcfae..c381f8e 100644 --- a/src/H5VLdummy.c +++ b/src/H5VLdummy.c @@ -58,11 +58,11 @@ static const H5VL_class_t H5VL_dummy_g = { NULL, /*fapl_copy */ NULL, /*fapl_free */ { /* file_cls */ - H5VL_dummy_open, /* open */ - H5VL_dummy_close, /* close */ H5VL_dummy_create, /* create */ + H5VL_dummy_open, /* open */ NULL, /* flush */ - NULL /* get */ + NULL, /* get */ + H5VL_dummy_close /* close */ }, { /* dataset_cls */ NULL, /* open */ diff --git a/src/H5VLnative.c b/src/H5VLnative.c index 7d59ded..6c804ef 100644 --- a/src/H5VLnative.c +++ b/src/H5VLnative.c @@ -104,37 +104,37 @@ static const H5VL_class_t H5VL_native_g = { NULL, /*fapl_copy */ NULL, /*fapl_free */ { /* attribute_cls */ - NULL, /* open */ - NULL, /* close */ NULL, /* create */ - NULL, /* delete */ + NULL, /* open */ NULL, /* read */ - NULL /* write */ + NULL, /* write */ + NULL, /* delete */ + NULL /* close */ }, { /* datatype_cls */ H5VL_native_datatype_commit, /* commit */ H5VL_native_datatype_open /* open */ }, { /* dataset_cls */ - H5VL_native_dataset_open, /* open */ - H5VL_native_dataset_close, /* close */ H5VL_native_dataset_create, /* create */ + H5VL_native_dataset_open, /* open */ H5VL_native_dataset_read, /* read */ H5VL_native_dataset_write, /* write */ - H5VL_native_dataset_get /* get */ + H5VL_native_dataset_get, /* get */ + H5VL_native_dataset_close /* close */ }, { /* group_cls */ H5VL_native_group_create, /* create */ H5VL_native_group_open, /* open */ - H5VL_native_group_close, /* close */ - H5VL_native_group_get /* get */ + H5VL_native_group_get, /* get */ + H5VL_native_group_close /* close */ }, { /* file_cls */ - H5VL_native_file_open, /* open */ - H5VL_native_file_close, /* close */ H5VL_native_file_create, /* create */ + H5VL_native_file_open, /* open */ H5VL_native_file_flush, /* flush */ - H5VL_native_file_get /* get */ + H5VL_native_file_get, /* get */ + H5VL_native_file_close /* close */ }, { /* link_cls */ NULL, /* create */ @@ -144,11 +144,11 @@ static const H5VL_class_t H5VL_native_g = { }, { /* object_cls */ H5VL_native_object_open, /* open */ - H5VL_native_object_close, /* close */ NULL, /* move */ NULL, /* copy */ H5VL_native_object_lookup, /* lookup */ - H5VL_native_object_get /* get */ + H5VL_native_object_get, /* get */ + H5VL_native_object_close /* close */ } }; @@ -296,12 +296,6 @@ H5VL_native_file_open(const char *name, unsigned flags, hid_t fcpl_id, /* Keep this ID in file object structure */ new_file->file_id = ret_value; -#if 0 - new_file->vol_id = plugin_id; - if(H5I_inc_ref(new_file->vol_id, FALSE) < 0) - HGOTO_ERROR(H5E_VOL, H5E_CANTINC, FAIL, "unable to increment ref count on VOL plugin") -#endif - done: if(ret_value < 0 && new_file && H5F_try_close(new_file) < 0) HDONE_ERROR(H5E_FILE, H5E_CANTCLOSEFILE, FAIL, "problems closing file") diff --git a/src/H5VLpublic.h b/src/H5VLpublic.h index b8eafa4..ede4358 100644 --- a/src/H5VLpublic.h +++ b/src/H5VLpublic.h @@ -77,36 +77,35 @@ typedef enum H5VL_object_lookup_t { /* H5F routines */ typedef struct H5VL_file_class_t { - hid_t (*open) (const char *name, unsigned flags, hid_t fcpl_id, hid_t fapl_id, hid_t dxpl_id); - 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 (*open) (const char *name, unsigned flags, hid_t fcpl_id, hid_t fapl_id, hid_t dxpl_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, int num_args, va_list arguments); + herr_t (*close) (hid_t file_id); } H5VL_file_class_t; /* H5D routines */ typedef struct H5VL_dataset_class_t { - hid_t (*open) (hid_t loc_id, const char *name, hid_t dapl_id); - herr_t (*close) (hid_t dataset_id); hid_t (*create)(hid_t loc_id, const char *name, hid_t dtype_id, hid_t space_id, hid_t lcpl_id, hid_t dcpl_id, hid_t dapl_id); + hid_t (*open) (hid_t loc_id, const char *name, hid_t dapl_id); 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); 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 (*get) (hid_t file_id, H5VL_dataset_get_t get_type, int num_args, va_list arguments); + herr_t (*close) (hid_t dataset_id); } H5VL_dataset_class_t; /* H5A routines */ typedef struct H5VL_attribute_class_t { - hid_t (*open) (hid_t obj_id, const char *attr_name, hid_t aapl_id); - herr_t (*close) (hid_t attr_id); hid_t (*create)( hid_t loc_id, const char *attr_name, hid_t type_id, hid_t space_id, hid_t acpl_id, hid_t aapl_id); - herr_t (*delete)(hid_t loc_id, const char *attr_name ); + hid_t (*open) (hid_t obj_id, 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 (*write) (hid_t attr_id, hid_t mem_type_id, const void *buf ); + herr_t (*delete)(hid_t loc_id, const char *attr_name ); + herr_t (*close) (hid_t attr_id); } H5VL_attribute_class_t; /* H5T routines*/ @@ -131,20 +130,20 @@ typedef struct H5VL_link_class_t { typedef struct H5VL_group_class_t { hid_t (*create)(hid_t loc_id, const char *name, hid_t lcpl_id, hid_t gcpl_id, hid_t gapl_id); hid_t (*open) (hid_t loc_id, const char *name, hid_t gapl_id); - herr_t (*close) (hid_t group_id); herr_t (*get) (hid_t file_id, H5VL_group_get_t get_type, int num_args, va_list arguments); + herr_t (*close) (hid_t group_id); } H5VL_group_class_t; /* H5O routines */ typedef struct H5VL_object_class_t { hid_t (*open) (hid_t loc_id, void *obj_loc, hid_t lapl_id); - herr_t (*close) (hid_t obj_id); herr_t (*move) (hid_t src_loc_id, const char *src_name, hid_t dst_loc_id, const char *dest_name, hid_t lcpl, hid_t lapl); 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, int num_args, va_list arguments); herr_t (*get) (hid_t loc_id, H5VL_object_get_t get_type, int num_args, va_list arguments); + herr_t (*close) (hid_t obj_id); } H5VL_object_class_t; /* Class information for each VOL driver */ |