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/H5Dbtree2.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/H5Dbtree2.c')
| -rw-r--r-- | src/H5Dbtree2.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/src/H5Dbtree2.c b/src/H5Dbtree2.c index 9de609f..3b9b803 100644 --- a/src/H5Dbtree2.c +++ b/src/H5Dbtree2.c @@ -1161,10 +1161,14 @@ H5D__bt2_idx_remove(const H5D_chk_idx_info_t *idx_info, H5D_chunk_common_ud_t *u HDassert(udata); /* Check if the v2 B-tree is open yet */ - if(NULL == idx_info->storage->u.btree2.bt2) + if(NULL == idx_info->storage->u.btree2.bt2) { /* Open existing v2 B-tree */ if(H5D__bt2_idx_open(idx_info) < 0) HGOTO_ERROR(H5E_DATASET, H5E_CANTOPENOBJ, FAIL, "can't open v2 B-tree") + } /* end if */ + else /* Patch the top level file pointer contained in bt2 if needed */ + if(H5B2_patch_file(idx_info->storage->u.btree2.bt2, idx_info->f) < 0) + HGOTO_ERROR(H5E_DATASET, H5E_CANTOPENOBJ, FAIL, "can't patch v2 B-tree file pointer") /* Set convenience pointer to v2 B-tree structure */ bt2 = idx_info->storage->u.btree2.bt2; @@ -1479,6 +1483,11 @@ H5D__bt2_idx_dest(const H5D_chk_idx_info_t *idx_info) /* Check if the v2-btree is open */ if(idx_info->storage->u.btree2.bt2) { + + /* Patch the top level file pointer contained in bt2 if needed */ + if(H5B2_patch_file(idx_info->storage->u.btree2.bt2, idx_info->f) < 0) + HGOTO_ERROR(H5E_DATASET, H5E_CANTOPENOBJ, FAIL, "can't patch v2 B-tree file pointer") + /* Close v2 B-tree */ if(H5B2_close(idx_info->storage->u.btree2.bt2, idx_info->dxpl_id) < 0) HGOTO_ERROR(H5E_DATASET, H5E_CANTCLOSEOBJ, FAIL, "can't close v2 B-tree") |