diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2015-06-03 15:35:28 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2015-06-03 15:35:28 (GMT) |
| commit | 235b3b86c1eabefcf6c4de9594a5609b6f03060b (patch) | |
| tree | ad92ab59e8545694bd914be12f46dc501f1963a0 /src/H5B2pkg.h | |
| parent | e2fa1a7555ea0c548824c33f84a5e5c9efd1b938 (diff) | |
| download | hdf5-235b3b86c1eabefcf6c4de9594a5609b6f03060b.zip hdf5-235b3b86c1eabefcf6c4de9594a5609b6f03060b.tar.gz hdf5-235b3b86c1eabefcf6c4de9594a5609b6f03060b.tar.bz2 | |
[svn-r27144] Description:
Normalize trunk against the metadata_cache_merge branch, in preparation
for merging the branch into the trunk.
Tested on:
MacOSX/64 10.10.3 (amazon) w/serial & parallel
Linux/64 2.6.x (koala) w/serial
Linux/32 2.6.x (jam) w/serial & parallel
Diffstat (limited to 'src/H5B2pkg.h')
| -rw-r--r-- | src/H5B2pkg.h | 20 |
1 files changed, 15 insertions, 5 deletions
diff --git a/src/H5B2pkg.h b/src/H5B2pkg.h index 72476eb..a2d32e6 100644 --- a/src/H5B2pkg.h +++ b/src/H5B2pkg.h @@ -45,10 +45,10 @@ /* Size of a "tree pointer" (on disk) */ /* (essentially, the largest internal pointer allowed) */ -#define H5B2_TREE_POINTER_SIZE(h) ( \ - (h)->sizeof_addr + \ +#define H5B2_TREE_POINTER_SIZE(sizeof_addr, sizeof_size) ( \ + (sizeof_addr) + \ H5B2_SIZEOF_RECORDS_PER_NODE + \ - (h)->sizeof_size \ + (sizeof_size) \ ) /* Size of a internal node pointer (on disk) */ @@ -70,7 +70,7 @@ ) /* Size of the v2 B-tree header on disk */ -#define H5B2_HEADER_SIZE(h) ( \ +#define H5B2_HEADER_SIZE(sizeof_addr, sizeof_size) ( \ /* General metadata fields */ \ H5B2_METADATA_PREFIX_SIZE \ \ @@ -80,7 +80,17 @@ + (unsigned)2 /* Depth of tree */ \ + (unsigned)1 /* Split % of full (as integer, ie. "98" means 98%) */ \ + (unsigned)1 /* Merge % of full (as integer, ie. "98" means 98%) */ \ - + H5B2_TREE_POINTER_SIZE(h) /* Node pointer to root node in tree */ \ + + H5B2_TREE_POINTER_SIZE(sizeof_addr, sizeof_size) /* Node pointer to root node in tree */ \ + ) + +/* Size of the v2 B-tree header on disk (via file pointer) */ +#define H5B2_HEADER_SIZE_FILE(f) ( \ + H5B2_HEADER_SIZE(H5F_SIZEOF_ADDR(f), H5F_SIZEOF_SIZE(f)) \ + ) + +/* Size of the v2 B-tree header on disk (via v2 B-tree header) */ +#define H5B2_HEADER_SIZE_HDR(h) ( \ + H5B2_HEADER_SIZE((h)->sizeof_addr, (h)->sizeof_size) \ ) /* Size of the v2 B-tree internal node prefix */ |