diff options
author | Quincey Koziol <koziol@hdfgroup.org> | 2009-01-27 14:47:26 (GMT) |
---|---|---|
committer | Quincey Koziol <koziol@hdfgroup.org> | 2009-01-27 14:47:26 (GMT) |
commit | 661734d541d076c26901190be44e687ad87ef576 (patch) | |
tree | d4aa2ac60e7c3af1ca29b5c20eb9c4202fc31030 /src/H5Oprivate.h | |
parent | 92f5db9daf63a4533db475745782f8898b53c489 (diff) | |
download | hdf5-661734d541d076c26901190be44e687ad87ef576.zip hdf5-661734d541d076c26901190be44e687ad87ef576.tar.gz hdf5-661734d541d076c26901190be44e687ad87ef576.tar.bz2 |
[svn-r16356] Description:
Bring r16354 back from trunk:
Refactor internal layout information, making it easier to add another
type of chunk index.
Tested on:
FreeBSD/32 (duty)
(other configurations tested with original change)
Diffstat (limited to 'src/H5Oprivate.h')
-rw-r--r-- | src/H5Oprivate.h | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/src/H5Oprivate.h b/src/H5Oprivate.h index 39dfb5c..40bb096 100644 --- a/src/H5Oprivate.h +++ b/src/H5Oprivate.h @@ -349,13 +349,20 @@ typedef struct H5O_layout_contig_t { hsize_t size; /* Size of data in bytes */ } H5O_layout_contig_t; -typedef struct H5O_layout_chunk_t { +typedef struct H5O_layout_chunk_btree_t { haddr_t addr; /* File address of B-tree */ + H5RC_t *shared; /* Ref-counted shared info for B-tree nodes */ +} H5O_layout_chunk_btree_t; + +typedef struct H5O_layout_chunk_t { + H5D_chunk_index_t idx_type; /* Type of chunk index */ unsigned ndims; /* Num dimensions in chunk */ uint32_t dim[H5O_LAYOUT_NDIMS]; /* Size of chunk in elements */ uint32_t size; /* Size of chunk in bytes */ - H5RC_t *btree_shared; /* Ref-counted info for B-tree nodes */ 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 */ + } u; } H5O_layout_chunk_t; typedef struct H5O_layout_compact_t { |