diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2003-07-16 14:56:58 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2003-07-16 14:56:58 (GMT) |
| commit | e9cc951e034865fb1f2e9dc0385ed34072675bba (patch) | |
| tree | cac0264cea02f3a795d27189dfd6570b2184f119 /src/H5Fpkg.h | |
| parent | 046a2e6c0a78ece5ad464af8c506c6ba776eec1d (diff) | |
| download | hdf5-e9cc951e034865fb1f2e9dc0385ed34072675bba.zip hdf5-e9cc951e034865fb1f2e9dc0385ed34072675bba.tar.gz hdf5-e9cc951e034865fb1f2e9dc0385ed34072675bba.tar.bz2 | |
[svn-r7232] Purpose:
Bug fix
Description:
When a non-default indexed storage B-tree internal 'K' value is set by the
user, the chunked datasets created in that file (until it is closed) use the
user's 'K' value and the data can be accessed correctly, but the 'K' value is
not stored in the file.
However, once the file is closed and re-opened, the non-default 'K' value
is lost and the data in the chunked datasets will not be able to be accessed
correctly.
Solution:
Store the indexed storage B-tree internal 'K' value in the superblock.
Platforms tested:
FreeBSD 4.8 (sleipnir)
h5committest
Diffstat (limited to 'src/H5Fpkg.h')
| -rw-r--r-- | src/H5Fpkg.h | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/H5Fpkg.h b/src/H5Fpkg.h index 131cde8..c14ac18 100644 --- a/src/H5Fpkg.h +++ b/src/H5Fpkg.h @@ -56,8 +56,9 @@ # undef H5F_DEBUG #endif -/* Maximum size of boot-block buffer */ -#define H5F_BOOTBLOCK_SIZE 1024 +/* Maximum size of super-block buffer */ +#define H5F_SUPERBLOCK_SIZE 256 +#define H5F_DRVINFOBLOCK_SIZE 1024 /* Define the HDF5 file signature */ #define H5F_SIGNATURE "\211HDF\r\n\032\n" @@ -118,11 +119,11 @@ typedef struct H5F_file_t { unsigned sym_leaf_k; /* Size of leaves in symbol tables */ unsigned btree_k[H5B_NUM_BTREE_ID]; /* B-tree key values for each type */ - haddr_t boot_addr; /* Absolute address of boot block */ + 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 driver_addr; /* File driver information block address*/ - unsigned boot_chksum; /* Boot block checksum */ + unsigned super_chksum; /* Superblock checksum */ unsigned drvr_chksum; /* Driver info block checksum */ struct H5AC_t *cache; /* The object cache */ hid_t fcpl_id; /* File creation property list ID */ @@ -217,7 +218,7 @@ H5_DLL herr_t H5F_istore_stats (H5F_t *f, hbool_t headers); H5_DLL herr_t H5F_istore_debug(H5F_t *f, hid_t dxpl_id, haddr_t addr, FILE * stream, int indent, int fwidth, int ndims); -/* Functions that operate on contiguous storage wrt boot block */ +/* Functions that operate on contiguous storage wrt superblock */ H5_DLL ssize_t H5F_contig_readvv(H5F_t *f, hsize_t _max_data, haddr_t _addr, size_t dset_max_nseq, size_t *dset_curr_seq, size_t dset_len_arr[], hsize_t dset_offset_arr[], size_t mem_max_nseq, size_t *mem_curr_seq, size_t mem_len_arr[], hsize_t mem_offset_arr[], |