diff options
| -rw-r--r-- | src/H5VLiod.c | 10 | ||||
| -rw-r--r-- | src/H5VLiod_analysis.c | 16 | ||||
| -rw-r--r-- | src/H5VLiod_attr.c | 116 | ||||
| -rw-r--r-- | src/H5VLiod_client.c | 4 | ||||
| -rw-r--r-- | src/H5VLiod_common.c | 6 | ||||
| -rw-r--r-- | src/H5VLiod_dset.c | 59 | ||||
| -rw-r--r-- | src/H5VLiod_dtype.c | 9 | ||||
| -rw-r--r-- | src/H5VLiod_encdec.c | 6 | ||||
| -rw-r--r-- | src/H5VLiod_group.c | 9 | ||||
| -rw-r--r-- | src/H5VLiod_link.c | 22 | ||||
| -rw-r--r-- | src/H5VLiod_map.c | 32 | ||||
| -rw-r--r-- | src/H5VLiod_obj.c | 29 | ||||
| -rw-r--r-- | src/H5VLiod_server.c | 26 | ||||
| -rw-r--r-- | src/H5VLiod_server.h | 8 | ||||
| -rw-r--r-- | src/H5VLiod_trans.c | 2 | ||||
| -rw-r--r-- | src/H5VLiod_util.c | 20 |
16 files changed, 187 insertions, 187 deletions
diff --git a/src/H5VLiod.c b/src/H5VLiod.c index 318dc52..cabc2a4 100644 --- a/src/H5VLiod.c +++ b/src/H5VLiod.c @@ -677,7 +677,7 @@ EFF_init(MPI_Comm comm, MPI_Info UNUSED info) fprintf(stderr, "Failed to initialize Mercury\n"); return FAIL; } - if (NA_SUCCESS != NA_Addr_lookup(network_class, addr_name, &ion_target)) { + if (NA_SUCCESS != NA_Addr_lookup_wait(network_class, addr_name, &ion_target)) { fprintf(stderr, "Server lookup failed\n"); return FAIL; } @@ -837,8 +837,8 @@ EFF_finalize(void) return FAIL; /* Finalize interface */ - if (HG_SUCCESS != HG_Bulk_finalize()) - return FAIL; + //if (HG_SUCCESS != HG_Bulk_finalize()) + //return FAIL; if (HG_SUCCESS != HG_Finalize()) return FAIL; @@ -3127,7 +3127,7 @@ H5VL_iod_dataset_read(void *_dset, hid_t mem_type_id, hid_t mem_space_id, * register data buffer. */ if(type_info->vls) { /* For now, just guess one segment for each vl in top level */ - vl_lengths_size = 8 * nelmts * type_info->num_vls; + vl_lengths_size = 8 * (size_t)nelmts * type_info->num_vls; /* Allocate vl_lengths */ if(NULL == (vl_lengths = (char *)HDmalloc(vl_lengths_size))) @@ -5012,7 +5012,7 @@ H5VL_iod_attribute_get(void *_obj, H5VL_attr_get_t get_type, hid_t dxpl_id, case H5VL_ATTR_GET_ACPL: { hid_t *ret_id = va_arg (arguments, hid_t *); - H5VL_iod_attr_t *attr = (H5VL_iod_attr_t *)obj; + //H5VL_iod_attr_t *attr = (H5VL_iod_attr_t *)obj; /* Retrieve the file's access property list */ if((*ret_id = H5Pcopy(H5P_ATTRIBUTE_CREATE_DEFAULT)) < 0) diff --git a/src/H5VLiod_analysis.c b/src/H5VLiod_analysis.c index 7bea617..a40f64d 100644 --- a/src/H5VLiod_analysis.c +++ b/src/H5VLiod_analysis.c @@ -823,13 +823,13 @@ H5VL_iod_server_analysis_execute_cb(AXE_engine_t UNUSED axe_engine, /* Traverse Path to retrieve object ID, and open object */ if(H5VL_iod_server_open_path(cohs[0], ROOT_ID, root_handle, obj_name, - rtid, &obj_id, &obj_oh) < 0) + rtid, 7, &obj_id, &obj_oh) < 0) HGOTO_ERROR2(H5E_SYM, H5E_NOSPACE, FAIL, "can't open object"); printf("(%d) coh %"PRIu64" objoh %"PRIu64" objid %"PRIx64" rtid %"PRIu64"\n", - my_rank_g, cohs[0], obj_oh.rd_oh.cookie, obj_id, rtid); + my_rank_g, cohs[0].cookie, obj_oh.rd_oh.cookie, obj_id, rtid); - printf("(%d) Calling iod_obj_query_map\n"); + printf("Calling iod_obj_query_map\n"); ret = iod_obj_query_map(obj_oh.rd_oh, rtid, &obj_map, NULL); if (ret != 0) { printf("iod_obj_query_map failed, ret: %d (%s).\n", ret, strerror(-ret)); @@ -892,13 +892,13 @@ H5VL_iod_server_analysis_execute_cb(AXE_engine_t UNUSED axe_engine, /* ****************** TEMP THING (as IOD requires collective container open) */ - printf("(%d) Closing container\n"); + printf("Closing container\n"); if(FAIL == H5VL__iod_request_container_close(cohs)) HGOTO_ERROR2(H5E_SYM, H5E_CANTGET, FAIL, "can't request container close"); /* ***************** END TEMP THING */ - printf("(%d) Analysis DONE\n"); + printf("Analysis DONE\n"); /* set output, and return to AS client */ output.ret = ret_value; HG_Handler_start_output(op_data->hg_handle, &output); @@ -1051,7 +1051,7 @@ H5VL_iod_server_analysis_transfer_cb(AXE_engine_t axe_engine, void *farm_op_data_ptr = NULL; H5VLiod_farm_data_t *farm_output = NULL; herr_t ret_value = SUCCEED; - hg_bulk_block_t bulk_block_handle; + hg_bulk_t bulk_block_handle; size_t data_size; hg_bulk_request_t bulk_request; na_addr_t source = HG_Handler_get_addr(op_data->hg_handle); @@ -1067,7 +1067,7 @@ H5VL_iod_server_analysis_transfer_cb(AXE_engine_t axe_engine, data_size = HG_Bulk_handle_get_size(input->bulk_handle); printf("(%d) Transferring split data back to master\n", my_rank_g); - HG_Bulk_block_handle_create(farm_output->data, data_size, HG_BULK_READ_ONLY, + HG_Bulk_handle_create(farm_output->data, data_size, HG_BULK_READ_ONLY, &bulk_block_handle); /* Write bulk data here and wait for the data to be there */ @@ -1080,7 +1080,7 @@ H5VL_iod_server_analysis_transfer_cb(AXE_engine_t axe_engine, HGOTO_ERROR2(H5E_SYM, H5E_WRITEERROR, FAIL, "can't get data from function shipper"); /* free the bds block handle */ - if(HG_SUCCESS != HG_Bulk_block_handle_free(bulk_block_handle)) + if(HG_SUCCESS != HG_Bulk_handle_free(bulk_block_handle)) HGOTO_ERROR2(H5E_SYM, H5E_WRITEERROR, FAIL, "can't free bds block handle"); free(farm_output->data); diff --git a/src/H5VLiod_attr.c b/src/H5VLiod_attr.c index 88b640f..6787a7b 100644 --- a/src/H5VLiod_attr.c +++ b/src/H5VLiod_attr.c @@ -74,7 +74,7 @@ H5VL_iod_server_attr_create_cb(AXE_engine_t UNUSED axe_engine, #if H5VL_IOD_DEBUG fprintf(stderr, "Start attribute create %s at %"PRIu64" with ID %"PRIx64" %"PRIx64"\n", - attr_name, loc_handle.wr_oh, attr_id, loc_attrkv_id); + attr_name, loc_handle.wr_oh.cookie, attr_id, loc_attrkv_id); #endif attr_oh.rd_oh.cookie = IOD_OH_UNDEFINED; @@ -98,7 +98,7 @@ H5VL_iod_server_attr_create_cb(AXE_engine_t UNUSED axe_engine, /* Open the object where the attribute needs to be created. */ if(H5VL_iod_server_open_path(coh, loc_id, loc_handle, loc_name, rtid, - &obj_id, &obj_oh) < 0) + cs_scope, &obj_id, &obj_oh) < 0) HGOTO_ERROR2(H5E_SYM, H5E_NOSPACE, FAIL, "can't open object"); /* Set the IOD array creation parameters */ @@ -308,7 +308,7 @@ H5VL_iod_server_attr_open_cb(AXE_engine_t UNUSED axe_engine, /* Open the object where the attribute needs to be opened. */ if(H5VL_iod_server_open_path(coh, loc_id, loc_handle, loc_name, - rtid, &obj_id, &obj_oh) < 0) + rtid, cs_scope, &obj_id, &obj_oh) < 0) HGOTO_ERROR2(H5E_SYM, H5E_NOSPACE, FAIL, "can't open object"); #if H5VL_IOD_DEBUG @@ -446,13 +446,14 @@ H5VL_iod_server_attr_read_cb(AXE_engine_t UNUSED axe_engine, iod_handle_t coh = input->coh; /* container handle */ iod_handle_t iod_oh = input->iod_oh.rd_oh; /* attribute's object handle */ iod_obj_id_t iod_id = input->iod_id; /* attribute's ID */ - //iod_obj_id_t mdkv_id = input->mdkv_id; /* The ID of the metadata KV */ + iod_obj_id_t mdkv_id = input->mdkv_id; /* The ID of the metadata KV */ hg_bulk_t bulk_handle = input->bulk_handle; /* bulk handle for data */ //hid_t type_id = input->type_id; /* datatype ID of data */ hid_t space_id = input->space_id; /* dataspace of attribute */ iod_trans_id_t rtid = input->rcxt_num; uint32_t cs_scope = input->cs_scope; - hg_bulk_block_t bulk_block_handle; /* HG block handle */ + iod_handle_t mdkv_oh; + hg_bulk_t bulk_block_handle; /* HG block handle */ hg_bulk_request_t bulk_request; /* HG request */ iod_mem_desc_t *mem_desc = NULL; /* memory descriptor used for reading array */ iod_array_iodesc_t file_desc; /* file descriptor used to read array */ @@ -478,7 +479,7 @@ H5VL_iod_server_attr_read_cb(AXE_engine_t UNUSED axe_engine, #if H5VL_IOD_DEBUG fprintf(stderr, "Start Attribute Read on OH %"PRIu64" OID %"PRIx64"\n", - iod_oh, iod_id); + iod_oh.cookie, iod_id); #endif size = HG_Bulk_handle_get_size(bulk_handle); @@ -486,21 +487,21 @@ H5VL_iod_server_attr_read_cb(AXE_engine_t UNUSED axe_engine, if(NULL == (buf = malloc(size))) HGOTO_ERROR2(H5E_SYM, H5E_NOSPACE, FAIL, "can't allocate read buffer"); - /* MSC - Not needed if dataspace is available */ -#if 0 - /* open the metadata scratch pad of the attribute */ - if (iod_obj_open_read(coh, mdkv_id, rtid, NULL /*hints*/, &mdkv_oh, NULL) < 0) - HGOTO_ERROR2(H5E_FILE, H5E_CANTINIT, FAIL, "can't open scratch pad"); + /* Get dataspace if it is not available */ + if(H5I_UNINIT == space_id) { + /* open the metadata scratch pad of the attribute */ + if (iod_obj_open_read(coh, mdkv_id, rtid, NULL /*hints*/, &mdkv_oh, NULL) < 0) + HGOTO_ERROR2(H5E_FILE, H5E_CANTINIT, FAIL, "can't open scratch pad"); - if(H5VL_iod_get_metadata(mdkv_oh, rtid, H5VL_IOD_DATASPACE, - H5VL_IOD_KEY_OBJ_DATASPACE, - cs_scope, NULL, &space_id) < 0) - HGOTO_ERROR2(H5E_SYM, H5E_CANTGET, FAIL, "failed to retrieve dataspace"); + if(H5VL_iod_get_metadata(mdkv_oh, rtid, H5VL_IOD_DATASPACE, + H5VL_IOD_KEY_OBJ_DATASPACE, + cs_scope, NULL, &space_id) < 0) + HGOTO_ERROR2(H5E_SYM, H5E_CANTGET, FAIL, "failed to retrieve dataspace"); - /* close the metadata scratch pad */ - if(iod_obj_close(mdkv_oh, NULL, NULL) < 0) - HGOTO_ERROR2(H5E_SYM, H5E_CANTINIT, FAIL, "can't close object"); -#endif + /* close the metadata scratch pad */ + if(iod_obj_close(mdkv_oh, NULL, NULL) < 0) + HGOTO_ERROR2(H5E_SYM, H5E_CANTINIT, FAIL, "can't close object"); + } /* set the memory descriptor */ mem_desc = (iod_mem_desc_t *)malloc(sizeof(iod_mem_desc_t) + sizeof(iod_mem_frag_t)); @@ -530,10 +531,10 @@ H5VL_iod_server_attr_read_cb(AXE_engine_t UNUSED axe_engine, hslabs.stride[0] = 1; } else { - hslabs.start = (iod_size_t *)malloc(sizeof(iod_size_t) * ndims); - hslabs.stride = (iod_size_t *)malloc(sizeof(iod_size_t) * ndims); - hslabs.block = (iod_size_t *)malloc(sizeof(iod_size_t) * ndims); - hslabs.count = (iod_size_t *)malloc(sizeof(iod_size_t) * ndims); + hslabs.start = (iod_size_t *)malloc(sizeof(iod_size_t) * (size_t)ndims); + hslabs.stride = (iod_size_t *)malloc(sizeof(iod_size_t) * (size_t)ndims); + hslabs.block = (iod_size_t *)malloc(sizeof(iod_size_t) * (size_t)ndims); + hslabs.count = (iod_size_t *)malloc(sizeof(iod_size_t) * (size_t)ndims); /* generate the descriptor */ if(H5VL_iod_get_file_desc(space_id, &num_descriptors, &hslabs) < 0) @@ -545,23 +546,21 @@ H5VL_iod_server_attr_read_cb(AXE_engine_t UNUSED axe_engine, /* read from array object */ ret = iod_array_read(iod_oh, rtid, NULL, mem_desc, &file_desc, - NULL/* MSC - need IOD -&iod_cs*/, NULL); + &iod_cs, NULL); if(ret < 0) { fprintf(stderr, "%d (%s).\n", ret, strerror(-ret)); HGOTO_ERROR2(H5E_SYM, H5E_READERROR, FAIL, "can't read from array object"); } - /* MSC - NEED IOD Checksums - if(cs_scope & H5_CHECKSUM_MEMORY) { + if(cs_scope & H5_CHECKSUM_IOD) { attr_cs = H5_checksum_crc64(buf, size); if(attr_cs != iod_cs) HGOTO_ERROR2(H5E_SYM, H5E_READERROR, FAIL, "Data corruption detected when reading attribute"); } - */ /* Create a new block handle to write the data */ - HG_Bulk_block_handle_create(buf, size, HG_BULK_READ_ONLY, &bulk_block_handle); + HG_Bulk_handle_create(buf, size, HG_BULK_READ_ONLY, &bulk_block_handle); /* Write bulk data here and wait for the data to be there */ if(HG_SUCCESS != HG_Bulk_write_all(dest, bulk_handle, bulk_block_handle, &bulk_request)) @@ -577,7 +576,7 @@ done: if(HG_SUCCESS != HG_Handler_start_output(op_data->hg_handle, &ret_value)) HDONE_ERROR(H5E_SYM, H5E_WRITEERROR, FAIL, "can't send result of write to client"); - if(HG_SUCCESS != HG_Bulk_block_handle_free(bulk_block_handle)) + if(HG_SUCCESS != HG_Bulk_handle_free(bulk_block_handle)) HDONE_ERROR(H5E_SYM, H5E_WRITEERROR, FAIL, "can't free bds block handle"); input = (attr_io_in_t *)H5MM_xfree(input); @@ -627,14 +626,15 @@ H5VL_iod_server_attr_write_cb(AXE_engine_t UNUSED axe_engine, iod_handle_t coh = input->coh; /* container handle */ iod_handle_t iod_oh = input->iod_oh.wr_oh; /* attribute's object handle */ iod_obj_id_t iod_id = input->iod_id; /* attribute's ID */ - //iod_obj_id_t mdkv_id = input->mdkv_id; /* The ID of the metadata KV */ + iod_obj_id_t mdkv_id = input->mdkv_id; /* The ID of the metadata KV */ hg_bulk_t bulk_handle = input->bulk_handle; /* bulk handle for data */ //hid_t type_id = input->type_id; /* datatype ID of data */ hid_t space_id = input->space_id; /* dataspace of attribute */ iod_trans_id_t wtid = input->trans_num; iod_trans_id_t rtid = input->rcxt_num; uint32_t cs_scope = input->cs_scope; - hg_bulk_block_t bulk_block_handle; /* HG block handle */ + iod_handle_t mdkv_oh; + hg_bulk_t bulk_block_handle; /* HG block handle */ hg_bulk_request_t bulk_request; /* HG request */ iod_mem_desc_t *mem_desc; /* memory descriptor used for writing array */ iod_array_iodesc_t file_desc; /* file descriptor used to write array */ @@ -659,7 +659,7 @@ H5VL_iod_server_attr_write_cb(AXE_engine_t UNUSED axe_engine, #if H5VL_IOD_DEBUG fprintf(stderr, "Start Attribute Write on OH %"PRIu64" OID %"PRIx64"\n", - iod_oh, iod_id); + iod_oh.cookie, iod_id); #endif /* Read bulk data here and wait for the data to be here */ @@ -667,7 +667,7 @@ H5VL_iod_server_attr_write_cb(AXE_engine_t UNUSED axe_engine, if(NULL == (buf = malloc(size))) HGOTO_ERROR2(H5E_SYM, H5E_NOSPACE, FAIL, "can't allocate read buffer"); - HG_Bulk_block_handle_create(buf, size, HG_BULK_READWRITE, &bulk_block_handle); + HG_Bulk_handle_create(buf, size, HG_BULK_READWRITE, &bulk_block_handle); /* Write bulk data here and wait for the data to be there */ if(HG_SUCCESS != HG_Bulk_read_all(source, bulk_handle, bulk_block_handle, &bulk_request)) @@ -677,7 +677,7 @@ H5VL_iod_server_attr_write_cb(AXE_engine_t UNUSED axe_engine, HGOTO_ERROR2(H5E_SYM, H5E_WRITEERROR, FAIL, "can't get data from function shipper"); /* free the bds block handle */ - if(HG_SUCCESS != HG_Bulk_block_handle_free(bulk_block_handle)) + if(HG_SUCCESS != HG_Bulk_handle_free(bulk_block_handle)) HGOTO_ERROR2(H5E_SYM, H5E_WRITEERROR, FAIL, "can't free bds block handle"); #if H5VL_IOD_DEBUG @@ -685,27 +685,27 @@ H5VL_iod_server_attr_write_cb(AXE_engine_t UNUSED axe_engine, int i; int *buf_ptr = (int *)buf; - fprintf(stderr, "AWRITE Received a buffer of size %d with values: ", size); + fprintf(stderr, "AWRITE Received a buffer of size %zu with values: ", size); for(i=0;i<60;++i) fprintf(stderr, "%d ", buf_ptr[i]); fprintf(stderr, "\n"); } #endif - /* MSC - Not needed if dataspace is available */ -#if 0 - /* open the metadata scratch pad of the attribute */ - if (iod_obj_open_read(coh, mdkv_id, wtid, NULL /*hints*/, &mdkv_oh, NULL) < 0) - HGOTO_ERROR2(H5E_FILE, H5E_CANTINIT, FAIL, "can't open scratch pad"); + /* Get dataspace if it is not available */ + if(H5I_UNINIT == space_id) { + /* open the metadata scratch pad of the attribute */ + if (iod_obj_open_read(coh, mdkv_id, wtid, NULL /*hints*/, &mdkv_oh, NULL) < 0) + HGOTO_ERROR2(H5E_FILE, H5E_CANTINIT, FAIL, "can't open scratch pad"); - if(H5VL_iod_get_metadata(mdkv_oh, rtid, H5VL_IOD_DATASPACE, H5VL_IOD_KEY_OBJ_DATASPACE, - cs_scope, NULL, &space_id) < 0) - HGOTO_ERROR2(H5E_SYM, H5E_CANTGET, FAIL, "failed to retrieve dataspace"); + if(H5VL_iod_get_metadata(mdkv_oh, rtid, H5VL_IOD_DATASPACE, H5VL_IOD_KEY_OBJ_DATASPACE, + cs_scope, NULL, &space_id) < 0) + HGOTO_ERROR2(H5E_SYM, H5E_CANTGET, FAIL, "failed to retrieve dataspace"); - /* close the metadata scratch pad */ - if(iod_obj_close(mdkv_oh, NULL, NULL) < 0) - HGOTO_ERROR2(H5E_SYM, H5E_CANTINIT, FAIL, "can't close object"); -#endif + /* close the metadata scratch pad */ + if(iod_obj_close(mdkv_oh, NULL, NULL) < 0) + HGOTO_ERROR2(H5E_SYM, H5E_CANTINIT, FAIL, "can't close object"); + } /* set the memory descriptor */ mem_desc = (iod_mem_desc_t *)malloc(sizeof(iod_mem_desc_t) + sizeof(iod_mem_frag_t)); @@ -735,10 +735,10 @@ H5VL_iod_server_attr_write_cb(AXE_engine_t UNUSED axe_engine, hslabs.stride[0] = 1; } else { - hslabs.start = (iod_size_t *)malloc(sizeof(iod_size_t) * ndims); - hslabs.stride = (iod_size_t *)malloc(sizeof(iod_size_t) * ndims); - hslabs.block = (iod_size_t *)malloc(sizeof(iod_size_t) * ndims); - hslabs.count = (iod_size_t *)malloc(sizeof(iod_size_t) * ndims); + hslabs.start = (iod_size_t *)malloc(sizeof(iod_size_t) * (size_t)ndims); + hslabs.stride = (iod_size_t *)malloc(sizeof(iod_size_t) * (size_t)ndims); + hslabs.block = (iod_size_t *)malloc(sizeof(iod_size_t) * (size_t)ndims); + hslabs.count = (iod_size_t *)malloc(sizeof(iod_size_t) * (size_t)ndims); /* generate the descriptor */ if(H5VL_iod_get_file_desc(space_id, &num_descriptors, &hslabs) < 0) @@ -748,7 +748,7 @@ H5VL_iod_server_attr_write_cb(AXE_engine_t UNUSED axe_engine, /* set the file descriptor */ file_desc = hslabs; - if(0) {// MSC - IOD fix - cs_scope & H5_CHECKSUM_IOD) { + if(cs_scope & H5_CHECKSUM_IOD) { attr_cs = H5_checksum_crc64(buf, size); /* write from array object */ @@ -836,7 +836,7 @@ H5VL_iod_server_attr_exists_cb(AXE_engine_t UNUSED axe_engine, /* Open the object where the attribute needs to be checked. */ if(H5VL_iod_server_open_path(coh, loc_id, loc_handle, loc_name, rtid, - &obj_id, &obj_oh) < 0) + cs_scope, &obj_id, &obj_oh) < 0) HGOTO_ERROR2(H5E_SYM, H5E_NOSPACE, FAIL, "can't open object"); if(loc_id != obj_id || IOD_OBJ_INVALID == input->loc_attrkv_id) { @@ -947,7 +947,7 @@ H5VL_iod_server_attr_rename_cb(AXE_engine_t UNUSED axe_engine, /* Open the object where the attribute needs to be checked. */ if(H5VL_iod_server_open_path(coh, loc_id, loc_handle, loc_name, - rtid, &obj_id, &obj_oh) < 0) + rtid, cs_scope, &obj_id, &obj_oh) < 0) HGOTO_ERROR2(H5E_SYM, H5E_NOSPACE, FAIL, "can't open object"); if(loc_id != obj_id || IOD_OBJ_INVALID == input->loc_attrkv_id) { @@ -997,7 +997,7 @@ H5VL_iod_server_attr_rename_cb(AXE_engine_t UNUSED axe_engine, kv.key = (void *)old_name; kv.key_len = strlen(old_name); kvs.kv = &kv; - kvs.cs = NULL; //MSC - need IOD - &cs; + kvs.cs = NULL; kvs.ret = &ret; if(iod_kv_unlink_keys(attr_kv_oh.wr_oh, wtid, NULL, 1, &kvs, NULL) < 0) HGOTO_ERROR2(H5E_SYM, H5E_CANTDEC, FAIL, "Unable to unlink KV pair"); @@ -1079,7 +1079,7 @@ H5VL_iod_server_attr_remove_cb(AXE_engine_t UNUSED axe_engine, /* Open the object where the attribute needs to be removed. */ if(H5VL_iod_server_open_path(coh, loc_id, loc_handle, loc_name, rtid, - &obj_id, &obj_oh) < 0) + cs_scope, &obj_id, &obj_oh) < 0) HGOTO_ERROR2(H5E_SYM, H5E_NOSPACE, FAIL, "can't open object"); if(loc_id != obj_id) { @@ -1153,7 +1153,7 @@ H5VL_iod_server_attr_remove_cb(AXE_engine_t UNUSED axe_engine, kv.key = (void *)attr_name; kv.key_len = strlen(attr_name); kvs.kv = &kv; - kvs.cs = NULL; //MSC - need IOD - &cs; + kvs.cs = NULL; kvs.ret = &ret; if(iod_kv_unlink_keys(attr_kv_oh.wr_oh, wtid, NULL, 1, &kvs, NULL) < 0) HGOTO_ERROR2(H5E_SYM, H5E_CANTDEC, FAIL, "Unable to unlink KV pair"); @@ -1231,7 +1231,7 @@ H5VL_iod_server_attr_close_cb(AXE_engine_t UNUSED axe_engine, #if H5VL_IOD_DEBUG fprintf(stderr, "Start attribute Close %"PRIu64" %"PRIu64"\n", - iod_oh.rd_oh, iod_oh.wr_oh); + iod_oh.rd_oh.cookie, iod_oh.wr_oh.cookie); #endif if((iod_obj_close(iod_oh.rd_oh, NULL, NULL)) < 0) diff --git a/src/H5VLiod_client.c b/src/H5VLiod_client.c index dabf780..db62a87 100644 --- a/src/H5VLiod_client.c +++ b/src/H5VLiod_client.c @@ -2403,7 +2403,7 @@ H5VL_iod_pre_read(hid_t type_id, H5S_t *space, const void *buf, hssize_t nelmts, HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, H5T_NO_CLASS, "not a datatype") type_size = H5T_get_size(dt); - buf_size = type_size * nelmts; + buf_size = type_size * (size_t)nelmts; /* If the memory selection is contiguous, create simple HG Bulk Handle */ if(H5S_select_is_contiguous(space)) { @@ -2423,7 +2423,7 @@ H5VL_iod_pre_read(hid_t type_id, H5S_t *space, const void *buf, hssize_t nelmts, uint8_t *start_offset = (uint8_t *) buf; /* generate the offsets/lengths pair arrays from the memory dataspace selection */ - if(H5S_get_offsets(space, type_size, nelmts, &off, &len, &count) < 0) + if(H5S_get_offsets(space, type_size, (size_t)nelmts, &off, &len, &count) < 0) HGOTO_ERROR(H5E_DATASET, H5E_READERROR, FAIL, "can't retrieve offets/lengths of memory space"); /* Register memory with segmented HG handle */ diff --git a/src/H5VLiod_common.c b/src/H5VLiod_common.c index bbec47d..9047613 100644 --- a/src/H5VLiod_common.c +++ b/src/H5VLiod_common.c @@ -178,7 +178,7 @@ H5VL_iod_get_type_info_helper(hid_t type_id, H5VL_iod_type_info_t *type_info, ERROR("failed to get number of compound datatype members"); /* Allocate array of members */ - if(NULL == (cmpd_membs = (H5VL_iod_cmpd_info_t *)malloc(nmemb * sizeof(H5VL_iod_cmpd_info_t)))) + if(NULL == (cmpd_membs = (H5VL_iod_cmpd_info_t *)malloc((size_t)nmemb * sizeof(H5VL_iod_cmpd_info_t)))) ERROR("failed ot allocate array of compound type members"); /* Get offset and type for all members */ @@ -239,7 +239,7 @@ H5VL_iod_get_type_info_helper(hid_t type_id, H5VL_iod_type_info_t *type_info, ERROR("failed to get array datatype number of dimensions"); /* Allocate array of dimensions */ - if(NULL == (dims = (hsize_t *)malloc(ndims * sizeof(hsize_t)))) + if(NULL == (dims = (hsize_t *)malloc((size_t)ndims * sizeof(hsize_t)))) ERROR("failed to allocate array of dimensions"); /* Get array dimensions */ @@ -579,7 +579,7 @@ H5VL_iod_cs_send_helper(char *buf, H5VL_iod_type_info_t *type_info, } /* end if */ /* Recurse into vlen data */ - if(H5VL_iod_cs_send_helper(vl.p, type_info->vls[j].base_type, vl.len, segments, num_segments, segments_nalloc, vl_lengths, vl_lengths_nused, vl_lengths_nalloc, free_list, free_list_len, free_list_nalloc) < 0) + if(H5VL_iod_cs_send_helper((char *)vl.p, type_info->vls[j].base_type, vl.len, segments, num_segments, segments_nalloc, vl_lengths, vl_lengths_nused, vl_lengths_nalloc, free_list, free_list_len, free_list_nalloc) < 0) ERROR("failed to build segments"); } /* end if */ } /* end if */ diff --git a/src/H5VLiod_dset.c b/src/H5VLiod_dset.c index 73e56fc..163a324 100644 --- a/src/H5VLiod_dset.c +++ b/src/H5VLiod_dset.c @@ -147,7 +147,7 @@ H5VL_iod_server_dset_create_cb(AXE_engine_t UNUSED axe_engine, FUNC_ENTER_NOAPI_NOINIT #if H5VL_IOD_DEBUG - fprintf(stderr, "Start dataset create %s at %"PRIu64"\n", name, loc_handle.wr_oh); + fprintf(stderr, "Start dataset create %s at %"PRIu64"\n", name, loc_handle.wr_oh.cookie); #endif if(H5P_DEFAULT == input->dcpl_id) @@ -162,12 +162,12 @@ H5VL_iod_server_dset_create_cb(AXE_engine_t UNUSED axe_engine, to be created. The traversal will fail if an intermediate group does not exist. */ if(H5VL_iod_server_traverse(coh, loc_id, loc_handle, name, wtid, rtid, FALSE, - &last_comp, &cur_id, &cur_oh) < 0) + cs_scope, &last_comp, &cur_id, &cur_oh) < 0) HGOTO_ERROR2(H5E_SYM, H5E_NOSPACE, FAIL, "can't traverse path"); #if H5VL_IOD_DEBUG fprintf(stderr, "Creating Dataset ID %"PRIx64" ",dset_id); - fprintf(stderr, "at (OH %"PRIu64" ID %"PRIx64") ", cur_oh.wr_oh, cur_id); + fprintf(stderr, "at (OH %"PRIu64" ID %"PRIx64") ", cur_oh.wr_oh.cookie, cur_id); if((cs_scope & H5_CHECKSUM_IOD) && enable_checksum) fprintf(stderr, "with Data integrity ENABLED\n"); else @@ -403,7 +403,8 @@ H5VL_iod_server_dset_open_cb(AXE_engine_t UNUSED axe_engine, #endif /* Traverse Path and open dset */ - if(H5VL_iod_server_open_path(coh, loc_id, loc_handle, name, rtid, &dset_id, &dset_oh) < 0) + if(H5VL_iod_server_open_path(coh, loc_id, loc_handle, name, rtid, + cs_scope, &dset_id, &dset_oh) < 0) HGOTO_ERROR2(H5E_SYM, H5E_NOSPACE, FAIL, "can't open object"); /* open a write handle on the ID. */ @@ -503,7 +504,7 @@ H5VL_iod_server_dset_read_cb(AXE_engine_t axe_engine, hid_t dst_id = input->mem_type_id; /* the memory type of the elements */ iod_trans_id_t rtid = input->rcxt_num; //uint32_t cs_scope = input->cs_scope; - hg_bulk_block_t bulk_block_handle; /* HG block handle */ + hg_bulk_t bulk_block_handle; /* HG block handle */ hg_bulk_request_t bulk_request; /* HG request */ size_t size, buf_size = 0; void *buf = NULL; /* buffer to hold outgoing data */ @@ -525,7 +526,7 @@ H5VL_iod_server_dset_read_cb(AXE_engine_t axe_engine, } #if H5VL_IOD_DEBUG - fprintf(stderr, "Start dataset Read on OH %"PRIu64" OID %"PRIx64"\n", iod_oh.rd_oh, iod_id); + fprintf(stderr, "Start dataset Read on OH %"PRIu64" OID %"PRIx64"\n", iod_oh.rd_oh.cookie, iod_id); #endif if(H5P_DEFAULT == input->dxpl_id) @@ -601,7 +602,7 @@ H5VL_iod_server_dset_read_cb(AXE_engine_t axe_engine, } /* Create a new block handle to write the data */ - HG_Bulk_block_handle_create(buf, size, HG_BULK_READ_ONLY, &bulk_block_handle); + HG_Bulk_handle_create(buf, size, HG_BULK_READ_ONLY, &bulk_block_handle); /* Write bulk data here and wait for the data to be there */ if(HG_SUCCESS != HG_Bulk_write_all(dest, bulk_handle, bulk_block_handle, &bulk_request)) @@ -611,7 +612,7 @@ H5VL_iod_server_dset_read_cb(AXE_engine_t axe_engine, HGOTO_ERROR2(H5E_SYM, H5E_READERROR, FAIL, "can't read from array object"); /* free block handle */ - if(HG_SUCCESS != HG_Bulk_block_handle_free(bulk_block_handle)) + if(HG_SUCCESS != HG_Bulk_handle_free(bulk_block_handle)) HGOTO_ERROR2(H5E_SYM, H5E_READERROR, FAIL, "can't free bds block handle"); done: @@ -674,7 +675,7 @@ H5VL_iod_server_dset_get_vl_size_cb(AXE_engine_t UNUSED axe_engine, iod_trans_id_t rtid = input->rcxt_num; uint32_t cs_scope = input->cs_scope; hg_bulk_t bulk_handle = input->bulk_handle; /* bulk handle for data */ - hg_bulk_block_t bulk_block_handle; /* HG block handle */ + hg_bulk_t bulk_block_handle; /* HG block handle */ hg_bulk_request_t bulk_request; /* HG request */ size_t buf_size, elmt_size; void *buf = NULL; /* buffer to hold blob IDs and sizes */ @@ -756,7 +757,7 @@ H5VL_iod_server_dset_get_vl_size_cb(AXE_engine_t UNUSED axe_engine, H5VL_iod_type_info_reset(&type_info); /* Create a new block handle to write the data */ - HG_Bulk_block_handle_create(temp_buf, buf_size, HG_BULK_READ_ONLY, &bulk_block_handle); + HG_Bulk_handle_create(temp_buf, buf_size, HG_BULK_READ_ONLY, &bulk_block_handle); /* Write bulk data here and wait for the data to be there */ if(HG_SUCCESS != HG_Bulk_write_all(dest, bulk_handle, bulk_block_handle, &bulk_request)) @@ -767,7 +768,7 @@ H5VL_iod_server_dset_get_vl_size_cb(AXE_engine_t UNUSED axe_engine, HGOTO_ERROR2(H5E_SYM, H5E_READERROR, FAIL, "can't read from array object"); /* free block handle */ - if(HG_SUCCESS != HG_Bulk_block_handle_free(bulk_block_handle)) + if(HG_SUCCESS != HG_Bulk_handle_free(bulk_block_handle)) HGOTO_ERROR2(H5E_SYM, H5E_READERROR, FAIL, "can't free bds block handle"); if(temp_buf) { @@ -836,7 +837,7 @@ H5VL_iod_server_dset_write_cb(AXE_engine_t UNUSED axe_engine, iod_trans_id_t rtid = input->rcxt_num; //uint32_t cs_scope = input->cs_scope; hid_t dxpl_id; - hg_bulk_block_t bulk_block_handle; /* HG block handle */ + hg_bulk_t bulk_block_handle; /* HG block handle */ hg_bulk_request_t bulk_request; /* HG request */ size_t size, buf_size; hbool_t is_vl_data; @@ -860,7 +861,7 @@ H5VL_iod_server_dset_write_cb(AXE_engine_t UNUSED axe_engine, } #if H5VL_IOD_DEBUG - fprintf(stderr, "Start dataset Write on OH %"PRIu64" OID %"PRIx64"\n", iod_oh.wr_oh, iod_id); + fprintf(stderr, "Start dataset Write on OH %"PRIu64" OID %"PRIx64"\n", iod_oh.wr_oh.cookie, iod_id); #endif if(H5P_DEFAULT == input->dxpl_id) @@ -880,7 +881,7 @@ H5VL_iod_server_dset_write_cb(AXE_engine_t UNUSED axe_engine, size_t vl_lengths_size = 0; void **free_list = NULL; size_t free_list_len = 0; - hg_bulk_block_t vl_len_handle; + hg_bulk_t vl_len_handle; /* Get size of vl_lengths array and allocate local buffer */ vl_lengths_size = HG_Bulk_handle_get_size(vl_len_bulk_handle); @@ -890,7 +891,7 @@ H5VL_iod_server_dset_write_cb(AXE_engine_t UNUSED axe_engine, HGOTO_ERROR2(H5E_SYM, H5E_NOSPACE, FAIL, "can't allocate vlen lengths buffer"); /* Register local memory buffer */ - if(HG_SUCCESS != HG_Bulk_block_handle_create(vl_lengths, vl_lengths_size, + if(HG_SUCCESS != HG_Bulk_handle_create(vl_lengths, vl_lengths_size, HG_BULK_READWRITE, &vl_len_handle)) HGOTO_ERROR2(H5E_SYM, H5E_CANTINIT, FAIL, "create vlen bulk handle"); @@ -904,7 +905,7 @@ H5VL_iod_server_dset_write_cb(AXE_engine_t UNUSED axe_engine, HGOTO_ERROR2(H5E_SYM, H5E_CANTINIT, FAIL, "can't wait for vlen lengths bulk data operation"); /* Free the bulk handle */ - if(HG_SUCCESS != HG_Bulk_block_handle_free(vl_len_handle)) + if(HG_SUCCESS != HG_Bulk_handle_free(vl_len_handle)) HGOTO_ERROR2(H5E_SYM, H5E_CANTINIT, FAIL, "can't free vlen bulk handle"); if(NULL == (buf = malloc(nelmts * type_info.size))) @@ -1001,7 +1002,7 @@ H5VL_iod_server_dset_write_cb(AXE_engine_t UNUSED axe_engine, HGOTO_ERROR2(H5E_SYM, H5E_NOSPACE, FAIL, "can't allocate read buffer"); /* create a Mercury block handle for transfer */ - HG_Bulk_block_handle_create(buf, size, HG_BULK_READWRITE, &bulk_block_handle); + HG_Bulk_handle_create(buf, size, HG_BULK_READWRITE, &bulk_block_handle); /* Write bulk data here and wait for the data to be there */ if(HG_SUCCESS != HG_Bulk_read_all(source, bulk_handle, bulk_block_handle, &bulk_request)) @@ -1011,7 +1012,7 @@ H5VL_iod_server_dset_write_cb(AXE_engine_t UNUSED axe_engine, HGOTO_ERROR2(H5E_SYM, H5E_WRITEERROR, FAIL, "can't get data from function shipper"); /* free the bds block handle */ - if(HG_SUCCESS != HG_Bulk_block_handle_free(bulk_block_handle)) + if(HG_SUCCESS != HG_Bulk_handle_free(bulk_block_handle)) HGOTO_ERROR2(H5E_SYM, H5E_WRITEERROR, FAIL, "can't free bds block handle"); /* MSC - check if client requested to corrupt data */ @@ -1165,7 +1166,7 @@ H5VL_iod_server_dset_set_extent_cb(AXE_engine_t UNUSED axe_engine, cs_scope, NULL, &space_id) < 0) HGOTO_ERROR2(H5E_SYM, H5E_CANTGET, FAIL, "failed to retrieve dataspace"); - if(rank = H5Sget_simple_extent_dims(space_id, current_dims, array_dims) < 0) + if((rank = H5Sget_simple_extent_dims(space_id, current_dims, array_dims)) < 0) HGOTO_ERROR2(H5E_SYM, H5E_CANTGET, FAIL, "can't get dimentions' sizes"); /* Modify the size of the data space */ @@ -1231,7 +1232,7 @@ H5VL_iod_server_dset_close_cb(AXE_engine_t UNUSED axe_engine, #if H5VL_IOD_DEBUG fprintf(stderr, "Start dataset Close %"PRIu64" %"PRIu64"\n", - iod_oh.rd_oh, iod_oh.wr_oh); + iod_oh.rd_oh.cookie, iod_oh.wr_oh.cookie); #endif if(iod_obj_close(iod_oh.rd_oh, NULL, NULL) < 0) @@ -1320,10 +1321,10 @@ H5VL__iod_server_final_io(iod_handle_t iod_oh, hid_t space_id, size_t elmt_size, HGOTO_ERROR2(H5E_SYM, H5E_NOSPACE, FAIL, "can't allocate iod array descriptors"); for(n=0 ; n<num_descriptors ; n++) { - hslabs[n].start = (iod_size_t *)malloc(sizeof(iod_size_t) * ndims); - hslabs[n].stride = (iod_size_t *)malloc(sizeof(iod_size_t) * ndims); - hslabs[n].block = (iod_size_t *)malloc(sizeof(iod_size_t) * ndims); - hslabs[n].count = (iod_size_t *)malloc(sizeof(iod_size_t) * ndims); + hslabs[n].start = (iod_size_t *)malloc(sizeof(iod_size_t) * (size_t)ndims); + hslabs[n].stride = (iod_size_t *)malloc(sizeof(iod_size_t) * (size_t)ndims); + hslabs[n].block = (iod_size_t *)malloc(sizeof(iod_size_t) * (size_t)ndims); + hslabs[n].count = (iod_size_t *)malloc(sizeof(iod_size_t) * (size_t)ndims); } /* generate the descriptors after allocating the array */ @@ -1348,8 +1349,8 @@ H5VL__iod_server_final_io(iod_handle_t iod_oh, hid_t space_id, size_t elmt_size, /* set the memory descriptor */ mem_desc = (iod_mem_desc_t *)malloc(sizeof(iod_mem_desc_t) + - (int)num_descriptors * sizeof(iod_mem_frag_t)); - mem_desc->nfrag = (int)num_descriptors; + (size_t)num_descriptors * sizeof(iod_mem_frag_t)); + mem_desc->nfrag = (long unsigned)num_descriptors; for(n=0 ; n<num_descriptors ; n++) { hsize_t num_bytes = 0; hsize_t num_elems = 1; @@ -1608,7 +1609,7 @@ H5VL__iod_server_vl_data_write(iod_handle_t coh, iod_obj_id_t iod_id, iod_handle { char bogus; /* bogus value to pass to H5Diterate() */ H5VL_iod_server_vl_write_t udata; - hg_bulk_block_t vl_data_handle; + hg_bulk_t vl_data_handle; hg_bulk_request_t bulk_request; size_t buf_size = 0, u; void *buf = NULL; @@ -1628,7 +1629,7 @@ H5VL__iod_server_vl_data_write(iod_handle_t coh, iod_obj_id_t iod_id, iod_handle HGOTO_ERROR2(H5E_SYM, H5E_NOSPACE, FAIL, "can't allocate data buffer"); /* Register local memory buffer */ - if(HG_SUCCESS != HG_Bulk_block_handle_create(buf, buf_size, HG_BULK_READWRITE, &vl_data_handle)) + if(HG_SUCCESS != HG_Bulk_handle_create(buf, buf_size, HG_BULK_READWRITE, &vl_data_handle)) HGOTO_ERROR2(H5E_SYM, H5E_CANTINIT, FAIL, "create vlen bulk handle"); /* Receive vl length data from client */ @@ -1640,7 +1641,7 @@ H5VL__iod_server_vl_data_write(iod_handle_t coh, iod_obj_id_t iod_id, iod_handle HGOTO_ERROR2(H5E_SYM, H5E_CANTINIT, FAIL, "can't wait for vlen lengths bulk data operation"); /* Free the bulk handle */ - if(HG_SUCCESS != HG_Bulk_block_handle_free(vl_data_handle)) + if(HG_SUCCESS != HG_Bulk_handle_free(vl_data_handle)) HGOTO_ERROR2(H5E_SYM, H5E_CANTINIT, FAIL, "can't free vlen bulk handle"); /* set other parameters needed to do IO */ diff --git a/src/H5VLiod_dtype.c b/src/H5VLiod_dtype.c index d18176c..d1f4c1a 100644 --- a/src/H5VLiod_dtype.c +++ b/src/H5VLiod_dtype.c @@ -75,7 +75,7 @@ H5VL_iod_server_dtype_commit_cb(AXE_engine_t UNUSED axe_engine, FUNC_ENTER_NOAPI_NOINIT #if H5VL_IOD_DEBUG - fprintf(stderr, "Start datatype commit %s at %"PRIu64"\n", name, loc_handle.wr_oh); + fprintf(stderr, "Start datatype commit %s at %"PRIu64"\n", name, loc_handle.wr_oh.cookie); #endif if(H5P_DEFAULT == input->tcpl_id) @@ -97,12 +97,12 @@ H5VL_iod_server_dtype_commit_cb(AXE_engine_t UNUSED axe_engine, to be created. The traversal will fail if an intermediate group does not exist. */ if(H5VL_iod_server_traverse(coh, loc_id, loc_handle, name, wtid, rtid, FALSE, - &last_comp, &cur_id, &cur_oh) < 0) + cs_scope, &last_comp, &cur_id, &cur_oh) < 0) HGOTO_ERROR2(H5E_SYM, H5E_NOSPACE, FAIL, "can't traverse path"); #if H5VL_IOD_DEBUG fprintf(stderr, "Creating Datatype ID %"PRIx64" ", dtype_id); - fprintf(stderr, "at (OH %"PRIu64" ID %"PRIx64") ", cur_oh.wr_oh, cur_id); + fprintf(stderr, "at (OH %"PRIu64" ID %"PRIx64") ", cur_oh.wr_oh.cookie, cur_id); if((cs_scope & H5_CHECKSUM_IOD) && enable_checksum) fprintf(stderr, "with Data integrity ENABLED\n"); else @@ -344,7 +344,8 @@ H5VL_iod_server_dtype_open_cb(AXE_engine_t UNUSED axe_engine, #endif /* Traverse Path and open dtype */ - if(H5VL_iod_server_open_path(coh, loc_id, loc_handle, name, rtid, &dtype_id, &dtype_oh) < 0) + if(H5VL_iod_server_open_path(coh, loc_id, loc_handle, name, rtid, + cs_scope, &dtype_id, &dtype_oh) < 0) HGOTO_ERROR2(H5E_SYM, H5E_NOSPACE, FAIL, "can't open object"); /* open a write handle on the ID. */ diff --git a/src/H5VLiod_encdec.c b/src/H5VLiod_encdec.c index a5668d6..39af2d9 100644 --- a/src/H5VLiod_encdec.c +++ b/src/H5VLiod_encdec.c @@ -237,7 +237,7 @@ int hg_proc_dims_t(hg_proc_t proc, void *data) break; case HG_DECODE: if(struct_data->rank) - struct_data->size = (hsize_t *)malloc (sizeof(hsize_t) * struct_data->rank); + struct_data->size = (hsize_t *)malloc (sizeof(hsize_t) * (size_t)struct_data->rank); for(i=0 ; i<struct_data->rank ; i++) { ret = hg_proc_uint64_t(proc, &struct_data->size[i]); @@ -888,8 +888,8 @@ int hg_proc_coords_t(hg_proc_t proc, void *data) break; case HG_DECODE: if(struct_data->rank) { - struct_data->start_cell = (uint64_t *)malloc (sizeof(uint64_t) * struct_data->rank); - struct_data->end_cell = (uint64_t *)malloc (sizeof(uint64_t) * struct_data->rank); + struct_data->start_cell = (uint64_t *)malloc (sizeof(uint64_t) * (size_t)struct_data->rank); + struct_data->end_cell = (uint64_t *)malloc (sizeof(uint64_t) * (size_t)struct_data->rank); } for(i=0 ; i<struct_data->rank ; i++) { diff --git a/src/H5VLiod_group.c b/src/H5VLiod_group.c index ea8e7c4..7fe7515 100644 --- a/src/H5VLiod_group.c +++ b/src/H5VLiod_group.c @@ -72,7 +72,7 @@ H5VL_iod_server_group_create_cb(AXE_engine_t UNUSED axe_engine, FUNC_ENTER_NOAPI_NOINIT #if H5VL_IOD_DEBUG - fprintf(stderr, "Start group create %s at %"PRIu64"\n", name, loc_handle.wr_oh); + fprintf(stderr, "Start group create %s at %"PRIu64"\n", name, loc_handle.wr_oh.cookie); #endif if(H5P_DEFAULT == input->gcpl_id) @@ -93,14 +93,14 @@ H5VL_iod_server_group_create_cb(AXE_engine_t UNUSED axe_engine, /* the traversal will retrieve the location where the group needs to be created. The traversal will fail if an intermediate group does not exist. */ - if(H5VL_iod_server_traverse(coh, loc_id, loc_handle, name, wtid, rtid, FALSE, + if(H5VL_iod_server_traverse(coh, loc_id, loc_handle, name, wtid, rtid, FALSE, cs_scope, &last_comp, &cur_id, &cur_oh) < 0) HGOTO_ERROR2(H5E_SYM, H5E_NOSPACE, FAIL, "can't traverse path"); #if H5VL_IOD_DEBUG fprintf(stderr, "Creating Group ID %"PRIx64" (CV %"PRIu64", TR %"PRIu64") ", grp_id, rtid, wtid); - fprintf(stderr, "at (OH %"PRIu64" ID %"PRIx64") ", cur_oh.wr_oh, cur_id); + fprintf(stderr, "at (OH %"PRIu64" ID %"PRIx64") ", cur_oh.wr_oh.cookie, cur_id); if((cs_scope & H5_CHECKSUM_IOD) && enable_checksum) fprintf(stderr, "with Data integrity ENABLED\n"); else @@ -290,7 +290,8 @@ H5VL_iod_server_group_open_cb(AXE_engine_t UNUSED axe_engine, } else { /* Traverse Path and open group */ - if(H5VL_iod_server_open_path(coh, loc_id, loc_handle, name, rtid, &grp_id, &grp_oh) < 0) + if(H5VL_iod_server_open_path(coh, loc_id, loc_handle, name, rtid, + cs_scope, &grp_id, &grp_oh) < 0) HGOTO_ERROR2(H5E_SYM, H5E_NOSPACE, FAIL, "can't open object"); } diff --git a/src/H5VLiod_link.c b/src/H5VLiod_link.c index ae9fe9b..127861b 100644 --- a/src/H5VLiod_link.c +++ b/src/H5VLiod_link.c @@ -68,7 +68,7 @@ H5VL_iod_server_link_create_cb(AXE_engine_t UNUSED axe_engine, to be created from. The traversal will fail if an intermediate group does not exist. */ if(H5VL_iod_server_traverse(coh, input->loc_id, input->loc_oh, input->loc_name, - wtid, rtid, FALSE, &src_last_comp, &src_id, &src_oh) < 0) + wtid, rtid, FALSE, cs_scope, &src_last_comp, &src_id, &src_oh) < 0) HGOTO_ERROR2(H5E_SYM, H5E_NOSPACE, FAIL, "can't traverse path"); #if H5VL_IOD_DEBUG @@ -91,7 +91,7 @@ H5VL_iod_server_link_create_cb(AXE_engine_t UNUSED axe_engine, } /* Traverse Path and open the target object */ if(H5VL_iod_server_open_path(coh, input->target_loc_id, input->target_loc_oh, - input->target_name, rtid, &target_id, &target_oh) < 0) + input->target_name, rtid, cs_scope, &target_id, &target_oh) < 0) HGOTO_ERROR2(H5E_SYM, H5E_NOSPACE, FAIL, "can't open object"); /* add link in parent group to current object */ @@ -230,15 +230,15 @@ H5VL_iod_server_link_move_cb(AXE_engine_t UNUSED axe_engine, #if H5VL_IOD_DEBUG fprintf(stderr, "Start link move SRC %s DST %s (%"PRIu64", %"PRIu64") to (%"PRIu64", %"PRIu64")\n", input->src_loc_name, input->dst_loc_name, - input->src_loc_oh.wr_oh, input->src_loc_oh.rd_oh, - input->dst_loc_oh.wr_oh, input->dst_loc_oh.rd_oh); + input->src_loc_oh.wr_oh.cookie, input->src_loc_oh.rd_oh.cookie, + input->dst_loc_oh.wr_oh.cookie, input->dst_loc_oh.rd_oh.cookie); #endif /* the traversal will retrieve the location where the link needs to be moved/copied from. The traversal will fail if an intermediate group does not exist. */ if(H5VL_iod_server_traverse(coh, input->src_loc_id, input->src_loc_oh, - input->src_loc_name, wtid, rtid, FALSE, + input->src_loc_name, wtid, rtid, FALSE, cs_scope, &src_last_comp, &src_id, &src_oh) < 0) HGOTO_ERROR2(H5E_SYM, H5E_NOSPACE, FAIL, "can't traverse path"); @@ -246,7 +246,7 @@ H5VL_iod_server_link_move_cb(AXE_engine_t UNUSED axe_engine, to be moved/copied to. The traversal will fail if an intermediate group does not exist. */ if(H5VL_iod_server_traverse(coh, input->dst_loc_id, input->dst_loc_oh, - input->dst_loc_name, wtid, rtid, FALSE, + input->dst_loc_name, wtid, rtid, FALSE, cs_scope, &dst_last_comp, &dst_id, &dst_oh) < 0) HGOTO_ERROR2(H5E_SYM, H5E_NOSPACE, FAIL, "can't traverse path"); @@ -419,7 +419,7 @@ H5VL_iod_server_link_exists_cb(AXE_engine_t UNUSED axe_engine, /* the traversal will retrieve the location where the link needs to be checked */ if(H5VL_iod_server_traverse(coh, loc_id, loc_oh, loc_name, rtid, rtid, FALSE, - &last_comp, &cur_id, &cur_oh) < 0) { + cs_scope, &last_comp, &cur_id, &cur_oh) < 0) { ret = FALSE; HGOTO_DONE(SUCCEED); } @@ -514,7 +514,7 @@ H5VL_iod_server_link_get_info_cb(AXE_engine_t UNUSED axe_engine, /* the traversal will retrieve the location where the link needs to be checked */ if(H5VL_iod_server_traverse(coh, loc_id, loc_oh, loc_name, rtid, rtid, FALSE, - &last_comp, &cur_id, &cur_oh) < 0) + cs_scope, &last_comp, &cur_id, &cur_oh) < 0) HGOTO_ERROR2(H5E_SYM, H5E_NOSPACE, FAIL, "can't traverse path"); #if H5VL_IOD_DEBUG @@ -619,7 +619,7 @@ H5VL_iod_server_link_get_val_cb(AXE_engine_t UNUSED axe_engine, /* the traversal will retrieve the location where the link needs to be checked */ if(H5VL_iod_server_traverse(coh, loc_id, loc_oh, loc_name, rtid, rtid, FALSE, - &last_comp, &cur_id, &cur_oh) < 0) + cs_scope, &last_comp, &cur_id, &cur_oh) < 0) HGOTO_ERROR2(H5E_SYM, H5E_NOSPACE, FAIL, "can't traverse path"); #if H5VL_IOD_DEBUG @@ -729,14 +729,14 @@ H5VL_iod_server_link_remove_cb(AXE_engine_t UNUSED axe_engine, #if H5VL_IOD_DEBUG fprintf(stderr, "Start link Remove %s at (%"PRIu64", %"PRIu64")\n", - loc_name, loc_oh.wr_oh, loc_oh.rd_oh); + loc_name, loc_oh.wr_oh.cookie, loc_oh.rd_oh.cookie); #endif /* the traversal will retrieve the location where the link needs to be removed. The traversal will fail if an intermediate group does not exist. */ if(H5VL_iod_server_traverse(coh, loc_id, loc_oh, loc_name, wtid, rtid, - FALSE, &last_comp, &cur_id, &cur_oh) < 0) + FALSE, cs_scope, &last_comp, &cur_id, &cur_oh) < 0) HGOTO_ERROR2(H5E_SYM, H5E_NOSPACE, FAIL, "can't traverse path"); /* lookup object ID in the current location */ diff --git a/src/H5VLiod_map.c b/src/H5VLiod_map.c index de26c3d..7b801f6 100644 --- a/src/H5VLiod_map.c +++ b/src/H5VLiod_map.c @@ -77,7 +77,7 @@ H5VL_iod_server_map_create_cb(AXE_engine_t UNUSED axe_engine, #if H5VL_IOD_DEBUG fprintf(stderr, "Start map create %s at %"PRIu64"\n", - name, loc_handle.wr_oh); + name, loc_handle.wr_oh.cookie); #endif if(H5P_DEFAULT == input->mcpl_id) @@ -99,12 +99,12 @@ H5VL_iod_server_map_create_cb(AXE_engine_t UNUSED axe_engine, to be created. The traversal will fail if an intermediate group does not exist. */ if(H5VL_iod_server_traverse(coh, loc_id, loc_handle, name, wtid, rtid, FALSE, - &last_comp, &cur_id, &cur_oh) < 0) + cs_scope, &last_comp, &cur_id, &cur_oh) < 0) HGOTO_ERROR2(H5E_SYM, H5E_NOSPACE, FAIL, "can't traverse path"); #if H5VL_IOD_DEBUG fprintf(stderr, "Creating Map ID %"PRIx64") ", map_id); - fprintf(stderr, "at (OH %"PRIu64" ID %"PRIx64") ", cur_oh.wr_oh, cur_id); + fprintf(stderr, "at (OH %"PRIu64" ID %"PRIx64") ", cur_oh.wr_oh.cookie, cur_id); if((cs_scope & H5_CHECKSUM_IOD) && enable_checksum) fprintf(stderr, "with Data integrity ENABLED\n"); else @@ -291,7 +291,7 @@ H5VL_iod_server_map_open_cb(AXE_engine_t UNUSED axe_engine, /* Traverse Path and open map */ if(H5VL_iod_server_open_path(coh, loc_id, loc_handle, name, rtid, - &map_id, &map_oh) < 0) + cs_scope, &map_id, &map_oh) < 0) HGOTO_ERROR2(H5E_SYM, H5E_NOSPACE, FAIL, "can't open object"); /* open a write handle on the ID. */ @@ -395,7 +395,7 @@ H5VL_iod_server_map_set_cb(AXE_engine_t UNUSED axe_engine, iod_trans_id_t rtid = input->rcxt_num; uint32_t cs_scope = input->cs_scope; na_addr_t source = HG_Handler_get_addr(op_data->hg_handle); /* source address to pull data from */ - hg_bulk_block_t bulk_block_handle; /* HG block handle */ + hg_bulk_t bulk_block_handle; /* HG block handle */ hg_bulk_request_t bulk_request; /* HG request */ size_t key_size, val_size, new_val_size; void *val_buf = NULL; @@ -409,7 +409,7 @@ H5VL_iod_server_map_set_cb(AXE_engine_t UNUSED axe_engine, #if H5VL_IOD_DEBUG fprintf(stderr, "Start Map Set Key %d on OH %"PRIu64" OID %"PRIx64"\n", - *((int *)key.buf), iod_oh, iod_id); + *((int *)key.buf), iod_oh.cookie, iod_id); #endif /* open the map if we don't have the handle yet */ @@ -431,7 +431,7 @@ H5VL_iod_server_map_set_cb(AXE_engine_t UNUSED axe_engine, HGOTO_ERROR2(H5E_SYM, H5E_NOSPACE, FAIL, "can't allocate read buffer"); /* create a Mercury block handle for transfer */ - HG_Bulk_block_handle_create(val_buf, val_size, HG_BULK_READWRITE, &bulk_block_handle); + HG_Bulk_handle_create(val_buf, val_size, HG_BULK_READWRITE, &bulk_block_handle); /* Write bulk data here and wait for the data to be there */ if(HG_SUCCESS != HG_Bulk_read_all(source, value_handle, bulk_block_handle, &bulk_request)) @@ -441,7 +441,7 @@ H5VL_iod_server_map_set_cb(AXE_engine_t UNUSED axe_engine, HGOTO_ERROR2(H5E_SYM, H5E_WRITEERROR, FAIL, "can't get data from function shipper"); /* free the bds block handle */ - if(HG_SUCCESS != HG_Bulk_block_handle_free(bulk_block_handle)) + if(HG_SUCCESS != HG_Bulk_handle_free(bulk_block_handle)) HGOTO_ERROR2(H5E_SYM, H5E_WRITEERROR, FAIL, "can't free bds block handle"); /* get the scope for data integrity checks for raw data */ @@ -597,7 +597,7 @@ H5VL_iod_server_map_get_cb(AXE_engine_t UNUSED axe_engine, size_t key_size, val_size; iod_size_t src_size; void *val_buf = NULL; - hg_bulk_block_t bulk_block_handle; /* HG block handle */ + hg_bulk_t bulk_block_handle; /* HG block handle */ hg_bulk_request_t bulk_request; /* HG request */ na_addr_t dest = HG_Handler_get_addr(op_data->hg_handle); /* destination address to push data to */ hbool_t opened_locally = FALSE; @@ -608,7 +608,7 @@ H5VL_iod_server_map_get_cb(AXE_engine_t UNUSED axe_engine, #if H5VL_IOD_DEBUG fprintf(stderr, "Start Map Get Key %d on OH %"PRIu64" OID %"PRIx64"\n", - *((int *)key.buf), iod_oh, iod_id); + *((int *)key.buf), iod_oh.cookie, iod_id); #endif /* open the map if we don't have the handle yet */ @@ -666,7 +666,7 @@ H5VL_iod_server_map_get_cb(AXE_engine_t UNUSED axe_engine, #endif /* Create a new block handle to write the data */ - HG_Bulk_block_handle_create(val_buf, (size_t)src_size, HG_BULK_READ_ONLY, &bulk_block_handle); + HG_Bulk_handle_create(val_buf, (size_t)src_size, HG_BULK_READ_ONLY, &bulk_block_handle); /* Write bulk data here and wait for the data to be there */ if(HG_SUCCESS != HG_Bulk_write_all(dest, value_handle, bulk_block_handle, &bulk_request)) @@ -676,7 +676,7 @@ H5VL_iod_server_map_get_cb(AXE_engine_t UNUSED axe_engine, HGOTO_ERROR2(H5E_SYM, H5E_READERROR, FAIL, "can't read from array object"); /* free block handle */ - if(HG_SUCCESS != HG_Bulk_block_handle_free(bulk_block_handle)) + if(HG_SUCCESS != HG_Bulk_handle_free(bulk_block_handle)) HGOTO_ERROR2(H5E_SYM, H5E_READERROR, FAIL, "can't free bds block handle"); } } @@ -727,7 +727,7 @@ H5VL_iod_server_map_get_cb(AXE_engine_t UNUSED axe_engine, output.ret = ret_value; /* Create a new block handle to write the data */ - HG_Bulk_block_handle_create(val_buf, val_size, HG_BULK_READ_ONLY, &bulk_block_handle); + HG_Bulk_handle_create(val_buf, val_size, HG_BULK_READ_ONLY, &bulk_block_handle); /* Write bulk data here and wait for the data to be there */ if(HG_SUCCESS != HG_Bulk_write_all(dest, value_handle, bulk_block_handle, &bulk_request)) @@ -737,7 +737,7 @@ H5VL_iod_server_map_get_cb(AXE_engine_t UNUSED axe_engine, HGOTO_ERROR2(H5E_SYM, H5E_READERROR, FAIL, "can't read from array object"); /* free block handle */ - if(HG_SUCCESS != HG_Bulk_block_handle_free(bulk_block_handle)) + if(HG_SUCCESS != HG_Bulk_handle_free(bulk_block_handle)) HGOTO_ERROR2(H5E_SYM, H5E_READERROR, FAIL, "can't free bds block handle"); } @@ -821,7 +821,7 @@ H5VL_iod_server_map_get_count_cb(AXE_engine_t UNUSED axe_engine, if(iod_kv_get_num(iod_oh, rtid, &num, NULL) < 0) HGOTO_ERROR2(H5E_SYM, H5E_CANTGET, FAIL, "can't retrieve Number of KV pairs in MAP"); - output = num; + output = (hsize_t)num; #if H5VL_IOD_DEBUG fprintf(stderr, "Done with map get_count, sending %d response to client\n", ret_value); @@ -1056,7 +1056,7 @@ H5VL_iod_server_map_close_cb(AXE_engine_t UNUSED axe_engine, #if H5VL_IOD_DEBUG fprintf(stderr, "Start map Close %"PRIu64" %"PRIu64"\n", - iod_oh.rd_oh, iod_oh.wr_oh); + iod_oh.rd_oh.cookie, iod_oh.wr_oh.cookie); #endif if((iod_obj_close(iod_oh.rd_oh, NULL, NULL)) < 0) diff --git a/src/H5VLiod_obj.c b/src/H5VLiod_obj.c index cb24dce..c110546 100644 --- a/src/H5VLiod_obj.c +++ b/src/H5VLiod_obj.c @@ -120,12 +120,12 @@ H5VL_iod_server_object_open_cb(AXE_engine_t UNUSED axe_engine, #if H5VL_IOD_DEBUG fprintf(stderr, "Start Object Open on %s (OH %"PRIu64" ID %"PRIx64")\n", - input->loc_name, input->loc_oh.rd_oh, input->loc_id); + input->loc_name, input->loc_oh.rd_oh.cookie, input->loc_id); #endif /* Traverse Path and open object */ if(H5VL_iod_server_open_path(coh, input->loc_id, input->loc_oh, input->loc_name, - rtid, &obj_id, &obj_oh) < 0) + rtid, cs_scope, &obj_id, &obj_oh) < 0) HGOTO_ERROR2(H5E_SYM, H5E_NOSPACE, FAIL, "can't open object"); if (iod_obj_open_write(coh, obj_id, rtid, NULL, &obj_oh.wr_oh, NULL) < 0) @@ -345,7 +345,7 @@ H5VL_iod_server_object_copy_cb(AXE_engine_t UNUSED axe_engine, /* Traverse Path and open object */ if(H5VL_iod_server_open_path(coh, input->src_loc_id, input->src_loc_oh, input->src_loc_name, - rtid, &obj_id, &obj_oh) < 0) + rtid, cs_scope, &obj_id, &obj_oh) < 0) HGOTO_ERROR2(H5E_SYM, H5E_NOSPACE, FAIL, "can't open object"); /* the traversal will retrieve the location where the objects @@ -530,11 +530,12 @@ H5VL_iod_server_object_exists_cb(AXE_engine_t UNUSED axe_engine, #if H5VL_IOD_DEBUG fprintf(stderr, "Start Object Exists on %s (OH %"PRIu64" ID %"PRIx64")\n", - input->loc_name, input->loc_oh.rd_oh, input->loc_id); + input->loc_name, input->loc_oh.rd_oh.cookie, input->loc_id); #endif /* Traverse Path and open object */ - if(H5VL_iod_server_open_path(coh, loc_id, loc_oh, loc_name, rtid, &obj_id, &obj_oh) < 0) { + if(H5VL_iod_server_open_path(coh, loc_id, loc_oh, loc_name, rtid, + cs_scope, &obj_id, &obj_oh) < 0) { ret = FALSE; HGOTO_DONE(SUCCEED); } @@ -605,12 +606,12 @@ H5VL_iod_server_object_get_info_cb(AXE_engine_t UNUSED axe_engine, #if H5VL_IOD_DEBUG fprintf(stderr, "Start Object Get Info on %s (OH %"PRIu64" ID %"PRIx64")\n", - input->loc_name, input->loc_oh.rd_oh, input->loc_id); + input->loc_name, input->loc_oh.rd_oh.cookie, input->loc_id); #endif /* Traverse Path and open object */ if(H5VL_iod_server_open_path(coh, loc_id, loc_oh, loc_name, - rtid, &obj_id, &obj_oh) < 0) + rtid, cs_scope, &obj_id, &obj_oh) < 0) HGOTO_ERROR2(H5E_SYM, H5E_CANTINIT, FAIL, "object does not exist"); oinfo.addr = obj_id; @@ -675,7 +676,7 @@ H5VL_iod_server_object_get_info_cb(AXE_engine_t UNUSED axe_engine, if(iod_kv_get_num(attrkv_oh, rtid, &num_attrs, NULL) < 0) HGOTO_ERROR2(H5E_SYM, H5E_CANTGET, FAIL, "failed to retrieve attribute count"); - oinfo.num_attrs = num_attrs; + oinfo.num_attrs = (hsize_t)num_attrs; /* close the metadata KV */ if(iod_obj_close(mdkv_oh, NULL, NULL) < 0) @@ -750,12 +751,12 @@ H5VL_iod_server_object_set_comment_cb(AXE_engine_t UNUSED axe_engine, #if H5VL_IOD_DEBUG fprintf(stderr, "Start Object Set comment on %s (OH %"PRIu64" ID %"PRIx64")\n", - input->path, input->loc_oh.rd_oh, input->loc_id); + input->path, input->loc_oh.rd_oh.cookie, input->loc_id); #endif /* Traverse Path and open object */ if(H5VL_iod_server_open_path(coh, loc_id, loc_oh, loc_name, rtid, - &obj_id, &obj_oh) < 0) + cs_scope, &obj_id, &obj_oh) < 0) HGOTO_ERROR2(H5E_SYM, H5E_NOSPACE, FAIL, "can't open object"); if(loc_id != obj_id || input->loc_mdkv_id == IOD_OBJ_INVALID) { @@ -782,7 +783,7 @@ H5VL_iod_server_object_set_comment_cb(AXE_engine_t UNUSED axe_engine, { iod_kv_t kv; - kv.key = (void *)H5VL_IOD_KEY_OBJ_COMMENT; + kv.key = H5VL_IOD_KEY_OBJ_COMMENT; kv.key_len = strlen(H5VL_IOD_KEY_OBJ_COMMENT); kv.value_len = strlen(comment) + 1; kv.value = comment; @@ -869,12 +870,12 @@ H5VL_iod_server_object_get_comment_cb(AXE_engine_t UNUSED axe_engine, #if H5VL_IOD_DEBUG fprintf(stderr, "Start Object Get comment on %s (OH %"PRIu64" ID %"PRIx64")\n", - input->path, input->loc_oh.rd_oh, input->loc_id); + input->path, input->loc_oh.rd_oh.cookie, input->loc_id); #endif /* Traverse Path and open object */ if(H5VL_iod_server_open_path(coh, loc_id, loc_oh, loc_name, - rtid, &obj_id, &obj_oh) < 0) + rtid, cs_scope, &obj_id, &obj_oh) < 0) HGOTO_ERROR2(H5E_SYM, H5E_NOSPACE, FAIL, "can't open object"); if(loc_id != obj_id || input->loc_mdkv_id == IOD_OBJ_INVALID) { @@ -941,7 +942,7 @@ H5VL_iod_server_object_get_comment_cb(AXE_engine_t UNUSED axe_engine, iod_obj_close(obj_oh.rd_oh, NULL, NULL) < 0) HGOTO_ERROR2(H5E_SYM, H5E_CANTINIT, FAIL, "can't close object"); - *comment.value_size = val_size; + *comment.value_size = (ssize_t)val_size; done: output.ret = ret_value; diff --git a/src/H5VLiod_server.c b/src/H5VLiod_server.c index 9bdc256..6642fcf 100644 --- a/src/H5VLiod_server.c +++ b/src/H5VLiod_server.c @@ -222,7 +222,7 @@ EFF_start_server(MPI_Comm comm, MPI_Info UNUSED info) network_class = NA_MPI_Init(NULL, MPI_INIT_SERVER); /* Allocate table addrs */ - na_addr_table = (char**) malloc(num_ions_g * sizeof(char*)); + na_addr_table = (char**) malloc((size_t)num_ions_g * sizeof(char*)); for (i = 0; i < num_ions_g; i++) { na_addr_table[i] = (char*) malloc(MPI_MAX_PORT_NAME); } @@ -255,14 +255,12 @@ EFF_start_server(MPI_Comm comm, MPI_Info UNUSED info) return FAIL; if(HG_SUCCESS != HG_Handler_init(network_class)) return FAIL; - if(HG_SUCCESS != HG_Bulk_init(network_class)) - return FAIL; /* Look up addr id */ /* We do the lookup here but this may not be optimal */ - server_addr_g = (na_addr_t *) malloc(num_ions_g * sizeof(na_addr_t)); + server_addr_g = (na_addr_t *) malloc((size_t)num_ions_g * sizeof(na_addr_t)); for (i = 0; i < num_ions_g; i++) { - if(NA_SUCCESS != NA_Addr_lookup(network_class, na_addr_table[i], &server_addr_g[i])) { + if(NA_SUCCESS != NA_Addr_lookup_wait(network_class, na_addr_table[i], &server_addr_g[i])) { fprintf(stderr, "Could not find addr\n"); return FAIL; } @@ -341,8 +339,6 @@ EFF_start_server(MPI_Comm comm, MPI_Info UNUSED info) } free(server_addr_g); - if(HG_SUCCESS != HG_Bulk_finalize()) - return FAIL; if(HG_SUCCESS != HG_Handler_finalize()) return FAIL; if(HG_SUCCESS != HG_Finalize()) @@ -2129,12 +2125,12 @@ done: *------------------------------------------------------------------------- */ int -H5VL_iod_server_link_iterate(hg_handle_t handle) +H5VL_iod_server_link_iterate(hg_handle_t UNUSED handle) { - op_data_t *op_data = NULL; + //op_data_t *op_data = NULL; int ret_value = HG_SUCCESS; - FUNC_ENTER_NOAPI_NOINIT + FUNC_ENTER_NOAPI_NOINIT_NOERR #if 0 if(NULL == (op_data = (op_data_t *)H5MM_malloc(sizeof(op_data_t)))) @@ -2159,7 +2155,7 @@ H5VL_iod_server_link_iterate(hg_handle_t handle) op_data->input = (void *)input; #endif -done: + //done: FUNC_LEAVE_NOAPI(ret_value) } /* end H5VL_iod_server_link_iterate() */ @@ -2557,14 +2553,14 @@ done: *------------------------------------------------------------------------- */ int -H5VL_iod_server_object_visit(hg_handle_t handle) +H5VL_iod_server_object_visit(hg_handle_t UNUSED handle) { - op_data_t *op_data = NULL; + //op_data_t *op_data = NULL; int ret_value = HG_SUCCESS; - FUNC_ENTER_NOAPI_NOINIT + FUNC_ENTER_NOAPI_NOINIT_NOERR -done: + //done: FUNC_LEAVE_NOAPI(ret_value) } /* end H5VL_iod_server_object_visit() */ diff --git a/src/H5VLiod_server.h b/src/H5VLiod_server.h index 3ebe1b5..1efabbc 100644 --- a/src/H5VLiod_server.h +++ b/src/H5VLiod_server.h @@ -386,12 +386,12 @@ H5_DLL void H5VL_iod_server_trans_abort_cb(AXE_engine_t axe_engine, /* Helper routines used several times in different places */ H5_DLL herr_t H5VL_iod_server_traverse(iod_handle_t coh, iod_obj_id_t loc_id, iod_handles_t loc_handle, const char *path, iod_trans_id_t wtid, iod_trans_id_t rtid, - hbool_t create_interm_grps, + hbool_t create_interm_grps, uint32_t cs_scope, char **last_comp, iod_obj_id_t *iod_id, iod_handles_t *iod_oh); H5_DLL herr_t H5VL_iod_server_open_path(iod_handle_t coh, iod_obj_id_t loc_id, - iod_handles_t loc_handle, const char *path, - iod_trans_id_t tid, /*out*/iod_obj_id_t *iod_id, - /*out*/iod_handles_t *iod_oh); + iod_handles_t loc_handle, const char *path, + iod_trans_id_t tid, uint32_t cs_scope, + /*out*/iod_obj_id_t *iod_id, /*out*/iod_handles_t *iod_oh); H5_DLL herr_t H5VL_iod_get_file_desc(hid_t space_id, hssize_t *count, iod_hyperslab_t *hslabs); H5_DLL herr_t H5VL_iod_insert_plist(iod_handle_t oh, iod_trans_id_t tid, hid_t plist_id, uint32_t cs_scope, iod_hint_list_t *hints, iod_event_t *event); diff --git a/src/H5VLiod_trans.c b/src/H5VLiod_trans.c index ed119fc..0142c6a 100644 --- a/src/H5VLiod_trans.c +++ b/src/H5VLiod_trans.c @@ -398,7 +398,7 @@ H5VL_iod_server_trans_finish_cb(AXE_engine_t UNUSED axe_engine, tr_finish_in_t *input = (tr_finish_in_t *)op_data->input; iod_handle_t coh = input->coh; /* the container handle */ uint32_t cs_scope = input->cs_scope; - hid_t trfpl_id; + //hid_t trfpl_id; iod_trans_id_t trans_num = input->trans_num; hbool_t acquire = input->acquire; uint32_t client_rank = input->client_rank; diff --git a/src/H5VLiod_util.c b/src/H5VLiod_util.c index 4fd994f..c577ecb 100644 --- a/src/H5VLiod_util.c +++ b/src/H5VLiod_util.c @@ -50,7 +50,7 @@ herr_t H5VL_iod_server_traverse(iod_handle_t coh, iod_obj_id_t loc_id, iod_handles_t loc_handle, const char *path, iod_trans_id_t wtid, iod_trans_id_t rtid, - hbool_t create_interm_grps, + hbool_t create_interm_grps, uint32_t cs_scope, /* out */char **last_comp, /* out */iod_obj_id_t *iod_id, /* out */iod_handles_t *iod_oh) { @@ -117,7 +117,7 @@ H5VL_iod_server_traverse(iod_handle_t coh, iod_obj_id_t loc_id, iod_handles_t lo /* lookup next object in the current group */ if(H5VL_iod_get_metadata(cur_oh.rd_oh, rtid, H5VL_IOD_LINK, - comp, NULL, NULL, &value) < 0) + comp, cs_scope, NULL, &value) < 0) HGOTO_ERROR2(H5E_SYM, H5E_CANTGET, FAIL, "failed to retrieve link value"); /* if this a soft link, traverse the link value if the ID is undefined */ @@ -128,7 +128,7 @@ H5VL_iod_server_traverse(iod_handle_t coh, iod_obj_id_t loc_id, iod_handles_t lo /* Traverse Path and open the target object */ if(H5VL_iod_server_open_path(coh, cur_id, cur_oh, value.u.symbolic_name, - rtid, &cur_id, &cur_oh) < 0) + rtid, cs_scope, &cur_id, &cur_oh) < 0) HGOTO_ERROR2(H5E_SYM, H5E_NOSPACE, FAIL, "can't open object"); free(value.u.symbolic_name); @@ -188,7 +188,7 @@ done: */ herr_t H5VL_iod_server_open_path(iod_handle_t coh, iod_obj_id_t loc_id, iod_handles_t loc_handle, - const char *path, iod_trans_id_t rtid, + const char *path, iod_trans_id_t rtid, uint32_t cs_scope, /*out*/iod_obj_id_t *iod_id, /*out*/iod_handles_t *iod_oh) { char comp_buf[1024]; /* Temporary buffer for path components */ @@ -242,7 +242,7 @@ H5VL_iod_server_open_path(iod_handle_t coh, iod_obj_id_t loc_id, iod_handles_t l /* lookup next object in the current group */ if(H5VL_iod_get_metadata(cur_oh.rd_oh, rtid, H5VL_IOD_LINK, - comp, NULL, NULL, &value) < 0) { + comp, cs_scope, NULL, &value) < 0) { /* Close previous handle unless it is the original one */ if(loc_handle.rd_oh.cookie != prev_oh.cookie && iod_obj_close(prev_oh, NULL, NULL) < 0) @@ -258,7 +258,7 @@ H5VL_iod_server_open_path(iod_handle_t coh, iod_obj_id_t loc_id, iod_handles_t l /* Traverse Path and open the target object */ if(H5VL_iod_server_open_path(coh, cur_id, cur_oh, value.u.symbolic_name, - rtid, &cur_id, &cur_oh) < 0) + rtid, cs_scope, &cur_id, &cur_oh) < 0) HGOTO_ERROR2(H5E_SYM, H5E_NOSPACE, FAIL, "can't open object"); free(value.u.symbolic_name); @@ -408,7 +408,7 @@ H5VL_iod_get_file_desc(hid_t space_id, hssize_t *count, iod_hyperslab_t *hslabs) hsize_t *blocks = NULL; size_t block_count = 0; - block_count = ndims * num_descriptors * sizeof(hsize_t) * 2; + block_count = ndims * (size_t)num_descriptors * sizeof(hsize_t) * 2; if(NULL == (blocks = (hsize_t *)malloc(block_count))) HGOTO_ERROR2(H5E_SYM, H5E_NOSPACE, FAIL, "can't allocate array for points coords"); @@ -1039,10 +1039,10 @@ H5VL_iod_get_metadata(iod_handle_t oh, iod_trans_id_t tid, H5VL_iod_metadata_t m { H5VL_iod_link_t *iod_link = (H5VL_iod_link_t *)ret; uint8_t *val_ptr; - iod_ret_t ret; + iod_ret_t iod_ret; - if((ret = iod_kv_get_value(oh, tid, key, key_size, NULL, &val_size, NULL, event)) < 0) { - fprintf(stderr, "%d (%s).\n", ret, strerror(-ret)); + if((iod_ret = iod_kv_get_value(oh, tid, key, key_size, NULL, &val_size, NULL, event)) < 0) { + fprintf(stderr, "%d (%s).\n", iod_ret, strerror(-iod_ret)); HGOTO_ERROR2(H5E_SYM, H5E_CANTINIT, FAIL, "lookup failed"); } if(NULL == (value = malloc((size_t)val_size))) |