diff options
author | Quincey Koziol <koziol@hdfgroup.org> | 2009-10-24 19:50:51 (GMT) |
---|---|---|
committer | Quincey Koziol <koziol@hdfgroup.org> | 2009-10-24 19:50:51 (GMT) |
commit | 5345a51120d9fcf05b91252544a914352b91065f (patch) | |
tree | b4316dcd641556fc2349b002d7f226773bb34000 /src/H5B2private.h | |
parent | 7a68924d3b81cf8b3e6e421294270abc933b44a9 (diff) | |
download | hdf5-5345a51120d9fcf05b91252544a914352b91065f.zip hdf5-5345a51120d9fcf05b91252544a914352b91065f.tar.gz hdf5-5345a51120d9fcf05b91252544a914352b91065f.tar.bz2 |
[svn-r17741] Description:
Bring r17740 from trunk to 1.8 branch:
Refactor v2 B-tree code to take creation parameters to H5B2_create() as
a struct (instead of individual arguments), call the client's class "cls"
instead of "type" internally, and add client class name to client class struct.
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 | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/src/H5B2private.h b/src/H5B2private.h index 80d7977..e99def0 100644 --- a/src/H5B2private.h +++ b/src/H5B2private.h @@ -82,6 +82,7 @@ typedef enum H5B2_compare_t { typedef struct H5B2_class_t H5B2_class_t; struct H5B2_class_t { H5B2_subid_t id; /* ID of B-tree class, as found in file */ + const char *name; /* Name of B-tree class, for debugging */ size_t nrec_size; /* Size of native (memory) record */ /* Store record from application to B-tree 'native' form */ @@ -100,6 +101,15 @@ struct H5B2_class_t { const void *udata); }; +/* v2 B-tree creation parameters */ +typedef struct H5B2_create_t { + const H5B2_class_t *cls; /* v2 B-tree client class */ + size_t node_size; /* Size of each node (in bytes) */ + size_t rrec_size; /* Size of raw record (in bytes) */ + unsigned split_percent; /* % full to split nodes */ + unsigned merge_percent; /* % full to merge nodes */ +} H5B2_create_t; + /* v2 B-tree metadata statistics info */ typedef struct H5B2_stat_t { unsigned depth; /* Depth of B-tree */ @@ -114,9 +124,8 @@ typedef struct H5B2_stat_t { /***************************************/ /* Library-private Function Prototypes */ /***************************************/ -H5_DLL herr_t H5B2_create(H5F_t *f, hid_t dxpl_id, const H5B2_class_t *type, - size_t node_size, size_t rrec_size, unsigned split_percent, - unsigned merge_percent, haddr_t *addr_p); +H5_DLL herr_t H5B2_create(H5F_t *f, hid_t dxpl_id, const H5B2_create_t *cparam, + haddr_t *addr_p); 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, |