[svn-r17521] Description:

	Bring r17514:17518 from trunk to revise_chunks branch

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

13 files changed, 1803 insertions, 112 deletions

diff --git a/MANIFEST b/MANIFEST
index 17fe9c1..e1a211c 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -828,6 +828,7 @@
 ./test/family_v16_00001.h5
 ./test/family_v16_00002.h5
 ./test/family_v16_00003.h5
+./test/farray.c
 ./test/fheap.c
 ./test/freespace.c
 ./test/fill_old.h5
@@ -1522,16 +1523,16 @@
 ./tools/h5diff/testfiles/h5diff_207.txt
 
 
+./tools/h5diff/testfiles/h5diff_attr1.h5
+./tools/h5diff/testfiles/h5diff_attr2.h5
 ./tools/h5diff/testfiles/h5diff_basic1.h5
 ./tools/h5diff/testfiles/h5diff_basic2.h5
-./tools/h5diff/testfiles/h5diff_dtypes.h5
 ./tools/h5diff/testfiles/h5diff_dset1.h5
 ./tools/h5diff/testfiles/h5diff_dset2.h5
+./tools/h5diff/testfiles/h5diff_dtypes.h5
 ./tools/h5diff/testfiles/h5diff_empty.h5
 ./tools/h5diff/testfiles/h5diff_hyper1.h5
-./tools/h5diff/testfiles/h5diff_attr1.h5
 ./tools/h5diff/testfiles/h5diff_hyper2.h5
-./tools/h5diff/testfiles/h5diff_attr2.h5
 ./tools/h5diff/testfiles/h5diff_types.h5
 
 
diff --git a/configure b/configure
index 5daa241..f45b113 100755
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.in Id: configure.in 17505 2009-09-22 17:49:17Z koziol .
+# From configure.in Id: configure.in 17515 2009-09-24 11:25:37Z koziol .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.64 for HDF5 1.9.46-FA_a4.
 #
diff --git a/src/H5FA.c b/src/H5FA.c
index a8cd36b..7d6a136 100644
--- a/src/H5FA.c
+++ b/src/H5FA.c
@@ -361,16 +361,16 @@ HDfprintf(stderr, "%s: fixed array data block address not defined!\n", FUNC, idx
     else { /* paging */
         size_t  page_idx;      		/* Index of page within data block */
         size_t  dblk_page_nelmts;      	/* # of elements in a data block page */
-        hsize_t elmt_idx;		/* Element index within the page */
+        size_t  elmt_idx;		/* Element index within the page */
         haddr_t dblk_page_addr;		/* Address of data block page */
 
         /* Compute the page & element index */
-        page_idx = (size_t)idx / dblock->dblk_page_nelmts;
-        elmt_idx = (size_t)idx % dblock->dblk_page_nelmts;
+        page_idx = (size_t)(idx / dblock->dblk_page_nelmts);
+        elmt_idx = (size_t)(idx % dblock->dblk_page_nelmts);
 
         /* Get the address of the data block page */
 	dblk_page_addr = dblock->addr + H5FA_DBLOCK_PREFIX_SIZE(dblock) +
-                        (page_idx * dblock->dblk_page_size);
+                        ((hsize_t)page_idx * dblock->dblk_page_size);
 
         /* Check for using last page, to set the number of elements on the page */
 	if((page_idx + 1) == dblock->npages)
@@ -378,7 +378,7 @@ HDfprintf(stderr, "%s: fixed array data block address not defined!\n", FUNC, idx
 	else
 	    dblk_page_nelmts = dblock->dblk_page_nelmts;
 
-        /* Check if the page has been create yet */
+        /* Check if the page has been created yet */
         if(!H5V_bit_get(dblock->dblk_page_init, page_idx)) {
 	    /* Create the data block page */
 	    if(H5FA__dblk_page_create(hdr, dxpl_id, dblk_page_addr, dblk_page_nelmts) < 0)
@@ -468,7 +468,7 @@ HDfprintf(stderr, "%s: Index %Hu\n", FUNC, idx);
             size_t  page_idx;           /* Index of page within data block */
 
             /* Compute the page index */
-            page_idx = (size_t)idx / dblock->dblk_page_nelmts;
+            page_idx = (size_t)(idx / dblock->dblk_page_nelmts);
 
             /* Check if the page is defined yet */
             if(!H5V_bit_get(dblock->dblk_page_init, page_idx)) {
@@ -480,15 +480,15 @@ HDfprintf(stderr, "%s: Index %Hu\n", FUNC, idx);
                 H5_LEAVE(SUCCEED)
             } /* end if */
             else { /* get the page */
-                hsize_t elmt_idx;		/* Element index within the page */
-                haddr_t dblk_page_addr;     /* Address of data block page */
-                size_t  dblk_page_nelmts;   /* # of elements in a data block page */
+                size_t  dblk_page_nelmts;	/* # of elements in a data block page */
+                size_t  elmt_idx;		/* Element index within the page */
+                haddr_t dblk_page_addr;		/* Address of data block page */
 
                 /* Compute the element index */
-                elmt_idx = (size_t)idx % dblock->dblk_page_nelmts;
+                elmt_idx = (size_t)(idx % dblock->dblk_page_nelmts);
 
                 /* Compute the address of the data block */
-                dblk_page_addr = dblock->addr + H5FA_DBLOCK_PREFIX_SIZE(dblock) + (page_idx * dblock->dblk_page_size);
+                dblk_page_addr = dblock->addr + H5FA_DBLOCK_PREFIX_SIZE(dblock) + ((hsize_t)page_idx * dblock->dblk_page_size);
 
                 /* Check for using last page, to set the number of elements on the page */
                 if((page_idx + 1) == dblock->npages)
diff --git a/src/H5FAcache.c b/src/H5FAcache.c
index 7a7e867..59a81e2 100644
--- a/src/H5FAcache.c
+++ b/src/H5FAcache.c
@@ -230,6 +230,25 @@ H5FA__cache_hdr_load(H5F_t *f, hid_t dxpl_id, haddr_t addr, const void *_cls,
     hdr->stats.nelmts = hdr->cparam.nelmts;
     hdr->stats.hdr_size = hdr->size = size;  	/* Size of header in file */
 
+    /* Check for data block */
+    if(H5F_addr_defined(hdr->dblk_addr)) {
+	H5FA_dblock_t  dblock;  	/* Fake data block for computing size */
+	size_t	dblk_page_nelmts;	/* # of elements per data block page */
+
+	/* Set up fake data block for computing size on disk */
+	dblock.hdr = hdr;
+	dblock.dblk_page_init_size = 0;
+	dblock.npages = 0;
+	dblk_page_nelmts = (size_t)1 << hdr->cparam.max_dblk_page_nelmts_bits;
+	if(hdr->cparam.nelmts > dblk_page_nelmts) {
+	    dblock.npages = (size_t)(((hdr->cparam.nelmts + dblk_page_nelmts) - 1) / dblk_page_nelmts);
+	    dblock.dblk_page_init_size = (dblock.npages + 7) / 8;
+	} /* end if */
+
+        /* Compute Fixed Array data block size for hdr statistics */
+	hdr->stats.dblk_size = (size_t)H5FA_DBLOCK_SIZE(&dblock);
+    } /* end if */
+
     /* Sanity check */
     /* (allow for checksum not decoded yet) */
     HDassert((size_t)(p - buf) == (size - H5FA_SIZEOF_CHKSUM));
diff --git a/src/H5FAdbg.c b/src/H5FAdbg.c
index b882c04..c1aa3d4 100644
--- a/src/H5FAdbg.c
+++ b/src/H5FAdbg.c
@@ -53,13 +53,6 @@
 /* Local Typedefs */
 /******************/
 
-/* Fixed array create/open user data */
-typedef struct ctx_ud_t {
-    const H5F_t *f;             /* Pointer to file info */
-    const H5O_layout_t *layout; /* Pointer to layout info */
-} ctx_ud_t;
-
-
 /********************/
 /* Package Typedefs */
 /********************/
@@ -105,9 +98,7 @@ H5FA__hdr_debug(H5F_t *f, hid_t dxpl_id, haddr_t addr, FILE *stream, int indent,
 
     /* Local variables */
     H5FA_hdr_t *hdr = NULL; 	/* Shared fixed array header */
-    H5O_loc_t obj_loc;		/* Pointer to an object's location */
-    H5O_layout_t layout;	/* Layout message */
-    ctx_ud_t udata;		/* User data */
+    void *dbg_ctx = NULL;	/* Fixed array debugging context */
 
     /* Check arguments */
     HDassert(f);
@@ -118,28 +109,15 @@ H5FA__hdr_debug(H5F_t *f, hid_t dxpl_id, haddr_t addr, FILE *stream, int indent,
     HDassert(fwidth >= 0);
     HDassert(cls);
 
-    H5O_loc_reset(&obj_loc);
-    obj_loc.file = f;
-    obj_loc.addr = obj_addr;
-
-    /* Open the object header where the layout message resides */
-    if(H5O_open(&obj_loc) < 0)
-	H5E_THROW(H5E_CANTPROTECT, "unable to open object header")
-
-    /* Read the layout message */
-    if(NULL == H5O_msg_read(&obj_loc, H5O_LAYOUT_ID, &layout, dxpl_id))
-	H5E_THROW(H5E_CANTPROTECT, "unable to read layout message")
-
-    /* close the object header */
-    if(H5O_close(&obj_loc) < 0)
-	H5E_THROW(H5E_CANTPROTECT, "unable to close object header")
-
-    /* Create user data */
-    udata.f = f;
-    udata.layout = &layout;
+    /* Check for debugging context callback available */
+    if(cls->crt_dbg_ctx) {
+        /* Create debugging context */
+        if(NULL == (dbg_ctx = cls->crt_dbg_ctx(f, dxpl_id, obj_addr)))
+	    H5E_THROW(H5E_CANTGET, "unable to create fixed array debugging context")
+    } /* end if */
 
     /* Load the fixed array header */
-    if(NULL == (hdr = (H5FA_hdr_t *)H5AC_protect(f, dxpl_id, H5AC_FARRAY_HDR, addr, cls, &udata, H5AC_READ)))
+    if(NULL == (hdr = (H5FA_hdr_t *)H5AC_protect(f, dxpl_id, H5AC_FARRAY_HDR, addr, cls, dbg_ctx, H5AC_READ)))
 	H5E_THROW(H5E_CANTPROTECT, "unable to load fixed array header")
 
     /* Print opening message */
@@ -170,6 +148,8 @@ H5FA__hdr_debug(H5F_t *f, hid_t dxpl_id, haddr_t addr, FILE *stream, int indent,
 	      "Fixed Array Data Block Address:", hdr->dblk_addr);
 
 CATCH
+    if(dbg_ctx && cls->dst_dbg_ctx(dbg_ctx) < 0)
+	H5E_THROW(H5E_CANTRELEASE, "unable to release fixed array debugging context")
     if(hdr && H5AC_unprotect(f, dxpl_id, H5AC_FARRAY_HDR, addr, hdr, H5AC__NO_FLAGS_SET) < 0)
 	H5E_THROW(H5E_CANTUNPROTECT, "unable to release fixed array header")
 
@@ -197,10 +177,8 @@ H5FA__dblock_debug(H5F_t *f, hid_t dxpl_id, haddr_t addr, FILE *stream, int inde
     /* Local variables */
     H5FA_hdr_t *hdr = NULL;             /* Shared fixed array header */
     H5FA_dblock_t *dblock = NULL;       /* Fixed array data block */
+    void *dbg_ctx = NULL;	        /* Fixed array context */
     size_t u;                           /* Local index variable */
-    H5O_loc_t obj_loc;		/* Pointer to an object's location */
-    H5O_layout_t layout;	/* Layout message */
-    ctx_ud_t udata;		/* User data */
 
     /* Check arguments */
     HDassert(f);
@@ -212,28 +190,15 @@ H5FA__dblock_debug(H5F_t *f, hid_t dxpl_id, haddr_t addr, FILE *stream, int inde
     HDassert(H5F_addr_defined(hdr_addr));
     HDassert(H5F_addr_defined(obj_addr));
 
-    H5O_loc_reset(&obj_loc);
-    obj_loc.file = f;
-    obj_loc.addr = obj_addr;
-
-    /* Open the object header where the layout message resides */
-    if(H5O_open(&obj_loc) < 0)
-	H5E_THROW(H5E_CANTPROTECT, "unable to open object header")
-
-    /* Read the layout message */
-    if(NULL == H5O_msg_read(&obj_loc, H5O_LAYOUT_ID, &layout, dxpl_id))
-        H5E_THROW(H5E_CANTPROTECT, "unable to read layout message")
-
-    /* close the object header */
-    if(H5O_close(&obj_loc) < 0)
-	H5E_THROW(H5E_CANTPROTECT, "unable to close object header")
-
-    /* Create user data */
-    udata.f = f;
-    udata.layout = &layout;
+    /* Check for debugging context callback available */
+    if(cls->crt_dbg_ctx) {
+        /* Create debugging context */
+        if(NULL == (dbg_ctx = cls->crt_dbg_ctx(f, dxpl_id, obj_addr)))
+	    H5E_THROW(H5E_CANTGET, "unable to create fixed array debugging context")
+    } /* end if */
 
     /* Load the fixed array header */
-    if(NULL == (hdr = (H5FA_hdr_t *)H5AC_protect(f, dxpl_id, H5AC_FARRAY_HDR, hdr_addr, cls, &udata, H5AC_READ)))
+    if(NULL == (hdr = (H5FA_hdr_t *)H5AC_protect(f, dxpl_id, H5AC_FARRAY_HDR, hdr_addr, cls, dbg_ctx, H5AC_READ)))
 	H5E_THROW(H5E_CANTPROTECT, "unable to load fixed array header")
 
     /* Protect data block */
@@ -243,7 +208,6 @@ H5FA__dblock_debug(H5F_t *f, hid_t dxpl_id, haddr_t addr, FILE *stream, int inde
     /* Print opening message */
     HDfprintf(stream, "%*sFixed Array data Block...\n", indent, "");
 
-
     /* Print the values */
     HDfprintf(stream, "%*s%-*s %s\n", indent, "", fwidth,
 	      "Array class ID:", hdr->cparam.cls->name);
@@ -312,6 +276,8 @@ H5FA__dblock_debug(H5F_t *f, hid_t dxpl_id, haddr_t addr, FILE *stream, int inde
     } /* end else */
 
 CATCH
+    if(dbg_ctx && cls->dst_dbg_ctx(dbg_ctx) < 0)
+	H5E_THROW(H5E_CANTRELEASE, "unable to release fixed array debugging context")
     if(dblock && H5FA__dblock_unprotect(dblock, dxpl_id, H5AC__NO_FLAGS_SET) < 0)
         H5E_THROW(H5E_CANTUNPROTECT, "unable to release fixed array data block")
     if(hdr && H5AC_unprotect(f, dxpl_id, H5AC_FARRAY_HDR, hdr_addr, hdr, H5AC__NO_FLAGS_SET) < 0)
diff --git a/src/H5FAhdr.c b/src/H5FAhdr.c
index 150742d..e6231d4 100644
--- a/src/H5FAhdr.c
+++ b/src/H5FAhdr.c
@@ -167,6 +167,10 @@ HDfprintf(stderr, "%s: Called\n", FUNC);
     /* Check for valid parameters */
     if(cparam->raw_elmt_size == 0)
 	H5E_THROW(H5E_BADVALUE, "element size must be greater than zero")
+    if(cparam->max_dblk_page_nelmts_bits == 0)        
+	H5E_THROW(H5E_BADVALUE, "max. # of elements bits must be greater than zero")
+    if(cparam->nelmts == 0)        
+	H5E_THROW(H5E_BADVALUE, "# of elements must be greater than zero")
 }
 #endif /* NDEBUG */
 
diff --git a/src/H5FApkg.h b/src/H5FApkg.h
index 16d2518..1ba8f84 100644
--- a/src/H5FApkg.h
+++ b/src/H5FApkg.h
@@ -203,7 +203,6 @@ typedef struct H5FA_dblk_page_load_ud_t {
 } H5FA_dblk_page_load_ud_t;
 
 
-
 /*****************************/
 /* Package Private Variables */
 /*****************************/
diff --git a/src/H5FAprivate.h b/src/H5FAprivate.h
index 2450218..16397fd 100644
--- a/src/H5FAprivate.h
+++ b/src/H5FAprivate.h
@@ -70,6 +70,8 @@ typedef struct H5FA_class_t {
     herr_t (*encode)(void *raw, const void *elmt, size_t nelmts, void *ctx);   /* Encode elements from native form to disk storage form */
     herr_t (*decode)(const void *raw, void *elmt, size_t nelmts, void *ctx);   /* Decode elements from disk storage form to native form */
     herr_t (*debug)(FILE *stream, int indent, int fwidth, hsize_t idx, const void *elmt); /* Print an element for debugging */
+    void *(*crt_dbg_ctx)(H5F_t *f, hid_t dxpl_id, haddr_t obj_addr); /* Create debugging context */
+    herr_t (*dst_dbg_ctx)(void *dbg_ctx);       /* Destroy debugging context */
 } H5FA_class_t;
 
 /* Fixed array creation parameters */
diff --git a/src/H5FAtest.c b/src/H5FAtest.c
index c76c80b..70e21dc 100644
--- a/src/H5FAtest.c
+++ b/src/H5FAtest.c
@@ -134,9 +134,6 @@ H5FA__test_crt_context(void UNUSED *udata))
     /* Local variables */
     H5FA__test_ctx_t *ctx;              /* Context for callbacks */
 
-    /* Sanity checks */
-    HDassert(udata);
-
     /* Allocate new context structure */
     if(NULL == (ctx = H5FL_MALLOC(H5FA__test_ctx_t)))
 	H5E_THROW(H5E_CANTALLOC, "can't allocate fixed array client callback context")
diff --git a/test/Makefile.am b/test/Makefile.am
index d52606a..7f21f74 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -42,7 +42,7 @@ TEST_PROG=testhdf5 lheap ohdr stab gheap cache cache_api \
            fillval mount flush1 flush2 app_ref enum \
            set_extent ttsafe \
            getname vfd ntypes dangle dtransform reserved cross_read \
-           freespace mf earray btree2 fheap
+           freespace mf farray earray btree2 fheap
 
 bin_PROGRAMS=swmr_generator swmr_reader swmr_writer
 
@@ -108,7 +108,8 @@ CHECK_CLEANFILES+=cmpd_dset.h5 compact_dataset.h5 dataset.h5 dset_offset.h5 \
             max_compact_dataset.h5 simple.h5 set_local.h5 random_chunks.h5 \
             huge_chunks.h5 chunk_cache.h5 big_chunk.h5 chunk_fast.h5 \
             chunk_expand.h5 extend.h5 istore.h5 extlinks*.h5 frspace.h5 \
-            links*.h5 tfile[1-4].h5 th5s[1-3].h5 lheap.h5 fheap.h5 ohdr.h5 \
+            links*.h5 sys_file1 tfile[1-4].h5 th5s[1-3].h5 lheap.h5 \
+            fheap.h5 ohdr.h5 \
             stab.h5 extern_[1-3].h5 extern_[1-4][ab].raw gheap[0-4].h5 \
             dt_arith[1-2] links.h5 links[0-6]*.h5 extlinks[0-15].h5 tmp \
 	    big.data big[0-9][0-9][0-9][0-9][0-9].h5  \
@@ -124,8 +125,8 @@ CHECK_CLEANFILES+=cmpd_dset.h5 compact_dataset.h5 dataset.h5 dset_offset.h5 \
             new_move_[ab].h5 ntypes.h5 dangle.h5 error_test.h5 err_compat.h5 \
             dtransform.h5 test_filters.h5 get_file_name.h5 tstint[1-2].h5    \
             unlink_chunked.h5 btree2.h5 objcopy_src.h5 objcopy_dst.h5        \
-            objcopy_ext.dat trefer1.h5 trefer2.h5 app_ref.h5 earray.h5       \
-            swmr_data.h5
+            objcopy_ext.dat trefer1.h5 trefer2.h5 app_ref.h5 farray.h5 \
+            earray.h5 swmr_data.h5
 
 # Sources for testhdf5 executable
 testhdf5_SOURCES=testhdf5.c tarray.c tattr.c tchecksum.c tconfig.c tfile.c \
diff --git a/test/Makefile.in b/test/Makefile.in
index 7d75ec1..ed3e205 100644
--- a/test/Makefile.in
+++ b/test/Makefile.in
@@ -89,7 +89,7 @@ am__EXEEXT_1 = testhdf5$(EXEEXT) lheap$(EXEEXT) ohdr$(EXEEXT) \
 	ttsafe$(EXEEXT) getname$(EXEEXT) vfd$(EXEEXT) ntypes$(EXEEXT) \
 	dangle$(EXEEXT) dtransform$(EXEEXT) reserved$(EXEEXT) \
 	cross_read$(EXEEXT) freespace$(EXEEXT) mf$(EXEEXT) \
-	earray$(EXEEXT) btree2$(EXEEXT) fheap$(EXEEXT)
+	farray$(EXEEXT) earray$(EXEEXT) btree2$(EXEEXT) fheap$(EXEEXT)
 am__EXEEXT_2 = gen_bad_ohdr$(EXEEXT) gen_bogus$(EXEEXT) \
 	gen_cross$(EXEEXT) gen_deflate$(EXEEXT) gen_filters$(EXEEXT) \
 	gen_new_array$(EXEEXT) gen_new_fill$(EXEEXT) \
@@ -174,6 +174,10 @@ external_SOURCES = external.c
 external_OBJECTS = external.$(OBJEXT)
 external_LDADD = $(LDADD)
 external_DEPENDENCIES = libh5test.la $(LIBHDF5)
+farray_SOURCES = farray.c
+farray_OBJECTS = farray.$(OBJEXT)
+farray_LDADD = $(LDADD)
+farray_DEPENDENCIES = libh5test.la $(LIBHDF5)
 fheap_SOURCES = fheap.c
 fheap_OBJECTS = fheap.$(OBJEXT)
 fheap_LDADD = $(LDADD)
@@ -372,10 +376,10 @@ LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
 SOURCES = $(libh5test_la_SOURCES) app_ref.c big.c bittests.c btree2.c \
 	cache.c cache_api.c cmpd_dset.c cross_read.c dangle.c dsets.c \
 	dt_arith.c dtransform.c dtypes.c earray.c enum.c err_compat.c \
-	error_test.c extend.c external.c fheap.c fillval.c flush1.c \
-	flush2.c freespace.c gen_bad_ohdr.c gen_bogus.c gen_cross.c \
-	gen_deflate.c gen_filters.c gen_new_array.c gen_new_fill.c \
-	gen_new_group.c gen_new_mtime.c gen_new_super.c \
+	error_test.c extend.c external.c farray.c fheap.c fillval.c \
+	flush1.c flush2.c freespace.c gen_bad_ohdr.c gen_bogus.c \
+	gen_cross.c gen_deflate.c gen_filters.c gen_new_array.c \
+	gen_new_fill.c gen_new_group.c gen_new_mtime.c gen_new_super.c \
 	gen_noencoder.c gen_nullspace.c gen_udlinks.c getname.c \
 	gheap.c hyperslab.c istore.c lheap.c links.c mf.c mount.c \
 	mtime.c ntypes.c objcopy.c ohdr.c pool.c reserved.c \
@@ -385,7 +389,7 @@ SOURCES = $(libh5test_la_SOURCES) app_ref.c big.c bittests.c btree2.c \
 DIST_SOURCES = $(libh5test_la_SOURCES) app_ref.c big.c bittests.c \
 	btree2.c cache.c cache_api.c cmpd_dset.c cross_read.c dangle.c \
 	dsets.c dt_arith.c dtransform.c dtypes.c earray.c enum.c \
-	err_compat.c error_test.c extend.c external.c fheap.c \
+	err_compat.c error_test.c extend.c external.c farray.c fheap.c \
 	fillval.c flush1.c flush2.c freespace.c gen_bad_ohdr.c \
 	gen_bogus.c gen_cross.c gen_deflate.c gen_filters.c \
 	gen_new_array.c gen_new_fill.c gen_new_group.c gen_new_mtime.c \
@@ -660,23 +664,24 @@ CHECK_CLEANFILES = *.chkexe *.chklog *.clog cmpd_dset.h5 \
 	max_compact_dataset.h5 simple.h5 set_local.h5 random_chunks.h5 \
 	huge_chunks.h5 chunk_cache.h5 big_chunk.h5 chunk_fast.h5 \
 	chunk_expand.h5 extend.h5 istore.h5 extlinks*.h5 frspace.h5 \
-	links*.h5 tfile[1-4].h5 th5s[1-3].h5 lheap.h5 fheap.h5 ohdr.h5 \
-	stab.h5 extern_[1-3].h5 extern_[1-4][ab].raw gheap[0-4].h5 \
-	dt_arith[1-2] links.h5 links[0-6]*.h5 extlinks[0-15].h5 tmp \
-	big.data big[0-9][0-9][0-9][0-9][0-9].h5 stdio.h5 sec2.h5 \
-	dtypes[1-8].h5 dt_arith[1-2].h5 tattr.h5 tselect.h5 mtime.h5 \
-	unlink.h5 unicode.h5 coord.h5 fillval_[0-9].h5 fillval.raw \
-	mount_[0-9].h5 testmeta.h5 ttime.h5 trefer[1-3].h5 tvltypes.h5 \
-	tvlstr.h5 tvlstr2.h5 flush.h5 enum1.h5 titerate.h5 ttsafe.h5 \
-	tarray1.h5 tgenprop.h5 tmisc[0-9]*.h5 set_extent[1-5].h5 \
-	ext[12].bin getname.h5 getname[1-3].h5 sec2_file.h5 \
-	direct_file.h5 family_file000[0-3][0-9].h5 \
-	new_family_v16_000[0-3][0-9].h5 multi_file-[rs].h5 core_file \
-	new_move_[ab].h5 ntypes.h5 dangle.h5 error_test.h5 \
-	err_compat.h5 dtransform.h5 test_filters.h5 get_file_name.h5 \
-	tstint[1-2].h5 unlink_chunked.h5 btree2.h5 objcopy_src.h5 \
-	objcopy_dst.h5 objcopy_ext.dat trefer1.h5 trefer2.h5 \
-	app_ref.h5 earray.h5 swmr_data.h5
+	links*.h5 sys_file1 tfile[1-4].h5 th5s[1-3].h5 lheap.h5 \
+	fheap.h5 ohdr.h5 stab.h5 extern_[1-3].h5 extern_[1-4][ab].raw \
+	gheap[0-4].h5 dt_arith[1-2] links.h5 links[0-6]*.h5 \
+	extlinks[0-15].h5 tmp big.data big[0-9][0-9][0-9][0-9][0-9].h5 \
+	stdio.h5 sec2.h5 dtypes[1-8].h5 dt_arith[1-2].h5 tattr.h5 \
+	tselect.h5 mtime.h5 unlink.h5 unicode.h5 coord.h5 \
+	fillval_[0-9].h5 fillval.raw mount_[0-9].h5 testmeta.h5 \
+	ttime.h5 trefer[1-3].h5 tvltypes.h5 tvlstr.h5 tvlstr2.h5 \
+	flush.h5 enum1.h5 titerate.h5 ttsafe.h5 tarray1.h5 tgenprop.h5 \
+	tmisc[0-9]*.h5 set_extent[1-5].h5 ext[12].bin getname.h5 \
+	getname[1-3].h5 sec2_file.h5 direct_file.h5 \
+	family_file000[0-3][0-9].h5 new_family_v16_000[0-3][0-9].h5 \
+	multi_file-[rs].h5 core_file new_move_[ab].h5 ntypes.h5 \
+	dangle.h5 error_test.h5 err_compat.h5 dtransform.h5 \
+	test_filters.h5 get_file_name.h5 tstint[1-2].h5 \
+	unlink_chunked.h5 btree2.h5 objcopy_src.h5 objcopy_dst.h5 \
+	objcopy_ext.dat trefer1.h5 trefer2.h5 app_ref.h5 farray.h5 \
+	earray.h5 swmr_data.h5
 INCLUDES = -I$(top_srcdir)/src -I$(top_builddir)/src
 
 # Test script for error_test and err_compat
@@ -697,7 +702,7 @@ TEST_PROG = testhdf5 lheap ohdr stab gheap cache cache_api \
            fillval mount flush1 flush2 app_ref enum \
            set_extent ttsafe \
            getname vfd ntypes dangle dtransform reserved cross_read \
-           freespace mf earray btree2 fheap
+           freespace mf farray earray btree2 fheap
 
 
 # These programs generate test files for the tests.  They don't need to be
@@ -918,6 +923,9 @@ extend$(EXEEXT): $(extend_OBJECTS) $(extend_DEPENDENCIES)
 external$(EXEEXT): $(external_OBJECTS) $(external_DEPENDENCIES) 
 	@rm -f external$(EXEEXT)
 	$(LINK) $(external_OBJECTS) $(external_LDADD) $(LIBS)
+farray$(EXEEXT): $(farray_OBJECTS) $(farray_DEPENDENCIES) 
+	@rm -f farray$(EXEEXT)
+	$(LINK) $(farray_OBJECTS) $(farray_LDADD) $(LIBS)
 fheap$(EXEEXT): $(fheap_OBJECTS) $(fheap_DEPENDENCIES) 
 	@rm -f fheap$(EXEEXT)
 	$(LINK) $(fheap_OBJECTS) $(fheap_LDADD) $(LIBS)
@@ -1074,6 +1082,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/error_test.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/extend.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/external.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/farray.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fheap.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fillval.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/flush1.Po@am__quote@
diff --git a/test/farray.c b/test/farray.c
new file mode 100644
index 0000000..c7a2796
--- /dev/null
+++ b/test/farray.c
@@ -0,0 +1,1659 @@
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+ * Copyright by The HDF Group.                                               *
+ * Copyright by the Board of Trustees of the University of Illinois.         *
+ * All rights reserved.                                                      *
+ *                                                                           *
+ * This file is part of HDF5.  The full HDF5 copyright notice, including     *
+ * terms governing use, modification, and redistribution, is contained in    *
+ * the files COPYING and Copyright.html.  COPYING can be found at the root   *
+ * of the source code distribution tree; Copyright.html can be found at the  *
+ * root level of an installed copy of the electronic HDF5 document set and   *
+ * is linked from the top-level documents page.  It can also be found at     *
+ * http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
+ * access to either file, you may request a copy from help@hdfgroup.org.     *
+ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+
+/* 
+ * This file is modified based on earray.c.
+ */
+#include "h5test.h"
+
+/*
+ * This file needs to access private datatypes from the H5FA package.
+ * This file also needs to access the fixed array testing code.
+ */
+#define H5FA_PACKAGE
+#define H5FA_TESTING
+#include "H5FApkg.h"		/* Fixed Arrays			*/
+
+/* Other private headers that this test requires */
+#include "H5Iprivate.h"		/* IDs			  		*/
+#include "H5Vprivate.h"		/* Vectors and arrays 			*/
+
+
+/* Local macros */
+
+/* Max. testfile name length */
+#define FARRAY_FILENAME_LEN     1024
+
+/* Fixed array creation values */
+#define ELMT_SIZE      	sizeof(uint64_t) 
+#define MAX_DBLOCK_PAGE_NELMTS_BITS     10      /* 2^10 = 1024 elements per data block page */
+
+/* Testing # of elements in the Fixed Array */
+#define TEST_NELMTS 	20000
+
+/* Convenience macros for computing earray state */
+#define FA_HDR_SIZE   	28   	/* hard-coded */
+#define DBLOCK_PREFIX   18	/* hard-coded */
+
+/* 4 giga-elements: max chunk size */
+#define MAX_NELMTS 	((unsigned long long)4*1024*1024*1024) /* 4 giga-elements */
+
+/* Iterator parameter values */
+#define FA_CYC_COUNT            4
+
+
+/* Local typedefs */
+
+/* Types of tests to perform */
+typedef enum {
+    FARRAY_TEST_NORMAL,         /* "Normal" test, with no testing parameters set */
+    FARRAY_TEST_REOPEN,         /* Set the reopen_array flag */
+    FARRAY_TEST_NTESTS          /* The number of test types, must be last */
+} farray_test_type_t;
+
+/* Types of iteration to perform */
+typedef enum {
+    FARRAY_ITER_FW,             /* "Forward" iteration */
+    FARRAY_ITER_RV,             /* "Reverse" iteration */
+    FARRAY_ITER_RND,            /* "Random" iteration */
+    FARRAY_ITER_CYC,            /* "Cyclic" iteration */
+    FARRAY_ITER_NITERS          /* The number of iteration types, must be last */
+} farray_iter_type_t;
+
+
+/* Fixed array state information */
+typedef struct farray_state_t {
+    hsize_t hdr_size;           /* Size of header */
+    hsize_t dblk_size;          /* Size of data block */
+    hsize_t nelmts;             /* # of elements */
+} farray_state_t;
+
+/* Forward decl. */
+typedef struct farray_test_param_t farray_test_param_t;
+
+/* Fixed array iterator class */
+typedef struct farray_iter_t {
+    void *(*init)(const H5FA_create_t *cparam, const farray_test_param_t *tparam,
+        hsize_t cnt);           /* Initialize/allocate iterator private info */
+    hssize_t (*next)(void *info);       /* Get the next element to test */
+    herr_t (*term)(void *info); /* Shutdown/free iterator private info */
+} farray_iter_t;
+
+
+/* Testing parameters */
+struct farray_test_param_t {
+    farray_test_type_t reopen_array;    /* Whether to re-open the array during the test */
+    hsize_t	nelmts;			/* # of elements to set for the fixed array */
+    const farray_iter_t *fiter;         /* Iterator to use for this test */
+};
+
+/* Local variables */
+const char *FILENAME[] = {
+    "farray",
+    NULL
+};
+
+/* Filename to use for all tests */
+char filename_g[FARRAY_FILENAME_LEN];
+
+/* Empty file size */
+h5_stat_size_t empty_size_g;
+
+
+/*-------------------------------------------------------------------------
+ * Function:	init_cparam
+ *
+ * Purpose:	Initialize array creation parameter structure
+ *
+ * Return:	Success:	0
+ *		Failure:	-1
+ *
+ *-------------------------------------------------------------------------
+ */
+static int
+init_cparam(H5FA_create_t *cparam, farray_test_param_t *tparam)
+{
+    /* Wipe out background */
+    HDmemset(cparam, 0, sizeof(*cparam));
+
+    cparam->cls = H5FA_CLS_TEST;
+    cparam->raw_elmt_size = ELMT_SIZE;
+    cparam->max_dblk_page_nelmts_bits = MAX_DBLOCK_PAGE_NELMTS_BITS;	
+    cparam->nelmts = tparam->nelmts;	
+
+    return(0);
+} /* init_cparam() */
+
+
+/*-------------------------------------------------------------------------
+ * Function:	create_file
+ *
+ * Purpose:	Create file and retrieve pointer to internal file object
+ *
+ * Return:	Success:	0
+ *		Failure:	-1
+ *
+ *-------------------------------------------------------------------------
+ */
+static int
+create_file(hid_t fapl, hid_t *file, H5F_t **f)
+{
+    /* Create the file to work on */
+    if((*file = H5Fcreate(filename_g, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0)
+        FAIL_STACK_ERROR
+
+    /* Get a pointer to the internal file object */
+    if(NULL == (*f = (H5F_t *)H5I_object(*file)))
+        FAIL_STACK_ERROR
+
+    /* Success */
+    return(0);
+
+error:
+    return(-1);
+} /* create_file() */
+
+
+/*-------------------------------------------------------------------------
+ * Function:	check_stats
+ *
+ * Purpose:	Verify stats for a fixed array
+ *
+ * Return:	Success:	0
+ *		Failure:	-1
+ *
+ *-------------------------------------------------------------------------
+ */
+static int
+check_stats(const H5FA_t *fa, const farray_state_t *state)
+{
+    H5FA_stat_t farray_stats;           /* Statistics about the array */
+
+    /* Get statistics for fixed array and verify they are correct */
+    if(H5FA_get_stats(fa, &farray_stats) < 0)
+        FAIL_STACK_ERROR
+
+    /* Compare information */
+    if(farray_stats.hdr_size != state->hdr_size) {
+        HDfprintf(stdout, "farray_stats.hdr_size = %Hu, state->hdr_size = %Hu\n", 
+	    farray_stats.hdr_size, state->hdr_size);
+        TEST_ERROR
+    } /* end if */
+
+    if(farray_stats.dblk_size != state->dblk_size) {
+        HDfprintf(stdout, "farray_stats.dblk_size = %Hu, state->dblk_size = %Hu\n", 
+	    farray_stats.dblk_size, state->dblk_size);
+        TEST_ERROR
+    } /* end if */
+
+    if(farray_stats.nelmts != state->nelmts) {
+        HDfprintf(stdout, "farray_stats.nelmts = %Hu, state->nelmts = %Hu\n", 
+	    farray_stats.nelmts, state->nelmts);
+        TEST_ERROR
+    } /* end if */
+
+    /* All tests passed */
+    return(0);
+
+error:
+    return(-1);
+} /* check_stats() */
+
+
+/*-------------------------------------------------------------------------
+ * Function:	set_fa_state
+ *
+ * Purpose:	Set the state of the Fixed Array
+ *
+ * Return:	does not fail
+ *
+ * Programmer:	Vailin Choi; 5th August, 2009
+ *
+ *-------------------------------------------------------------------------
+ */
+static int
+set_fa_state(const H5FA_create_t *cparam, farray_state_t *state)
+{
+    size_t dblk_page_nelmts;			/* # of elements per page */
+
+    /* Sanity check */
+    HDassert(cparam);
+    HDassert(state);
+
+    /* Compute the state of the fixed array */
+    state->hdr_size = FA_HDR_SIZE;
+    state->nelmts = cparam->nelmts;
+
+    dblk_page_nelmts = (size_t)1 << cparam->max_dblk_page_nelmts_bits;
+    if(state->nelmts > dblk_page_nelmts) {
+	size_t npages = (size_t)(((state->nelmts + dblk_page_nelmts) - 1) / dblk_page_nelmts);
+	size_t dblk_page_init_size = (npages + 7) / 8;
+	hsize_t checksum_size = npages * 4;
+
+	state->dblk_size = DBLOCK_PREFIX + dblk_page_init_size + checksum_size + 
+			    state->nelmts * cparam->raw_elmt_size;
+    } else 
+	state->dblk_size = DBLOCK_PREFIX + state->nelmts * cparam->raw_elmt_size;
+
+    return(0);
+} /* end set_fa_state() */
+
+
+/*-------------------------------------------------------------------------
+ * Function:	reopen_file
+ *
+ * Purpose:	Perform common "re-open" operations on file & array for testing
+ *
+ * Return:	Success:	0
+ *		Failure:	-1
+ *
+ *-------------------------------------------------------------------------
+ */
+static int
+reopen_file(hid_t *file, H5F_t **f, hid_t fapl, hid_t dxpl,
+    H5FA_t **fa, haddr_t fa_addr, const H5FA_class_t *fa_cls,
+    const farray_test_param_t *tparam)
+{
+    /* Check for closing & re-opening the array */
+    /* (actually will close & re-open the file as well) */
+    if(tparam->reopen_array) {
+        /* Close array, if given */
+        if(fa) {
+            if(H5FA_close(*fa, dxpl) < 0)
+                FAIL_STACK_ERROR
+            *fa = NULL;
+        } /* end if */
+
+        /* Close file */
+        if(H5Fclose(*file) < 0)
+            FAIL_STACK_ERROR
+        *file = (-1);
+        *f = NULL;
+
+        /* Re-open the file */
+        if((*file = H5Fopen(filename_g, H5F_ACC_RDWR, fapl)) < 0)
+            FAIL_STACK_ERROR
+
+        /* Get a pointer to the internal file object */
+        if(NULL == (*f = (H5F_t *)H5I_object(*file)))
+            FAIL_STACK_ERROR
+
+        /* Re-open array, if given */
+        if(fa) {
+            if(NULL == (*fa = H5FA_open(*f, dxpl, fa_addr, fa_cls, NULL)))
+                FAIL_STACK_ERROR
+        } /* end if */
+    } /* end if */
+
+    /* Success */
+    return(0);
+
+error:
+    return(-1);
+} /* reopen_file() */
+
+
+/*-------------------------------------------------------------------------
+ * Function:	create_array
+ *
+ * Purpose:	Create a fixed array and perform initial checks
+ *
+ * Return:	Success:	0
+ *		Failure:	-1
+ *
+ *-------------------------------------------------------------------------
+ */
+static int
+create_array(H5F_t *f, hid_t dxpl, const H5FA_create_t *cparam,
+    H5FA_t **fa, haddr_t *fa_addr, void *cb)
+{
+    farray_state_t state;               /* State of extensible array */
+
+    /* Create array */
+    if(NULL == (*fa = H5FA_create(f, dxpl, cparam, cb)))
+        FAIL_STACK_ERROR
+
+    /* Check status of array */
+    if(H5FA_get_addr(*fa, fa_addr) < 0)
+        FAIL_STACK_ERROR
+    if(!H5F_addr_defined(*fa_addr))
+        TEST_ERROR
+    HDmemset(&state, 0, sizeof(state));
+    state.hdr_size = FA_HDR_SIZE;
+    state.nelmts = cparam->nelmts;
+    if(check_stats(*fa, &state))
+        TEST_ERROR
+
+    /* Success */
+    return(0);
+
+error:
+    return(-1);
+} /* create_array() */
+
+
+/*-------------------------------------------------------------------------
+ * Function:	verify_cparam
+ *
+ * Purpose:	Verify creation parameters are correct
+ *
+ * Return:	Success:	0
+ *		Failure:	-1
+ *
+ *-------------------------------------------------------------------------
+ */
+static int
+verify_cparam(const H5FA_t *fa, const H5FA_create_t *cparam)
+{
+    H5FA_create_t test_cparam;          /* Creation parameters for array */
+
+    /* Retrieve creation parameters */
+    HDmemset(&test_cparam, 0, sizeof(H5FA_create_t));
+    if(H5FA_get_cparam_test(fa, &test_cparam) < 0)
+        FAIL_STACK_ERROR
+
+    /* Verify creation parameters */
+    if(H5FA_cmp_cparam_test(cparam, &test_cparam))
+        TEST_ERROR
+
+    /* Success */
+    return(0);
+
+error:
+    return(-1);
+} /* verify_cparam() */
+
+
+/*-------------------------------------------------------------------------
+ * Function:	finish
+ *
+ * Purpose:	Close array, delete array, close file and verify that file
+ *              is empty size
+ *
+ * Return:	Success:	0
+ *		Failure:	-1
+ *
+ *-------------------------------------------------------------------------
+ */
+static int
+finish(hid_t file, hid_t fapl, H5F_t *f, H5FA_t *fa, haddr_t fa_addr)
+{
+    h5_stat_size_t file_size;           /* File size, after deleting array */
+
+    /* Close the fixed array */
+    if(H5FA_close(fa, H5P_DATASET_XFER_DEFAULT) < 0) 
+        FAIL_STACK_ERROR
+
+    /* Delete array */
+    if(H5FA_delete(f, H5P_DATASET_XFER_DEFAULT, fa_addr) < 0)
+        FAIL_STACK_ERROR
+
+    /* Close the file */
+    if(H5Fclose(file) < 0)
+        FAIL_STACK_ERROR
+
+    /* Get the size of the file */
+    if((file_size = h5_get_file_size(filename_g, fapl)) < 0)
+        TEST_ERROR
+
+    /* Verify the file is correct size */
+    if(file_size != empty_size_g)
+        TEST_ERROR
+
+    /* Success */
+    return(0);
+
+error:
+    return(-1);
+} /* finish() */
+
+
+/*-------------------------------------------------------------------------
+ * Function:	test_create
+ *
+ * Purpose:	Test creating fixed array
+ *
+ * Return:	Success: 0
+ *		Failure: 1
+ *
+ *-------------------------------------------------------------------------
+ */
+static unsigned
+test_create(hid_t fapl, H5FA_create_t *cparam, farray_test_param_t UNUSED *tparam)
+{
+    hid_t	file = -1;              /* File ID */
+    H5F_t	*f = NULL;              /* Internal file object pointer */
+    H5FA_t      *fa = NULL;             /* Fixed array wrapper */
+    haddr_t     fa_addr = HADDR_UNDEF;  /* Array address in file */
+
+    /* Create file & retrieve pointer to internal file object */
+    if(create_file(fapl, &file, &f) < 0)
+        TEST_ERROR
+
+    /*
+     * Display testing message
+     */
+    TESTING("invalid fixed array creation parameters");
+
+#ifndef NDEBUG
+{
+    H5FA_create_t test_cparam;          /* Creation parameters for array */
+
+    /* Set invalid element size */
+    HDmemcpy(&test_cparam, cparam, sizeof(test_cparam));
+    test_cparam.raw_elmt_size = 0;
+    H5E_BEGIN_TRY {
+        fa = H5FA_create(f, H5P_DATASET_XFER_DEFAULT, &test_cparam, NULL);
+    } H5E_END_TRY;
+    if(fa) {
+        /* Close opened fixed array */
+        H5FA_close(fa, H5P_DATASET_XFER_DEFAULT);
+        fa = NULL;
+
+        /* Indicate error */
+        TEST_ERROR
+    } /* end if */
+
+    /* Set invalid max. # of elements bits */
+    HDmemcpy(&test_cparam, cparam, sizeof(test_cparam));
+    test_cparam.max_dblk_page_nelmts_bits = 0;
+    H5E_BEGIN_TRY {
+        fa = H5FA_create(f, H5P_DATASET_XFER_DEFAULT, &test_cparam, NULL);
+    } H5E_END_TRY;
+    if(fa) {
+        /* Close opened fixed array */
+        H5FA_close(fa, H5P_DATASET_XFER_DEFAULT);
+        fa = NULL;
+
+        /* Indicate error */
+        TEST_ERROR
+    } /* end if */
+
+    /* Set invalid max. # of elements */
+    HDmemcpy(&test_cparam, cparam, sizeof(test_cparam));
+    test_cparam.nelmts = 0;
+    H5E_BEGIN_TRY {
+        fa = H5FA_create(f, H5P_DATASET_XFER_DEFAULT, &test_cparam, NULL);
+    } H5E_END_TRY;
+    if(fa) {
+        /* Close opened fixed array */
+        H5FA_close(fa, H5P_DATASET_XFER_DEFAULT);
+        fa = NULL;
+
+        /* Indicate error */
+        TEST_ERROR
+    } /* end if */
+
+    PASSED()
+}
+#else /* NDEBUG */
+    SKIPPED();
+    puts("    Not tested when assertions are disabled");
+#endif /* NDEBUG */
+
+    /*
+     * Display testing message
+     */
+    TESTING("fixed array creation");
+
+    /* Create array */
+    if(create_array(f, H5P_DATASET_XFER_DEFAULT, cparam, &fa, &fa_addr, NULL) < 0)
+        TEST_ERROR
+
+    PASSED()
+
+    /* Verify the creation parameters */
+    TESTING("verify array creation parameters");
+
+    /* Verify the creation parameters */
+    if(verify_cparam(fa, cparam) < 0)
+        TEST_ERROR
+
+    /* Close array, delete array, close file & verify file is empty */
+    if(finish(file, fapl, f, fa, fa_addr) < 0)
+        TEST_ERROR
+
+    /* All tests passed */
+    PASSED()
+
+    return 0;
+
+error:
+    H5E_BEGIN_TRY {
+        if(fa)
+            H5FA_close(fa, H5P_DATASET_XFER_DEFAULT);
+	H5Fclose(file);
+    } H5E_END_TRY;
+
+    return 1;
+} /* end test_create() */
+
+
+/*-------------------------------------------------------------------------
+ * Function:	test_reopen
+ *
+ * Purpose:	Create & reopen a fixed array
+ *
+ * Return:	Success:	0
+ *		Failure:	1
+ *
+ *-------------------------------------------------------------------------
+ */
+static unsigned
+test_reopen(hid_t fapl, H5FA_create_t *cparam, farray_test_param_t *tparam)
+{
+    hid_t	file = -1;              /* File ID */
+    H5F_t	*f = NULL;              /* Internal file object pointer */
+    H5FA_t      *fa = NULL;             /* Fixed array wrapper */
+    haddr_t     fa_addr = HADDR_UNDEF;  /* Array address in file */
+
+    /* Create file & retrieve pointer to internal file object */
+    if(create_file(fapl, &file, &f) < 0)
+        TEST_ERROR
+
+    /*
+     * Display testing message
+     */
+    TESTING("create, close & reopen fixed array");
+
+    /* Create array */
+    if(create_array(f, H5P_DATASET_XFER_DEFAULT, cparam, &fa, &fa_addr, NULL) < 0)
+        TEST_ERROR
+
+    /* Close the fixed array */
+    if(H5FA_close(fa, H5P_DATASET_XFER_DEFAULT) < 0)
+        FAIL_STACK_ERROR
+
+    /* Check for closing & re-opening the file */
+    if(reopen_file(&file, &f, fapl, H5P_DATASET_XFER_DEFAULT, NULL, HADDR_UNDEF, NULL, tparam) < 0)
+        TEST_ERROR
+
+    /* Re-open the array */
+    if(NULL == (fa = H5FA_open(f, H5P_DATASET_XFER_DEFAULT, fa_addr, cparam->cls, NULL)))
+        FAIL_STACK_ERROR
+
+    /* Verify the creation parameters */
+    if(verify_cparam(fa, cparam) < 0)
+        TEST_ERROR
+
+    /* Close array, delete array, close file & verify file is empty */
+    if(finish(file, fapl, f, fa, fa_addr) < 0)
+        TEST_ERROR
+
+    /* All tests passed */
+    PASSED()
+
+    return 0;
+
+error:
+    H5E_BEGIN_TRY {
+        if(fa)
+            H5FA_close(fa, H5P_DATASET_XFER_DEFAULT);
+	H5Fclose(file);
+    } H5E_END_TRY;
+
+    return 1;
+} /* test_reopen() */
+
+
+/*-------------------------------------------------------------------------
+ * Function:	test_open_twice
+ *
+ * Purpose:	Open an extensible array twice
+ *
+ * Return:	Success:	0
+ *		Failure:	1
+ *
+ *-------------------------------------------------------------------------
+ */
+static unsigned
+test_open_twice(hid_t fapl, H5FA_create_t *cparam, farray_test_param_t *tparam)
+{
+    hid_t	file = -1;              /* File ID */
+    hid_t	file2 = -1;             /* File ID */
+    H5F_t	*f = NULL;              /* Internal file object pointer */
+    H5F_t	*f2 = NULL;             /* Internal file object pointer */
+    H5FA_t      *fa = NULL;             /* Fixed array wrapper */
+    H5FA_t      *fa2 = NULL;            /* Fixed array wrapper */
+    haddr_t     fa_addr = HADDR_UNDEF;  /* Array address in file */
+
+    /* Create file & retrieve pointer to internal file object */
+    if(create_file(fapl, &file, &f) < 0)
+        TEST_ERROR
+
+    /*
+     * Display testing message
+     */
+    TESTING("open fixed array twice");
+
+    /* Create array */
+    if(create_array(f, H5P_DATASET_XFER_DEFAULT, cparam, &fa, &fa_addr, NULL) < 0)
+        TEST_ERROR
+
+    /* Open the array again, through the first file handle */
+    if(NULL == (fa2 = H5FA_open(f, H5P_DATASET_XFER_DEFAULT, fa_addr, cparam->cls, NULL)))
+        FAIL_STACK_ERROR
+
+    /* Verify the creation parameters */
+    if(verify_cparam(fa, cparam) < 0)
+        TEST_ERROR
+    if(verify_cparam(fa2, cparam) < 0)
+        TEST_ERROR
+
+    /* Close the second fixed array wrapper */
+    if(H5FA_close(fa2, H5P_DATASET_XFER_DEFAULT) < 0)
+        FAIL_STACK_ERROR
+    fa2 = NULL;
+
+    /* Check for closing & re-opening the file */
+    if(reopen_file(&file, &f, fapl, H5P_DATASET_XFER_DEFAULT, &fa, fa_addr, cparam->cls, tparam) < 0)
+        TEST_ERROR
+
+    /* Re-open the file */
+    if((file2 = H5Freopen(file)) < 0)
+        FAIL_STACK_ERROR
+
+    /* Get a pointer to the internal file object */
+    if(NULL == (f2 = (H5F_t *)H5I_object(file2)))
+        FAIL_STACK_ERROR
+
+    /* Open the fixed array through the second file handle */
+    if(NULL == (fa2 = H5FA_open(f2, H5P_DATASET_XFER_DEFAULT, fa_addr, cparam->cls, NULL))) FAIL_STACK_ERROR
+
+    /* Verify the creation parameters */
+    if(verify_cparam(fa, cparam) < 0)
+        TEST_ERROR
+
+    /* Close the first extensible array wrapper */
+    if(H5FA_close(fa, H5P_DATASET_XFER_DEFAULT) < 0)
+        FAIL_STACK_ERROR
+    fa = NULL;
+
+    /* Close the first file */
+    /* (close before second file, to detect error on internal array header's
+     *  shared file information)
+     */
+    if(H5Fclose(file) < 0)
+        FAIL_STACK_ERROR
+
+    /* Close array, delete array, close file & verify file is empty */
+    if(finish(file2, fapl, f2, fa2, fa_addr) < 0)
+        TEST_ERROR
+
+    /* All tests passed */
+    PASSED()
+
+    return 0;
+
+error:
+    H5E_BEGIN_TRY {
+        if(fa)
+            H5FA_close(fa, H5P_DATASET_XFER_DEFAULT);
+        if(fa2)
+            H5FA_close(fa2, H5P_DATASET_XFER_DEFAULT);
+	H5Fclose(file);
+	H5Fclose(file2);
+    } H5E_END_TRY;
+
+    return 1;
+} /* test_open_twice() */
+
+
+/*-------------------------------------------------------------------------
+ * Function:	test_delete_open
+ *
+ * Purpose:	Delete opened fixed array (& open deleted array)
+ *
+ * Return:	Success:	0
+ *		Failure:	1
+ *
+ *-------------------------------------------------------------------------
+ */
+static unsigned
+test_delete_open(hid_t fapl, H5FA_create_t *cparam, farray_test_param_t *tparam)
+{
+    hid_t	file = -1;              /* File ID */
+    H5F_t	*f = NULL;              /* Internal file object pointer */
+    H5FA_t      *fa = NULL;             /* Fixed array wrapper */
+    H5FA_t      *fa2 = NULL;            /* Fixed array wrapper */
+    haddr_t     fa_addr = HADDR_UNDEF;  /* Array address in file */
+    h5_stat_size_t file_size;           /* File size, after deleting array */
+
+    /* Create file & retrieve pointer to internal file object */
+    if(create_file(fapl, &file, &f) < 0)
+        TEST_ERROR
+
+    /*
+     * Display testing message
+     */
+    TESTING("deleting open fixed array");
+
+    /* Create array */
+    if(create_array(f, H5P_DATASET_XFER_DEFAULT, cparam, &fa, &fa_addr, NULL) < 0)
+        TEST_ERROR
+
+    /* Open the array again */
+    if(NULL == (fa2 = H5FA_open(f, H5P_DATASET_XFER_DEFAULT, fa_addr, cparam->cls, NULL)))
+        FAIL_STACK_ERROR
+
+    /* Request that the array be deleted */
+    if(H5FA_delete(f, H5P_DATASET_XFER_DEFAULT, fa_addr) < 0)
+        FAIL_STACK_ERROR
+
+    /* Verify the creation parameters */
+    if(verify_cparam(fa, cparam) < 0)
+        TEST_ERROR
+    if(verify_cparam(fa2, cparam) < 0)
+        TEST_ERROR
+
+    /* Close the second fixed array wrapper */
+    if(H5FA_close(fa2, H5P_DATASET_XFER_DEFAULT) < 0)
+        FAIL_STACK_ERROR
+    fa2 = NULL;
+
+    /* Try re-opening the array again (should fail, as array will be deleted) */
+    H5E_BEGIN_TRY {
+        fa2 = H5FA_open(f, H5P_DATASET_XFER_DEFAULT, fa_addr, cparam->cls, NULL);
+    } H5E_END_TRY;
+    if(fa2) {
+        /* Close opened array */
+        H5FA_close(fa2, H5P_DATASET_XFER_DEFAULT);
+
+        /* Indicate error */
+        TEST_ERROR
+    } /* end if */
+
+    /* Close the first fixed array wrapper */
+    if(H5FA_close(fa, H5P_DATASET_XFER_DEFAULT) < 0)
+        FAIL_STACK_ERROR
+    fa = NULL;
+
+    /* Check for closing & re-opening the file */
+    if(reopen_file(&file, &f, fapl, H5P_DATASET_XFER_DEFAULT, NULL, HADDR_UNDEF, NULL, tparam) < 0)
+        TEST_ERROR
+
+    /* Try re-opening the array again (should fail, as array is now deleted) */
+    H5E_BEGIN_TRY {
+        fa = H5FA_open(f, H5P_DATASET_XFER_DEFAULT, fa_addr, cparam->cls, NULL);
+    } H5E_END_TRY;
+    if(fa) {
+        /* Close opened array */
+        H5FA_close(fa, H5P_DATASET_XFER_DEFAULT);
+
+        /* Indicate error */
+        TEST_ERROR
+    } /* end if */
+
+    /* Close the file */
+    if(H5Fclose(file) < 0)
+        FAIL_STACK_ERROR
+
+    /* Get the size of the file */
+    if((file_size = h5_get_file_size(filename_g, fapl)) < 0)
+        TEST_ERROR
+
+    /* Verify the file is correct size */
+    if(file_size != empty_size_g)
+        TEST_ERROR
+
+    /* All tests passed */
+    PASSED()
+
+    return 0;
+
+error:
+    H5E_BEGIN_TRY {
+        if(fa)
+            H5FA_close(fa, H5P_DATASET_XFER_DEFAULT);
+        if(fa2)
+            H5FA_close(fa2, H5P_DATASET_XFER_DEFAULT);
+	H5Fclose(file);
+    } H5E_END_TRY;
+
+    return 1;
+} /* test_delete_open() */
+
+/* Fixed array iterator info for forward iteration */
+typedef struct fiter_fw_t {
+    hsize_t idx;        /* Index of next array location */
+} fiter_fw_t;
+
+
+/*-------------------------------------------------------------------------
+ * Function:	fiter_fw_init
+ *
+ * Purpose:	Initialize element interator (forward iteration)
+ *
+ * Return:	Success:	Pointer to iteration status object
+ *		Failure:	NULL
+ *
+ *-------------------------------------------------------------------------
+ */
+static void *
+fiter_fw_init(const H5FA_create_t UNUSED *cparam, const farray_test_param_t UNUSED *tparam,
+    hsize_t UNUSED cnt)
+{
+    fiter_fw_t *fiter;          /* Forward element iteration object */
+
+    /* Allocate space for the element iteration object */
+    fiter = (fiter_fw_t *)HDmalloc(sizeof(fiter_fw_t));
+    HDassert(fiter);
+
+    /* Initialize the element iteration object */
+    fiter->idx = 0;
+
+    /* Return iteration object */
+    return(fiter);
+} /* end fiter_fw_init() */
+
+
+/*-------------------------------------------------------------------------
+ * Function:	fiter_fw_next
+ *
+ * Purpose:	Get next element index (forward iteration)
+ *
+ * Return:	Success:	Non-negative
+ *		Failure:	Negative
+ *
+ *-------------------------------------------------------------------------
+ */
+static hssize_t
+fiter_fw_next(void *_fiter)
+{
+    fiter_fw_t *fiter = (fiter_fw_t *)_fiter;
+    hssize_t ret_val;
+
+    /* Sanity check */
+    HDassert(fiter);
+
+    /* Get the next array index to test */
+    ret_val = (hssize_t)fiter->idx++;
+
+    return(ret_val);
+} /* end fiter_fw_next() */
+
+
+/*-------------------------------------------------------------------------
+ * Function:	fiter_term
+ *
+ * Purpose:	Shut down element interator (simple iterators)
+ *
+ * Return:	Success:	0
+ *		Failure:	-1
+ *
+ *-------------------------------------------------------------------------
+ */
+static int
+fiter_term(void *fiter)
+{
+    /* Sanity check */
+    HDassert(fiter);
+
+    /* Free iteration object */
+    HDfree(fiter);
+
+    return(0);
+} /* end fiter_term() */
+
+/* Fixed array iterator class for forward iteration */
+static const farray_iter_t fa_iter_fw = {
+    fiter_fw_init,              /* Iterator init */
+    fiter_fw_next,              /* Next array index */
+    fiter_term               	/* Iterator term */
+};
+
+/* Fixed array iterator info for reverse iteration */
+typedef struct fiter_rv_t {
+    hsize_t idx;                        /* Index of next array location */
+} fiter_rv_t;
+
+
+/*-------------------------------------------------------------------------
+ * Function:	fiter_rv_init
+ *
+ * Purpose:	Initialize element interator (reverse iteration)
+ *
+ * Return:	Success:	Pointer to iteration status object
+ *		Failure:	NULL
+ *
+ *-------------------------------------------------------------------------
+ */
+static void *
+fiter_rv_init(const H5FA_create_t *cparam, const farray_test_param_t UNUSED *tparam,
+    hsize_t UNUSED cnt)
+{
+    fiter_rv_t *fiter;          /* Reverse element iteration object */
+
+    /* Allocate space for the element iteration object */
+    fiter = (fiter_rv_t *)HDmalloc(sizeof(fiter_rv_t));
+    HDassert(fiter);
+
+    /* Initialize reverse iteration info */
+    fiter->idx = cparam->nelmts - 1;
+
+    /* Return iteration object */
+    return(fiter);
+} /* end fiter_rv_init() */
+
+
+/*-------------------------------------------------------------------------
+ * Function:	fiter_rv_next
+ *
+ * Purpose:	Get next element index (reverse iteration)
+ *
+ * Return:	Success:	Non-negative
+ *		Failure:	Negative
+ *
+ *-------------------------------------------------------------------------
+ */
+static hssize_t
+fiter_rv_next(void *_fiter)
+{
+    fiter_rv_t *fiter = (fiter_rv_t *)_fiter;
+    hssize_t ret_val;
+
+    /* Sanity check */
+    HDassert(fiter);
+
+    /* Get the next array index to test */
+    ret_val = (hssize_t)fiter->idx--;
+
+    return(ret_val);
+} /* end fiter_rv_next() */
+
+/* Fixed array iterator class for reverse iteration */
+static const farray_iter_t fa_iter_rv = {
+    fiter_rv_init,              /* Iterator init */
+    fiter_rv_next,              /* Next array index */
+    fiter_term               	/* Iterator term */
+};
+
+/* Fixed array iterator info for random iteration */
+typedef struct fiter_rnd_t {
+    hsize_t pos;                /* Position in shuffled array */
+    hsize_t *idx;               /* Array of shuffled indices */
+} fiter_rnd_t;
+
+
+/*-------------------------------------------------------------------------
+ * Function:	fiter_rnd_init
+ *
+ * Purpose:	Initialize element interator (random iteration)
+ *
+ * Return:	Success:	Pointer to iteration status object
+ *		Failure:	NULL
+ *
+ *-------------------------------------------------------------------------
+ */
+static void *
+fiter_rnd_init(const H5FA_create_t UNUSED *cparam, const farray_test_param_t UNUSED *tparam,
+    hsize_t cnt)
+{
+    fiter_rnd_t *fiter;         /* Random element iteration object */
+    size_t u;                   /* Local index variable */
+
+    /* Allocate space for the element iteration object */
+    fiter = (fiter_rnd_t *)HDmalloc(sizeof(fiter_rnd_t));
+    HDassert(fiter);
+
+    /* Allocate space for the array of shuffled indices */
+    fiter->idx = (hsize_t *)HDmalloc(sizeof(hsize_t) * (size_t)cnt);
+    HDassert(fiter->idx);
+
+    /* Initialize reverse iteration info */
+    fiter->pos = 0;
+    for(u = 0; u < (size_t)cnt; u++)
+        fiter->idx[u] = (hsize_t)u;
+
+    /* Randomly shuffle array indices */
+    if(cnt > 1) {
+        for(u = 0; u < (size_t)cnt; u++) {
+            size_t swap_idx;            /* Location to swap with when shuffling */
+            hsize_t temp_idx;           /* Temporary index */
+
+            swap_idx = ((size_t)HDrandom() % ((size_t)cnt - u)) + u;
+            temp_idx = fiter->idx[u];
+            fiter->idx[u] = fiter->idx[swap_idx];
+            fiter->idx[swap_idx] = temp_idx;
+        } /* end for */
+    } /* end if */
+
+    /* Return iteration object */
+    return(fiter);
+} /* end fiter_rnd_init() */
+
+
+/*-------------------------------------------------------------------------
+ * Function:	fiter_rnd_next
+ *
+ * Purpose:	Get next element index (random iteration)
+ *
+ * Return:	Success:	Non-negative
+ *		Failure:	Negative
+ *
+ *-------------------------------------------------------------------------
+ */
+static hssize_t
+fiter_rnd_next(void *_fiter)
+{
+    fiter_rnd_t *fiter = (fiter_rnd_t *)_fiter;
+    hssize_t ret_val;
+
+    /* Sanity check */
+    HDassert(fiter);
+
+    /* Get the next array index to test */
+    ret_val = (hssize_t)fiter->idx[fiter->pos];
+    fiter->pos++;
+
+    return(ret_val);
+} /* end fiter_rnd_next() */
+
+
+/*-------------------------------------------------------------------------
+ * Function:	fiter_rnd_term
+ *
+ * Purpose:	Shut down element interator (random iteration)
+ *
+ * Return:	Success:	0
+ *		Failure:	-1
+ *
+ *-------------------------------------------------------------------------
+ */
+static int
+fiter_rnd_term(void *_fiter)
+{
+    fiter_rnd_t *fiter = (fiter_rnd_t *)_fiter;
+
+    /* Sanity check */
+    HDassert(fiter);
+    HDassert(fiter->idx);
+
+    /* Free shuffled index array */
+    HDfree(fiter->idx);
+
+    /* Free iteration object */
+    HDfree(fiter);
+
+    return(0);
+} /* end fiter_rnd_term() */
+
+/* Fixed array iterator class for random iteration */
+static const farray_iter_t fa_iter_rnd = {
+    fiter_rnd_init,             /* Iterator init */
+    fiter_rnd_next,             /* Next array index */
+    fiter_rnd_term              /* Iterator term */
+};
+
+/* Fixed array iterator info for cyclic iteration */
+typedef struct fiter_cyc_t {
+    hsize_t pos;                /* Position in shuffled array */
+    hsize_t cnt;                /* # of elements to store */
+    hsize_t cyc;                /* Cycle of elements to choose from */
+} fiter_cyc_t;
+
+
+/*-------------------------------------------------------------------------
+ * Function:	fiter_cyc_init
+ *
+ * Purpose:	Initialize element interator (cyclic iteration)
+ *
+ * Return:	Success:	Pointer to iteration status object
+ *		Failure:	NULL
+ *
+ *-------------------------------------------------------------------------
+ */
+static void *
+fiter_cyc_init(const H5FA_create_t UNUSED *cparam, const farray_test_param_t UNUSED *tparam,
+    hsize_t cnt)
+{
+    fiter_cyc_t *fiter;         /* Cyclic element iteration object */
+
+    /* Allocate space for the element iteration object */
+    fiter = (fiter_cyc_t *)HDmalloc(sizeof(fiter_cyc_t));
+    HDassert(fiter);
+
+    /* Initialize reverse iteration info */
+    fiter->pos = 0;
+    fiter->cnt = cnt;
+    fiter->cyc = 0;
+
+    /* Return iteration object */
+    return(fiter);
+} /* end fiter_cyc_init() */
+
+
+/*-------------------------------------------------------------------------
+ * Function:	fiter_cyc_next
+ *
+ * Purpose:	Get next element index (cyclic iteration)
+ *
+ * Return:	Success:	Non-negative
+ *		Failure:	Negative
+ *
+ *-------------------------------------------------------------------------
+ */
+static hssize_t
+fiter_cyc_next(void *_fiter)
+{
+    fiter_cyc_t *fiter = (fiter_cyc_t *)_fiter;
+    hssize_t ret_val;
+
+    /* Sanity check */
+    HDassert(fiter);
+
+    /* Get the next array index to test */
+    ret_val = (hssize_t)fiter->pos;
+    fiter->pos += FA_CYC_COUNT;
+    if(fiter->pos >= fiter->cnt)
+        fiter->pos = ++fiter->cyc;
+
+    return(ret_val);
+} /* end fiter_cyc_next() */
+
+
+/* Fixed array iterator class for cyclic iteration */
+static const farray_iter_t fa_iter_cyc = {
+    fiter_cyc_init,             /* Iterator init */
+    fiter_cyc_next,             /* Next array index */
+    fiter_term              	/* Iterator term */
+};
+
+
+/*-------------------------------------------------------------------------
+ * Function:	check_elmt
+ *
+ * Purpose:	Check whether _relmt is the same as in _welmt
+ *
+ * Return:	Success:	0
+ *		Failure:	1
+ *
+ * Programmer:  Vailin Choi; 6th August, 2009
+ *
+ *-------------------------------------------------------------------------
+ */
+static int
+check_elmt(farray_test_param_t *tparam, void *_relmt, void *_welmt)
+{
+    uint64_t *relmt = (uint64_t *)_relmt;
+    uint64_t *welmt = (uint64_t *)_welmt;
+
+    if(welmt == NULL) { /* check for fill value */
+        if(*relmt != H5FA_TEST_FILL)
+            TEST_ERROR
+    } /* end if */
+    else {
+        if(*relmt != *welmt)
+            TEST_ERROR
+    } /* end else */
+
+    return(0);
+
+error:
+    return(-1);
+} /* end check_elmt() */
+
+
+/*-------------------------------------------------------------------------
+ * Function:	test_set_elmts
+ *
+ * Purpose:	Set all elements from 0 to ('nelmts' - 1) in fixed array
+ *		("nelmts" is the # of elements to be set in the fixed array)
+ *
+ * Return:	Success:	0
+ *		Failure:	1
+ *
+ *-------------------------------------------------------------------------
+ */
+static unsigned
+test_set_elmts(hid_t fapl, H5FA_create_t *cparam, farray_test_param_t *tparam,
+    hsize_t nelmts, const char *test_str)
+{
+    hid_t	file = -1;              /* File ID */
+    H5F_t	*f = NULL;              /* Internal file object pointer */
+    H5FA_t      *fa = NULL;             /* Fixed array wrapper */
+    void        *fiter_info;            /* Fixed array iterator info */
+    farray_state_t state;               /* State of fixed array */
+    uint64_t    welmt;                  /* Element to write */
+    uint64_t    relmt;                  /* Element to read */
+    hsize_t     cnt;                    /* Count of array indices */
+    hssize_t    sidx;                   /* Index value of next element in the fixed array */ 
+    hsize_t     idx;                    /* Index value of next element in the fixed array */
+    hsize_t	fa_nelmts;		/* # of elements in fixed array */
+    haddr_t     fa_addr = HADDR_UNDEF;  /* Array address in file */
+
+    HDassert(nelmts);
+    /*
+     * Display testing message
+     */
+    TESTING(test_str);
+
+    /* Create file & retrieve pointer to internal file object */
+    if(create_file(fapl, &file, &f) < 0)
+        TEST_ERROR
+
+    /* Create array */
+    if(create_array(f, H5P_DATASET_XFER_DEFAULT, cparam, &fa, &fa_addr, NULL) < 0)
+        TEST_ERROR
+
+    /* Verify the creation parameters */
+    if(verify_cparam(fa, cparam) < 0)
+        TEST_ERROR
+
+    /* Check for closing & re-opening the file */
+    if(reopen_file(&file, &f, fapl, H5P_DATASET_XFER_DEFAULT, &fa, fa_addr, cparam->cls, tparam) < 0)
+        TEST_ERROR
+
+    if(H5FA_get_nelmts(fa, &fa_nelmts) < 0)
+        FAIL_STACK_ERROR
+
+    if(nelmts > fa_nelmts)
+        TEST_ERROR
+
+    /* Verify array state */
+    HDmemset(&state, 0, sizeof(state));
+    state.hdr_size = FA_HDR_SIZE;
+    state.nelmts = cparam->nelmts;
+    state.dblk_size = 0;
+    if(check_stats(fa, &state))
+        TEST_ERROR
+
+    /* Get all elements from empty array */
+
+    /* Initialize iterator */
+    if(NULL == (fiter_info = tparam->fiter->init(cparam, tparam, nelmts)))
+        TEST_ERROR
+
+    /* Get elements of array */
+    for(cnt = 0; cnt < nelmts; cnt++) {
+        /* Get the array index */
+        if((sidx = tparam->fiter->next(fiter_info)) < 0)
+            TEST_ERROR
+	idx = (hsize_t)sidx;
+
+        /* Retrieve element of array (not set yet) */
+        relmt = (uint64_t)0;
+        if(H5FA_get(fa, H5P_DATASET_XFER_DEFAULT, idx, &relmt) < 0)
+            FAIL_STACK_ERROR
+
+        /* Verify that the retrieved is correct */
+        if(check_elmt(tparam, &relmt, NULL))
+            TEST_ERROR
+    } /* end for */
+
+    /* Shutdown iterator */
+    if(tparam->fiter->term(fiter_info) < 0)
+        TEST_ERROR
+
+
+    /* Set (& get) all elements from empty array */
+
+    /* Initialize iterator */
+    if(NULL == (fiter_info = tparam->fiter->init(cparam, tparam, nelmts)))
+        TEST_ERROR
+
+    /* Set elements of array */
+    for(cnt = 0; cnt < nelmts; cnt++) {
+        /* Get the array index */
+        if((sidx = tparam->fiter->next(fiter_info)) < 0)
+            TEST_ERROR
+	idx = (hsize_t)sidx;
+
+        relmt = (uint64_t)0;
+        if(H5FA_get(fa, H5P_DATASET_XFER_DEFAULT, idx, &relmt) < 0)
+            FAIL_STACK_ERROR
+
+        /* Verify that the retrieved element is correct */
+        if(check_elmt(tparam, &relmt, NULL))
+            TEST_ERROR
+
+        /* Set element of array */
+        welmt = (uint64_t)7 + idx;
+        if(H5FA_set(fa, H5P_DATASET_XFER_DEFAULT, idx, &welmt) < 0)
+            FAIL_STACK_ERROR
+
+        /* Retrieve element of array (set now) */
+        relmt = (uint64_t)0;
+        if(H5FA_get(fa, H5P_DATASET_XFER_DEFAULT, idx, &relmt) < 0)
+            FAIL_STACK_ERROR
+
+        /* Verify that the retrieved element is correct */
+        if(check_elmt(tparam, &relmt, &welmt))
+            TEST_ERROR
+    } /* end for */
+
+    /* Verify array state */
+    HDmemset(&state, 0, sizeof(state));
+    set_fa_state(cparam, &state);
+    if(check_stats(fa, &state))
+        TEST_ERROR
+
+    /* Shutdown iterator */
+    if(tparam->fiter->term(fiter_info) < 0)
+        TEST_ERROR
+
+    /* Close array, delete array, close file & verify file is empty */
+    if(finish(file, fapl, f, fa, fa_addr) < 0)
+        TEST_ERROR
+
+    /* All tests passed */
+    PASSED()
+
+    return 0;
+
+error:
+    H5E_BEGIN_TRY {
+        if(fa)
+            H5FA_close(fa, H5P_DATASET_XFER_DEFAULT);
+	H5Fclose(file);
+    } H5E_END_TRY;
+
+    return 1;
+} /* test_set_elmts() */
+
+
+/*-------------------------------------------------------------------------
+ * Function:	test_skip_elmts
+ *
+ * Purpose:	Set the element "skip_elmts" in the fixed array
+ *		("skip_elmts" is the index of the fixed array to be set.)
+ *
+ * Return:	Success:	0
+ *		Failure:	1
+ *
+ *-------------------------------------------------------------------------
+ */
+static unsigned
+test_skip_elmts(hid_t fapl, H5FA_create_t *cparam, farray_test_param_t *tparam,
+    hsize_t skip_elmts, hbool_t check_rest, const char *test_str)
+{
+    hid_t	file = -1;              /* File ID */
+    H5F_t	*f = NULL;              /* Internal file object pointer */
+    H5FA_t      *fa = NULL;             /* Extensible array wrapper */
+    farray_state_t state;               /* State of extensible array */
+    uint64_t    welmt;                  /* Element to write */
+    uint64_t    relmt;                  /* Element to read */
+    hsize_t     idx;                    /* Index value of element to get */
+    hsize_t     cnt;                    /* Count of array indices */
+    hsize_t	fa_nelmts;		/* # of elements in fixed array */
+    haddr_t     fa_addr = HADDR_UNDEF;  /* Array address in file */
+
+    /*
+     * Display testing message
+     */
+    TESTING(test_str);
+
+    /* Create file & retrieve pointer to internal file object */
+    if(create_file(fapl, &file, &f) < 0)
+        TEST_ERROR
+
+    /* Create array */
+    if(create_array(f, H5P_DATASET_XFER_DEFAULT, cparam, &fa, &fa_addr, NULL) < 0)
+        TEST_ERROR
+
+    /* Verify the creation parameters */
+    if(verify_cparam(fa, cparam) < 0)
+        TEST_ERROR
+
+    /* Check for closing & re-opening the file */
+    if(reopen_file(&file, &f, fapl, H5P_DATASET_XFER_DEFAULT, &fa, fa_addr, cparam->cls, tparam) < 0)
+        TEST_ERROR
+
+    if(H5FA_get_nelmts(fa, &fa_nelmts) < 0)
+        FAIL_STACK_ERROR
+
+    if(skip_elmts >= fa_nelmts)
+        TEST_ERROR
+
+    /* Verify array state */
+    HDmemset(&state, 0, sizeof(state));
+    state.hdr_size = FA_HDR_SIZE;
+    state.nelmts = cparam->nelmts;
+    state.dblk_size = 0;
+    if(check_stats(fa, &state))
+        TEST_ERROR
+
+    /* Set (& get) element after skipping elements */
+    idx = skip_elmts;
+
+    /* Retrieve element of array (not set yet) */
+    relmt = (uint64_t)0;
+    if(H5FA_get(fa, H5P_DATASET_XFER_DEFAULT, idx, &relmt) < 0)
+        FAIL_STACK_ERROR
+
+    /* Verify that the retrieved is correct */
+    if(check_elmt(tparam, &relmt, NULL))
+        TEST_ERROR
+
+    /* Set element of array */
+    welmt = (uint64_t)7 + idx;
+    if(H5FA_set(fa, H5P_DATASET_XFER_DEFAULT, idx, &welmt) < 0)
+        FAIL_STACK_ERROR
+
+    /* Verify array state */
+    HDmemset(&state, 0, sizeof(state));
+    set_fa_state(cparam, &state);
+    if(check_stats(fa, &state))
+        TEST_ERROR
+
+    /* Retrieve element of array (set now) */
+    relmt = (uint64_t)0;
+    if(H5FA_get(fa, H5P_DATASET_XFER_DEFAULT, idx, &relmt) < 0)
+        FAIL_STACK_ERROR
+
+    /* Verify that the retrieved is correct */
+    if(check_elmt(tparam, &relmt, &welmt))
+        TEST_ERROR
+
+    if(check_rest) {
+        /* Get unset elements of array */
+        for(cnt = 0; cnt < skip_elmts; cnt++) {
+            /* Retrieve element of array (not set yet) */
+            relmt = (uint64_t)0;
+            if(H5FA_get(fa, H5P_DATASET_XFER_DEFAULT, cnt, &relmt) < 0)
+                FAIL_STACK_ERROR
+
+            /* Verify that the retrieved is correct */
+            if(check_elmt(tparam, &relmt, NULL))
+                TEST_ERROR
+        } /* end for */
+    } /* end if */
+
+    /* Close array, delete array, close file & verify file is empty */
+    if(finish(file, fapl, f, fa, fa_addr) < 0)
+        TEST_ERROR
+
+    /* All tests passed */
+    PASSED()
+
+    return 0;
+
+error:
+    H5E_BEGIN_TRY {
+        if(fa)
+            H5FA_close(fa, H5P_DATASET_XFER_DEFAULT);
+	H5Fclose(file);
+    } H5E_END_TRY;
+
+    return 1;
+} /* test_skip_elmts() */
+
+
+/*-------------------------------------------------------------------------
+ * Function:	main
+ *
+ * Purpose:	Test the fixed array code
+ *
+ * Return:	Success: 0
+ *		Failure: 1
+ *
+ *-------------------------------------------------------------------------
+ */
+int
+main(void)
+{
+    H5FA_create_t cparam;               /* Creation parameters for fixed array */
+    farray_test_param_t tparam;         /* Testing parameters */
+    farray_test_type_t curr_test;       /* Current test being worked on */
+    farray_iter_type_t curr_iter;       /* Current iteration type being worked on */
+    hid_t	fapl = -1;              /* File access property list for data files */
+    unsigned	nerrors = 0;            /* Cumulative error count */
+    time_t      curr_time;              /* Current time, for seeding random number generator */
+    int		ExpressMode;            /* Test express value */
+
+    /* Reset library */
+    h5_reset();
+    fapl = h5_fileaccess();
+    ExpressMode = GetTestExpress();
+    if(ExpressMode > 1)
+	printf("***Express test mode on.  Some tests may be skipped\n");
+
+    /* Set the filename to use for this test (dependent on fapl) */
+    h5_fixname(FILENAME[0], fapl, filename_g, sizeof(filename_g));
+
+    /* Seed random #'s */
+    curr_time = HDtime(NULL);
+    HDsrandom((unsigned long)curr_time);
+
+    /* Create an empty file to retrieve size */
+    {
+        hid_t	file;              /* File ID */
+
+        if((file = H5Fcreate(filename_g, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0)
+            FAIL_STACK_ERROR
+
+        /* Close file */
+        if(H5Fclose(file) < 0)
+            FAIL_STACK_ERROR
+
+        /* Get the size of a file w/no array */
+        if((empty_size_g = h5_get_file_size(filename_g, fapl)) < 0)
+            TEST_ERROR
+    }
+
+    /* Iterate over the testing parameters */
+    for(curr_test = FARRAY_TEST_NORMAL; curr_test < FARRAY_TEST_NTESTS; curr_test++) {
+
+        /* Initialize the testing parameters */
+	HDmemset(&tparam, 0, sizeof(tparam));
+	tparam.nelmts = TEST_NELMTS;
+
+        /* Set appropriate testing parameters for each test */
+        switch(curr_test) {
+            /* "Normal" testing parameters */
+            case FARRAY_TEST_NORMAL:
+                puts("Testing with NORMAL PARAMETERS");
+                break;
+
+            /* "Re-open array" testing parameters */
+            case FARRAY_TEST_REOPEN:
+                puts("Testing with reopen array flag set");
+                tparam.reopen_array = FARRAY_TEST_REOPEN;
+                break;
+
+            /* An unknown test? */
+            case FARRAY_TEST_NTESTS:
+            default:
+                goto error;
+        } /* end switch */
+
+	/* Initialize fixed array creation parameters */
+	init_cparam(&cparam, &tparam);
+
+        /* Basic capability tests */
+        nerrors += test_create(fapl, &cparam, &tparam);
+        nerrors += test_reopen(fapl, &cparam, &tparam);
+        nerrors += test_open_twice(fapl, &cparam, &tparam);
+        nerrors += test_delete_open(fapl, &cparam, &tparam);
+
+	/* Iterate over the type of capacity tests */
+	for(curr_iter = FARRAY_ITER_FW; curr_iter < FARRAY_ITER_NITERS; curr_iter++) {
+
+            /* Set appropriate parameters for each type of iteration */
+            switch(curr_iter) {
+                /* "Forward" testing parameters */
+                case FARRAY_ITER_FW:
+                    puts("Testing with forward iteration");
+                    tparam.fiter = &fa_iter_fw;
+                    break;
+
+                /* "Reverse" testing parameters */
+                case FARRAY_ITER_RV:
+                    puts("Testing with reverse iteration");
+                    tparam.fiter = &fa_iter_rv;
+                    break;
+
+                /* "Random" testing parameters */
+                case FARRAY_ITER_RND:
+                    puts("Testing with random iteration");
+                    tparam.fiter = &fa_iter_rnd;
+                    break;
+
+                /* "Cyclic" testing parameters */
+                case FARRAY_ITER_CYC:
+                    puts("Testing with cyclic iteration");
+                    tparam.fiter = &fa_iter_cyc;
+                    break;
+
+                /* An unknown iteration? */
+                case FARRAY_ITER_NITERS:
+                default:
+                    goto error;
+            } /* end switch */
+
+            /* Basic capacity tests */
+            nerrors += test_set_elmts(fapl, &cparam, &tparam, (hsize_t)1, "setting 1 element of the array");
+            nerrors += test_set_elmts(fapl, &cparam, &tparam, (hsize_t)(tparam.nelmts/2), "setting half of the array's elements ");
+            nerrors += test_set_elmts(fapl, &cparam, &tparam, (hsize_t)tparam.nelmts, "setting all the array elements");
+        } /* end for */
+
+	/* Check skipping elements */
+        nerrors += test_skip_elmts(fapl, &cparam, &tparam, (hsize_t)1, TRUE, "skipping to first element");
+        nerrors += test_skip_elmts(fapl, &cparam, &tparam, ((hsize_t)1 << cparam.max_dblk_page_nelmts_bits), TRUE, "skipping to first element in data block page");
+        nerrors += test_skip_elmts(fapl, &cparam, &tparam, (hsize_t)(tparam.nelmts - 1), TRUE, "skipping to last element");
+
+	/* Create Fixed Array of MAX_NELMTS elements */
+	/* 
+	 * MAX_NELMTS succeeds on jam and smirom.
+	 * The value was adjusted for linew due to the following:
+	    Linew failed with "H5FD_sec2_truncate(): unable to extend file properly"
+	    Linew failed with "H5FD_sec2_truncate(): File too large"
+	 */
+        tparam.nelmts = MAX_NELMTS/17;
+	init_cparam(&cparam, &tparam);
+
+	/* Set the last element in the Fixed Array */
+        nerrors += test_skip_elmts(fapl, &cparam, &tparam, (hsize_t)(tparam.nelmts - 1), FALSE, "skipping to last element");
+    } /* end for */
+
+    if(nerrors)
+        goto error;
+    puts("All fixed array tests passed.");
+
+    /* Clean up file used */
+    h5_cleanup(FILENAME, fapl);
+
+    return 0;
+
+error:
+    puts("*** TESTS FAILED ***");
+
+    H5E_BEGIN_TRY {
+	H5Pclose(fapl);
+    } H5E_END_TRY;
+
+    return 1;
+} /* end main() */
+
diff --git a/test/tfile.c b/test/tfile.c
index b0a84b6..b96a47e 100644
--- a/test/tfile.c
+++ b/test/tfile.c
@@ -49,6 +49,7 @@
 #define F1_SYM_LEAF_K	   4
 #define F1_SYM_INTERN_K	   16
 #define FILE1	"tfile1.h5"
+#define SFILE1	"sys_file1"
 
 #define F2_USERBLOCK_SIZE  (hsize_t)512
 #define F2_OFFSET_SIZE	   8
@@ -2074,20 +2075,15 @@ test_cached_stab_info(void)
 **              June 29, 2009
 **
 **  Modification: Raymond Lu
-**                Skip this function for OpenVMS.
+**                I added a test with the system functions to make
+**                sure the stat function behaves as we expected.
 **                17 September 2009
 *****************************************************************/
-#ifdef H5_VMS
-static void
-test_rw_noupdate(void)
-{
-    /* Output message about test being performed */
-    MESSAGE(1, ("Testing to verify that nothing is written if nothing is changed.  This test is skipped on OpenVMS because the modification time from stat is the same as the last access time.\n"));
-} /* end test_rw_noupdate() */
-#else
 static void
 test_rw_noupdate(void)
 {
+    int   fid;          /* File ID from system-created file */
+    struct stat sys_sb1, sys_sb2;  /* Info from the system stat */
     hid_t file_id;      /* HDF5 File ID */
     h5_stat_t sb1, sb2; /* Info from 'stat' call */
     double diff;        /* Difference in modification times */
@@ -2096,7 +2092,42 @@ test_rw_noupdate(void)
     /* Output message about test being performed */
     MESSAGE(5, ("Testing to verify that nothing is written if nothing is changed.\n"));
 
-    /* Create and Close File */
+    /* First make sure the stat function behaves as we expect - the modification time
+     * is the time that the file was modified last time. */
+    fid = open(SFILE1, O_RDWR | O_CREAT | O_TRUNC, 0666);
+    CHECK(fid, FAIL, "open");
+    ret = close(fid);
+    CHECK(ret, FAIL, "close");
+
+    /* Determine File's Initial Timestamp */
+    ret = stat(SFILE1, &sys_sb1);
+    VERIFY(ret, 0, "stat");
+
+    /* Wait for 2 seconds */
+    /* This ensures a system time difference between the two file accesses */
+    sleep(2);
+
+    fid = open(SFILE1, O_RDWR);
+    CHECK(fid, FAIL, "open");
+    ret = close(fid);
+    CHECK(ret, FAIL, "close");
+
+    /* Determine File's New Timestamp */
+    ret = stat(SFILE1, &sys_sb2);
+    VERIFY(ret, 0, "stat");
+
+    /* Ensure That Timestamps Are Equal */
+    diff = difftime(sys_sb2.st_mtime, sys_sb1.st_mtime);
+
+    if(!DBL_ABS_EQUAL(diff, 0.0)) {
+        /* Output message about test being performed */
+        MESSAGE(1, ("Testing to verify that nothing is written if nothing is changed: This test is skipped on this system because the modification time from stat is the same as the last access time (We know OpenVMS behaves in this way).\n"));
+
+        goto done;
+    }
+
+    /* Then we can test with a HDF5 file */
+    /* Create and Close a HDF5 File */
     file_id = H5Fcreate(FILE1, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
     CHECK(file_id, FAIL, "H5Fcreate");
     ret = H5Fclose(file_id);
@@ -2124,8 +2155,10 @@ test_rw_noupdate(void)
     diff = HDdifftime(sb2.st_mtime, sb1.st_mtime);
     ret = (diff > 0.0);
     VERIFY(ret, 0, "Timestamp");
+
+done:
+    ; /* do nothing */
 } /* end test_rw_noupdate() */
-#endif
 
 /****************************************************************
 **
@@ -2730,6 +2763,7 @@ test_file(void)
 void
 cleanup_file(void)
 {
+    HDremove(SFILE1);
     HDremove(FILE1);
     HDremove(FILE2);
     HDremove(FILE3);