diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2009-11-05 20:31:07 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2009-11-05 20:31:07 (GMT) |
| commit | 016d3bd3fbc54ff002cc91b175eaac1c2524a3d9 (patch) | |
| tree | 97d377426ffa9465421761c928e5fde19d1a3df0 /src/H5B2private.h | |
| parent | 12f9610b7b576b238f986965b5c499fcaba0c4c4 (diff) | |
| download | hdf5-016d3bd3fbc54ff002cc91b175eaac1c2524a3d9.zip hdf5-016d3bd3fbc54ff002cc91b175eaac1c2524a3d9.tar.gz hdf5-016d3bd3fbc54ff002cc91b175eaac1c2524a3d9.tar.bz2 | |
[svn-r17843] Description:
Bring r17842 from trunk to 1.8 branch:
Further refactor v2 B-tree code toward being able to pass context info
down to encode/decode client callbacks:
- Separate H5B2_create call to return H5B2_t structure
- Make loading the v2 B-tree header pick up the client class from the
ID stored in the file. Simplify some internal API calls as a
result.
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/H5B2private.h')
| -rw-r--r-- | src/H5B2private.h | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/H5B2private.h b/src/H5B2private.h index 481f910..a97e332 100644 --- a/src/H5B2private.h +++ b/src/H5B2private.h @@ -130,6 +130,8 @@ typedef struct H5B2_t H5B2_t; /***************************************/ H5_DLL herr_t H5B2_create(H5F_t *f, hid_t dxpl_id, const H5B2_create_t *cparam, haddr_t *addr_p); +H5_DLL H5B2_t *H5B2_create_2(H5F_t *f, hid_t dxpl_id, const H5B2_create_t *cparam); +H5_DLL herr_t H5B2_get_addr(const H5B2_t *bt2, haddr_t *addr/*out*/); H5_DLL herr_t H5B2_insert(H5F_t *f, hid_t dxpl_id, const H5B2_class_t *type, haddr_t addr, void *udata); H5_DLL herr_t H5B2_iterate(H5F_t *f, hid_t dxpl_id, const H5B2_class_t *type, @@ -153,12 +155,12 @@ H5_DLL herr_t H5B2_remove_by_idx(H5F_t *f, hid_t dxpl_id, const H5B2_class_t *ty void *op_data); H5_DLL herr_t H5B2_get_nrec(H5F_t *f, hid_t dxpl_id, const H5B2_class_t *type, haddr_t addr, hsize_t *nrec); -H5_DLL herr_t H5B2_delete(H5F_t *f, hid_t dxpl_id, const H5B2_class_t *type, - haddr_t addr, H5B2_remove_t op, void *op_data); +H5_DLL herr_t H5B2_delete(H5F_t *f, hid_t dxpl_id, haddr_t addr, + H5B2_remove_t op, void *op_data); /* Statistics routines */ -H5_DLL herr_t H5B2_stat_info(H5F_t *f, hid_t dxpl_id, const H5B2_class_t *type, - haddr_t addr, H5B2_stat_t *info); +H5_DLL herr_t H5B2_stat_info(H5F_t *f, hid_t dxpl_id, haddr_t addr, + H5B2_stat_t *info); #endif /* _H5B2private_H */ |