diff options
| author | Mohamad Chaarawi <chaarawi@hdfgroup.org> | 2014-02-05 15:55:58 (GMT) |
|---|---|---|
| committer | Mohamad Chaarawi <chaarawi@hdfgroup.org> | 2014-02-05 15:55:58 (GMT) |
| commit | f810a4278c9d736723963b0d2aa8f11ad4e82e68 (patch) | |
| tree | ea73bc2d446817cbc6e05aba57a8176e17ebff20 | |
| parent | 65322cd6cb0b9f9851bb840e36ec985367c9d254 (diff) | |
| download | hdf5-f810a4278c9d736723963b0d2aa8f11ad4e82e68.zip hdf5-f810a4278c9d736723963b0d2aa8f11ad4e82e68.tar.gz hdf5-f810a4278c9d736723963b0d2aa8f11ad4e82e68.tar.bz2 | |
[svn-r24689] increase number of AXE threads to 4.
fix other bug with H5Oopen to open datatype that was ignoring tcpl.
| -rw-r--r-- | src/H5VLiod_dset.c | 1 | ||||
| -rw-r--r-- | src/H5VLiod_obj.c | 6 | ||||
| -rw-r--r-- | src/H5VLiod_server.c | 2 |
3 files changed, 7 insertions, 2 deletions
diff --git a/src/H5VLiod_dset.c b/src/H5VLiod_dset.c index 163a324..ca00ef9 100644 --- a/src/H5VLiod_dset.c +++ b/src/H5VLiod_dset.c @@ -1007,6 +1007,7 @@ H5VL_iod_server_dset_write_cb(AXE_engine_t UNUSED axe_engine, /* 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)) HGOTO_ERROR2(H5E_SYM, H5E_WRITEERROR, FAIL, "can't get data from function shipper"); + /* wait for it to complete */ if(HG_SUCCESS != HG_Bulk_wait(bulk_request, HG_MAX_IDLE_TIME, HG_STATUS_IGNORE)) HGOTO_ERROR2(H5E_SYM, H5E_WRITEERROR, FAIL, "can't get data from function shipper"); diff --git a/src/H5VLiod_obj.c b/src/H5VLiod_obj.c index c110546..2ec9340 100644 --- a/src/H5VLiod_obj.c +++ b/src/H5VLiod_obj.c @@ -205,6 +205,10 @@ H5VL_iod_server_object_open_cb(AXE_engine_t UNUSED axe_engine, key_size = strlen(H5VL_IOD_KEY_DTYPE_SIZE); val_size = sizeof(iod_size_t); + if(H5VL_iod_get_metadata(mdkv_oh, rtid, H5VL_IOD_PLIST, H5VL_IOD_KEY_OBJ_CPL, + cs_scope, NULL, &output.cpl_id) < 0) + HGOTO_ERROR2(H5E_SYM, H5E_CANTGET, FAIL, "failed to retrieve dcpl"); + /* retrieve blob size metadata from scratch pad */ if(iod_kv_get_value(mdkv_oh, rtid, H5VL_IOD_KEY_DTYPE_SIZE, key_size, &buf_size, &val_size, iod_cs, NULL) < 0) @@ -236,7 +240,7 @@ H5VL_iod_server_object_open_cb(AXE_engine_t UNUSED axe_engine, /* read the serialized type value from the BLOB object */ if(iod_blob_read(obj_oh.rd_oh, rtid, NULL, mem_desc, file_desc, &blob_cs, NULL) < 0) - HGOTO_ERROR2(H5E_SYM, H5E_CANTINIT, FAIL, "unable to write BLOB object"); + HGOTO_ERROR2(H5E_SYM, H5E_CANTINIT, FAIL, "unable to read BLOB object"); if(blob_cs && (cs_scope & H5_CHECKSUM_IOD)) { /* calculate a checksum for the datatype */ diff --git a/src/H5VLiod_server.c b/src/H5VLiod_server.c index 6642fcf..5e7de8d 100644 --- a/src/H5VLiod_server.c +++ b/src/H5VLiod_server.c @@ -298,7 +298,7 @@ EFF_start_server(MPI_Comm comm, MPI_Info UNUSED info) return FAIL; /* Set number of threads in AXE engine */ - if(AXEset_num_threads(&engine_attr, 1) != AXE_SUCCEED) + if(AXEset_num_threads(&engine_attr, 4) != AXE_SUCCEED) return FAIL; /* Create AXE engine */ |