diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2009-10-29 14:54:08 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2009-10-29 14:54:08 (GMT) |
| commit | ac0778592ae832ccd2b3ec4a6ed62d5340d8ea2a (patch) | |
| tree | 54c6ad6ea49eb560abfa7cdd3e105426b184bf4b /src/H5B2stat.c | |
| parent | 7abd8c4d3003d56f6564a79dd0eaa4d97604a769 (diff) | |
| download | hdf5-ac0778592ae832ccd2b3ec4a6ed62d5340d8ea2a.zip hdf5-ac0778592ae832ccd2b3ec4a6ed62d5340d8ea2a.tar.gz hdf5-ac0778592ae832ccd2b3ec4a6ed62d5340d8ea2a.tar.bz2 | |
[svn-r17786] Description:
Bring r17749 & 17785 from trunk to 1.8 branch:
17749:
Refactor v2 B-tree code to bring it further in line with how the fractal
heap code works, to make forthcoming modificaions easier. Also minor tweaks to
the fractal heap code to clean it up a bit more also.
17785:
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/H5B2stat.c')
| -rw-r--r-- | src/H5B2stat.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/H5B2stat.c b/src/H5B2stat.c index 4b97e17..5fc7659 100644 --- a/src/H5B2stat.c +++ b/src/H5B2stat.c @@ -85,7 +85,7 @@ *------------------------------------------------------------------------- */ herr_t -H5B2_stat_info(H5F_t *f, hid_t dxpl_id, const H5B2_class_t *type, haddr_t addr, +H5B2_stat_info(H5F_t *f, hid_t dxpl_id, const H5B2_class_t *cls, haddr_t addr, H5B2_stat_t *info) { H5B2_hdr_t *hdr = NULL; /* Pointer to the B-tree header */ @@ -95,12 +95,12 @@ H5B2_stat_info(H5F_t *f, hid_t dxpl_id, const H5B2_class_t *type, haddr_t addr, /* Check arguments. */ HDassert(f); - HDassert(type); + HDassert(cls); HDassert(H5F_addr_defined(addr)); HDassert(info); /* Look up the B-tree header */ - if(NULL == (hdr = (H5B2_hdr_t *)H5AC_protect(f, dxpl_id, H5AC_BT2_HDR, addr, type, NULL, H5AC_READ))) + if(NULL == (hdr = (H5B2_hdr_t *)H5AC_protect(f, dxpl_id, H5AC_BT2_HDR, addr, cls, NULL, H5AC_READ))) HGOTO_ERROR(H5E_BTREE, H5E_CANTPROTECT, FAIL, "unable to load B-tree header") /* Get information about the B-tree */ |