diff options
author | Quincey Koziol <koziol@hdfgroup.org> | 2015-04-17 20:49:27 (GMT) |
---|---|---|
committer | Quincey Koziol <koziol@hdfgroup.org> | 2015-04-17 20:49:27 (GMT) |
commit | 7bf3a426e8634c851d9c550fd980f07d3e29fc1b (patch) | |
tree | 4102bab36bd666a2caf3421e05a6e3b1b350220c /src/H5Dmpio.c | |
parent | c6717e8134be832103cf777d3685d61d225b61c3 (diff) | |
download | hdf5-7bf3a426e8634c851d9c550fd980f07d3e29fc1b.zip hdf5-7bf3a426e8634c851d9c550fd980f07d3e29fc1b.tar.gz hdf5-7bf3a426e8634c851d9c550fd980f07d3e29fc1b.tar.bz2 |
[svn-r26837] Description:
Separate allocating chunk on disk from inserting the chunk record into the
index. This allows a "SWMR-safe" insert/update of chunks (the chunk is always
allocated -> written -> inserted/updated in the index).
Tested on:
Mac OSX/64 10.10.2 (amazon) w/parallel & serial
Linux/32 2.6.18 (jam) w/serial & parallel
Diffstat (limited to 'src/H5Dmpio.c')
-rw-r--r-- | src/H5Dmpio.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/H5Dmpio.c b/src/H5Dmpio.c index 01d2288..bd1531d 100644 --- a/src/H5Dmpio.c +++ b/src/H5Dmpio.c @@ -863,7 +863,7 @@ H5D__link_chunk_collective_io(H5D_io_info_t *io_info, const H5D_type_info_t *typ if(H5D__chunk_lookup(io_info->dset, io_info->dxpl_id, chunk_info->coords, chunk_info->index, &udata) < 0) HGOTO_ERROR(H5E_STORAGE, H5E_CANTGET, FAIL, "couldn't get chunk address") - ctg_store.contig.dset_addr = udata.addr; + ctg_store.contig.dset_addr = udata.chunk_block.offset; } /* end else */ /* Set up the base storage address for this chunk */ @@ -1592,7 +1592,7 @@ if(H5DEBUG(D)) if(H5D__chunk_lookup(io_info->dset, io_info->dxpl_id, chunk_info->coords, chunk_info->index, &udata) < 0) HGOTO_ERROR(H5E_STORAGE, H5E_CANTGET, FAIL, "couldn't get chunk info from skipped list") - chunk_addr = udata.addr; + chunk_addr = udata.chunk_block.offset; } /* end if */ else chunk_addr = total_chunk_addr_array[chunk_info->index]; |