[svn-r15561] Description:

	Update extensible array code with function to open an existing earray,
add more tests and avoid running the test when core/split/family/multi VFDs
are used.

	Clean up fractal heap test code a bit and expand some of the tests a
little bit also.

Tested on:
        Mac OS X/32 10.5.4 (amazon) in debug mode
        Mac OS X/32 10.5.4 (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 (kagiso) 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

1 files changed, 6 insertions, 4 deletions

diff --git a/src/H5EAcache.c b/src/H5EAcache.c
index 3fc408d..a6e8178 100644
--- a/src/H5EAcache.c
+++ b/src/H5EAcache.c
@@ -169,8 +169,9 @@ H5EA__cache_hdr_load(H5F_t *f, hid_t dxpl_id, haddr_t addr, const void UNUSED *u
     if(*p++ != H5EA_HDR_VERSION)
 	H5E_THROW(H5E_VERSION, "wrong extensible array header version")
 
-    /* General array information */
-    hdr->elmt_size = *p++;              /* Element size (in bytes) */
+    /* General array creation/configuration information */
+    hdr->raw_elmt_size = *p++;          /* Element size in file (in bytes) */
+    hdr->max_nelmts_bits = *p++;        /* Log2(Max. # of elements in array) - i.e. # of bits needed to store max. # of elements */
     hdr->idx_blk_elmts = *p++;          /* # of elements to store in index block */
     hdr->data_blk_min_elmts = *p++;     /* Min. # of elements per data block */
     hdr->sup_blk_min_data_ptrs = *p++;  /* Min. # of data block pointers for a super block */
@@ -263,8 +264,9 @@ H5EA__cache_hdr_flush(H5F_t *f, hid_t dxpl_id, hbool_t destroy, haddr_t addr, H5
         /* Version # */
         *p++ = H5EA_HDR_VERSION;
 
-        /* General array information */
-        *p++ = hdr->elmt_size;              /* Element size (in bytes) */
+        /* General array creation/configuration information */
+        *p++ = hdr->raw_elmt_size;          /* Element size in file (in bytes) */
+        *p++ = hdr->max_nelmts_bits;        /* Log2(Max. # of elements in array) - i.e. # of bits needed to store max. # of elements */
         *p++ = hdr->idx_blk_elmts;          /* # of elements to store in index block */
         *p++ = hdr->data_blk_min_elmts;     /* Min. # of elements per data block */
         *p++ = hdr->sup_blk_min_data_ptrs;  /* Min. # of data block pointers for a super block */