diff options
| author | James Laird <jlaird@hdfgroup.org> | 2007-01-09 22:08:54 (GMT) |
|---|---|---|
| committer | James Laird <jlaird@hdfgroup.org> | 2007-01-09 22:08:54 (GMT) |
| commit | a2a3e47d06ce348ce27718b4a3e0e4b156fba6f5 (patch) | |
| tree | 423182103eab823f0af546780628fd034cd903b9 /src/H5SMpkg.h | |
| parent | 26d2abe9e87a051cd897f77a4a472a432675db8c (diff) | |
| download | hdf5-a2a3e47d06ce348ce27718b4a3e0e4b156fba6f5.zip hdf5-a2a3e47d06ce348ce27718b4a3e0e4b156fba6f5.tar.gz hdf5-a2a3e47d06ce348ce27718b4a3e0e4b156fba6f5.tar.bz2 | |
[svn-r13129] More refactoring. Moved index versions to the index header, so that an
index can be read all at once. This changes the file format!
Tested on Windows, kagiso, and smirom.
Diffstat (limited to 'src/H5SMpkg.h')
| -rwxr-xr-x | src/H5SMpkg.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/H5SMpkg.h b/src/H5SMpkg.h index 6416a1b..b771893 100755 --- a/src/H5SMpkg.h +++ b/src/H5SMpkg.h @@ -41,13 +41,14 @@ #define H5SM_SOHM_ENTRY_SIZE(f) (4 /* Hash value */ \ + 4 /* reference count*/ \ - + 8) /* JAMES: size of heap ID on disk */ + + sizeof(H5SM_fheap_id_t)) /* size of heap ID on disk */ #define H5SM_TABLE_SIZE(f) ( H5SM_TABLE_SIZEOF_MAGIC \ + 1 /* Table version */ \ + H5SM_SIZEOF_CHECKSUM) /* Checksum */ #define H5SM_INDEX_HEADER_SIZE(f) (1 /* Whether index is a list or B-tree */ \ + + 1 /* Version of index format */ \ + 2 /* Type of messages stored in the index */ \ + 4 /* Minimum size of messages to share */ \ + (3 * 2) /* B-tree cutoff, list cutoff, # of shared messages */ \ @@ -55,7 +56,6 @@ + H5F_SIZEOF_ADDR(f)) /* Address of heap */ #define H5SM_LIST_SIZE(f, num_mesg) H5SM_LIST_SIZEOF_MAGIC \ - + 1 /* List version */ \ + (H5SM_SOHM_ENTRY_SIZE(f) * num_mesg) \ + H5SM_SIZEOF_CHECKSUM /* Checksum */ |