diff options
Diffstat (limited to 'src/H5Oprivate.h')
| -rw-r--r-- | src/H5Oprivate.h | 44 |
1 files changed, 27 insertions, 17 deletions
diff --git a/src/H5Oprivate.h b/src/H5Oprivate.h index 856d1fd..251e770 100644 --- a/src/H5Oprivate.h +++ b/src/H5Oprivate.h @@ -363,8 +363,34 @@ typedef struct H5O_storage_contig_t { hsize_t size; /* Size of data in bytes */ } H5O_storage_contig_t; +typedef struct H5O_storage_chunk_btree_t { + H5RC_t *shared; /* Ref-counted shared info for B-tree nodes */ +} H5O_storage_chunk_btree_t; + +/* Forward declaration of structs used below */ +struct H5FA_t; /* Defined in H5FAprivate.h */ + +typedef struct H5O_storage_chunk_farray_t { + struct H5FA_t *fa; /* Pointer to fixed index array struct */ +} H5O_storage_chunk_farray_t; + +/* Forward declaration of structs used below */ +struct H5EA_t; /* Defined in H5EAprivate.h */ + +typedef struct H5O_storage_chunk_earray_t { + haddr_t dset_ohdr_addr; /* File address dataset's object header */ + struct H5EA_t *ea; /* Pointer to extensible index array struct */ +} H5O_storage_chunk_earray_t; + typedef struct H5O_storage_chunk_t { + H5D_chunk_index_t idx_type; /* Type of chunk index */ haddr_t idx_addr; /* File address of chunk index */ + const struct H5D_chunk_ops_t *ops; /* Pointer to chunked storage operations */ + union { + H5O_storage_chunk_btree_t btree; /* Information for v1 B-tree index */ + H5O_storage_chunk_farray_t farray; /* Information for fixed array index */ + H5O_storage_chunk_earray_t earray; /* Information for extensible array index */ + } u; } H5O_storage_chunk_t; typedef struct H5O_storage_compact_t { @@ -382,13 +408,6 @@ typedef struct H5O_storage_t { } u; } H5O_storage_t; -typedef struct H5O_layout_chunk_btree_t { - H5RC_t *shared; /* Ref-counted shared info for B-tree nodes */ -} H5O_layout_chunk_btree_t; - -/* Forward declaration of structs used below */ -struct H5FA_t; /* Defined in H5FAprivate.h */ - typedef struct H5O_layout_chunk_farray_t { /* Creation parameters for fixed array data structure */ struct { @@ -396,13 +415,8 @@ typedef struct H5O_layout_chunk_farray_t { i.e. # of bits needed to store max. # of elements in a data block page */ } cparam; - - struct H5FA_t *fa; /* Pointer to fixed index array struct */ } H5O_layout_chunk_farray_t; -/* Forward declaration of structs used below */ -struct H5EA_t; /* Defined in H5EAprivate.h */ - typedef struct H5O_layout_chunk_earray_t { /* Creation parameters for extensible array data structure */ struct { @@ -413,10 +427,8 @@ typedef struct H5O_layout_chunk_earray_t { uint8_t max_dblk_page_nelmts_bits; /* Log2(Max. # of elements in data block page) - i.e. # of bits needed to store max. # of elements in data block page */ } cparam; - haddr_t dset_ohdr_addr; /* File address dataset's object header */ unsigned unlim_dim; /* Rank of unlimited dimension for dataset */ hsize_t swizzled_down_chunks[H5O_LAYOUT_NDIMS]; /* swizzled "down" size of number of chunks in each dimension */ - struct H5EA_t *ea; /* Pointer to extensible array struct */ } H5O_layout_chunk_earray_t; typedef struct H5O_layout_chunk_t { @@ -428,9 +440,7 @@ typedef struct H5O_layout_chunk_t { hsize_t nchunks; /* Number of chunks in dataset */ hsize_t chunks[H5O_LAYOUT_NDIMS]; /* # of chunks in dataset dimensions */ hsize_t down_chunks[H5O_LAYOUT_NDIMS]; /* "down" size of number of chunks in each dimension */ - const struct H5D_chunk_ops_t *ops; /* Pointer to chunked layout operations */ union { - H5O_layout_chunk_btree_t btree; /* Information for v1 B-tree index */ H5O_layout_chunk_farray_t farray; /* Information for fixed array index */ H5O_layout_chunk_earray_t earray; /* Information for extensible array index */ } u; @@ -443,7 +453,7 @@ typedef struct H5O_layout_t { union { H5O_layout_chunk_t chunk; /* Information for chunked layout */ } u; - H5O_storage_t store; /* Information for storing dataset elements */ + H5O_storage_t storage; /* Information for storing dataset elements */ } H5O_layout_t; /* Enable reading/writing "bogus" messages */ |