diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2009-05-27 23:21:24 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2009-05-27 23:21:24 (GMT) |
| commit | bae373c32236ad99425154f5fcec4cb185e583d0 (patch) | |
| tree | 9ba2bd0e8e3157eafc9c5ff84d1cb45762639672 /src/H5Dbtree.c | |
| parent | 29d45ed0d13493d07d7d744950e1fe1b6d5bbff1 (diff) | |
| download | hdf5-bae373c32236ad99425154f5fcec4cb185e583d0.zip hdf5-bae373c32236ad99425154f5fcec4cb185e583d0.tar.gz hdf5-bae373c32236ad99425154f5fcec4cb185e583d0.tar.bz2 | |
[svn-r16988] Description:
Refactor layout initialization so that chunk index information can be
set for extensible array indices.
Tested on:
FreeBSD/32 6.3 (duty) in debug mode
FreeBSD/64 6.3 (liberty) w/C++ & FORTRAN, in debug mode
Linux/32 2.6 (jam) w/PGI compilers, w/C++ & FORTRAN, w/threadsafe,
in debug mode
Linux/64-amd64 2.6 (smirom) w/Intel compilers w/default API=1.6.x,
w/C++ & FORTRAN, in production mode
Solaris/32 2.10 (linew) w/deprecated symbols disabled, w/C++ & FORTRAN,
w/szip filter, in production mode
Linux/64-ia64 2.6 (cobalt) w/Intel compilers, w/C++ & FORTRAN,
in production mode
Linux/64-ia64 2.4 (tg-login3) w/parallel, w/FORTRAN, in debug mode
Linux/64-amd64 2.6 (abe) w/parallel, w/FORTRAN, in production mode
Mac OS X/32 10.5.6 (amazon) in debug mode
Mac OS X/32 10.5.6 (amazon) w/C++ & FORTRAN, w/threadsafe,
in production mode
Diffstat (limited to 'src/H5Dbtree.c')
| -rw-r--r-- | src/H5Dbtree.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/H5Dbtree.c b/src/H5Dbtree.c index 3674ae3..1195c80 100644 --- a/src/H5Dbtree.c +++ b/src/H5Dbtree.c @@ -135,7 +135,8 @@ static herr_t H5D_btree_debug_key(FILE *stream, H5F_t *f, hid_t dxpl_id, int indent, int fwidth, const void *key, const void *udata); /* Chunked layout indexing callbacks */ -static herr_t H5D_btree_idx_init(const H5D_chk_idx_info_t *idx_info); +static herr_t H5D_btree_idx_init(const H5D_chk_idx_info_t *idx_info, + haddr_t dset_ohdr_addr); static herr_t H5D_btree_idx_create(const H5D_chk_idx_info_t *idx_info); static hbool_t H5D_btree_idx_is_space_alloc(const H5O_layout_t *layout); static herr_t H5D_btree_idx_insert(const H5D_chk_idx_info_t *idx_info, @@ -845,7 +846,7 @@ done: *------------------------------------------------------------------------- */ static herr_t -H5D_btree_idx_init(const H5D_chk_idx_info_t *idx_info) +H5D_btree_idx_init(const H5D_chk_idx_info_t *idx_info, haddr_t UNUSED dset_ohdr_addr) { herr_t ret_value = SUCCEED; /* Return value */ @@ -856,6 +857,7 @@ H5D_btree_idx_init(const H5D_chk_idx_info_t *idx_info) HDassert(idx_info->f); HDassert(idx_info->pline); HDassert(idx_info->layout); + HDassert(H5F_addr_defined(dset_ohdr_addr)); /* Allocate the shared structure */ if(H5D_btree_shared_create(idx_info->f, idx_info->layout) < 0) |