diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2010-08-31 19:34:39 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2010-08-31 19:34:39 (GMT) |
| commit | b8d1216dcac1b773f9a7f757ee4dca67547dc082 (patch) | |
| tree | e9548723856027a225796d4c309b7fd70ad449d3 /src/H5FApkg.h | |
| parent | cf4e0ca807fedf1d1ce43acfc9660aa4a2f1d768 (diff) | |
| download | hdf5-b8d1216dcac1b773f9a7f757ee4dca67547dc082.zip hdf5-b8d1216dcac1b773f9a7f757ee4dca67547dc082.tar.gz hdf5-b8d1216dcac1b773f9a7f757ee4dca67547dc082.tar.bz2 | |
[svn-r19324] Description:
Bring recent tweaks to extensible and fixed array file formats from
revise_chunks branch back to trunk.
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/default API=1.8.x,
w/C++ & FORTRAN, w/threadsafe, in debug mode
Linux/64-amd64 2.6 (amani) 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, w/threadsafe, in production mode
Linux/PPC 2.6 (heiwa) w/C++ & FORTRAN, w/threadsafe, in debug mode
Linux/64-ia64 2.6 (cobalt) w/Intel compilers, w/C++ & FORTRAN,
in production mode
Linux/64-amd64 2.6 (abe) w/parallel, w/FORTRAN, in debug mode
Mac OS X/32 10.6.4 (amazon) in debug mode
Mac OS X/32 10.6.4 (amazon) w/C++ & FORTRAN, w/threadsafe,
in production mode
Mac OS X/32 10.6.4 (amazon) w/parallel, in debug mode
Diffstat (limited to 'src/H5FApkg.h')
| -rw-r--r-- | src/H5FApkg.h | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/src/H5FApkg.h b/src/H5FApkg.h index 674c96c..20d30c3 100644 --- a/src/H5FApkg.h +++ b/src/H5FApkg.h @@ -65,6 +65,7 @@ #define H5FA_METADATA_PREFIX_SIZE(c) ( \ H5_SIZEOF_MAGIC /* Signature */ \ + 1 /* Version */ \ + + 1 /* Array type */ \ + ((c) ? H5FA_SIZEOF_CHKSUM : 0) /* Metadata checksum */ \ ) @@ -74,7 +75,6 @@ H5FA_METADATA_PREFIX_SIZE(TRUE) \ \ /* General array information */ \ - + 1 /* Array type */ \ + 1 /* Element Size */ \ + 1 /* Log2(Max. # of elements in data block page) - i.e. # of bits needed to store max. # of elements in data block page */ \ \ @@ -91,8 +91,7 @@ H5FA_METADATA_PREFIX_SIZE(TRUE) \ \ /* Sanity-checking fields */ \ - + (d)->hdr->sizeof_addr /* File address of Fixed Array header owning the data block */ \ - + 1 /* Array type */ \ + + (d)->hdr->sizeof_addr /* File address of Fixed Array header owning the data block */ \ \ /* Fixed Array Data Block specific fields */ \ + (d)->dblk_page_init_size /* Fixed array data block 'page init' bitmasks (can be 0 if no pages) */ \ @@ -223,17 +222,8 @@ H5_DLLVAR const H5AC_class_t H5AC_FARRAY_DBLOCK[1]; /* H5FA data block page inherits cache-like properties from H5AC */ H5_DLLVAR const H5AC_class_t H5AC_FARRAY_DBLK_PAGE[1]; - -/* The Fixed Array class for dataset chunks w/o filters*/ -H5_DLLVAR const H5FA_class_t H5FA_CLS_CHUNK[1]; - -/* The Fixed Array class for dataset chunks w/ filters*/ -H5_DLLVAR const H5FA_class_t H5FA_CLS_FILT_CHUNK[1]; - /* Internal fixed array testing class */ -#ifdef H5FA_TESTING H5_DLLVAR const H5FA_class_t H5FA_CLS_TEST[1]; -#endif /* H5FA_TESTING */ /* Array of fixed array client ID -> client class mappings */ extern const H5FA_class_t *const H5FA_client_class_g[H5FA_NUM_CLS_ID]; |