diff options
author | Mohamad Chaarawi <chaarawi@hdfgroup.org> | 2014-01-24 21:37:07 (GMT) |
---|---|---|
committer | Mohamad Chaarawi <chaarawi@hdfgroup.org> | 2014-01-24 21:37:07 (GMT) |
commit | 143d7fab5e9c0c489dabe558f692326654acb135 (patch) | |
tree | fd244a1c42771d6d179e0d97914ce9539a43f79a /src/H5VLiod_attr.c | |
parent | 4dbf5a2d2e752739238dd5a5c6ec7da3e83aa84b (diff) | |
download | hdf5-143d7fab5e9c0c489dabe558f692326654acb135.zip hdf5-143d7fab5e9c0c489dabe558f692326654acb135.tar.gz hdf5-143d7fab5e9c0c489dabe558f692326654acb135.tar.bz2 |
[svn-r24645] - Add Neil's VL datatype changes from the Netvol to H5VLiod_common.c
- Refactor VL datatype handling for datasets to use Neil's functions.
* Still can't handle complicated VLs (nested, compunds, etc...).
* Need MPI mercury plugin fix and to update Neil's buffer construction at server for IOD storage.
- Fix and Update IOD storage for VL dataypes in arrays by algorithmically calculating the BLOB ID.
- Add test for Array VL datatypes to the FF test suite.
- Other minor fixes.
Diffstat (limited to 'src/H5VLiod_attr.c')
-rw-r--r-- | src/H5VLiod_attr.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/H5VLiod_attr.c b/src/H5VLiod_attr.c index 99dfbf4..602060d 100644 --- a/src/H5VLiod_attr.c +++ b/src/H5VLiod_attr.c @@ -531,7 +531,8 @@ H5VL_iod_server_attr_read_cb(AXE_engine_t UNUSED axe_engine, file_desc = hslabs; /* read from array object */ - ret = iod_array_read(iod_oh, rtid, NULL, mem_desc, &file_desc, &iod_cs, NULL); + ret = iod_array_read(iod_oh, rtid, NULL, mem_desc, &file_desc, + NULL/* MSC - need IOD -&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"); @@ -734,7 +735,7 @@ H5VL_iod_server_attr_write_cb(AXE_engine_t UNUSED axe_engine, /* set the file descriptor */ file_desc = hslabs; - if(cs_scope & H5_CHECKSUM_IOD) { + if(0) {// MSC - IOD fix - cs_scope & H5_CHECKSUM_IOD) { attr_cs = H5_checksum_crc64(buf, size); /* write from array object */ @@ -983,7 +984,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 = &cs; + kvs.cs = NULL; //MSC - need IOD - &cs; 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"); @@ -1139,7 +1140,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 = &cs; + kvs.cs = NULL; //MSC - need IOD - &cs; 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"); |