diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2009-10-15 22:26:46 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2009-10-15 22:26:46 (GMT) |
| commit | 3dd3756ea1f1ead111abb8e4f2ab7e1f3a64582e (patch) | |
| tree | 2859bfde0469c459da8261e311c9ba6bc8d90b02 /src/H5B2pkg.h | |
| parent | 21518fd05a3777c20c69ce214a2f6da54ae8dfe0 (diff) | |
| download | hdf5-3dd3756ea1f1ead111abb8e4f2ab7e1f3a64582e.zip hdf5-3dd3756ea1f1ead111abb8e4f2ab7e1f3a64582e.tar.gz hdf5-3dd3756ea1f1ead111abb8e4f2ab7e1f3a64582e.tar.bz2 | |
[svn-r17657] Description:
Refactor the v2 B-tree code to use an open & close call internally, in
preparation for making those part of the library private APIs for dealing with
v2 B-trees.
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/H5B2pkg.h')
| -rw-r--r-- | src/H5B2pkg.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/H5B2pkg.h b/src/H5B2pkg.h index e52ab81..6050057 100644 --- a/src/H5B2pkg.h +++ b/src/H5B2pkg.h @@ -156,7 +156,9 @@ typedef struct H5B2_t { /* Shared internal data structures (not stored) */ H5F_t *f; /* Pointer to the file that the B-tree is in */ + haddr_t addr; /* Address of B-tree header in the file */ size_t rc; /* Reference count of nodes using this header */ + hbool_t pending_delete; /* B-tree is pending deletion */ const H5B2_class_t *type; /* Type of tree */ uint8_t *page; /* Common disk page for I/O */ size_t *nat_off; /* Array of offsets of native records */ @@ -239,6 +241,7 @@ H5_DLLVAR const H5B2_class_t H5B2_TEST[1]; H5_DLL herr_t H5B2_hdr_incr(H5B2_t *bt2); H5_DLL herr_t H5B2_hdr_decr(H5B2_t *bt2); H5_DLL herr_t H5B2_hdr_dirty(H5B2_t *bt2); +H5_DLL herr_t H5B2_hdr_delete(H5B2_t *bt2); H5_DLL herr_t H5B2_hdr_init(H5F_t *f, H5B2_t *bt2, const H5B2_class_t *type, unsigned depth, size_t node_size, size_t rrec_size, unsigned split_percent, unsigned merge_percent); @@ -249,8 +252,7 @@ H5_DLL H5B2_internal_t *H5B2_protect_internal(H5F_t *f, hid_t dxpl_id, H5B2_t *bt2, haddr_t addr, unsigned nrec, unsigned depth, H5AC_protect_t rw); /* Routines for allocating nodes */ -H5_DLL herr_t H5B2_split_root(H5F_t *f, hid_t dxpl_id, H5B2_t *bt2, - unsigned *bt2_flags_ptr); +H5_DLL herr_t H5B2_split_root(H5F_t *f, hid_t dxpl_id, H5B2_t *bt2); H5_DLL herr_t H5B2_create_leaf(H5F_t *f, hid_t dxpl_id, H5B2_t *bt2, H5B2_node_ptr_t *node_ptr); |