diff options
Diffstat (limited to 'src/H5VLiod_common.h')
-rw-r--r-- | src/H5VLiod_common.h | 91 |
1 files changed, 41 insertions, 50 deletions
diff --git a/src/H5VLiod_common.h b/src/H5VLiod_common.h index 10ed6d2..302e9ea 100644 --- a/src/H5VLiod_common.h +++ b/src/H5VLiod_common.h @@ -38,11 +38,6 @@ typedef enum H5VL_iod_state_t { H5VL_IOD_CANCELLED } H5VL_iod_state_t; -typedef struct axe_ids_t { - size_t count; - uint64_t *ids; -} axe_ids_t; - typedef struct H5VL_iod_read_status_t { int ret; uint32_t cs; @@ -71,9 +66,11 @@ typedef struct value_t { } value_t; typedef struct axe_t { - uint64_t axe_id; - uint64_t start_range; - uint64_t count; + AXE_task_t axe_id; + AXE_task_t start_range; + size_t count; + size_t num_parents; + AXE_task_t *parent_axe_ids; } axe_t; H5_DLL int hg_proc_ret_t(hg_proc_t proc, void *data); @@ -117,164 +114,158 @@ MERCURY_GEN_PROC(file_close_in_t, ((axe_t)(axe_info)) MERCURY_GEN_PROC(attr_create_in_t, ((axe_t)(axe_info)) ((iod_handle_t)(coh)) ((iod_handle_t)(loc_oh)) ((iod_obj_id_t)(loc_id)) ((iod_obj_id_t)(attr_id)) - ((uint64_t)(parent_axe_id)) ((hg_string_t)(path)) + ((hg_string_t)(path)) ((hg_string_t)(attr_name)) ((hid_t)(acpl_id)) ((hid_t)(type_id)) ((hid_t)(space_id))) MERCURY_GEN_PROC(attr_create_out_t, ((iod_handle_t)(iod_oh))) MERCURY_GEN_PROC(attr_open_in_t, ((axe_t)(axe_info)) ((iod_handle_t)(coh)) ((iod_handle_t)(loc_oh)) - ((iod_obj_id_t)(loc_id)) ((uint64_t)(parent_axe_id)) ((hg_string_t)(path)) + ((iod_obj_id_t)(loc_id)) ((hg_string_t)(path)) ((hg_string_t)(attr_name))) MERCURY_GEN_PROC(attr_open_out_t, ((iod_handle_t)(iod_oh)) ((iod_obj_id_t)(iod_id)) ((hid_t)(acpl_id)) ((hid_t)(type_id)) ((hid_t)(space_id))) MERCURY_GEN_PROC(attr_op_in_t, ((axe_t)(axe_info)) ((iod_handle_t)(coh)) ((iod_handle_t)(loc_oh)) - ((iod_obj_id_t)(loc_id)) ((uint64_t)(parent_axe_id)) + ((iod_obj_id_t)(loc_id)) ((hg_string_t)(path)) ((hg_string_t)(attr_name))) MERCURY_GEN_PROC(attr_rename_in_t, ((axe_t)(axe_info)) ((iod_handle_t)(coh)) ((iod_handle_t)(loc_oh)) - ((iod_obj_id_t)(loc_id)) ((uint64_t)(parent_axe_id)) + ((iod_obj_id_t)(loc_id)) ((hg_string_t)(path)) ((hg_string_t)(old_attr_name)) ((hg_string_t)(new_attr_name))) MERCURY_GEN_PROC(attr_io_in_t, ((axe_t)(axe_info)) ((iod_handle_t)(coh)) ((iod_handle_t)(iod_oh)) - ((iod_obj_id_t)(iod_id)) ((uint64_t)(parent_axe_id)) + ((iod_obj_id_t)(iod_id)) ((hid_t)(type_id)) ((hg_bulk_t)(bulk_handle))) MERCURY_GEN_PROC(attr_close_in_t, ((axe_t)(axe_info)) - ((iod_handle_t)(iod_oh)) ((iod_obj_id_t)(iod_id)) - ((axe_ids_t)(parent_axe_ids))) + ((iod_handle_t)(iod_oh)) ((iod_obj_id_t)(iod_id))) MERCURY_GEN_PROC(group_create_in_t, ((axe_t)(axe_info)) ((iod_handle_t)(coh)) ((iod_handle_t)(loc_oh)) ((iod_obj_id_t)(loc_id)) ((iod_obj_id_t)(grp_id)) - ((uint64_t)(parent_axe_id)) ((hg_string_t)(name)) ((hid_t)(gapl_id)) + ((hg_string_t)(name)) ((hid_t)(gapl_id)) ((hid_t)(gcpl_id)) ((hid_t)(lcpl_id))) MERCURY_GEN_PROC(group_create_out_t, ((iod_handle_t)(iod_oh))) MERCURY_GEN_PROC(group_open_in_t, ((axe_t)(axe_info)) ((iod_handle_t)(coh)) ((iod_handle_t)(loc_oh)) - ((iod_obj_id_t)(loc_id)) ((uint64_t)(parent_axe_id)) ((hg_string_t)(name)) + ((iod_obj_id_t)(loc_id)) ((hg_string_t)(name)) ((hid_t)(gapl_id))) MERCURY_GEN_PROC(group_open_out_t, ((iod_handle_t)(iod_oh)) ((iod_obj_id_t)(iod_id)) ((hid_t)(gcpl_id))) MERCURY_GEN_PROC(group_close_in_t, ((axe_t)(axe_info)) - ((iod_handle_t)(iod_oh)) ((iod_obj_id_t)(iod_id)) - ((axe_ids_t)(parent_axe_ids))) + ((iod_handle_t)(iod_oh)) ((iod_obj_id_t)(iod_id))) MERCURY_GEN_PROC(map_create_in_t, ((axe_t)(axe_info)) ((iod_handle_t)(coh)) ((iod_handle_t)(loc_oh)) ((iod_obj_id_t)(loc_id)) ((iod_obj_id_t)(map_id)) - ((uint64_t)(parent_axe_id)) ((hg_string_t)(name)) + ((hg_string_t)(name)) ((hid_t)(keytype_id)) ((hid_t)(valtype_id)) ((hid_t)(mapl_id)) ((hid_t)(mcpl_id)) ((hid_t)(lcpl_id))) MERCURY_GEN_PROC(map_create_out_t, ((iod_handle_t)(iod_oh))) MERCURY_GEN_PROC(map_open_in_t, ((axe_t)(axe_info)) ((iod_handle_t)(coh)) ((iod_handle_t)(loc_oh)) - ((iod_obj_id_t)(loc_id)) ((uint64_t)(parent_axe_id)) + ((iod_obj_id_t)(loc_id)) ((hg_string_t)(name)) ((hid_t)(mapl_id))) MERCURY_GEN_PROC(map_open_out_t, ((iod_handle_t)(iod_oh)) ((iod_obj_id_t)(iod_id)) ((hid_t)(keytype_id)) ((hid_t)(valtype_id)) ((hid_t)(mcpl_id))) MERCURY_GEN_PROC(map_set_in_t, ((axe_t)(axe_info)) ((iod_handle_t)(coh)) ((iod_handle_t)(iod_oh)) - ((iod_obj_id_t)(iod_id)) ((uint64_t)(parent_axe_id)) + ((iod_obj_id_t)(iod_id)) ((hid_t)(key_maptype_id)) ((hid_t)(key_memtype_id)) ((binary_buf_t)(key)) ((hid_t)(val_maptype_id)) ((hid_t)(val_memtype_id)) ((binary_buf_t)(val)) ((hid_t)(dxpl_id))) MERCURY_GEN_PROC(map_get_in_t, ((axe_t)(axe_info)) ((iod_handle_t)(coh)) ((iod_handle_t)(iod_oh)) - ((iod_obj_id_t)(iod_id)) ((uint64_t)(parent_axe_id)) + ((iod_obj_id_t)(iod_id)) ((hid_t)(key_maptype_id)) ((hid_t)(key_memtype_id)) ((binary_buf_t)(key)) ((hid_t)(val_maptype_id)) ((hid_t)(val_memtype_id)) ((hid_t)(dxpl_id))) MERCURY_GEN_PROC(map_get_out_t, ((int32_t)(ret)) ((value_t)(val))) MERCURY_GEN_PROC(map_get_count_in_t, ((axe_t)(axe_info)) ((iod_handle_t)(coh)) ((iod_handle_t)(iod_oh)) - ((iod_obj_id_t)(iod_id)) ((uint64_t)(parent_axe_id))) + ((iod_obj_id_t)(iod_id))) MERCURY_GEN_PROC(map_op_in_t, ((axe_t)(axe_info)) ((iod_handle_t)(coh)) ((iod_handle_t)(iod_oh)) - ((iod_obj_id_t)(iod_id)) ((uint64_t)(parent_axe_id)) + ((iod_obj_id_t)(iod_id)) ((hid_t)(key_maptype_id)) ((hid_t)(key_memtype_id)) ((binary_buf_t)(key))) MERCURY_GEN_PROC(map_close_in_t, ((axe_t)(axe_info)) - ((iod_handle_t)(iod_oh)) ((iod_obj_id_t)(iod_id)) - ((axe_ids_t)(parent_axe_ids))) + ((iod_handle_t)(iod_oh)) ((iod_obj_id_t)(iod_id))) MERCURY_GEN_PROC(dset_create_in_t, ((axe_t)(axe_info)) ((iod_handle_t)(coh)) ((iod_handle_t)(loc_oh)) ((iod_obj_id_t)(loc_id)) ((iod_obj_id_t)(dset_id)) - ((uint64_t)(parent_axe_id)) ((hg_string_t)(name)) + ((hg_string_t)(name)) ((hid_t)(dapl_id)) ((hid_t)(dcpl_id)) ((hid_t)(lcpl_id)) ((hid_t)(type_id)) ((hid_t)(space_id))) MERCURY_GEN_PROC(dset_create_out_t, ((iod_handle_t)(iod_oh))) MERCURY_GEN_PROC(dset_open_in_t, ((axe_t)(axe_info)) ((iod_handle_t)(coh)) ((iod_handle_t)(loc_oh)) - ((iod_obj_id_t)(loc_id)) ((uint64_t)(parent_axe_id)) + ((iod_obj_id_t)(loc_id)) ((hg_string_t)(name)) ((hid_t)(dapl_id))) MERCURY_GEN_PROC(dset_open_out_t, ((iod_handle_t)(iod_oh)) ((iod_obj_id_t)(iod_id)) ((hid_t)(dcpl_id)) ((hid_t)(type_id)) ((hid_t)(space_id))) MERCURY_GEN_PROC(dset_set_extent_in_t, ((axe_t)(axe_info)) ((iod_handle_t)(coh)) ((iod_handle_t)(iod_oh)) - ((iod_obj_id_t)(iod_id)) ((axe_ids_t)(parent_axe_ids)) - ((dims_t)(dims))) + ((iod_obj_id_t)(iod_id)) ((dims_t)(dims))) MERCURY_GEN_PROC(dset_io_in_t, ((axe_t)(axe_info)) ((iod_handle_t)(coh)) ((iod_handle_t)(iod_oh)) - ((iod_obj_id_t)(iod_id)) ((uint64_t)(parent_axe_id)) + ((iod_obj_id_t)(iod_id)) ((hid_t)(dset_type_id)) ((hid_t)(mem_type_id)) ((hid_t)(space_id)) ((hid_t)(dxpl_id)) ((uint32_t)(checksum)) ((hg_bulk_t)(bulk_handle))) MERCURY_GEN_PROC(dset_get_vl_size_in_t, ((axe_t)(axe_info)) ((iod_handle_t)(coh)) ((iod_handle_t)(iod_oh)) - ((iod_obj_id_t)(iod_id)) ((uint64_t)(parent_axe_id)) ((hid_t)(mem_type_id)) + ((iod_obj_id_t)(iod_id)) ((hid_t)(mem_type_id)) ((hid_t)(space_id)) ((hid_t)(dxpl_id))) MERCURY_GEN_PROC(dset_read_out_t, ((int32_t)(ret)) ((uint32_t)(cs)) ((size_t)(buf_size))) MERCURY_GEN_PROC(dset_close_in_t, ((axe_t)(axe_info)) - ((iod_handle_t)(iod_oh)) ((iod_obj_id_t)(iod_id)) - ((axe_ids_t)(parent_axe_ids))) + ((iod_handle_t)(iod_oh)) ((iod_obj_id_t)(iod_id))) MERCURY_GEN_PROC(dtype_commit_in_t, ((axe_t)(axe_info)) ((iod_handle_t)(coh)) ((iod_handle_t)(loc_oh)) ((iod_obj_id_t)(loc_id)) ((iod_obj_id_t)(dtype_id)) - ((uint64_t)(parent_axe_id)) ((hg_string_t)(name)) + ((hg_string_t)(name)) ((hid_t)(tapl_id)) ((hid_t)(tcpl_id)) ((hid_t)(lcpl_id)) ((hid_t)(type_id))) MERCURY_GEN_PROC(dtype_commit_out_t, ((iod_handle_t)(iod_oh))) MERCURY_GEN_PROC(dtype_open_in_t, ((axe_t)(axe_info)) ((iod_handle_t)(coh)) ((iod_handle_t)(loc_oh)) - ((iod_obj_id_t)(loc_id)) ((uint64_t)(parent_axe_id)) + ((iod_obj_id_t)(loc_id)) ((hg_string_t)(name)) ((hid_t)(tapl_id))) MERCURY_GEN_PROC(dtype_open_out_t, ((iod_handle_t)(iod_oh)) ((iod_obj_id_t)(iod_id)) ((hid_t)(tcpl_id)) ((hid_t)(type_id))) MERCURY_GEN_PROC(dtype_close_in_t, ((axe_t)(axe_info)) - ((iod_handle_t)(iod_oh)) ((iod_obj_id_t)(iod_id)) - ((uint64_t)(parent_axe_id))) + ((iod_handle_t)(iod_oh)) ((iod_obj_id_t)(iod_id))) MERCURY_GEN_PROC(link_create_in_t, ((axe_t)(axe_info)) ((int8_t)(create_type)) ((iod_handle_t)(coh)) ((iod_handle_t)(loc_oh)) ((iod_obj_id_t)(loc_id)) - ((uint64_t)(parent_axe_id)) ((hg_string_t)(loc_name)) + ((hg_string_t)(loc_name)) ((iod_handle_t)(target_loc_oh)) ((iod_obj_id_t)(target_loc_id)) - ((uint64_t)(target_parent_axe_id)) ((hg_string_t)(target_name)) + ((hg_string_t)(target_name)) ((hg_string_t)(link_value)) ((hid_t)(lapl_id)) ((hid_t)(lcpl_id))) MERCURY_GEN_PROC(link_move_in_t, ((axe_t)(axe_info)) ((hbool_t)(copy_flag)) ((iod_handle_t)(coh)) ((iod_handle_t)(src_loc_oh)) ((iod_obj_id_t)(src_loc_id)) - ((uint64_t)(src_parent_axe_id)) ((hg_string_t)(src_loc_name)) + ((hg_string_t)(src_loc_name)) ((iod_handle_t)(dst_loc_oh)) ((iod_obj_id_t)(dst_loc_id)) - ((uint64_t)(dst_parent_axe_id)) ((hg_string_t)(dst_loc_name)) + ((hg_string_t)(dst_loc_name)) ((hid_t)(lapl_id)) ((hid_t)(lcpl_id))) MERCURY_GEN_PROC(link_op_in_t, ((axe_t)(axe_info)) ((iod_handle_t)(coh)) ((iod_handle_t)(loc_oh)) - ((iod_obj_id_t)(loc_id)) ((uint64_t)(parent_axe_id)) + ((iod_obj_id_t)(loc_id)) ((hg_string_t)(path))) MERCURY_GEN_PROC(link_get_val_in_t, ((axe_t)(axe_info)) ((iod_handle_t)(coh)) ((iod_handle_t)(loc_oh)) - ((iod_obj_id_t)(loc_id)) ((uint64_t)(parent_axe_id)) + ((iod_obj_id_t)(loc_id)) ((hg_string_t)(path)) ((uint64_t)(length))) MERCURY_GEN_PROC(link_get_val_out_t, ((int32_t)(ret)) ((value_t)(value))) MERCURY_GEN_PROC(object_op_in_t, ((axe_t)(axe_info)) ((iod_handle_t)(coh)) ((iod_handle_t)(loc_oh)) - ((iod_obj_id_t)(loc_id)) ((uint64_t)(parent_axe_id)) + ((iod_obj_id_t)(loc_id)) ((hg_string_t)(loc_name))) MERCURY_GEN_PROC(object_open_out_t, ((int32_t)(obj_type)) ((iod_handle_t)(iod_oh)) ((iod_obj_id_t)(iod_id)) @@ -282,17 +273,17 @@ MERCURY_GEN_PROC(object_open_out_t, ((int32_t)(obj_type)) MERCURY_GEN_PROC(object_copy_in_t, ((axe_t)(axe_info)) ((iod_handle_t)(coh)) ((iod_handle_t)(src_loc_oh)) ((iod_obj_id_t)(src_loc_id)) - ((uint64_t)(src_parent_axe_id)) ((hg_string_t)(src_loc_name)) + ((hg_string_t)(src_loc_name)) ((iod_handle_t)(dst_loc_oh)) ((iod_obj_id_t)(dst_loc_id)) - ((uint64_t)(dst_parent_axe_id)) ((hg_string_t)(dst_loc_name)) + ((hg_string_t)(dst_loc_name)) ((hid_t)(ocpypl_id)) ((hid_t)(lcpl_id))) MERCURY_GEN_PROC(object_set_comment_in_t, ((axe_t)(axe_info)) ((iod_handle_t)(coh)) ((iod_handle_t)(loc_oh)) - ((iod_obj_id_t)(loc_id)) ((uint64_t)(parent_axe_id)) + ((iod_obj_id_t)(loc_id)) ((hg_string_t)(path)) ((hg_string_t)(comment))) MERCURY_GEN_PROC(object_get_comment_in_t, ((axe_t)(axe_info)) ((iod_handle_t)(coh)) ((iod_handle_t)(loc_oh)) - ((iod_obj_id_t)(loc_id)) ((uint64_t)(parent_axe_id)) + ((iod_obj_id_t)(loc_id)) ((hg_string_t)(path)) ((uint64_t)(length))) MERCURY_GEN_PROC(object_get_comment_out_t, ((int32_t)(ret)) ((name_t)(name))) |