diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2016-04-24 05:50:00 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2016-04-24 05:50:00 (GMT) |
| commit | b0980a5f5418dcfabb442592d82eebb625dc6220 (patch) | |
| tree | 03f5cda6d273681f481c5283593c397a30eab311 /src/H5Dfarray.c | |
| parent | 3ac0a74bf3396fc684df961add72b6a80c56ae75 (diff) | |
| download | hdf5-b0980a5f5418dcfabb442592d82eebb625dc6220.zip hdf5-b0980a5f5418dcfabb442592d82eebb625dc6220.tar.gz hdf5-b0980a5f5418dcfabb442592d82eebb625dc6220.tar.bz2 | |
[svn-r29776] Description:
Bring "file pointer patching" code & test from revise_chunks to trunk.
Tested on:
MacOSX/64 10.11.4 (amazon) w/serial, parallel & production
(h5committest forthcoming)
Diffstat (limited to 'src/H5Dfarray.c')
| -rw-r--r-- | src/H5Dfarray.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/src/H5Dfarray.c b/src/H5Dfarray.c index 7afeae6..3303370 100644 --- a/src/H5Dfarray.c +++ b/src/H5Dfarray.c @@ -1204,10 +1204,13 @@ H5D__farray_idx_remove(const H5D_chk_idx_info_t *idx_info, H5D_chunk_common_ud_t HDassert(udata); /* Check if the fixed array is open yet */ - if(NULL == idx_info->storage->u.farray.fa) + if(NULL == idx_info->storage->u.farray.fa) { /* Open the fixed array in file */ if(H5D__farray_idx_open(idx_info) < 0) HGOTO_ERROR(H5E_DATASET, H5E_CANTOPENOBJ, FAIL, "can't open fixed array") + } else /* Patch the top level file pointer contained in fa if needed */ + if(H5FA_patch_file(idx_info->storage->u.farray.fa, idx_info->f) < 0) + HGOTO_ERROR(H5E_DATASET, H5E_CANTOPENOBJ, FAIL, "can't patch fixed array file pointer") /* Set convenience pointer to fixed array structure */ fa = idx_info->storage->u.farray.fa; @@ -1626,6 +1629,11 @@ H5D__farray_idx_dest(const H5D_chk_idx_info_t *idx_info) /* Check if the fixed array is open */ if(idx_info->storage->u.farray.fa) { + + /* Patch the top level file pointer contained in fa if needed */ + if(H5FA_patch_file(idx_info->storage->u.farray.fa, idx_info->f) < 0) + HGOTO_ERROR(H5E_DATASET, H5E_CANTOPENOBJ, FAIL, "can't patch fixed array file pointer") + /* Close fixed array */ if(H5FA_close(idx_info->storage->u.farray.fa, idx_info->dxpl_id) < 0) HGOTO_ERROR(H5E_DATASET, H5E_CANTCLOSEOBJ, FAIL, "unable to close fixed array") |