diff options
| author | James Laird <jlaird@hdfgroup.org> | 2007-02-06 18:21:39 (GMT) |
|---|---|---|
| committer | James Laird <jlaird@hdfgroup.org> | 2007-02-06 18:21:39 (GMT) |
| commit | 9e390cc1d94864b678ac9013793b157ce4d200f7 (patch) | |
| tree | 7671ea1af51c76505714f4ac7d3e37bb2b9b46fc /src/H5Fpkg.h | |
| parent | 571523db1ffab60b505a0f66d3f7c25f4d1752d7 (diff) | |
| download | hdf5-9e390cc1d94864b678ac9013793b157ce4d200f7.zip hdf5-9e390cc1d94864b678ac9013793b157ce4d200f7.tar.gz hdf5-9e390cc1d94864b678ac9013793b157ce4d200f7.tar.bz2 | |
[svn-r13245] Added "superblock extension" object header to hold shared object header
information, rather than storing it directly in the superblock.
This should make future updates to the superblock much less painful.
Tested on Windows, kagiso, and smirom.
Diffstat (limited to 'src/H5Fpkg.h')
| -rw-r--r-- | src/H5Fpkg.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/H5Fpkg.h b/src/H5Fpkg.h index 1d6cc3f..d1457df 100644 --- a/src/H5Fpkg.h +++ b/src/H5Fpkg.h @@ -38,6 +38,7 @@ #include "H5FLprivate.h" /* Free Lists */ #include "H5FOprivate.h" /* File objects */ #include "H5Gprivate.h" /* Groups */ +#include "H5Oprivate.h" /* Object header messages */ #include "H5RCprivate.h" /* Reference counted object functions */ /* @@ -91,8 +92,8 @@ ( 2 /* indexed B-tree internal k */ \ + H5F_SIZEOF_ADDR(f) /* base address */ \ + H5F_SIZEOF_ADDR(f) /* free space address */ \ - + H5F_SIZEOF_ADDR(f) /* shared message table address */ \ - + 2 /* shared message version and number of indexes */ \ +/* + H5F_SIZEOF_ADDR(f) /* shared message table address */ \ +/* JAMES + 2 /* shared message version and number of indexes */ \ + H5F_SIZEOF_ADDR(f) /* EOF address */ \ + H5F_SIZEOF_ADDR(f) /* driver block address */ \ + H5G_SIZEOF_ENTRY(f) /* root group ptr */ \ @@ -140,7 +141,8 @@ typedef struct H5F_file_t { size_t sizeof_size; /* Size of offsets in file */ haddr_t super_addr; /* Absolute address of super block */ haddr_t base_addr; /* Absolute base address for rel.addrs. */ - haddr_t freespace_addr; /* Relative address of free-space info */ + haddr_t extension_addr; /* Relative address of superblock extension */ + H5O_shmesg_table_t sohm_table; /* Shared message table information */ haddr_t sohm_addr; /* Relative address of shared object header message table */ unsigned sohm_vers; /* Version of shared message table on disk */ unsigned sohm_nindexes; /* Number of shared messages indexes in the table */ |