summaryrefslogtreecommitdiffstats
path: root/src/H5Oprivate.h
diff options
context:
space:
mode:
authorQuincey Koziol <koziol@hdfgroup.org>2009-07-30 17:51:49 (GMT)
committerQuincey Koziol <koziol@hdfgroup.org>2009-07-30 17:51:49 (GMT)
commite1ceea54ff06ffef0029b20007cd7685e000fdec (patch)
tree3aacc0bfbc6762d7c28f53df2183b797e9d32854 /src/H5Oprivate.h
parentf0ce4df67f82ee7308ad812a1772079fcb141182 (diff)
downloadhdf5-e1ceea54ff06ffef0029b20007cd7685e000fdec.zip
hdf5-e1ceea54ff06ffef0029b20007cd7685e000fdec.tar.gz
hdf5-e1ceea54ff06ffef0029b20007cd7685e000fdec.tar.bz2
[svn-r17275] Description:
Refactor dataet storage information further, moving the chunk operations into the storage struct and also fine-tune the chunk index structure for index callbacks. Tested on: FreeBSD/32 6.3 (duty) in debug mode FreeBSD/64 6.3 (liberty) w/C++ & FORTRAN, in debug mode Linux/32 2.6 (jam) w/PGI compilers, w/C++ & FORTRAN, w/threadsafe, in debug mode Linux/64-amd64 2.6 (smirom) w/Intel compilers w/default API=1.6.x, w/C++ & FORTRAN, in production mode Solaris/32 2.10 (linew) w/deprecated symbols disabled, w/C++ & FORTRAN, w/szip filter, in production mode Linux/64-ia64 2.6 (cobalt) w/Intel compilers, w/C++ & FORTRAN, in production mode Linux/64-ia64 2.4 (tg-login3) w/parallel, w/FORTRAN, in debug mode Linux/64-amd64 2.6 (abe) w/parallel, w/FORTRAN, in production mode Mac OS X/32 10.5.7 (amazon) in debug mode Mac OS X/32 10.5.7 (amazon) w/C++ & FORTRAN, w/threadsafe, in production mode
Diffstat (limited to 'src/H5Oprivate.h')
-rw-r--r--src/H5Oprivate.h20
1 files changed, 10 insertions, 10 deletions
diff --git a/src/H5Oprivate.h b/src/H5Oprivate.h
index d6b3cd0..6aa9c5d 100644
--- a/src/H5Oprivate.h
+++ b/src/H5Oprivate.h
@@ -358,8 +358,17 @@ 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;
+
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 */
+ } u;
} H5O_storage_chunk_t;
typedef struct H5O_storage_compact_t {
@@ -377,22 +386,13 @@ 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;
-
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 */
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 */
- } u;
} H5O_layout_chunk_t;
typedef struct H5O_layout_t {
@@ -402,7 +402,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 */