diff options
author | Quincey Koziol <koziol@hdfgroup.org> | 2009-11-07 14:43:22 (GMT) |
---|---|---|
committer | Quincey Koziol <koziol@hdfgroup.org> | 2009-11-07 14:43:22 (GMT) |
commit | fbd4cf9bfea5418e2e4e2b81f31459db4aae4d61 (patch) | |
tree | e7dac6b1aa04b9086a28137f218d4d33eb4bd911 /src/H5B2.c | |
parent | 016d3bd3fbc54ff002cc91b175eaac1c2524a3d9 (diff) | |
download | hdf5-fbd4cf9bfea5418e2e4e2b81f31459db4aae4d61.zip hdf5-fbd4cf9bfea5418e2e4e2b81f31459db4aae4d61.tar.gz hdf5-fbd4cf9bfea5418e2e4e2b81f31459db4aae4d61.tar.bz2 |
[svn-r17849] Description:
Bring r17848 from trunk to 1.8 branch:
Further refactoring v2 B-trees so that they can get context to the
encode/decode client callbacks:
- Switch tests to using refactored routines
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/H5B2.c')
-rw-r--r-- | src/H5B2.c | 44 |
1 files changed, 12 insertions, 32 deletions
@@ -61,26 +61,6 @@ /********************/ /* Local Prototypes */ /********************/ -static H5B2_t *H5B2_open(H5F_t *f, hid_t dxpl_id, haddr_t addr); -static herr_t H5B2_insert_2(H5B2_t *bt2, hid_t dxpl_id, void *udata); -static herr_t H5B2_iterate_2(H5B2_t *bt2, hid_t dxpl_id, H5B2_operator_t op, - void *op_data); -static htri_t H5B2_find_2(H5B2_t *bt2, hid_t dxpl_id, void *udata, - H5B2_found_t op, void *op_data); -static herr_t H5B2_index_2(H5B2_t *bt2, hid_t dxpl_id, H5_iter_order_t order, - hsize_t idx, H5B2_found_t op, void *op_data); -static herr_t H5B2_remove_2(H5B2_t *b2, hid_t dxpl_id, void *udata, - H5B2_remove_t op, void *op_data); -static herr_t H5B2_remove_by_idx_2(H5B2_t *bt2, hid_t dxpl_id, - H5_iter_order_t order, hsize_t idx, H5B2_remove_t op, void *op_data); -static herr_t H5B2_get_nrec_2(const H5B2_t *bt2, hsize_t *nrec); -static herr_t H5B2_neighbor_2(H5B2_t *bt2, hid_t dxpl_id, H5B2_compare_t range, - void *udata, H5B2_found_t op, void *op_data); -static herr_t H5B2_modify_2(H5B2_t *bt2, hid_t dxpl_id, void *udata, - H5B2_modify_t op, void *op_data); -static herr_t H5B2_iterate_size_2(H5B2_t *bt2, hid_t dxpl_id, - hsize_t *btree_size); -static herr_t H5B2_close(H5B2_t *bt2, hid_t dxpl_id); /*********************/ @@ -258,7 +238,7 @@ done: * *------------------------------------------------------------------------- */ -static H5B2_t * +H5B2_t * H5B2_open(H5F_t *f, hid_t dxpl_id, haddr_t addr) { H5B2_t *bt2 = NULL; /* Pointer to the B-tree */ @@ -322,7 +302,7 @@ done: * *------------------------------------------------------------------------- */ -static herr_t +herr_t H5B2_insert_2(H5B2_t *bt2, hid_t dxpl_id, void *udata) { H5B2_hdr_t *hdr; /* Pointer to the B-tree header */ @@ -464,7 +444,7 @@ H5B2_get_addr(const H5B2_t *bt2, haddr_t *addr_p) * *------------------------------------------------------------------------- */ -static herr_t +herr_t H5B2_iterate_2(H5B2_t *bt2, hid_t dxpl_id, H5B2_operator_t op, void *op_data) { H5B2_hdr_t *hdr; /* Pointer to the B-tree header */ @@ -565,7 +545,7 @@ done: * *------------------------------------------------------------------------- */ -static htri_t +htri_t H5B2_find_2(H5B2_t *bt2, hid_t dxpl_id, void *udata, H5B2_found_t op, void *op_data) { @@ -756,7 +736,7 @@ done: * *------------------------------------------------------------------------- */ -static herr_t +herr_t H5B2_index_2(H5B2_t *bt2, hid_t dxpl_id, H5_iter_order_t order, hsize_t idx, H5B2_found_t op, void *op_data) { @@ -962,7 +942,7 @@ done: * *------------------------------------------------------------------------- */ -static herr_t +herr_t H5B2_remove_2(H5B2_t *bt2, hid_t dxpl_id, void *udata, H5B2_remove_t op, void *op_data) { @@ -1079,7 +1059,7 @@ done: * *------------------------------------------------------------------------- */ -static herr_t +herr_t H5B2_remove_by_idx_2(H5B2_t *bt2, hid_t dxpl_id, H5_iter_order_t order, hsize_t idx, H5B2_remove_t op, void *op_data) { @@ -1205,7 +1185,7 @@ done: * *------------------------------------------------------------------------- */ -static herr_t +herr_t H5B2_get_nrec_2(const H5B2_t *bt2, hsize_t *nrec) { FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5B2_get_nrec_2) @@ -1291,7 +1271,7 @@ done: * *------------------------------------------------------------------------- */ -static herr_t +herr_t H5B2_neighbor_2(H5B2_t *bt2, hid_t dxpl_id, H5B2_compare_t range, void *udata, H5B2_found_t op, void *op_data) { @@ -1406,7 +1386,7 @@ done: * *------------------------------------------------------------------------- */ -static herr_t +herr_t H5B2_modify_2(H5B2_t *bt2, hid_t dxpl_id, void *udata, H5B2_modify_t op, void *op_data) { @@ -1614,7 +1594,7 @@ done: * *------------------------------------------------------------------------- */ -static herr_t +herr_t H5B2_iterate_size_2(H5B2_t *bt2, hid_t dxpl_id, hsize_t *btree_size) { H5B2_hdr_t *hdr; /* Pointer to the B-tree header */ @@ -1709,7 +1689,7 @@ done: * *------------------------------------------------------------------------- */ -static herr_t +herr_t H5B2_close(H5B2_t *bt2, hid_t dxpl_id) { haddr_t bt2_addr = HADDR_UNDEF; /* Address of v2 B-tree (for deletion) */ |