diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2009-12-01 16:45:27 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2009-12-01 16:45:27 (GMT) |
| commit | 71a9d507255366be01c25e458ac4c953d4481f45 (patch) | |
| tree | 511f2662e8cc85010434af4a64812da147848317 /src/H5B2pkg.h | |
| parent | 1bc79f977be67f734a44fd237be6f05b5fb25f53 (diff) | |
| download | hdf5-71a9d507255366be01c25e458ac4c953d4481f45.zip hdf5-71a9d507255366be01c25e458ac4c953d4481f45.tar.gz hdf5-71a9d507255366be01c25e458ac4c953d4481f45.tar.bz2 | |
[svn-r17943] Description:
Finish refactoring v2 B-trees so that they can have client callback
context provided to the encode/decode callbacks.
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.2 (amazon) in debug mode
Mac OS X/32 10.6.2 (amazon) w/C++ & FORTRAN, w/threadsafe,
in production mode
Diffstat (limited to 'src/H5B2pkg.h')
| -rw-r--r-- | src/H5B2pkg.h | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/H5B2pkg.h b/src/H5B2pkg.h index 8b68d1e..c336227 100644 --- a/src/H5B2pkg.h +++ b/src/H5B2pkg.h @@ -168,10 +168,13 @@ typedef struct H5B2_hdr_t { uint8_t sizeof_addr; /* Size of file addresses */ H5B2_remove_t remove_op; /* Callback operator for deleting B-tree */ void *remove_op_data;/* B-tree deletion callback's context */ - const H5B2_class_t *cls; /* Class of B-tree client */ uint8_t *page; /* Common disk page for I/O */ size_t *nat_off; /* Array of offsets of native records */ H5B2_node_info_t *node_info; /* Table of node info structs for current depth of B-tree */ + + /* Client information (not stored) */ + const H5B2_class_t *cls; /* Class of B-tree client */ + void *cb_ctx; /* Client callback context */ } H5B2_hdr_t; /* B-tree leaf node information */ @@ -255,9 +258,9 @@ extern const H5B2_class_t *const H5B2_client_class_g[]; /* Routines for managing B-tree header info */ H5_DLL H5B2_hdr_t *H5B2_hdr_alloc(H5F_t *f); H5_DLL haddr_t H5B2_hdr_create(H5F_t *f, hid_t dxpl_id, - const H5B2_create_t *cparam); + const H5B2_create_t *cparam, void *ctx_udata); H5_DLL herr_t H5B2_hdr_init(H5F_t *f, H5B2_hdr_t *hdr, - const H5B2_create_t *cparam, uint16_t depth); + const H5B2_create_t *cparam, void *ctx_udata, uint16_t depth); H5_DLL herr_t H5B2_hdr_incr(H5B2_hdr_t *hdr); H5_DLL herr_t H5B2_hdr_decr(H5B2_hdr_t *hdr); H5_DLL herr_t H5B2_hdr_fuse_incr(H5B2_hdr_t *hdr); |