[svn-r24520] - fix bug in file open

- update latest M6.2 demo code from Ruth and add a minor fix
- resolve conflicts with Jerome's changes in H5VLiod_common.h

4 files changed, 491 insertions, 221 deletions

diff --git a/src/H5VLiod.c b/src/H5VLiod.c
index 7e29913..ba6796f 100644
--- a/src/H5VLiod.c
+++ b/src/H5VLiod.c
@@ -4852,7 +4852,8 @@ H5VL_iod_attribute_get(void *_obj, H5VL_attr_get_t get_type, hid_t dxpl_id,
                     HGOTO_ERROR(H5E_SYM, H5E_NOSPACE, FAIL, "can't allocate parent req element");
 
                 /* retrieve parent requests */
-                if(H5VL_iod_get_parent_requests(obj, (H5VL_iod_req_info_t *)rc, parent_reqs, &num_parents) < 0)
+                if(H5VL_iod_get_parent_requests(obj, (H5VL_iod_req_info_t *)rc, 
+                                                parent_reqs, &num_parents) < 0)
                     HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "Failed to retrieve parent requests");
 
                 /* retrieve IOD info of location object */
diff --git a/src/H5VLiod_attr.c b/src/H5VLiod_attr.c
index 74e72f7..8380138 100644
--- a/src/H5VLiod_attr.c
+++ b/src/H5VLiod_attr.c
@@ -754,7 +754,7 @@ H5VL_iod_server_attr_exists_cb(AXE_engine_t UNUSED axe_engine,
                                  &obj_id, &obj_oh) < 0)
         HGOTO_ERROR2(H5E_SYM, H5E_NOSPACE, FAIL, "can't open object");
 
-    if(obj_id != loc_id) {
+    if(loc_id != obj_id || IOD_OBJ_INVALID == input->loc_attrkv_id) {
         /* get scratch pad of the parent */
         if(iod_obj_get_scratch(obj_oh.rd_oh, rtid, &sp, &sp_cs, NULL) < 0)
             HGOTO_ERROR2(H5E_ATTR, H5E_CANTINIT, FAIL, "can't get scratch pad for object");
diff --git a/src/H5VLiod_common.h b/src/H5VLiod_common.h
index 3383aa5..e8fcde9 100644
--- a/src/H5VLiod_common.h
+++ b/src/H5VLiod_common.h
@@ -96,300 +96,566 @@ H5_DLL int hg_proc_linfo_t(hg_proc_t proc, void *data);
 H5_DLL int hg_proc_oinfo_t(hg_proc_t proc, void *data);
 H5_DLL int hg_proc_iod_layout_t(hg_proc_t proc, void *data);
 
-MERCURY_GEN_PROC(analysis_execute_in_t, ((axe_t)(axe_info))
-                 ((hid_t)(query_id)) ((hg_const_string_t)(file_name))
+MERCURY_GEN_PROC(analysis_execute_in_t, 
+                 ((axe_t)(axe_info))
+                 ((hid_t)(query_id)) 
+                 ((hg_const_string_t)(file_name))
                  ((hg_const_string_t)(obj_name))
                  ((hg_const_string_t)(split_script))
-                 ((hg_const_string_t)(combine_script))
-                 )
+                 ((hg_const_string_t)(combine_script)))
 MERCURY_GEN_PROC(analysis_execute_out_t, ((int32_t)(ret)))
-MERCURY_GEN_PROC(analysis_farm_in_t, ((axe_t)(axe_info))
-                 ((iod_handle_t)(coh)) ((hid_t)(query_id)) ((hid_t)(space_id))
-                 ((hid_t)(type_id)) ((uint64_t)(rtid)) ((iod_obj_id_t)(obj_id))
-                 ((iod_layout_t)(layout)) ((int32_t)(target_idx))
-                 ((hg_const_string_t)(split_script))
-                 )
-MERCURY_GEN_PROC(analysis_farm_out_t, ((int32_t)(ret)) ((uint64_t)(axe_id))
+MERCURY_GEN_PROC(analysis_farm_in_t, 
+                 ((axe_t)(axe_info))
+                 ((iod_handle_t)(coh)) 
+                 ((hid_t)(query_id)) 
+                 ((hid_t)(space_id))
+                 ((hid_t)(type_id)) 
+                 ((uint64_t)(rtid)) 
+                 ((iod_obj_id_t)(obj_id))
+                 ((iod_layout_t)(layout)) 
+                 ((int32_t)(target_idx))
+                 ((hg_const_string_t)(split_script)))
+MERCURY_GEN_PROC(analysis_farm_out_t, 
+                 ((int32_t)(ret)) 
+                 ((uint64_t)(axe_id))
                  ((hg_bulk_t)(bulk_handle)))
 
-MERCURY_GEN_PROC(eff_init_in_t, ((uint32_t)(proc_num)))
+MERCURY_GEN_PROC(eff_init_in_t, 
+                 ((uint32_t)(proc_num)))
 
-MERCURY_GEN_PROC(file_create_in_t, ((axe_t)(axe_info)) 
-                 ((hg_const_string_t)(name)) ((uint32_t)(flags)) 
+MERCURY_GEN_PROC(file_create_in_t, 
+                 ((axe_t)(axe_info)) 
+                 ((hg_const_string_t)(name)) 
+                 ((uint32_t)(flags)) 
                  ((iod_obj_id_t)(root_id))
-                 ((iod_obj_id_t)(mdkv_id)) ((iod_obj_id_t)(attrkv_id)) 
+                 ((iod_obj_id_t)(mdkv_id)) 
+                 ((iod_obj_id_t)(attrkv_id)) 
                  ((uint32_t)(num_peers))
-                 ((hid_t)(fapl_id)) ((hid_t)(fcpl_id)))
-MERCURY_GEN_PROC(file_create_out_t, ((iod_handle_t)(coh)) ((iod_handles_t)(root_oh))
-                 ((uint64_t)(kv_oid_index)) ((uint64_t)(array_oid_index))
+                 ((hid_t)(fapl_id)) 
+                 ((hid_t)(fcpl_id)))
+MERCURY_GEN_PROC(file_create_out_t, 
+                 ((iod_handle_t)(coh)) 
+                 ((iod_handles_t)(root_oh))
+                 ((uint64_t)(kv_oid_index)) 
+                 ((uint64_t)(array_oid_index))
                  ((uint64_t)(blob_oid_index)))
-MERCURY_GEN_PROC(file_open_in_t, ((axe_t)(axe_info)) 
-                 ((hg_const_string_t)(name)) ((uint32_t)(flags)) 
-                 ((hbool_t)(acquire)) ((hid_t)(fapl_id)))
-MERCURY_GEN_PROC(file_open_out_t, ((iod_handle_t)(coh)) ((iod_handles_t)(root_oh))
-                 ((uint64_t)(kv_oid_index)) ((uint64_t)(array_oid_index)) 
-                 ((uint64_t)(blob_oid_index))
+MERCURY_GEN_PROC(file_open_in_t, 
+                 ((axe_t)(axe_info)) 
+                 ((hg_const_string_t)(name)) 
+                 ((uint32_t)(flags)) 
+                 ((hbool_t)(acquire)) 
+                 ((hid_t)(fapl_id)))
+MERCURY_GEN_PROC(file_open_out_t, 
+                 ((iod_handle_t)(coh)) 
+                 ((iod_handles_t)(root_oh))
+                 ((uint64_t)(kv_oid_index)) 
+                 ((uint64_t)(array_oid_index)) 
+                 ((uint64_t)(blob_oid_index)) 
                  ((iod_obj_id_t)(root_id)) 
-                 ((iod_obj_id_t)(mdkv_id)) ((iod_obj_id_t)(attrkv_id)) 
-                 ((uint64_t)(c_version))
+                 ((iod_obj_id_t)(mdkv_id)) 
+                 ((iod_obj_id_t)(attrkv_id)) 
+                 ((uint64_t)(c_version)) 
                  ((hid_t)(fcpl_id)))
-MERCURY_GEN_PROC(file_close_in_t, ((axe_t)(axe_info)) ((uint32_t)(cs_scope)) 
-                 ((iod_handle_t)(coh)) ((iod_handles_t)(root_oh))
-                 ((iod_obj_id_t)(root_id)) ((uint64_t)(max_kv_index)) 
-                 ((uint64_t)(max_array_index)) ((uint64_t)(max_blob_index)))
+MERCURY_GEN_PROC(file_close_in_t, 
+                 ((axe_t)(axe_info)) 
+                 ((uint32_t)(cs_scope)) 
+                 ((iod_handle_t)(coh)) 
+                 ((iod_handles_t)(root_oh))
+                 ((iod_obj_id_t)(root_id)) 
+                 ((uint64_t)(max_kv_index)) 
+                 ((uint64_t)(max_array_index)) 
+                 ((uint64_t)(max_blob_index)))
 
-MERCURY_GEN_PROC(attr_create_in_t, ((axe_t)(axe_info)) ((uint32_t)(cs_scope)) 
-                 ((uint64_t)(rcxt_num)) ((uint64_t)(trans_num))
-                 ((iod_handle_t)(coh)) ((iod_handles_t)(loc_oh))
-                 ((iod_obj_id_t)(loc_id)) ((iod_obj_id_t)(loc_attrkv_id))
+MERCURY_GEN_PROC(attr_create_in_t, 
+                 ((axe_t)(axe_info)) 
+                 ((uint32_t)(cs_scope)) 
+                 ((uint64_t)(rcxt_num)) 
+                 ((uint64_t)(trans_num))
+                 ((iod_handle_t)(coh)) 
+                 ((iod_handles_t)(loc_oh))
+                 ((iod_obj_id_t)(loc_id)) 
+                 ((iod_obj_id_t)(loc_attrkv_id))
                  ((iod_obj_id_t)(attr_id))
                  ((iod_obj_id_t)(mdkv_id))
                  ((hg_const_string_t)(path))
                  ((hg_const_string_t)(attr_name))
-                 ((hid_t)(type_id)) ((hid_t)(space_id)))
-MERCURY_GEN_PROC(attr_create_out_t, ((iod_handles_t)(iod_oh)))
-MERCURY_GEN_PROC(attr_open_in_t, ((axe_t)(axe_info)) ((uint32_t)(cs_scope)) 
+                 ((hid_t)(type_id)) 
+                 ((hid_t)(space_id)))
+MERCURY_GEN_PROC(attr_create_out_t, 
+                 ((iod_handles_t)(iod_oh)))
+MERCURY_GEN_PROC(attr_open_in_t, 
+                 ((axe_t)(axe_info)) 
+                 ((uint32_t)(cs_scope)) 
                  ((uint64_t)(rcxt_num))
-                 ((iod_handle_t)(coh)) ((iod_handles_t)(loc_oh))
-                 ((iod_obj_id_t)(loc_id)) ((iod_obj_id_t)(loc_attrkv_id))
+                 ((iod_handle_t)(coh)) 
+                 ((iod_handles_t)(loc_oh))
+                 ((iod_obj_id_t)(loc_id)) 
+                 ((iod_obj_id_t)(loc_attrkv_id))
                  ((hg_const_string_t)(path)) 
                  ((hg_const_string_t)(attr_name)))
-MERCURY_GEN_PROC(attr_open_out_t, ((iod_handles_t)(iod_oh)) ((iod_obj_id_t)(iod_id)) 
+MERCURY_GEN_PROC(attr_open_out_t, 
+                 ((iod_handles_t)(iod_oh)) 
+                 ((iod_obj_id_t)(iod_id)) 
                  ((iod_obj_id_t)(mdkv_id))
-                 ((hid_t)(type_id)) ((hid_t)(space_id)))
-MERCURY_GEN_PROC(attr_op_in_t, ((axe_t)(axe_info)) ((uint32_t)(cs_scope)) 
-                 ((uint64_t)(rcxt_num)) ((uint64_t)(trans_num))
-                 ((iod_handle_t)(coh)) ((iod_handles_t)(loc_oh))
-                 ((iod_obj_id_t)(loc_id)) ((iod_obj_id_t)(loc_attrkv_id))
-                 ((hg_const_string_t)(path)) ((hg_const_string_t)(attr_name)))
-MERCURY_GEN_PROC(attr_rename_in_t, ((axe_t)(axe_info)) ((uint32_t)(cs_scope)) 
-                 ((uint64_t)(rcxt_num)) ((uint64_t)(trans_num))
-                 ((iod_handle_t)(coh)) ((iod_handles_t)(loc_oh))
-                 ((iod_obj_id_t)(loc_id)) ((iod_obj_id_t)(loc_attrkv_id))
-                 ((hg_const_string_t)(path)) ((hg_const_string_t)(old_attr_name)) 
+                 ((hid_t)(type_id)) 
+                 ((hid_t)(space_id)))
+MERCURY_GEN_PROC(attr_op_in_t, 
+                 ((axe_t)(axe_info)) 
+                 ((uint32_t)(cs_scope)) 
+                 ((uint64_t)(rcxt_num)) 
+                 ((uint64_t)(trans_num))
+                 ((iod_handle_t)(coh)) 
+                 ((iod_handles_t)(loc_oh))
+                 ((iod_obj_id_t)(loc_id)) 
+                 ((iod_obj_id_t)(loc_attrkv_id))
+                 ((hg_const_string_t)(path)) 
+                 ((hg_const_string_t)(attr_name)))
+MERCURY_GEN_PROC(attr_rename_in_t, 
+                 ((axe_t)(axe_info)) 
+                 ((uint32_t)(cs_scope)) 
+                 ((uint64_t)(rcxt_num)) 
+                 ((uint64_t)(trans_num))
+                 ((iod_handle_t)(coh)) 
+                 ((iod_handles_t)(loc_oh))
+                 ((iod_obj_id_t)(loc_id)) 
+                 ((iod_obj_id_t)(loc_attrkv_id))
+                 ((hg_const_string_t)(path)) 
+                 ((hg_const_string_t)(old_attr_name)) 
                  ((hg_const_string_t)(new_attr_name)))
-MERCURY_GEN_PROC(attr_io_in_t, ((axe_t)(axe_info)) ((uint32_t)(cs_scope)) 
-                 ((uint64_t)(rcxt_num)) ((uint64_t)(trans_num))
-                 ((iod_handle_t)(coh)) ((iod_handles_t)(iod_oh)) 
-                 ((iod_obj_id_t)(iod_id)) ((iod_obj_id_t)(mdkv_id))
-                 ((uint64_t)(checksum)) ((hid_t)(space_id))
-                 ((hid_t)(type_id)) ((hg_bulk_t)(bulk_handle)))
-MERCURY_GEN_PROC(attr_close_in_t, ((axe_t)(axe_info))
-                 ((iod_handles_t)(iod_oh)) ((iod_obj_id_t)(iod_id)))
+MERCURY_GEN_PROC(attr_io_in_t, 
+                 ((axe_t)(axe_info)) 
+                 ((uint32_t)(cs_scope)) 
+                 ((uint64_t)(rcxt_num)) 
+                 ((uint64_t)(trans_num))
+                 ((iod_handle_t)(coh)) 
+                 ((iod_handles_t)(iod_oh)) 
+                 ((iod_obj_id_t)(iod_id)) 
+                 ((iod_obj_id_t)(mdkv_id))
+                 ((uint64_t)(checksum)) 
+                 ((hid_t)(space_id))
+                 ((hid_t)(type_id)) 
+                 ((hg_bulk_t)(bulk_handle)))
+MERCURY_GEN_PROC(attr_close_in_t, 
+                 ((axe_t)(axe_info))
+                 ((iod_handles_t)(iod_oh)) 
+                 ((iod_obj_id_t)(iod_id)))
 
-MERCURY_GEN_PROC(group_create_in_t, ((axe_t)(axe_info)) ((uint32_t)(cs_scope)) 
-                 ((uint64_t)(rcxt_num)) ((uint64_t)(trans_num))
-                 ((iod_handle_t)(coh)) ((iod_handles_t)(loc_oh))
-                 ((iod_obj_id_t)(loc_id)) ((iod_obj_id_t)(grp_id))
-                 ((iod_obj_id_t)(mdkv_id)) ((iod_obj_id_t)(attrkv_id)) 
-                 ((hg_const_string_t)(name)) ((hid_t)(gapl_id)) 
-                 ((hid_t)(gcpl_id)) ((hid_t)(lcpl_id)))
-MERCURY_GEN_PROC(group_create_out_t, ((iod_handles_t)(iod_oh)))
-MERCURY_GEN_PROC(group_open_in_t, ((axe_t)(axe_info)) ((uint32_t)(cs_scope)) 
+MERCURY_GEN_PROC(group_create_in_t, 
+                 ((axe_t)(axe_info)) 
+                 ((uint32_t)(cs_scope)) 
+                 ((uint64_t)(rcxt_num)) 
+                 ((uint64_t)(trans_num))
+                 ((iod_handle_t)(coh)) 
+                 ((iod_handles_t)(loc_oh))
+                 ((iod_obj_id_t)(loc_id)) 
+                 ((iod_obj_id_t)(grp_id))
+                 ((iod_obj_id_t)(mdkv_id)) 
+                 ((iod_obj_id_t)(attrkv_id)) 
+                 ((hg_const_string_t)(name)) 
+                 ((hid_t)(gapl_id)) 
+                 ((hid_t)(gcpl_id)) 
+                 ((hid_t)(lcpl_id)))
+MERCURY_GEN_PROC(group_create_out_t, 
+                 ((iod_handles_t)(iod_oh)))
+MERCURY_GEN_PROC(group_open_in_t, 
+                 ((axe_t)(axe_info)) 
+                 ((uint32_t)(cs_scope)) 
                  ((uint64_t)(rcxt_num))
-                 ((iod_handle_t)(coh)) ((iod_handles_t)(loc_oh))
-                 ((iod_obj_id_t)(loc_id)) ((hg_const_string_t)(name))
+                 ((iod_handle_t)(coh)) 
+                 ((iod_handles_t)(loc_oh))
+                 ((iod_obj_id_t)(loc_id)) 
+                 ((hg_const_string_t)(name))
                  ((hid_t)(gapl_id)))
-MERCURY_GEN_PROC(group_open_out_t, ((iod_handles_t)(iod_oh)) ((iod_obj_id_t)(iod_id)) 
-                 ((iod_obj_id_t)(mdkv_id)) ((iod_obj_id_t)(attrkv_id)) 
+MERCURY_GEN_PROC(group_open_out_t, 
+                 ((iod_handles_t)(iod_oh)) 
+                 ((iod_obj_id_t)(iod_id)) 
+                 ((iod_obj_id_t)(mdkv_id)) 
+                 ((iod_obj_id_t)(attrkv_id)) 
                  ((hid_t)(gcpl_id)))
-MERCURY_GEN_PROC(group_close_in_t, ((axe_t)(axe_info))
-                 ((iod_handles_t)(iod_oh)) ((iod_obj_id_t)(iod_id)))
+MERCURY_GEN_PROC(group_close_in_t, 
+                 ((axe_t)(axe_info))
+                 ((iod_handles_t)(iod_oh)) 
+                 ((iod_obj_id_t)(iod_id)))
 
-MERCURY_GEN_PROC(map_create_in_t, ((axe_t)(axe_info)) ((uint32_t)(cs_scope))
-                 ((uint64_t)(rcxt_num)) ((uint64_t)(trans_num))
-                 ((iod_handle_t)(coh)) ((iod_handles_t)(loc_oh))
-                 ((iod_obj_id_t)(loc_id)) ((iod_obj_id_t)(map_id))
-                 ((iod_obj_id_t)(mdkv_id)) ((iod_obj_id_t)(attrkv_id)) 
+MERCURY_GEN_PROC(map_create_in_t, 
+                 ((axe_t)(axe_info)) 
+                 ((uint32_t)(cs_scope))
+                 ((uint64_t)(rcxt_num)) 
+                 ((uint64_t)(trans_num))
+                 ((iod_handle_t)(coh)) 
+                 ((iod_handles_t)(loc_oh))
+                 ((iod_obj_id_t)(loc_id))
+                 ((iod_obj_id_t)(map_id))
+                 ((iod_obj_id_t)(mdkv_id))
+                 ((iod_obj_id_t)(attrkv_id)) 
                  ((hg_const_string_t)(name)) 
-                 ((hid_t)(keytype_id)) ((hid_t)(valtype_id)) 
-                 ((hid_t)(mapl_id)) ((hid_t)(mcpl_id)) 
+                 ((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_handles_t)(iod_oh)))
-MERCURY_GEN_PROC(map_open_in_t, ((axe_t)(axe_info)) ((uint32_t)(cs_scope))
+MERCURY_GEN_PROC(map_create_out_t, 
+                 ((iod_handles_t)(iod_oh)))
+MERCURY_GEN_PROC(map_open_in_t, 
+                 ((axe_t)(axe_info))
+                 ((uint32_t)(cs_scope))
                  ((uint64_t)(rcxt_num))
-                 ((iod_handle_t)(coh)) ((iod_handles_t)(loc_oh))
+                 ((iod_handle_t)(coh))
+                 ((iod_handles_t)(loc_oh))
                  ((iod_obj_id_t)(loc_id)) 
-                 ((hg_const_string_t)(name)) ((hid_t)(mapl_id)))
-MERCURY_GEN_PROC(map_open_out_t, ((iod_handles_t)(iod_oh)) ((iod_obj_id_t)(iod_id)) 
-                 ((iod_obj_id_t)(mdkv_id)) ((iod_obj_id_t)(attrkv_id)) 
-                 ((hid_t)(keytype_id)) ((hid_t)(valtype_id)) ((hid_t)(mcpl_id)))
-MERCURY_GEN_PROC(map_set_in_t, ((axe_t)(axe_info)) ((uint32_t)(cs_scope))
-                 ((uint64_t)(rcxt_num)) ((uint64_t)(trans_num))
-                 ((iod_handle_t)(coh)) ((iod_handles_t)(iod_oh))
+                 ((hg_const_string_t)(name))
+                 ((hid_t)(mapl_id)))
+MERCURY_GEN_PROC(map_open_out_t, 
+                 ((iod_handles_t)(iod_oh))
+                 ((iod_obj_id_t)(iod_id)) 
+                 ((iod_obj_id_t)(mdkv_id))
+                 ((iod_obj_id_t)(attrkv_id)) 
+                 ((hid_t)(keytype_id))
+                 ((hid_t)(valtype_id))
+                 ((hid_t)(mcpl_id)))
+MERCURY_GEN_PROC(map_set_in_t, 
+                 ((axe_t)(axe_info))
+                 ((uint32_t)(cs_scope))
+                 ((uint64_t)(rcxt_num))
+                 ((uint64_t)(trans_num))
+                 ((iod_handle_t)(coh))
+                 ((iod_handles_t)(iod_oh))
                  ((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))
-                 ((uint64_t)(val_checksum)) ((hg_bulk_t)(val_handle))
+                 ((hid_t)(key_maptype_id))
+                 ((hid_t)(key_memtype_id))
+                 ((binary_buf_t)(key))
+                 ((hid_t)(val_maptype_id))
+                 ((hid_t)(val_memtype_id))
+                 ((uint64_t)(val_checksum))
+                 ((hg_bulk_t)(val_handle))
                  ((hid_t)(dxpl_id)))
-MERCURY_GEN_PROC(map_get_in_t, ((axe_t)(axe_info)) ((uint32_t)(cs_scope))
+MERCURY_GEN_PROC(map_get_in_t, 
+                 ((axe_t)(axe_info))
+                 ((uint32_t)(cs_scope))
                  ((uint64_t)(rcxt_num))
-                 ((iod_handle_t)(coh)) ((iod_handles_t)(iod_oh))
+                 ((iod_handle_t)(coh))
+                 ((iod_handles_t)(iod_oh))
                  ((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)) ((hbool_t)(val_is_vl))
+                 ((hid_t)(key_maptype_id))
+                 ((hid_t)(key_memtype_id))
+                 ((binary_buf_t)(key))
+                 ((hid_t)(val_maptype_id))
+                 ((hid_t)(val_memtype_id))
+                 ((hbool_t)(val_is_vl))
                  ((hg_bulk_t)(val_handle))
-                 ((size_t)(val_size)) ((hid_t)(dxpl_id)))
-MERCURY_GEN_PROC(map_get_out_t, ((int32_t)(ret)) ((size_t)(val_size)) ((uint64_t)(val_cs)))
-MERCURY_GEN_PROC(map_get_count_in_t, ((axe_t)(axe_info)) ((uint32_t)(cs_scope))
+                 ((size_t)(val_size))
+                 ((hid_t)(dxpl_id)))
+MERCURY_GEN_PROC(map_get_out_t, 
+                 ((int32_t)(ret))
+                 ((size_t)(val_size))
+                 ((uint64_t)(val_cs)))
+MERCURY_GEN_PROC(map_get_count_in_t, 
+                 ((axe_t)(axe_info))
+                 ((uint32_t)(cs_scope))
                  ((uint64_t)(rcxt_num))
-                 ((iod_handle_t)(coh)) ((iod_handles_t)(iod_oh))
+                 ((iod_handle_t)(coh))
+                 ((iod_handles_t)(iod_oh))
                  ((iod_obj_id_t)(iod_id)))
-MERCURY_GEN_PROC(map_op_in_t, ((axe_t)(axe_info)) ((uint32_t)(cs_scope))
-                 ((uint64_t)(rcxt_num)) ((uint64_t)(trans_num))
-                 ((iod_handle_t)(coh)) ((iod_handles_t)(iod_oh))
+MERCURY_GEN_PROC(map_op_in_t, 
+                 ((axe_t)(axe_info))
+                 ((uint32_t)(cs_scope))
+                 ((uint64_t)(rcxt_num))
+                 ((uint64_t)(trans_num))
+                 ((iod_handle_t)(coh))
+                 ((iod_handles_t)(iod_oh))
                  ((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_handles_t)(iod_oh)) ((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_handles_t)(iod_oh))
+                 ((iod_obj_id_t)(iod_id)))
 
-MERCURY_GEN_PROC(dset_create_in_t, ((axe_t)(axe_info)) ((uint32_t)(cs_scope))
-                 ((uint64_t)(rcxt_num)) ((uint64_t)(trans_num))
-                 ((iod_handle_t)(coh)) ((iod_handles_t)(loc_oh))
-                 ((iod_obj_id_t)(loc_id)) ((iod_obj_id_t)(dset_id)) 
-                 ((iod_obj_id_t)(mdkv_id)) ((iod_obj_id_t)(attrkv_id)) 
+MERCURY_GEN_PROC(dset_create_in_t, 
+                 ((axe_t)(axe_info))
+                 ((uint32_t)(cs_scope))
+                 ((uint64_t)(rcxt_num))
+                 ((uint64_t)(trans_num))
+                 ((iod_handle_t)(coh))
+                 ((iod_handles_t)(loc_oh))
+                 ((iod_obj_id_t)(loc_id))
+                 ((iod_obj_id_t)(dset_id)) 
+                 ((iod_obj_id_t)(mdkv_id))
+                 ((iod_obj_id_t)(attrkv_id)) 
                  ((hg_const_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_handles_t)(iod_oh)))
-MERCURY_GEN_PROC(dset_open_in_t, ((axe_t)(axe_info)) ((uint32_t)(cs_scope))
+                 ((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_handles_t)(iod_oh)))
+MERCURY_GEN_PROC(dset_open_in_t, 
+                 ((axe_t)(axe_info))
+                 ((uint32_t)(cs_scope))
                  ((uint64_t)(rcxt_num))
-                 ((iod_handle_t)(coh)) ((iod_handles_t)(loc_oh))
+                 ((iod_handle_t)(coh))
+                 ((iod_handles_t)(loc_oh))
                  ((iod_obj_id_t)(loc_id)) 
-                 ((hg_const_string_t)(name)) ((hid_t)(dapl_id)))
-MERCURY_GEN_PROC(dset_open_out_t, ((iod_handles_t)(iod_oh)) ((iod_obj_id_t)(iod_id)) 
-                 ((iod_obj_id_t)(mdkv_id)) ((iod_obj_id_t)(attrkv_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)) ((uint32_t)(cs_scope))
-                 ((uint64_t)(rcxt_num)) ((uint64_t)(trans_num))
-                 ((iod_handle_t)(coh)) ((iod_handles_t)(iod_oh)) 
-                 ((iod_obj_id_t)(iod_id)) ((iod_obj_id_t)(mdkv_id)) 
+                 ((hg_const_string_t)(name))
+                 ((hid_t)(dapl_id)))
+MERCURY_GEN_PROC(dset_open_out_t, 
+                 ((iod_handles_t)(iod_oh))
+                 ((iod_obj_id_t)(iod_id)) 
+                 ((iod_obj_id_t)(mdkv_id))
+                 ((iod_obj_id_t)(attrkv_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))
+                 ((uint32_t)(cs_scope))
+                 ((uint64_t)(rcxt_num))
+                 ((uint64_t)(trans_num))
+                 ((iod_handle_t)(coh))
+                 ((iod_handles_t)(iod_oh)) 
+                 ((iod_obj_id_t)(iod_id))
+                 ((iod_obj_id_t)(mdkv_id)) 
                  ((dims_t)(dims)))
-MERCURY_GEN_PROC(dset_io_in_t, ((axe_t)(axe_info)) ((uint32_t)(cs_scope))
-                 ((uint64_t)(rcxt_num)) ((uint64_t)(trans_num))
-                 ((iod_handle_t)(coh)) ((iod_handles_t)(iod_oh)) 
-                 ((iod_obj_id_t)(iod_id)) ((iod_obj_id_t)(mdkv_id))
-                 ((hid_t)(dset_type_id)) ((hid_t)(mem_type_id))
-                 ((hid_t)(space_id)) ((hid_t)(dxpl_id)) ((uint64_t)(checksum))
+MERCURY_GEN_PROC(dset_io_in_t, 
+                 ((axe_t)(axe_info))
+                 ((uint32_t)(cs_scope))
+                 ((uint64_t)(rcxt_num))
+                 ((uint64_t)(trans_num))
+                 ((iod_handle_t)(coh))
+                 ((iod_handles_t)(iod_oh)) 
+                 ((iod_obj_id_t)(iod_id))
+                 ((iod_obj_id_t)(mdkv_id))
+                 ((hid_t)(dset_type_id))
+                 ((hid_t)(mem_type_id))
+                 ((hid_t)(space_id))
+                 ((hid_t)(dxpl_id))
+                 ((uint64_t)(checksum))
                  ((hg_bulk_t)(bulk_handle)))
-MERCURY_GEN_PROC(dset_get_vl_size_in_t, ((axe_t)(axe_info)) ((uint32_t)(cs_scope))
+MERCURY_GEN_PROC(dset_get_vl_size_in_t, 
+                 ((axe_t)(axe_info))
+                 ((uint32_t)(cs_scope))
                  ((uint64_t)(rcxt_num))
-                 ((iod_handle_t)(coh)) ((iod_handles_t)(iod_oh)) 
-                 ((iod_obj_id_t)(iod_id)) ((iod_obj_id_t)(mdkv_id))
+                 ((iod_handle_t)(coh))
+                 ((iod_handles_t)(iod_oh)) 
+                 ((iod_obj_id_t)(iod_id))
+                 ((iod_obj_id_t)(mdkv_id))
                  ((hid_t)(mem_type_id))
-                 ((hid_t)(space_id)) ((hid_t)(dxpl_id)))
-MERCURY_GEN_PROC(dset_read_out_t, ((int32_t)(ret)) ((uint64_t)(cs)) ((size_t)(buf_size)))
-MERCURY_GEN_PROC(dset_close_in_t, ((axe_t)(axe_info))
-                 ((iod_handles_t)(iod_oh)) ((iod_obj_id_t)(iod_id)))
+                 ((hid_t)(space_id))
+                 ((hid_t)(dxpl_id)))
+MERCURY_GEN_PROC(dset_read_out_t, 
+                 ((int32_t)(ret))
+                 ((uint64_t)(cs))
+                 ((size_t)(buf_size)))
+MERCURY_GEN_PROC(dset_close_in_t, 
+                 ((axe_t)(axe_info))
+                 ((iod_handles_t)(iod_oh))
+                 ((iod_obj_id_t)(iod_id)))
 
-MERCURY_GEN_PROC(dtype_commit_in_t, ((axe_t)(axe_info)) ((uint32_t)(cs_scope)) 
-                 ((uint64_t)(rcxt_num)) ((uint64_t)(trans_num))
-                 ((iod_handle_t)(coh)) ((iod_handles_t)(loc_oh))
-                 ((iod_obj_id_t)(loc_id)) ((iod_obj_id_t)(dtype_id)) 
-                 ((iod_obj_id_t)(mdkv_id)) ((iod_obj_id_t)(attrkv_id)) 
+MERCURY_GEN_PROC(dtype_commit_in_t, 
+                 ((axe_t)(axe_info))
+                 ((uint32_t)(cs_scope)) 
+                 ((uint64_t)(rcxt_num))
+                 ((uint64_t)(trans_num))
+                 ((iod_handle_t)(coh))
+                 ((iod_handles_t)(loc_oh))
+                 ((iod_obj_id_t)(loc_id))
+                 ((iod_obj_id_t)(dtype_id)) 
+                 ((iod_obj_id_t)(mdkv_id))
+                 ((iod_obj_id_t)(attrkv_id)) 
                  ((hg_const_string_t)(name))
-                 ((hid_t)(tapl_id)) ((hid_t)(tcpl_id)) ((hid_t)(lcpl_id))
+                 ((hid_t)(tapl_id))
+                 ((hid_t)(tcpl_id))
+                 ((hid_t)(lcpl_id))
                  ((hid_t)(type_id)))
-MERCURY_GEN_PROC(dtype_commit_out_t, ((iod_handles_t)(iod_oh)))
-MERCURY_GEN_PROC(dtype_open_in_t, ((axe_t)(axe_info)) ((uint32_t)(cs_scope)) 
+MERCURY_GEN_PROC(dtype_commit_out_t, 
+                 ((iod_handles_t)(iod_oh)))
+MERCURY_GEN_PROC(dtype_open_in_t, 
+                 ((axe_t)(axe_info))
+                 ((uint32_t)(cs_scope)) 
                  ((uint64_t)(rcxt_num))
-                 ((iod_handle_t)(coh)) ((iod_handles_t)(loc_oh))
+                 ((iod_handle_t)(coh))
+                 ((iod_handles_t)(loc_oh))
                  ((iod_obj_id_t)(loc_id)) 
-                 ((hg_const_string_t)(name)) ((hid_t)(tapl_id)))
-MERCURY_GEN_PROC(dtype_open_out_t, ((iod_handles_t)(iod_oh)) ((iod_obj_id_t)(iod_id)) 
-                 ((iod_obj_id_t)(mdkv_id)) ((iod_obj_id_t)(attrkv_id)) 
-                 ((hid_t)(tcpl_id)) ((hid_t)(type_id)))
-MERCURY_GEN_PROC(dtype_close_in_t, ((axe_t)(axe_info))
-                 ((iod_handles_t)(iod_oh)) ((iod_obj_id_t)(iod_id)))
+                 ((hg_const_string_t)(name))
+                 ((hid_t)(tapl_id)))
+MERCURY_GEN_PROC(dtype_open_out_t, 
+                 ((iod_handles_t)(iod_oh))
+                 ((iod_obj_id_t)(iod_id)) 
+                 ((iod_obj_id_t)(mdkv_id))
+                 ((iod_obj_id_t)(attrkv_id)) 
+                 ((hid_t)(tcpl_id))
+                 ((hid_t)(type_id)))
+MERCURY_GEN_PROC(dtype_close_in_t, 
+                 ((axe_t)(axe_info))
+                 ((iod_handles_t)(iod_oh))
+                 ((iod_obj_id_t)(iod_id)))
 
-MERCURY_GEN_PROC(link_create_in_t, ((axe_t)(axe_info)) ((uint32_t)(cs_scope))
-                 ((uint64_t)(rcxt_num)) ((uint64_t)(trans_num))
-                 ((int8_t)(create_type)) ((iod_handle_t)(coh)) 
-                 ((iod_handles_t)(loc_oh)) ((iod_obj_id_t)(loc_id))
+MERCURY_GEN_PROC(link_create_in_t, 
+                 ((axe_t)(axe_info))
+                 ((uint32_t)(cs_scope))
+                 ((uint64_t)(rcxt_num))
+                 ((uint64_t)(trans_num))
+                 ((int8_t)(create_type))
+                 ((iod_handle_t)(coh)) 
+                 ((iod_handles_t)(loc_oh))
+                 ((iod_obj_id_t)(loc_id))
                  ((hg_const_string_t)(loc_name))
                  ((iod_handles_t)(target_loc_oh)) 
-                 ((iod_obj_id_t)(target_loc_id)) ((iod_obj_id_t)(target_mdkv_id))
+                 ((iod_obj_id_t)(target_loc_id))
+                 ((iod_obj_id_t)(target_mdkv_id))
                  ((hg_const_string_t)(target_name))
                  ((hg_const_string_t)(link_value))
-                 ((hid_t)(lapl_id)) ((hid_t)(lcpl_id)))
-MERCURY_GEN_PROC(link_move_in_t, ((axe_t)(axe_info)) ((uint32_t)(cs_scope))
-                 ((uint64_t)(rcxt_num)) ((uint64_t)(trans_num))
-                 ((hbool_t)(copy_flag)) ((iod_handle_t)(coh)) 
-                 ((iod_handles_t)(src_loc_oh)) ((iod_obj_id_t)(src_loc_id))
+                 ((hid_t)(lapl_id))
+                 ((hid_t)(lcpl_id)))
+MERCURY_GEN_PROC(link_move_in_t, 
+                 ((axe_t)(axe_info))
+                 ((uint32_t)(cs_scope))
+                 ((uint64_t)(rcxt_num))
+                 ((uint64_t)(trans_num))
+                 ((hbool_t)(copy_flag))
+                 ((iod_handle_t)(coh)) 
+                 ((iod_handles_t)(src_loc_oh))
+                 ((iod_obj_id_t)(src_loc_id))
                  ((hg_const_string_t)(src_loc_name))
-                 ((iod_handles_t)(dst_loc_oh)) ((iod_obj_id_t)(dst_loc_id))
+                 ((iod_handles_t)(dst_loc_oh))
+                 ((iod_obj_id_t)(dst_loc_id))
                  ((hg_const_string_t)(dst_loc_name))
-                 ((hid_t)(lapl_id)) ((hid_t)(lcpl_id)))
-MERCURY_GEN_PROC(link_op_in_t, ((axe_t)(axe_info)) ((uint32_t)(cs_scope))
-                 ((uint64_t)(rcxt_num)) ((uint64_t)(trans_num))
-                 ((iod_handle_t)(coh)) ((iod_handles_t)(loc_oh)) 
+                 ((hid_t)(lapl_id))
+                 ((hid_t)(lcpl_id)))
+MERCURY_GEN_PROC(link_op_in_t, 
+                 ((axe_t)(axe_info))
+                 ((uint32_t)(cs_scope))
+                 ((uint64_t)(rcxt_num))
+                 ((uint64_t)(trans_num))
+                 ((iod_handle_t)(coh))
+                 ((iod_handles_t)(loc_oh)) 
                  ((iod_obj_id_t)(loc_id)) 
                  ((hg_const_string_t)(path)))
-MERCURY_GEN_PROC(link_get_val_in_t, ((axe_t)(axe_info)) ((uint32_t)(cs_scope))
+MERCURY_GEN_PROC(link_get_val_in_t, 
+                 ((axe_t)(axe_info))
+                 ((uint32_t)(cs_scope))
                  ((uint64_t)(rcxt_num))
-                 ((iod_handle_t)(coh)) ((iod_handles_t)(loc_oh)) 
+                 ((iod_handle_t)(coh))
+                 ((iod_handles_t)(loc_oh)) 
                  ((iod_obj_id_t)(loc_id)) 
-                 ((hg_const_string_t)(path)) ((uint64_t)(length)))
-MERCURY_GEN_PROC(link_get_val_out_t, ((int32_t)(ret)) ((value_t)(value)))
+                 ((hg_const_string_t)(path))
+                 ((uint64_t)(length)))
+MERCURY_GEN_PROC(link_get_val_out_t, 
+                 ((int32_t)(ret))
+                 ((value_t)(value)))
 
-MERCURY_GEN_PROC(object_token_in_t, ((axe_t)(axe_info)) ((uint32_t)(cs_scope)) 
-                 ((iod_handle_t)(coh)) ((iod_obj_id_t)(iod_id)))
-//MERCURY_GEN_PROC(object_open_out_t, ((iod_handles_t)(iod_oh)))
-MERCURY_GEN_PROC(object_op_in_t, ((axe_t)(axe_info)) ((uint32_t)(cs_scope)) 
+MERCURY_GEN_PROC(object_token_in_t, 
+                 ((axe_t)(axe_info))
+                 ((uint32_t)(cs_scope)) 
+                 ((iod_handle_t)(coh))
+                 ((iod_obj_id_t)(iod_id)))
+MERCURY_GEN_PROC(object_op_in_t, 
+                 ((axe_t)(axe_info))
+                 ((uint32_t)(cs_scope)) 
                  ((uint64_t)(rcxt_num))
-                 ((iod_handle_t)(coh)) ((iod_handles_t)(loc_oh)) 
-                 ((iod_obj_id_t)(loc_id)) ((iod_obj_id_t)(loc_mdkv_id))
+                 ((iod_handle_t)(coh))
+                 ((iod_handles_t)(loc_oh)) 
+                 ((iod_obj_id_t)(loc_id))
+                 ((iod_obj_id_t)(loc_mdkv_id))
                  ((iod_obj_id_t)(loc_attrkv_id))
                  ((hg_const_string_t)(loc_name)))
-MERCURY_GEN_PROC(object_open_out_t, ((int32_t)(obj_type))
-                 ((iod_handles_t)(iod_oh)) ((iod_obj_id_t)(iod_id)) 
-                 ((iod_obj_id_t)(mdkv_id)) ((iod_obj_id_t)(attrkv_id)) 
-                 ((hid_t)(cpl_id)) ((hid_t)(id1)) ((hid_t)(id2)))
-MERCURY_GEN_PROC(object_copy_in_t, ((axe_t)(axe_info)) ((uint32_t)(cs_scope)) 
-                 ((uint64_t)(rcxt_num)) ((uint64_t)(trans_num))
+MERCURY_GEN_PROC(object_open_out_t, 
+                 ((int32_t)(obj_type))
+                 ((iod_handles_t)(iod_oh))
+                 ((iod_obj_id_t)(iod_id)) 
+                 ((iod_obj_id_t)(mdkv_id))
+                 ((iod_obj_id_t)(attrkv_id)) 
+                 ((hid_t)(cpl_id))
+                 ((hid_t)(id1))
+                 ((hid_t)(id2)))
+MERCURY_GEN_PROC(object_copy_in_t, 
+                 ((axe_t)(axe_info))
+                 ((uint32_t)(cs_scope)) 
+                 ((uint64_t)(rcxt_num))
+                 ((uint64_t)(trans_num))
                  ((iod_handle_t)(coh)) 
-                 ((iod_handles_t)(src_loc_oh)) ((iod_obj_id_t)(src_loc_id))
+                 ((iod_handles_t)(src_loc_oh))
+                 ((iod_obj_id_t)(src_loc_id))
                  ((hg_const_string_t)(src_loc_name))
-                 ((iod_handles_t)(dst_loc_oh)) ((iod_obj_id_t)(dst_loc_id))
+                 ((iod_handles_t)(dst_loc_oh))
+                 ((iod_obj_id_t)(dst_loc_id))
                  ((hg_const_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)) ((uint32_t)(cs_scope)) 
-                 ((uint64_t)(rcxt_num)) ((uint64_t)(trans_num))
-                 ((iod_handle_t)(coh)) ((iod_handles_t)(loc_oh)) 
-                 ((iod_obj_id_t)(loc_id)) ((iod_obj_id_t)(loc_mdkv_id))
-                 ((hg_const_string_t)(path)) ((hg_const_string_t)(comment)))
-MERCURY_GEN_PROC(object_get_comment_in_t, ((axe_t)(axe_info)) ((uint32_t)(cs_scope)) 
+                 ((hid_t)(ocpypl_id))
+                 ((hid_t)(lcpl_id)))
+MERCURY_GEN_PROC(object_set_comment_in_t, 
+                 ((axe_t)(axe_info))
+                 ((uint32_t)(cs_scope)) 
                  ((uint64_t)(rcxt_num))
-                 ((iod_handle_t)(coh)) ((iod_handles_t)(loc_oh)) 
-                 ((iod_obj_id_t)(loc_id)) ((iod_obj_id_t)(loc_mdkv_id))
-                 ((hg_const_string_t)(path)) ((uint64_t)(length)))
-MERCURY_GEN_PROC(object_get_comment_out_t, ((int32_t)(ret)) ((name_t)(name)))
+                 ((uint64_t)(trans_num))
+                 ((iod_handle_t)(coh))
+                 ((iod_handles_t)(loc_oh)) 
+                 ((iod_obj_id_t)(loc_id))
+                 ((iod_obj_id_t)(loc_mdkv_id))
+                 ((hg_const_string_t)(path))
+                 ((hg_const_string_t)(comment)))
+MERCURY_GEN_PROC(object_get_comment_in_t, 
+                 ((axe_t)(axe_info))
+                 ((uint32_t)(cs_scope)) 
+                 ((uint64_t)(rcxt_num))
+                 ((iod_handle_t)(coh))
+                 ((iod_handles_t)(loc_oh)) 
+                 ((iod_obj_id_t)(loc_id))
+                 ((iod_obj_id_t)(loc_mdkv_id))
+                 ((hg_const_string_t)(path))
+                 ((uint64_t)(length)))
+MERCURY_GEN_PROC(object_get_comment_out_t, 
+                 ((int32_t)(ret))
+                 ((name_t)(name)))
 
-MERCURY_GEN_PROC(rc_acquire_in_t, ((axe_t)(axe_info)) 
-                 ((iod_handle_t)(coh)) ((uint64_t)(c_version))
+MERCURY_GEN_PROC(rc_acquire_in_t, 
+                 ((axe_t)(axe_info)) 
+                 ((iod_handle_t)(coh))
+                 ((uint64_t)(c_version))
                  ((hid_t)(rcapl_id)))
-MERCURY_GEN_PROC(rc_acquire_out_t, ((int32_t)(ret)) ((uint64_t)(c_version)))
-MERCURY_GEN_PROC(rc_release_in_t, ((axe_t)(axe_info))
-                 ((iod_handle_t)(coh)) ((uint64_t)(c_version)))
-MERCURY_GEN_PROC(rc_persist_in_t, ((axe_t)(axe_info))
-                 ((iod_handle_t)(coh)) ((uint64_t)(c_version)))
-MERCURY_GEN_PROC(rc_snapshot_in_t, ((axe_t)(axe_info))
-                 ((iod_handle_t)(coh)) ((hg_const_string_t)(snapshot_name)) 
+MERCURY_GEN_PROC(rc_acquire_out_t, 
+                 ((int32_t)(ret))
+                 ((uint64_t)(c_version)))
+MERCURY_GEN_PROC(rc_release_in_t, 
+                 ((axe_t)(axe_info))
+                 ((iod_handle_t)(coh))
+                 ((uint64_t)(c_version)))
+MERCURY_GEN_PROC(rc_persist_in_t, 
+                 ((axe_t)(axe_info))
+                 ((iod_handle_t)(coh))
+                 ((uint64_t)(c_version)))
+MERCURY_GEN_PROC(rc_snapshot_in_t, 
+                 ((axe_t)(axe_info))
+                 ((iod_handle_t)(coh))
+                 ((hg_const_string_t)(snapshot_name)) 
                  ((uint64_t)(c_version)))
 
-MERCURY_GEN_PROC(tr_start_in_t, ((axe_t)(axe_info))
-                 ((iod_handle_t)(coh)) ((uint64_t)(trans_num))
+MERCURY_GEN_PROC(tr_start_in_t, 
+                 ((axe_t)(axe_info))
+                 ((iod_handle_t)(coh))
+                 ((uint64_t)(trans_num))
                  ((hid_t)(trspl_id)))
-MERCURY_GEN_PROC(tr_finish_in_t, ((axe_t)(axe_info))
-                 ((iod_handle_t)(coh)) ((uint64_t)(trans_num))
-                 ((hbool_t)(acquire)) ((hid_t)(trfpl_id)))
-MERCURY_GEN_PROC(tr_set_depend_in_t, ((axe_t)(axe_info))
-                 ((iod_handle_t)(coh)) ((uint64_t)(child_trans_num))
+MERCURY_GEN_PROC(tr_finish_in_t, 
+                 ((axe_t)(axe_info))
+                 ((iod_handle_t)(coh))
+                 ((uint64_t)(trans_num))
+                 ((hbool_t)(acquire))
+                 ((hid_t)(trfpl_id)))
+MERCURY_GEN_PROC(tr_set_depend_in_t, 
+                 ((axe_t)(axe_info))
+                 ((iod_handle_t)(coh))
+                 ((uint64_t)(child_trans_num))
                  ((uint64_t)(parent_trans_num)))
-MERCURY_GEN_PROC(tr_skip_in_t, ((axe_t)(axe_info)) ((iod_handle_t)(coh)) 
-                 ((uint64_t)(start_trans_num)) ((uint64_t)(count)))
-MERCURY_GEN_PROC(tr_abort_in_t, ((axe_t)(axe_info))
-                 ((iod_handle_t)(coh)) ((uint64_t)(trans_num)))
+MERCURY_GEN_PROC(tr_skip_in_t, 
+                 ((axe_t)(axe_info))
+                 ((iod_handle_t)(coh)) 
+                 ((uint64_t)(start_trans_num))
+                 ((uint64_t)(count)))
+MERCURY_GEN_PROC(tr_abort_in_t, 
+                 ((axe_t)(axe_info))
+                 ((iod_handle_t)(coh))
+                 ((uint64_t)(trans_num)))
 
 #endif /* H5_HAVE_EFF */
 #endif /* _H5VLiod_common_H */
diff --git a/src/H5VLiod_file.c b/src/H5VLiod_file.c
index 1039a84..d1c71b7 100644
--- a/src/H5VLiod_file.c
+++ b/src/H5VLiod_file.c
@@ -334,6 +334,8 @@ H5VL_iod_server_file_open_cb(AXE_engine_t UNUSED axe_engine,
 
     output.coh.cookie = coh.cookie;
     output.root_id = ROOT_ID;
+    output.mdkv_id = sp[0];
+    output.attrkv_id = sp[1];
     output.root_oh.rd_oh = root_oh.rd_oh;
     output.root_oh.wr_oh = root_oh.wr_oh;
     output.c_version = rtid;
@@ -346,7 +348,8 @@ H5VL_iod_server_file_open_cb(AXE_engine_t UNUSED axe_engine,
     }
 
 #if H5VL_IOD_DEBUG
-    fprintf(stderr, "Done with file open, sending response to client\n");
+    fprintf(stderr, "Done with file open coh: %"PRIu64" root rd: %"PRIu64"  wr: %"PRIu64" CV: %"PRIu64"\n",
+            coh.cookie, root_oh.rd_oh.cookie, root_oh.wr_oh.cookie, rtid);
 #endif
 
     HG_Handler_start_output(op_data->hg_handle, &output);