diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2008-11-18 00:05:45 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2008-11-18 00:05:45 (GMT) |
| commit | a28e8407cf5a526a20ad682382f0faed58aace76 (patch) | |
| tree | be0dc3b77a701265e64d7914bd480f7f797cde86 /src/H5EApkg.h | |
| parent | 4a219c18b65436d9abce2b6554e0dc153745b3b5 (diff) | |
| download | hdf5-a28e8407cf5a526a20ad682382f0faed58aace76.zip hdf5-a28e8407cf5a526a20ad682382f0faed58aace76.tar.gz hdf5-a28e8407cf5a526a20ad682382f0faed58aace76.tar.bz2 | |
[svn-r16093] Description:
Initial changes to allow data blocks to be paged in, instead of loaded
completely.
Also, refactored test code to be smaller and more maintainable.
Tested on:
Mac OS X/32 10.5.5 (amazon) in debug mode
Mac OS X/32 10.5.5 (amazon) w/C++ & FORTRAN, w/threadsafe,
in production mode
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 production mode
Linux/64-amd64 2.6 (abe) w/parallel, w/FORTRAN, in production mode
Diffstat (limited to 'src/H5EApkg.h')
| -rw-r--r-- | src/H5EApkg.h | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/src/H5EApkg.h b/src/H5EApkg.h index 9fded70..a1f578f 100644 --- a/src/H5EApkg.h +++ b/src/H5EApkg.h @@ -354,7 +354,6 @@ func_init_failed: \ #define H5EA_METADATA_PREFIX_SIZE(c) ( \ H5_SIZEOF_MAGIC /* Signature */ \ + 1 /* Version */ \ - + 1 /* Array type */ \ + ((c) ? H5EA_SIZEOF_CHKSUM : 0) /* Metadata checksum */ \ ) @@ -364,11 +363,13 @@ func_init_failed: \ H5EA_METADATA_PREFIX_SIZE(TRUE) \ \ /* General heap information */ \ + + 1 /* Array type */ \ + 1 /* Element Size */ \ + 1 /* Max. # of elements bits */ \ + 1 /* # of elements to store in index block */ \ + 1 /* Min. # elements per data block */ \ + 1 /* Min. # of data block pointers for a super block */ \ + + 1 /* Log2(Max. # of elements in data block page) - i.e. # of bits needed to store max. # of elements in data block page */ \ \ /* Extensible Array Header statistics fields */ \ + (h)->sizeof_size /* Max. index set */ \ @@ -385,8 +386,11 @@ func_init_failed: \ /* General metadata fields */ \ H5EA_METADATA_PREFIX_SIZE(TRUE) \ \ - /* Extensible Array Index Block specific fields */ \ + /* Sanity-checking fields */ \ + + 1 /* Array type */ \ + (i)->hdr->sizeof_addr /* File address of array owning the block */ \ + \ + /* Extensible Array Index Block specific fields */ \ + ((size_t)(i)->hdr->cparam.idx_blk_elmts * (size_t)(i)->hdr->cparam.raw_elmt_size) /* Elements in index block */ \ + ((i)->ndblk_addrs * (i)->hdr->sizeof_addr) /* Data block addresses in index block */ \ + ((i)->nsblk_addrs * (i)->hdr->sizeof_addr) /* Super block addresses in index block */ \ @@ -397,9 +401,12 @@ func_init_failed: \ /* General metadata fields */ \ H5EA_METADATA_PREFIX_SIZE(TRUE) \ \ - /* Extensible Array Super Block specific fields */ \ + /* Sanity-checking fields */ \ + + 1 /* Array type */ \ + (s)->hdr->sizeof_addr /* File address of array owning the block */ \ + (s)->hdr->arr_off_size /* Offset of the block in the array */ \ + \ + /* Extensible Array Super Block specific fields */ \ + ((s)->ndblks * (s)->hdr->sizeof_addr) /* Data block addresses in super block */ \ ) @@ -408,9 +415,12 @@ func_init_failed: \ /* General metadata fields */ \ H5EA_METADATA_PREFIX_SIZE(TRUE) \ \ - /* Extensible Array Data Block specific fields */ \ + /* Sanity-checking fields */ \ + + 1 /* Array type */ \ + (d)->hdr->sizeof_addr /* File address of array owning the block */ \ + (d)->hdr->arr_off_size /* Offset of the block in the array */ \ + \ + /* Extensible Array Data Block specific fields */ \ + ((d)->nelmts * (size_t)(d)->hdr->cparam.raw_elmt_size) /* Elements in index block */ \ ) |