[svn-r15674] Description:

	Add base support for extensible array "data blocks" to code, tests and
h5debug.

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, 445 insertions, 93 deletions

diff --git a/src/H5EAcache.c b/src/H5EAcache.c
index 3a8bba5..d7d57c3 100644
--- a/src/H5EAcache.c
+++ b/src/H5EAcache.c
@@ -43,6 +43,7 @@
 #include "H5Eprivate.h"		/* Error handling		  	*/
 #include "H5EApkg.h"		/* Extensible Arrays			*/
 #include "H5MFprivate.h"	/* File memory management		*/
+#include "H5Vprivate.h"		/* Vectors and arrays 			*/
 #include "H5WBprivate.h"        /* Wrapped Buffers                      */
 
 
@@ -53,10 +54,12 @@
 /* Fractal heap format version #'s */
 #define H5EA_HDR_VERSION        0               /* Header */
 #define H5EA_IBLOCK_VERSION     0               /* Index block */
+#define H5EA_DBLOCK_VERSION     0               /* Data block */
 
 /* Size of stack buffer for serialization buffers */
 #define H5EA_HDR_BUF_SIZE       512
 #define H5EA_IBLOCK_BUF_SIZE    512
+#define H5EA_DBLOCK_BUF_SIZE    512
 
 
 /******************/
@@ -75,13 +78,20 @@
 
 /* Metadata cache (H5AC) callbacks */
 static H5EA_hdr_t *H5EA__cache_hdr_load(H5F_t *f, hid_t dxpl_id, haddr_t addr, const void *udata, void *udata2);
-static herr_t H5EA__cache_hdr_flush(H5F_t *f, hid_t dxpl_id, hbool_t destroy, haddr_t addr, H5EA_hdr_t *hdr, unsigned UNUSED * flags_ptr);
+static herr_t H5EA__cache_hdr_flush(H5F_t *f, hid_t dxpl_id, hbool_t destroy, haddr_t addr, H5EA_hdr_t *hdr, unsigned * flags_ptr);
 static herr_t H5EA__cache_hdr_clear(H5F_t *f, H5EA_hdr_t *hdr, hbool_t destroy);
 static herr_t H5EA__cache_hdr_size(const H5F_t *f, const H5EA_hdr_t *hdr, size_t *size_ptr);
+static herr_t H5EA__cache_hdr_dest(H5F_t *f, H5EA_hdr_t *hdr);
 static H5EA_iblock_t *H5EA__cache_iblock_load(H5F_t *f, hid_t dxpl_id, haddr_t addr, const void *udata, void *udata2);
-static herr_t H5EA__cache_iblock_flush(H5F_t *f, hid_t dxpl_id, hbool_t destroy, haddr_t addr, H5EA_iblock_t *iblock, unsigned UNUSED * flags_ptr);
+static herr_t H5EA__cache_iblock_flush(H5F_t *f, hid_t dxpl_id, hbool_t destroy, haddr_t addr, H5EA_iblock_t *iblock, unsigned * flags_ptr);
 static herr_t H5EA__cache_iblock_clear(H5F_t *f, H5EA_iblock_t *iblock, hbool_t destroy);
 static herr_t H5EA__cache_iblock_size(const H5F_t *f, const H5EA_iblock_t *iblock, size_t *size_ptr);
+static herr_t H5EA__cache_iblock_dest(H5F_t *f, H5EA_iblock_t *iblock);
+static H5EA_dblock_t *H5EA__cache_dblock_load(H5F_t *f, hid_t dxpl_id, haddr_t addr, const void *udata, void *udata2);
+static herr_t H5EA__cache_dblock_flush(H5F_t *f, hid_t dxpl_id, hbool_t destroy, haddr_t addr, H5EA_dblock_t *dblock, unsigned * flags_ptr);
+static herr_t H5EA__cache_dblock_clear(H5F_t *f, H5EA_dblock_t *dblock, hbool_t destroy);
+static herr_t H5EA__cache_dblock_size(const H5F_t *f, const H5EA_dblock_t *dblock, size_t *size_ptr);
+static herr_t H5EA__cache_dblock_dest(H5F_t *f, H5EA_dblock_t *dblock);
 
 
 /*********************/
@@ -108,6 +118,16 @@ const H5AC_class_t H5AC_EARRAY_IBLOCK[1] = {{
     (H5AC_size_func_t)H5EA__cache_iblock_size,
 }};
 
+/* H5EA data block inherits cache-like properties from H5AC */
+const H5AC_class_t H5AC_EARRAY_DBLOCK[1] = {{
+    H5AC_EARRAY_DBLOCK_ID,
+    (H5AC_load_func_t)H5EA__cache_dblock_load,
+    (H5AC_flush_func_t)H5EA__cache_dblock_flush,
+    (H5AC_dest_func_t)H5EA__cache_dblock_dest,
+    (H5AC_clear_func_t)H5EA__cache_dblock_clear,
+    (H5AC_size_func_t)H5EA__cache_dblock_size,
+}};
+
 
 /*****************************/
 /* Library Private Variables */
@@ -136,7 +156,8 @@ const H5AC_class_t H5AC_EARRAY_IBLOCK[1] = {{
  */
 BEGIN_FUNC(STATIC, ERR,
 H5EA_hdr_t *, NULL, NULL,
-H5EA__cache_hdr_load(H5F_t *f, hid_t dxpl_id, haddr_t addr, const void *_cls, void UNUSED *udata2))
+H5EA__cache_hdr_load(H5F_t *f, hid_t dxpl_id, haddr_t addr, const void *_cls,
+    void UNUSED *udata2))
 
     /* Local variables */
     const H5EA_class_t  *cls = (const H5EA_class_t *)_cls;      /* Extensible array class */
@@ -200,15 +221,15 @@ H5EA__cache_hdr_load(H5F_t *f, hid_t dxpl_id, haddr_t addr, const void *_cls, vo
 
     /* Internal information */
     H5F_addr_decode(f, &p, &hdr->idx_blk_addr); /* Address of index block */
-    H5F_DECODE_LENGTH(f, p, hdr->max_idx_set);  /* Max. index set (+1) */
+    H5F_DECODE_LENGTH(f, p, hdr->stats.max_idx_set);    /* Max. index set (+1) */
+    H5F_DECODE_LENGTH(f, p, hdr->stats.nsuper_blks);    /* Number of super blocks created */
+    H5F_DECODE_LENGTH(f, p, hdr->stats.ndata_blks);     /* Number of data blocks created */
+    H5F_DECODE_LENGTH(f, p, hdr->stats.nelmts);         /* Number of elements 'realized' */
 
     /* Sanity check */
     /* (allow for checksum not decoded yet) */
     HDassert((size_t)(p - buf) == (size - H5EA_SIZEOF_CHKSUM));
 
-    /* Set the array header's size */
-    hdr->size = size;
-
     /* Compute checksum on entire header */
     /* (including the filter information, if present) */
     computed_chksum = H5_checksum_metadata(buf, (size_t)(p - buf), 0);
@@ -217,12 +238,17 @@ H5EA__cache_hdr_load(H5F_t *f, hid_t dxpl_id, haddr_t addr, const void *_cls, vo
     UINT32DECODE(p, stored_chksum);
 
     /* Sanity check */
-    HDassert((size_t)(p - buf) == hdr->size);
+    HDassert((size_t)(p - buf) == size);
 
     /* Verify checksum */
     if(stored_chksum != computed_chksum)
 	H5E_THROW(H5E_BADVALUE, "incorrect metadata checksum for extensible array header")
 
+    /* Finish initializing extensible array header */
+    if(H5EA__hdr_init(hdr) < 0)
+	H5E_THROW(H5E_CANTINIT, "initialization failed for extensible array header")
+    HDassert(hdr->size == size);
+
     /* Set return value */
     ret_value = hdr;
 
@@ -253,7 +279,8 @@ END_FUNC(STATIC)   /* end H5EA__cache_hdr_load() */
  */
 BEGIN_FUNC(STATIC, ERR,
 herr_t, SUCCEED, FAIL,
-H5EA__cache_hdr_flush(H5F_t *f, hid_t dxpl_id, hbool_t destroy, haddr_t addr, H5EA_hdr_t *hdr, unsigned UNUSED * flags_ptr))
+H5EA__cache_hdr_flush(H5F_t *f, hid_t dxpl_id, hbool_t destroy, haddr_t addr,
+    H5EA_hdr_t *hdr, unsigned UNUSED * flags_ptr))
 
     H5WB_t *wb = NULL;                  /* Wrapped buffer for header data */
     uint8_t hdr_buf[H5EA_HDR_BUF_SIZE]; /* Buffer for header */
@@ -302,7 +329,10 @@ H5EA__cache_hdr_flush(H5F_t *f, hid_t dxpl_id, hbool_t destroy, haddr_t addr, H5
 
         /* Internal information */
         H5F_addr_encode(f, &p, hdr->idx_blk_addr);  /* Address of index block */
-        H5F_ENCODE_LENGTH(f, p, hdr->max_idx_set);  /* Max. index set (+1) */
+        H5F_ENCODE_LENGTH(f, p, hdr->stats.max_idx_set);    /* Max. index set (+1) */
+        H5F_ENCODE_LENGTH(f, p, hdr->stats.nsuper_blks);    /* Number of super blocks created */
+        H5F_ENCODE_LENGTH(f, p, hdr->stats.ndata_blks);     /* Number of data blocks created */
+        H5F_ENCODE_LENGTH(f, p, hdr->stats.nelmts);         /* Number of elements 'realized' */
 
         /* Compute metadata checksum */
         metadata_chksum = H5_checksum_metadata(buf, (size_t)(p - buf), 0);
@@ -332,36 +362,6 @@ END_FUNC(STATIC)   /* end H5EA__cache_hdr_flush() */
 
 
 /*-------------------------------------------------------------------------
- * Function:	H5EA__cache_hdr_dest
- *
- * Purpose:	Destroys a extensible array header in memory.
- *
- * Return:	Non-negative on success/Negative on failure
- *
- * Programmer:	Quincey Koziol
- *		koziol@hdfgroup.org
- *		Aug 26 2008
- *
- *-------------------------------------------------------------------------
- */
-/* ARGSUSED */
-BEGIN_FUNC(PKG, NOERR,
-herr_t, SUCCEED, -,
-H5EA__cache_hdr_dest(H5F_t UNUSED *f, H5EA_hdr_t *hdr))
-
-    /*
-     * Check arguments.
-     */
-    HDassert(hdr);
-    HDassert(hdr->rc == 0);
-
-    /* Free the shared info itself */
-    (void)H5FL_FREE(H5EA_hdr_t, hdr);
-
-END_FUNC(PKG)   /* end H5EA__cache_hdr_dest() */
-
-
-/*-------------------------------------------------------------------------
  * Function:	H5EA__cache_hdr_clear
  *
  * Purpose:	Mark a extensible array header in memory as non-dirty.
@@ -378,9 +378,7 @@ BEGIN_FUNC(STATIC, ERR,
 herr_t, SUCCEED, FAIL,
 H5EA__cache_hdr_clear(H5F_t *f, H5EA_hdr_t *hdr, hbool_t destroy))
 
-    /*
-     * Check arguments.
-     */
+    /* Sanity check */
     HDassert(hdr);
 
     /* Reset the dirty flag.  */
@@ -413,9 +411,10 @@ END_FUNC(STATIC)   /* end H5EA__cache_hdr_clear() */
 /* ARGSUSED */
 BEGIN_FUNC(STATIC, NOERR,
 herr_t, SUCCEED, -,
-H5EA__cache_hdr_size(const H5F_t UNUSED *f, const H5EA_hdr_t *hdr, size_t *size_ptr))
+H5EA__cache_hdr_size(const H5F_t UNUSED *f, const H5EA_hdr_t *hdr,
+    size_t *size_ptr))
 
-    /* check arguments */
+    /* Sanity check */
     HDassert(f);
     HDassert(hdr);
     HDassert(size_ptr);
@@ -427,6 +426,36 @@ END_FUNC(STATIC)   /* end H5EA__cache_hdr_size() */
 
 
 /*-------------------------------------------------------------------------
+ * Function:	H5EA__cache_hdr_dest
+ *
+ * Purpose:	Destroys an extensible array header in memory.
+ *
+ * Return:	Non-negative on success/Negative on failure
+ *
+ * Programmer:	Quincey Koziol
+ *		koziol@hdfgroup.org
+ *		Aug 26 2008
+ *
+ *-------------------------------------------------------------------------
+ */
+/* ARGSUSED */
+BEGIN_FUNC(STATIC, ERR,
+herr_t, SUCCEED, FAIL,
+H5EA__cache_hdr_dest(H5F_t UNUSED *f, H5EA_hdr_t *hdr))
+
+    /* Check arguments */
+    HDassert(hdr);
+
+    /* Release the extensible array header */
+    if(H5EA__hdr_dest(hdr) < 0)
+        H5E_THROW(H5E_CANTFREE, "can't free extensible array header")
+
+CATCH
+
+END_FUNC(STATIC)   /* end H5EA__cache_hdr_dest() */
+
+
+/*-------------------------------------------------------------------------
  * Function:	H5EA__cache_iblock_load
  *
  * Purpose:	Loads an extensible array index block from the disk.
@@ -442,7 +471,8 @@ END_FUNC(STATIC)   /* end H5EA__cache_hdr_size() */
  */
 BEGIN_FUNC(STATIC, ERR,
 H5EA_iblock_t *, NULL, NULL,
-H5EA__cache_iblock_load(H5F_t *f, hid_t dxpl_id, haddr_t addr, const void UNUSED *udata1, void *_hdr))
+H5EA__cache_iblock_load(H5F_t *f, hid_t dxpl_id, haddr_t addr,
+    const void UNUSED *udata1, void *_hdr))
 
     /* Local variables */
     H5EA_hdr_t    *hdr = (H5EA_hdr_t *)_hdr;      /* Shared extensible array information */
@@ -462,12 +492,7 @@ H5EA__cache_iblock_load(H5F_t *f, hid_t dxpl_id, haddr_t addr, const void UNUSED
 
     /* Allocate the extensible array index block */
     if(NULL == (iblock = H5EA__iblock_alloc(hdr)))
-	H5E_THROW(H5E_CANTALLOC, "memory allocation failed for extensible array shared header")
-
-    /* Share common array information */
-    iblock->hdr = hdr;
-    if(H5EA__hdr_incr(hdr) < 0)
-	H5E_THROW(H5E_CANTINC, "can't increment reference count on shared array header")
+	H5E_THROW(H5E_CANTALLOC, "memory allocation failed for extensible array index block")
 
     /* Set the extensible array index block's address */
     iblock->addr = addr;
@@ -477,7 +502,7 @@ H5EA__cache_iblock_load(H5F_t *f, hid_t dxpl_id, haddr_t addr, const void UNUSED
 	H5E_THROW(H5E_CANTINIT, "can't wrap buffer")
 
     /* Compute the size of the extensible array index block on disk */
-    size = H5EA_IBLOCK_SIZE(hdr);
+    size = H5EA_IBLOCK_SIZE(iblock);
 
     /* Get a pointer to a buffer that's large enough for serialized info */
     if(NULL == (buf = (uint8_t *)H5WB_actual(wb, size)))
@@ -513,6 +538,24 @@ H5EA__cache_iblock_load(H5F_t *f, hid_t dxpl_id, haddr_t addr, const void UNUSED
         p += (hdr->idx_blk_elmts * hdr->raw_elmt_size);
     } /* end if */
 
+    /* Decode data block addresses in index block */
+    if(iblock->ndblk_addrs > 0) {
+        size_t u;               /* Local index variable */
+
+        /* Decode addresses of data blocks in index block */
+        for(u = 0; u < iblock->ndblk_addrs; u++)
+            H5F_addr_decode(f, &p, &iblock->dblk_addrs[u]);
+    } /* end if */
+
+    /* Decode super block addresses in index block */
+    if(iblock->nsblk_addrs > 0) {
+        size_t u;               /* Local index variable */
+
+        /* Decode addresses of super blocks in index block */
+        for(u = 0; u < iblock->nsblk_addrs; u++)
+            H5F_addr_decode(f, &p, &iblock->sblk_addrs[u]);
+    } /* end if */
+
     /* Sanity check */
     /* (allow for checksum not decoded yet) */
     HDassert((size_t)(p - buf) == (size - H5EA_SIZEOF_CHKSUM));
@@ -563,11 +606,12 @@ END_FUNC(STATIC)   /* end H5EA__cache_iblock_load() */
  */
 BEGIN_FUNC(STATIC, ERR,
 herr_t, SUCCEED, FAIL,
-H5EA__cache_iblock_flush(H5F_t *f, hid_t dxpl_id, hbool_t destroy, haddr_t addr, H5EA_iblock_t *iblock, unsigned UNUSED * flags_ptr))
+H5EA__cache_iblock_flush(H5F_t *f, hid_t dxpl_id, hbool_t destroy, haddr_t addr,
+    H5EA_iblock_t *iblock, unsigned UNUSED * flags_ptr))
 
     /* Local variables */
     H5WB_t *wb = NULL;                  /* Wrapped buffer for serializing data */
-    uint8_t ser_buf[H5EA_HDR_BUF_SIZE]; /* Serialization buffer */
+    uint8_t ser_buf[H5EA_IBLOCK_BUF_SIZE]; /* Serialization buffer */
 
     /* Sanity check */
     HDassert(f);
@@ -615,6 +659,24 @@ H5EA__cache_iblock_flush(H5F_t *f, hid_t dxpl_id, hbool_t destroy, haddr_t addr,
             p += (iblock->hdr->idx_blk_elmts * iblock->hdr->raw_elmt_size);
         } /* end if */
 
+        /* Encode data block addresses in index block */
+        if(iblock->ndblk_addrs > 0) {
+            size_t u;               /* Local index variable */
+
+            /* Encode addresses of data blocks in index block */
+            for(u = 0; u < iblock->ndblk_addrs; u++)
+                H5F_addr_encode(f, &p, iblock->dblk_addrs[u]);
+        } /* end if */
+
+        /* Encode data block addresses in index block */
+        if(iblock->nsblk_addrs > 0) {
+            size_t u;               /* Local index variable */
+
+            /* Encode addresses of super blocks in index block */
+            for(u = 0; u < iblock->nsblk_addrs; u++)
+                H5F_addr_encode(f, &p, iblock->sblk_addrs[u]);
+        } /* end if */
+
         /* Compute metadata checksum */
         metadata_chksum = H5_checksum_metadata(buf, (size_t)(p - buf), 0);
 
@@ -643,9 +705,73 @@ END_FUNC(STATIC)   /* end H5EA__cache_iblock_flush() */
 
 
 /*-------------------------------------------------------------------------
+ * Function:	H5EA__cache_iblock_clear
+ *
+ * Purpose:	Mark a extensible array index block in memory as non-dirty.
+ *
+ * Return:	Non-negative on success/Negative on failure
+ *
+ * Programmer:	Quincey Koziol
+ *		koziol@hdfgroup.org
+ *		Sept 9 2008
+ *
+ *-------------------------------------------------------------------------
+ */
+BEGIN_FUNC(STATIC, ERR,
+herr_t, SUCCEED, FAIL,
+H5EA__cache_iblock_clear(H5F_t *f, H5EA_iblock_t *iblock, hbool_t destroy))
+
+    /* Sanity check */
+    HDassert(iblock);
+
+    /* Reset the dirty flag */
+    iblock->cache_info.is_dirty = FALSE;
+
+    if(destroy)
+        if(H5EA__cache_iblock_dest(f, iblock) < 0)
+            H5E_THROW(H5E_CANTFREE, "unable to destroy extensible array index block")
+
+CATCH
+
+END_FUNC(STATIC)   /* end H5EA__cache_iblock_clear() */
+
+
+/*-------------------------------------------------------------------------
+ * Function:	H5EA__cache_iblock_size
+ *
+ * Purpose:	Compute the size in bytes of a extensible array index block
+ *		on disk, and return it in *size_ptr.  On failure,
+ *		the value of *size_ptr is undefined.
+ *
+ * Return:	Non-negative on success/Negative on failure
+ *
+ * Programmer:	Quincey Koziol
+ *		koziol@hdfgroup.org
+ *		Sept 9 2008
+ *
+ *-------------------------------------------------------------------------
+ */
+/* ARGSUSED */
+BEGIN_FUNC(STATIC, NOERR,
+herr_t, SUCCEED, -,
+H5EA__cache_iblock_size(const H5F_t UNUSED *f, const H5EA_iblock_t *iblock,
+    size_t *size_ptr))
+
+    /* Sanity check */
+    HDassert(f);
+    HDassert(iblock);
+    HDassert(size_ptr);
+
+    /* Set size value */
+    *size_ptr = iblock->size;
+
+END_FUNC(STATIC)   /* end H5EA__cache_iblock_size() */
+
+
+/*-------------------------------------------------------------------------
  * Function:	H5EA__cache_iblock_dest
  *
- * Purpose:	Destroys a extensible array index block in memory.
+ * Purpose:	Destroys an extensible array index block in memory.
  *
  * Return:	Non-negative on success/Negative on failure
  *
@@ -655,75 +781,270 @@ END_FUNC(STATIC)   /* end H5EA__cache_iblock_flush() */
  *
  *-------------------------------------------------------------------------
  */
-/* ARGSUSED */
-BEGIN_FUNC(PKG, ERR,
+BEGIN_FUNC(STATIC, ERR,
 herr_t, SUCCEED, FAIL,
-H5EA__cache_iblock_dest(H5F_t UNUSED *f, H5EA_iblock_t *iblock))
+H5EA__cache_iblock_dest(H5F_t *f, H5EA_iblock_t *iblock))
 
     /* Sanity check */
     HDassert(iblock);
-    HDassert(iblock->rc == 0);
 
-    /* Set the shared array header's file context for this operation */
-    iblock->hdr->f = f;
+    /* Release the index block */
+    if(H5EA__iblock_dest(f, iblock) < 0)
+        H5E_THROW(H5E_CANTFREE, "can't free extensible array index block")
 
-    /* Check if we've got elements in the index block */
-    if(iblock->hdr->idx_blk_elmts > 0) {
-        /* Free buffer for index block elements */
-        HDassert(iblock->elmts);
-        (void)H5FL_BLK_FREE(elmt_buf, iblock->elmts);
-    } /* end if */
+CATCH
+
+END_FUNC(STATIC)   /* end H5EA__cache_iblock_dest() */
+
+
+/*-------------------------------------------------------------------------
+ * Function:	H5EA__cache_dblock_load
+ *
+ * Purpose:	Loads an extensible array data block from the disk.
+ *
+ * Return:	Success:	Pointer to a new extensible array data block
+ *		Failure:	NULL
+ *
+ * Programmer:	Quincey Koziol
+ *		koziol@hdfgroup.org
+ *		Sep 16 2008
+ *
+ *-------------------------------------------------------------------------
+ */
+BEGIN_FUNC(STATIC, ERR,
+H5EA_dblock_t *, NULL, NULL,
+H5EA__cache_dblock_load(H5F_t *f, hid_t dxpl_id, haddr_t addr,
+    const void *_nelmts, void *_hdr))
 
-    /* Decrement reference count on shared info */
-    if(H5EA__hdr_decr(iblock->hdr) < 0)
-        H5E_THROW(H5E_CANTDEC, "can't decrement reference count on shared array header")
+    /* Local variables */
+    H5EA_hdr_t          *hdr = (H5EA_hdr_t *)_hdr;  /* Shared extensible array information */
+    const size_t        *nelmts = (const size_t *)_nelmts;  /* Number of elements in data block */
+    H5EA_dblock_t	*dblock = NULL; /* Data block info */
+    size_t		size;           /* Data block size */
+    H5WB_t              *wb = NULL;     /* Wrapped buffer for data block data */
+    uint8_t             dblock_buf[H5EA_DBLOCK_BUF_SIZE]; /* Buffer for data block */
+    uint8_t		*buf;           /* Pointer to data block buffer */
+    const uint8_t	*p;             /* Pointer into raw data buffer */
+    uint32_t            stored_chksum;  /* Stored metadata checksum value */
+    uint32_t            computed_chksum; /* Computed metadata checksum value */
 
-    /* Free the index block itself */
-    (void)H5FL_FREE(H5EA_iblock_t, iblock);
+    /* Sanity check */
+    HDassert(f);
+    HDassert(H5F_addr_defined(addr));
+    HDassert(nelmts && *nelmts > 0);
+    HDassert(hdr);
+
+    /* Allocate the extensible array data block */
+    if(NULL == (dblock = H5EA__dblock_alloc(hdr, *nelmts)))
+	H5E_THROW(H5E_CANTALLOC, "memory allocation failed for extensible array data block")
+
+    /* Set the extensible array data block's information */
+    dblock->addr = addr;
+
+    /* Wrap the local buffer for serialized info */
+    if(NULL == (wb = H5WB_wrap(dblock_buf, sizeof(dblock_buf))))
+	H5E_THROW(H5E_CANTINIT, "can't wrap buffer")
+
+    /* Compute the size of the extensible array data block on disk */
+    size = H5EA_DBLOCK_SIZE(dblock);
+
+    /* Get a pointer to a buffer that's large enough for serialized info */
+    if(NULL == (buf = (uint8_t *)H5WB_actual(wb, size)))
+	H5E_THROW(H5E_CANTGET, "can't get actual buffer")
+
+    /* Read data block from disk */
+    if(H5F_block_read(f, H5FD_MEM_EARRAY_DBLOCK, addr, size, dxpl_id, buf) < 0)
+	H5E_THROW(H5E_READERROR, "can't read extensible array data block")
+
+    /* Get temporary pointer to serialized header */
+    p = buf;
+
+    /* Magic number */
+    if(HDmemcmp(p, H5EA_DBLOCK_MAGIC, (size_t)H5EA_SIZEOF_MAGIC))
+	H5E_THROW(H5E_BADVALUE, "wrong extensible array data block signature")
+    p += H5EA_SIZEOF_MAGIC;
+
+    /* Version */
+    if(*p++ != H5EA_DBLOCK_VERSION)
+	H5E_THROW(H5E_VERSION, "wrong extensible array data block version")
+
+    /* Extensible array type */
+    if(*p++ != (uint8_t)hdr->cls->id)
+	H5E_THROW(H5E_BADTYPE, "incorrect extensible array class")
+
+    /* Internal information */
+
+    /* Decode elements in data block */
+    /* Convert from raw elements on disk into native elements in memory */
+    if((hdr->cls->decode)(p, dblock->elmts, *nelmts) < 0)
+        H5E_THROW(H5E_CANTDECODE, "can't decode extensible array data elements")
+    p += (*nelmts * hdr->raw_elmt_size);
+
+    /* Sanity check */
+    /* (allow for checksum not decoded yet) */
+    HDassert((size_t)(p - buf) == (size - H5EA_SIZEOF_CHKSUM));
+
+    /* Save the data block's size */
+    dblock->size = size;
+
+    /* Compute checksum on data block */
+    computed_chksum = H5_checksum_metadata(buf, (size_t)(p - buf), 0);
+
+    /* Metadata checksum */
+    UINT32DECODE(p, stored_chksum);
+
+    /* Sanity check */
+    HDassert((size_t)(p - buf) == dblock->size);
+
+    /* Verify checksum */
+    if(stored_chksum != computed_chksum)
+	H5E_THROW(H5E_BADVALUE, "incorrect metadata checksum for extensible array data block")
+
+    /* Set return value */
+    ret_value = dblock;
 
 CATCH
 
-END_FUNC(PKG)   /* end H5EA__cache_iblock_dest() */
+    /* Release resources */
+    if(wb && H5WB_unwrap(wb) < 0)
+	H5E_THROW(H5E_CLOSEERROR, "can't close wrapped buffer")
+    if(!ret_value)
+        if(dblock && H5EA__cache_dblock_dest(f, dblock) < 0)
+            H5E_THROW(H5E_CANTFREE, "unable to destroy extensible array data block")
+
+END_FUNC(STATIC)   /* end H5EA__cache_dblock_load() */
 
 
 /*-------------------------------------------------------------------------
- * Function:	H5EA__cache_iblock_clear
+ * Function:	H5EA__cache_dblock_flush
  *
- * Purpose:	Mark a extensible array index block in memory as non-dirty.
+ * Purpose:	Flushes a dirty extensible array data block to disk.
  *
  * Return:	Non-negative on success/Negative on failure
  *
  * Programmer:	Quincey Koziol
  *		koziol@hdfgroup.org
- *		Sept 9 2008
+ *		Sep 18 2008
  *
  *-------------------------------------------------------------------------
  */
 BEGIN_FUNC(STATIC, ERR,
 herr_t, SUCCEED, FAIL,
-H5EA__cache_iblock_clear(H5F_t *f, H5EA_iblock_t *iblock, hbool_t destroy))
+H5EA__cache_dblock_flush(H5F_t *f, hid_t dxpl_id, hbool_t destroy, haddr_t addr,
+    H5EA_dblock_t *dblock, unsigned UNUSED * flags_ptr))
 
-    /*
-     * Check arguments.
-     */
-    HDassert(iblock);
+    /* Local variables */
+    H5WB_t *wb = NULL;                  /* Wrapped buffer for serializing data */
+    uint8_t ser_buf[H5EA_DBLOCK_BUF_SIZE]; /* Serialization buffer */
+
+    /* Sanity check */
+    HDassert(f);
+    HDassert(H5F_addr_defined(addr));
+    HDassert(dblock);
+    HDassert(dblock->hdr);
+
+    if(dblock->cache_info.is_dirty) {
+        uint8_t	*buf;           /* Temporary raw data buffer */
+        uint8_t *p;             /* Pointer into raw data buffer */
+        size_t	size;           /* Index block size on disk */
+        uint32_t metadata_chksum; /* Computed metadata checksum value */
+
+        /* Wrap the local buffer for serialized info */
+        if(NULL == (wb = H5WB_wrap(ser_buf, sizeof(ser_buf))))
+            H5E_THROW(H5E_CANTINIT, "can't wrap buffer")
+
+        /* Compute the size of the data block on disk */
+        size = dblock->size;
+
+        /* Get a pointer to a buffer that's large enough for serialized info */
+        if(NULL == (buf = (uint8_t *)H5WB_actual(wb, size)))
+            H5E_THROW(H5E_CANTGET, "can't get actual buffer")
+
+        /* Get temporary pointer to serialized info */
+        p = buf;
+
+        /* Magic number */
+        HDmemcpy(p, H5EA_DBLOCK_MAGIC, (size_t)H5EA_SIZEOF_MAGIC);
+        p += H5EA_SIZEOF_MAGIC;
+
+        /* Version # */
+        *p++ = H5EA_DBLOCK_VERSION;
+
+        /* Extensible array type */
+        *p++ = dblock->hdr->cls->id;
+
+        /* Internal information */
+
+        /* Encode elements in data block */
+
+        /* Convert from native elements in memory into raw elements on disk */
+        if((dblock->hdr->cls->encode)(p, dblock->elmts, dblock->nelmts) < 0)
+            H5E_THROW(H5E_CANTENCODE, "can't encode extensible array data elements")
+        p += (dblock->nelmts * dblock->hdr->raw_elmt_size);
+
+        /* Compute metadata checksum */
+        metadata_chksum = H5_checksum_metadata(buf, (size_t)(p - buf), 0);
+
+        /* Metadata checksum */
+        UINT32ENCODE(p, metadata_chksum);
+
+	/* Write the index block */
+        HDassert((size_t)(p - buf) == size);
+	if(H5F_block_write(f, H5FD_MEM_EARRAY_DBLOCK, addr, size, dxpl_id, buf) < 0)
+            H5E_THROW(H5E_WRITEERROR, "unable to save extensible array data block to disk")
+
+	dblock->cache_info.is_dirty = FALSE;
+    } /* end if */
+
+    if(destroy)
+        if(H5EA__cache_dblock_dest(f, dblock) < 0)
+            H5E_THROW(H5E_CANTFREE, "unable to destroy extensible array data block")
+
+CATCH
+
+    /* Release resources */
+    if(wb && H5WB_unwrap(wb) < 0)
+	H5E_THROW(H5E_CLOSEERROR, "can't close wrapped buffer")
+
+END_FUNC(STATIC)   /* end H5EA__cache_dblock_flush() */
+
+
+/*-------------------------------------------------------------------------
+ * Function:	H5EA__cache_dblock_clear
+ *
+ * Purpose:	Mark a extensible array data block in memory as non-dirty.
+ *
+ * Return:	Non-negative on success/Negative on failure
+ *
+ * Programmer:	Quincey Koziol
+ *		koziol@hdfgroup.org
+ *		Sept 18 2008
+ *
+ *-------------------------------------------------------------------------
+ */
+BEGIN_FUNC(STATIC, ERR,
+herr_t, SUCCEED, FAIL,
+H5EA__cache_dblock_clear(H5F_t *f, H5EA_dblock_t *dblock, hbool_t destroy))
+
+    /* Sanity check */
+    HDassert(dblock);
 
     /* Reset the dirty flag */
-    iblock->cache_info.is_dirty = FALSE;
+    dblock->cache_info.is_dirty = FALSE;
 
     if(destroy)
-        if(H5EA__cache_iblock_dest(f, iblock) < 0)
-            H5E_THROW(H5E_CANTFREE, "unable to destroy extensible array index block")
+        if(H5EA__cache_dblock_dest(f, dblock) < 0)
+            H5E_THROW(H5E_CANTFREE, "unable to destroy extensible array data block")
 
 CATCH
 
-END_FUNC(STATIC)   /* end H5EA__cache_iblock_clear() */
+END_FUNC(STATIC)   /* end H5EA__cache_dblock_clear() */
 
 
 /*-------------------------------------------------------------------------
- * Function:	H5EA__cache_iblock_size
+ * Function:	H5EA__cache_dblock_size
  *
- * Purpose:	Compute the size in bytes of a extensible array index block
+ * Purpose:	Compute the size in bytes of a extensible array data block
  *		on disk, and return it in *size_ptr.  On failure,
  *		the value of *size_ptr is undefined.
  *
@@ -731,22 +1052,53 @@ END_FUNC(STATIC)   /* end H5EA__cache_iblock_clear() */
  *
  * Programmer:	Quincey Koziol
  *		koziol@hdfgroup.org
- *		Sept 9 2008
+ *		Sept 18 2008
  *
  *-------------------------------------------------------------------------
  */
 /* ARGSUSED */
 BEGIN_FUNC(STATIC, NOERR,
 herr_t, SUCCEED, -,
-H5EA__cache_iblock_size(const H5F_t UNUSED *f, const H5EA_iblock_t *iblock, size_t *size_ptr))
+H5EA__cache_dblock_size(const H5F_t UNUSED *f, const H5EA_dblock_t *dblock,
+    size_t *size_ptr))
 
     /* Sanity check */
     HDassert(f);
-    HDassert(iblock);
+    HDassert(dblock);
     HDassert(size_ptr);
 
     /* Set size value */
-    *size_ptr = iblock->size;
+    *size_ptr = dblock->size;
 
-END_FUNC(STATIC)   /* end H5EA__cache_iblock_size() */
+END_FUNC(STATIC)   /* end H5EA__cache_dblock_size() */
+
+
+/*-------------------------------------------------------------------------
+ * Function:	H5EA__cache_dblock_dest
+ *
+ * Purpose:	Destroys an extensible array data block in memory.
+ *
+ * Return:	Non-negative on success/Negative on failure
+ *
+ * Programmer:	Quincey Koziol
+ *		koziol@hdfgroup.org
+ *		Sep 18 2008
+ *
+ *-------------------------------------------------------------------------
+ */
+/* ARGSUSED */
+BEGIN_FUNC(STATIC, ERR,
+herr_t, SUCCEED, FAIL,
+H5EA__cache_dblock_dest(H5F_t *f, H5EA_dblock_t *dblock))
+
+    /* Sanity check */
+    HDassert(dblock);
+
+    /* Release the data block */
+    if(H5EA__dblock_dest(f, dblock) < 0)
+        H5E_THROW(H5E_CANTFREE, "can't free extensible array data block")
+
+CATCH
+
+END_FUNC(STATIC)   /* end H5EA__cache_dblock_dest() */