diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2009-10-15 18:26:50 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2009-10-15 18:26:50 (GMT) |
| commit | d38b38db5a78e1d47a7610b00c65f54b5533de0c (patch) | |
| tree | e2dd16037e239fa45552f2fa113a4e6caa9287aa /src/H5B2stat.c | |
| parent | f7b06c8505eee62e54e295468b45ebcfd0f2cf65 (diff) | |
| download | hdf5-d38b38db5a78e1d47a7610b00c65f54b5533de0c.zip hdf5-d38b38db5a78e1d47a7610b00c65f54b5533de0c.tar.gz hdf5-d38b38db5a78e1d47a7610b00c65f54b5533de0c.tar.bz2 | |
[svn-r17649] Description:
Refactor v2 B-trees to pin the B-tree header in the cache instead of
using separate reference counted data structure.
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 | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/src/H5B2stat.c b/src/H5B2stat.c index 899bb8a..dd88d43 100644 --- a/src/H5B2stat.c +++ b/src/H5B2stat.c @@ -83,11 +83,10 @@ *------------------------------------------------------------------------- */ herr_t -H5B2_stat_info(H5F_t *f, hid_t dxpl_id, const H5B2_class_t *type, - haddr_t addr, H5B2_stat_t *info) +H5B2_stat_info(H5F_t *f, hid_t dxpl_id, const H5B2_class_t *type, haddr_t addr, + H5B2_stat_t *info) { H5B2_t *bt2 = NULL; /* Pointer to the B-tree header */ - H5B2_shared_t *shared; /* Pointer to B-tree's shared information */ herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_NOAPI_NOINIT(H5B2_stat_info) @@ -102,11 +101,8 @@ H5B2_stat_info(H5F_t *f, hid_t dxpl_id, const H5B2_class_t *type, if(NULL == (bt2 = (H5B2_t *)H5AC_protect(f, dxpl_id, H5AC_BT2_HDR, addr, type, NULL, H5AC_READ))) HGOTO_ERROR(H5E_BTREE, H5E_CANTPROTECT, FAIL, "unable to load B-tree header") - /* Get pointer to reference counted shared B-tree info */ - shared = (H5B2_shared_t *)H5RC_GET_OBJ(bt2->shared); - /* Get information about the B-tree */ - info->depth = shared->depth; + info->depth = bt2->depth; info->nrecords = bt2->root.all_nrec; done: |