diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2009-10-29 13:58:52 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2009-10-29 13:58:52 (GMT) |
| commit | 56276c02cdfe8d16c9663a5875803e89112700ed (patch) | |
| tree | 64628715223d2a751300768f75e3ea76187845ba /src/H5B2cache.c | |
| parent | 0475c8ce57f84ced2e8ab35dabbcde6bd4e4e3fa (diff) | |
| download | hdf5-56276c02cdfe8d16c9663a5875803e89112700ed.zip hdf5-56276c02cdfe8d16c9663a5875803e89112700ed.tar.gz hdf5-56276c02cdfe8d16c9663a5875803e89112700ed.tar.bz2 | |
[svn-r17785] Description:
Further refactor v2 B-tree code to bring it closer to modern data
structure designed in the library, mainly by introducing a H5B2_t type so that
the v2 B-tree could be held open, but not require the B-tree header to be
protected the whole time. A few other minor tweaks as well.
Also, remove unused 'dirty' flag from fractal heap header.
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/default API=1.8.x,
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.6.1 (amazon) in debug mode
Mac OS X/32 10.6.1 (amazon) w/C++ & FORTRAN, w/threadsafe,
in production mode
Diffstat (limited to 'src/H5B2cache.c')
| -rw-r--r-- | src/H5B2cache.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/H5B2cache.c b/src/H5B2cache.c index 859554e..aa39adb 100644 --- a/src/H5B2cache.c +++ b/src/H5B2cache.c @@ -170,7 +170,7 @@ H5B2_cache_hdr_load(H5F_t *f, hid_t dxpl_id, haddr_t addr, const void *_cls, voi HDassert(cls); /* Allocate new B-tree header and reset cache info */ - if(NULL == (hdr = H5B2_hdr_alloc())) + if(NULL == (hdr = H5B2_hdr_alloc(f))) HGOTO_ERROR(H5E_BTREE, H5E_CANTALLOC, NULL, "allocation failed for B-tree header") /* Wrap the local buffer for serialized header info */ @@ -730,6 +730,7 @@ H5B2_cache_internal_dest(H5F_t *f, H5B2_internal_t *internal) /* * Check arguments. */ + HDassert(f); HDassert(internal); HDassert(internal->hdr); @@ -1052,6 +1053,7 @@ H5B2_cache_leaf_dest(H5F_t *f, H5B2_leaf_t *leaf) /* * Check arguments. */ + HDassert(f); HDassert(leaf); HDassert(leaf->hdr); |