[svn-r27237] Description:

    Merge v3 metadata cache changes to trunk.  Yay! :-)

Tested on:
    MacOSX/64 10.10.3 (amazon) w/serial & parallel
    Linux/32 2.6.x (jam) w/serial & parallel
    (daily tested on branch)

1 files changed, 496 insertions, 603 deletions

diff --git a/src/H5FAcache.c b/src/H5FAcache.c
index 9a1fc57..298eb56 100644
--- a/src/H5FAcache.c
+++ b/src/H5FAcache.c
@@ -55,11 +55,6 @@
 #define H5FA_HDR_VERSION        0               /* Header */
 #define H5FA_DBLOCK_VERSION     0               /* Data block */
 
-/* Size of stack buffer for serialization buffers */
-#define H5FA_HDR_BUF_SIZE       512
-#define H5FA_DBLOCK_BUF_SIZE    512
-#define H5FA_DBLK_PAGE_BUF_SIZE 512
-
 
 /******************/
 /* Local Typedefs */
@@ -76,23 +71,35 @@
 /********************/
 
 /* Metadata cache (H5AC) callbacks */
-static H5FA_hdr_t *H5FA__cache_hdr_load(H5F_t *f, hid_t dxpl_id, haddr_t addr, void *udata);
-static herr_t H5FA__cache_hdr_flush(H5F_t *f, hid_t dxpl_id, hbool_t destroy, haddr_t addr, H5FA_hdr_t *hdr, unsigned * flags_ptr);
-static herr_t H5FA__cache_hdr_clear(H5F_t *f, H5FA_hdr_t *hdr, hbool_t destroy);
-static herr_t H5FA__cache_hdr_size(const H5F_t *f, const H5FA_hdr_t *hdr, size_t *size_ptr);
-static herr_t H5FA__cache_hdr_dest(H5F_t *f, H5FA_hdr_t *hdr);
-
-static H5FA_dblock_t *H5FA__cache_dblock_load(H5F_t *f, hid_t dxpl_id, haddr_t addr, void *udata);
-static herr_t H5FA__cache_dblock_flush(H5F_t *f, hid_t dxpl_id, hbool_t destroy, haddr_t addr, H5FA_dblock_t *dblock, unsigned * flags_ptr);
-static herr_t H5FA__cache_dblock_clear(H5F_t *f, H5FA_dblock_t *dblock, hbool_t destroy);
-static herr_t H5FA__cache_dblock_size(const H5F_t *f, const H5FA_dblock_t *dblock, size_t *size_ptr);
-static herr_t H5FA__cache_dblock_dest(H5F_t *f, H5FA_dblock_t *dblock);
-
-static H5FA_dblk_page_t *H5FA__cache_dblk_page_load(H5F_t *f, hid_t dxpl_id, haddr_t addr, void *udata);
-static herr_t H5FA__cache_dblk_page_flush(H5F_t *f, hid_t dxpl_id, hbool_t destroy, haddr_t addr, H5FA_dblk_page_t *dblk_page, unsigned * flags_ptr);
-static herr_t H5FA__cache_dblk_page_clear(H5F_t *f, H5FA_dblk_page_t *dblk_page, hbool_t destroy);
-static herr_t H5FA__cache_dblk_page_size(const H5F_t *f, const H5FA_dblk_page_t *dblk_page, size_t *size_ptr);
-static herr_t H5FA__cache_dblk_page_dest(H5F_t *f, H5FA_dblk_page_t *dblk_page);
+static herr_t H5FA__cache_hdr_get_load_size(const void *udata, size_t *image_len);
+static void *H5FA__cache_hdr_deserialize(const void *image, size_t len,
+    void *udata, hbool_t *dirty);
+static herr_t H5FA__cache_hdr_image_len(const void *thing, size_t *image_len,
+    hbool_t *compressed_ptr, size_t *compressed_image_len_ptr);
+static herr_t H5FA__cache_hdr_serialize(const H5F_t *f, void *image, size_t len,
+    void *thing);
+static herr_t H5FA__cache_hdr_free_icr(void *thing);
+
+static herr_t H5FA__cache_dblock_get_load_size(const void *udata, size_t *image_len);
+static void *H5FA__cache_dblock_deserialize(const void *image, size_t len,
+    void *udata, hbool_t *dirty);
+static herr_t H5FA__cache_dblock_image_len(const void *thing, 
+    size_t *image_len, hbool_t *compressed_ptr, 
+    size_t *compressed_image_len_ptr);
+static herr_t H5FA__cache_dblock_serialize(const H5F_t *f, void *image, size_t len,
+    void *thing);
+static herr_t H5FA__cache_dblock_free_icr(void *thing);
+static herr_t H5FA__cache_dblock_fsf_size(const void *thing, size_t *fsf_size);
+
+static herr_t H5FA__cache_dblk_page_get_load_size(const void *udata, size_t *image_len);
+static void *H5FA__cache_dblk_page_deserialize(const void *image, size_t len,
+    void *udata, hbool_t *dirty);
+static herr_t H5FA__cache_dblk_page_image_len(const void *thing, 
+    size_t *image_len, hbool_t *compressed_ptr, 
+    size_t *compressed_image_len_ptr);
+static herr_t H5FA__cache_dblk_page_serialize(const H5F_t *f, void *image, size_t len,
+    void *thing);
+static herr_t H5FA__cache_dblk_page_free_icr(void *thing);
 
 
 /*********************/
@@ -101,36 +108,53 @@ static herr_t H5FA__cache_dblk_page_dest(H5F_t *f, H5FA_dblk_page_t *dblk_page);
 
 /* H5FA header inherits cache-like properties from H5AC */
 const H5AC_class_t H5AC_FARRAY_HDR[1] = {{
-    H5AC_FARRAY_HDR_ID,
-    (H5AC_load_func_t)H5FA__cache_hdr_load,
-    (H5AC_flush_func_t)H5FA__cache_hdr_flush,
-    (H5AC_dest_func_t)H5FA__cache_hdr_dest,
-    (H5AC_clear_func_t)H5FA__cache_hdr_clear,
-    (H5AC_notify_func_t)NULL,
-    (H5AC_size_func_t)H5FA__cache_hdr_size,
+    H5AC_FARRAY_HDR_ID,                 /* Metadata client ID */
+    "Fixed-array Header",               /* Metadata client name (for debugging) */
+    H5FD_MEM_FARRAY_HDR,                /* File space memory type for client */
+    H5AC__CLASS_NO_FLAGS_SET,           /* Client class behavior flags */
+    H5FA__cache_hdr_get_load_size,      /* 'get_load_size' callback */
+    H5FA__cache_hdr_deserialize,        /* 'deserialize' callback */
+    H5FA__cache_hdr_image_len,          /* 'image_len' callback */
+    NULL,                               /* 'pre_serialize' callback */
+    H5FA__cache_hdr_serialize,          /* 'serialize' callback */
+    NULL,                               /* 'notify' callback */
+    H5FA__cache_hdr_free_icr,           /* 'free_icr' callback */
+    NULL,				/* 'clear' callback */
+    NULL,                               /* 'fsf_size' callback */
 }};
 
-
 /* H5FA data block inherits cache-like properties from H5AC */
 const H5AC_class_t H5AC_FARRAY_DBLOCK[1] = {{
-    H5AC_FARRAY_DBLOCK_ID,
-    (H5AC_load_func_t)H5FA__cache_dblock_load,
-    (H5AC_flush_func_t)H5FA__cache_dblock_flush,
-    (H5AC_dest_func_t)H5FA__cache_dblock_dest,
-    (H5AC_clear_func_t)H5FA__cache_dblock_clear,
-    (H5AC_notify_func_t)NULL,
-    (H5AC_size_func_t)H5FA__cache_dblock_size,
+    H5AC_FARRAY_DBLOCK_ID,              /* Metadata client ID */
+    "Fixed Array Data Block",           /* Metadata client name (for debugging) */
+    H5FD_MEM_FARRAY_DBLOCK,             /* File space memory type for client */
+    H5AC__CLASS_NO_FLAGS_SET,           /* Client class behavior flags */
+    H5FA__cache_dblock_get_load_size,   /* 'get_load_size' callback */
+    H5FA__cache_dblock_deserialize,     /* 'deserialize' callback */
+    H5FA__cache_dblock_image_len,       /* 'image_len' callback */
+    NULL,                               /* 'pre_serialize' callback */
+    H5FA__cache_dblock_serialize,       /* 'serialize' callback */
+    NULL,                               /* 'notify' callback */
+    H5FA__cache_dblock_free_icr,        /* 'free_icr' callback */
+    NULL,				/* 'clear' callback */
+    H5FA__cache_dblock_fsf_size,        /* 'fsf_size' callback */
 }};
 
 /* H5FA data block page inherits cache-like properties from H5AC */
 const H5AC_class_t H5AC_FARRAY_DBLK_PAGE[1] = {{
-    H5AC_FARRAY_DBLK_PAGE_ID,
-    (H5AC_load_func_t)H5FA__cache_dblk_page_load,
-    (H5AC_flush_func_t)H5FA__cache_dblk_page_flush,
-    (H5AC_dest_func_t)H5FA__cache_dblk_page_dest,
-    (H5AC_clear_func_t)H5FA__cache_dblk_page_clear,
-    (H5AC_notify_func_t)NULL,
-    (H5AC_size_func_t)H5FA__cache_dblk_page_size,
+    H5AC_FARRAY_DBLK_PAGE_ID,           /* Metadata client ID */
+    "Fixed Array Data Block Page",      /* Metadata client name (for debugging) */
+    H5FD_MEM_FARRAY_DBLK_PAGE,          /* File space memory type for client */
+    H5AC__CLASS_NO_FLAGS_SET,           /* Client class behavior flags */
+    H5FA__cache_dblk_page_get_load_size, /* 'get_load_size' callback */
+    H5FA__cache_dblk_page_deserialize,  /* 'deserialize' callback */
+    H5FA__cache_dblk_page_image_len,    /* 'image_len' callback */
+    NULL,                               /* 'pre_serialize' callback */
+    H5FA__cache_dblk_page_serialize,    /* 'serialize' callback */
+    NULL,                               /* 'notify' callback */
+    H5FA__cache_dblk_page_free_icr,     /* 'free_icr' callback */
+    NULL,				/* 'clear' callback */
+    NULL,                               /* 'fsf_size' callback */
 }};
 
 
@@ -146,88 +170,101 @@ const H5AC_class_t H5AC_FARRAY_DBLK_PAGE[1] = {{
 
 
 /*-------------------------------------------------------------------------
- * Function:	H5FA__cache_hdr_load
+ * Function:    H5FA__cache_hdr_get_load_size
+ *
+ * Purpose:     Compute the size of the data structure on disk.
+ *
+ * Return:      Non-negative on success/Negative on failure
+ *
+ * Programmer:  Quincey Koziol
+ *              koziol@hdfgroup.org
+ *              July 31, 2013
+ *
+ *-------------------------------------------------------------------------
+ */
+BEGIN_FUNC(STATIC, NOERR,
+herr_t, SUCCEED, -,
+H5FA__cache_hdr_get_load_size(const void *_udata, size_t *image_len))
+
+    /* Local variables */
+    const H5FA_hdr_cache_ud_t *udata = (const H5FA_hdr_cache_ud_t *)_udata; /* User data for callback */
+
+    /* Check arguments */
+    HDassert(udata);
+    HDassert(udata->f);
+    HDassert(image_len);
+
+    /* Set the image length size */
+    *image_len = (size_t)H5FA_HEADER_SIZE_FILE(udata->f);
+
+END_FUNC(STATIC)   /* end H5FA__cache_hdr_get_load_size() */
+
+
+/*-------------------------------------------------------------------------
+ * Function:	H5FA__cache_hdr_deserialize
  *
- * Purpose:	Loads a fixed array header from the disk.
+ * Purpose:	Loads a data structure from the disk.
  *
- * Return:	Success:	Pointer to a new fixed array
+ * Return:	Success:	Pointer to a new B-tree.
  *		Failure:	NULL
  *
- * Programmer:	Vailin Choi
- *              Thursday, April 30, 2009
+ * Programmer:	Quincey Koziol
+ *              koziol@hdfgroup.org
+ *              August 12, 2013
  *
  *-------------------------------------------------------------------------
  */
 BEGIN_FUNC(STATIC, ERR,
-H5FA_hdr_t *, NULL, NULL,
-H5FA__cache_hdr_load(H5F_t *f, hid_t dxpl_id, haddr_t addr, void *udata))
+void *, NULL, NULL,
+H5FA__cache_hdr_deserialize(const void *_image, size_t len,
+    void *_udata, hbool_t H5_ATTR_UNUSED *dirty))
 
     /* Local variables */
     H5FA_cls_id_t       id;		/* ID of fixed array class, as found in file */
     H5FA_hdr_t		*hdr = NULL;    /* Fixed array info */
-    size_t		size;           /* Header size */
-    H5WB_t              *wb = NULL;     /* Wrapped buffer for header data */
-    uint8_t             hdr_buf[H5FA_HDR_BUF_SIZE]; /* Buffer for header */
-    uint8_t		*buf;           /* Pointer to header buffer */
-    const uint8_t	*p;             /* Pointer into raw data buffer */
+    H5FA_hdr_cache_ud_t *udata = (H5FA_hdr_cache_ud_t *)_udata;
+    const uint8_t	*image = (const uint8_t *)_image;       /* Pointer into raw data buffer */
     uint32_t            stored_chksum;  /* Stored metadata checksum value */
     uint32_t            computed_chksum; /* Computed metadata checksum value */
 
     /* Check arguments */
-    HDassert(f);
-    HDassert(H5F_addr_defined(addr));
+    HDassert(udata);
+    HDassert(udata->f);
+    HDassert(H5F_addr_defined(udata->addr));
 
     /* Allocate space for the fixed array data structure */
-    if(NULL == (hdr = H5FA__hdr_alloc(f)))
+    if(NULL == (hdr = H5FA__hdr_alloc(udata->f)))
 	H5E_THROW(H5E_CANTALLOC, "memory allocation failed for fixed array shared header")
 
     /* Set the fixed array header's address */
-    hdr->addr = addr;
-
-    /* Wrap the local buffer for serialized info */
-    if(NULL == (wb = H5WB_wrap(hdr_buf, sizeof(hdr_buf))))
-	H5E_THROW(H5E_CANTINIT, "can't wrap buffer")
-
-    /* Compute the 'base' size of the fixed array header on disk */
-    size = H5FA_HEADER_SIZE_HDR(hdr);
-
-    /* Get a pointer to a buffer that's large enough for serialized header */
-    if(NULL == (buf = (uint8_t *)H5WB_actual(wb, size)))
-	H5E_THROW(H5E_CANTGET, "can't get actual buffer")
-
-    /* Read header from disk */
-    if(H5F_block_read(f, H5FD_MEM_FARRAY_HDR, addr, size, dxpl_id, buf) < 0)
-	H5E_THROW(H5E_READERROR, "can't read fixed array header")
-
-    /* Get temporary pointer to serialized header */
-    p = buf;
+    hdr->addr = udata->addr;
 
     /* Magic number */
-    if(HDmemcmp(p, H5FA_HDR_MAGIC, (size_t)H5_SIZEOF_MAGIC))
+    if(HDmemcmp(image, H5FA_HDR_MAGIC, (size_t)H5_SIZEOF_MAGIC))
 	H5E_THROW(H5E_BADVALUE, "wrong fixed array header signature")
-    p += H5_SIZEOF_MAGIC;
+    image += H5_SIZEOF_MAGIC;
 
     /* Version */
-    if(*p++ != H5FA_HDR_VERSION)
+    if(*image++ != H5FA_HDR_VERSION)
 	H5E_THROW(H5E_VERSION, "wrong fixed array header version")
 
     /* Fixed array class */
-    id = (H5FA_cls_id_t)*p++;
+    id = (H5FA_cls_id_t)*image++;
     if(id >= H5FA_NUM_CLS_ID)
 	H5E_THROW(H5E_BADTYPE, "incorrect fixed array class")
     hdr->cparam.cls = H5FA_client_class_g[id];
 
     /* General array creation/configuration information */
-    hdr->cparam.raw_elmt_size = *p++;         	   /* Element size in file (in bytes) */
-    hdr->cparam.max_dblk_page_nelmts_bits = *p++;  /* Log2(Max. # of elements in data block page) -
-						      i.e. # of bits needed to store max. # of
-						      elements in data block page. */
+    hdr->cparam.raw_elmt_size = *image++;             /* Element size in file (in bytes) */
+    hdr->cparam.max_dblk_page_nelmts_bits = *image++; /* Log2(Max. # of elements in data block page) -
+						         i.e. # of bits needed to store max. # of
+						         elements in data block page. */
 
     /* Array statistics */
-    H5F_DECODE_LENGTH(f, p, hdr->cparam.nelmts);	/* Number of elements */
+    H5F_DECODE_LENGTH(udata->f, image, hdr->cparam.nelmts);	/* Number of elements */
 
     /* Internal information */
-    H5F_addr_decode(f, &p, &hdr->dblk_addr); 		/* Address of index block */
+    H5F_addr_decode(udata->f, &image, &hdr->dblk_addr); 		/* Address of index block */
 
     /* Check for data block */
     if(H5F_addr_defined(hdr->dblk_addr)) {
@@ -250,26 +287,26 @@ H5FA__cache_hdr_load(H5F_t *f, hid_t dxpl_id, haddr_t addr, void *udata))
 
     /* Sanity check */
     /* (allow for checksum not decoded yet) */
-    HDassert((size_t)(p - buf) == (size - H5FA_SIZEOF_CHKSUM));
+    HDassert((size_t)(image - (const uint8_t *)_image) == (len - H5FA_SIZEOF_CHKSUM));
 
     /* Compute checksum on entire header */
     /* (including the filter information, if present) */
-    computed_chksum = H5_checksum_metadata(buf, (size_t)(p - buf), 0);
+    computed_chksum = H5_checksum_metadata(_image, (size_t)(image - (const uint8_t *)_image), 0);
 
     /* Metadata checksum */
-    UINT32DECODE(p, stored_chksum);
+    UINT32DECODE(image, stored_chksum);
 
     /* Sanity check */
-    HDassert((size_t)(p - buf) == size);
+    HDassert((size_t)(image - (const uint8_t *)_image) == len);
 
     /* Verify checksum */
     if(stored_chksum != computed_chksum)
 	H5E_THROW(H5E_BADVALUE, "incorrect metadata checksum for fixed array header")
 
     /* Finish initializing fixed array header */
-    if(H5FA__hdr_init(hdr, udata) < 0)
+    if(H5FA__hdr_init(hdr, udata->ctx_udata) < 0)
 	H5E_THROW(H5E_CANTINIT, "initialization failed for fixed array header")
-    HDassert(hdr->size == size);
+    HDassert(hdr->size == len);
 
     /* Set return value */
     ret_value = hdr;
@@ -277,326 +314,277 @@ H5FA__cache_hdr_load(H5F_t *f, hid_t dxpl_id, haddr_t addr, void *udata))
 CATCH
 
     /* Release resources */
-    if(wb && H5WB_unwrap(wb) < 0)
-	H5E_THROW(H5E_CLOSEERROR, "can't close wrapped buffer")
     if(!ret_value)
         if(hdr && H5FA__hdr_dest(hdr) < 0)
             H5E_THROW(H5E_CANTFREE, "unable to destroy fixed array header")
 
-END_FUNC(STATIC)   /* end H5FA__cache_hdr_load() */
+END_FUNC(STATIC)   /* end H5FA__cache_hdr_deserialize() */
 
 
 /*-------------------------------------------------------------------------
- * Function:	H5FA__cache_hdr_flush
+ * Function:    H5FA__cache_hdr_image_len
  *
- * Purpose:	Flushes a dirty fixed array header to disk.
+ * Purpose:     Compute the size of the data structure on disk.
  *
- * Return:	Non-negative on success/Negative on failure
+ * Return:      Non-negative on success/Negative on failure
  *
- * Programmer:	Vailin Choi
- *              Thursday, April 30, 2009
+ * Programmer:  Quincey Koziol
+ *              koziol@hdfgroup.org
+ *              August 12, 2013
  *
  *-------------------------------------------------------------------------
  */
-BEGIN_FUNC(STATIC, ERR,
-herr_t, SUCCEED, FAIL,
-H5FA__cache_hdr_flush(H5F_t *f, hid_t dxpl_id, hbool_t destroy, haddr_t addr,
-    H5FA_hdr_t *hdr, unsigned H5_ATTR_UNUSED * flags_ptr))
+BEGIN_FUNC(STATIC, NOERR,
+herr_t, SUCCEED, -,
+H5FA__cache_hdr_image_len(const void *_thing, size_t *image_len,
+    hbool_t H5_ATTR_UNUSED *compressed_ptr, size_t H5_ATTR_UNUSED *compressed_image_len_ptr))
 
-    H5WB_t *wb = NULL;                  /* Wrapped buffer for header data */
-    uint8_t hdr_buf[H5FA_HDR_BUF_SIZE]; /* Buffer for header */
+    /* Local variables */
+    const H5FA_hdr_t *hdr = (const H5FA_hdr_t *)_thing;      /* Pointer to the object */
 
-    /* check arguments */
-    HDassert(f);
-    HDassert(H5F_addr_defined(addr));
+    /* Check arguments */
     HDassert(hdr);
+    HDassert(image_len);
 
-    if(hdr->cache_info.is_dirty) {
-        uint8_t	*buf;           /* Temporary raw data buffer */
-        uint8_t *p;             /* Pointer into raw data buffer */
-        size_t	size;           /* Header size on disk */
-        uint32_t metadata_chksum; /* Computed metadata checksum value */
-
-        /* Wrap the local buffer for serialized header info */
-        if(NULL == (wb = H5WB_wrap(hdr_buf, sizeof(hdr_buf))))
-            H5E_THROW(H5E_CANTINIT, "can't wrap buffer")
-
-        /* Compute the size of the array header on disk */
-        size = hdr->size;
-
-        /* Get a pointer to a buffer that's large enough for serialized header */
-        if(NULL == (buf = (uint8_t *)H5WB_actual(wb, size)))
-            H5E_THROW(H5E_CANTGET, "can't get actual buffer")
-
-        /* Get temporary pointer to serialized header */
-        p = buf;
+    /* Set the image length size */
+    *image_len = hdr->size;
 
-        /* Magic number */
-        HDmemcpy(p, H5FA_HDR_MAGIC, (size_t)H5_SIZEOF_MAGIC);
-        p += H5_SIZEOF_MAGIC;
+END_FUNC(STATIC)   /* end H5FA__cache_hdr_image_len() */
 
-        /* Version # */
-        *p++ = H5FA_HDR_VERSION;
+
+/*-------------------------------------------------------------------------
+ * Function:	H5FA__cache_hdr_serialize
+ *
+ * Purpose:	Flushes a dirty object to disk.
+ *
+ * Return:	Non-negative on success/Negative on failure
+ *
+ * Programmer:	Quincey Koziol
+ *              koziol@hdfgroup.org
+ *              August 12, 2013
+ *
+ *-------------------------------------------------------------------------
+ */
+BEGIN_FUNC(STATIC, NOERR,
+herr_t, SUCCEED, -,
+H5FA__cache_hdr_serialize(const H5F_t *f, void *_image, size_t H5_ATTR_UNUSED len,
+    void *_thing))
 
-        /* Fixed array type */
-        *p++ = hdr->cparam.cls->id;
+    /* Local variables */
+    H5FA_hdr_t *hdr = (H5FA_hdr_t *)_thing;     /* Pointer to the fixed array header */
+    uint8_t *image = (uint8_t *)_image;         /* Pointer into raw data buffer */
+    uint32_t metadata_chksum;   /* Computed metadata checksum value */
 
-        /* General array creation/configuration information */
-        *p++ = hdr->cparam.raw_elmt_size;          /* Element size in file (in bytes) */
-        *p++ = hdr->cparam.max_dblk_page_nelmts_bits;  /* Log2(Max. # of elements in data block page) - i.e. # of bits needed to store max. # of elements in data block page */
+    /* check arguments */
+    HDassert(f);
+    HDassert(image);
+    HDassert(hdr);
 
-        /* Array statistics */
-        H5F_ENCODE_LENGTH(f, p, hdr->stats.nelmts);       /* Number of elements for the fixed array */
+    /* Magic number */
+    HDmemcpy(image, H5FA_HDR_MAGIC, (size_t)H5_SIZEOF_MAGIC);
+    image += H5_SIZEOF_MAGIC;
 
-        /* Internal information */
-        H5F_addr_encode(f, &p, hdr->dblk_addr);  /* Address of fixed array data block */
+    /* Version # */
+    *image++ = H5FA_HDR_VERSION;
 
-        /* Compute metadata checksum */
-        metadata_chksum = H5_checksum_metadata(buf, (size_t)(p - buf), 0);
+    /* Fixed array type */
+    *image++ = hdr->cparam.cls->id;
 
-        /* Metadata checksum */
-        UINT32ENCODE(p, metadata_chksum);
+    /* General array creation/configuration information */
+    *image++ = hdr->cparam.raw_elmt_size;          /* Element size in file (in bytes) */
+    *image++ = hdr->cparam.max_dblk_page_nelmts_bits;  /* Log2(Max. # of elements in data block page) - i.e. # of bits needed to store max. # of elements in data block page */
 
-	/* Write the array header. */
-        HDassert((size_t)(p - buf) == size);
-	if(H5F_block_write(f, H5FD_MEM_FARRAY_HDR, addr, size, dxpl_id, buf) < 0)
-            H5E_THROW(H5E_WRITEERROR, "unable to save fixed array header to disk")
+    /* Array statistics */
+    H5F_ENCODE_LENGTH(f, image, hdr->stats.nelmts);       /* Number of elements for the fixed array */
 
-	hdr->cache_info.is_dirty = FALSE;
-    } /* end if */
+    /* Internal information */
+    H5F_addr_encode(f, &image, hdr->dblk_addr);  /* Address of fixed array data block */
 
-    if(destroy)
-        if(H5FA__cache_hdr_dest(f, hdr) < 0)
-            H5E_THROW(H5E_CANTFREE, "unable to destroy fixed array header")
+    /* Compute metadata checksum */
+    metadata_chksum = H5_checksum_metadata(_image, (size_t)(image - (uint8_t *)_image), 0);
 
-CATCH
+    /* Metadata checksum */
+    UINT32ENCODE(image, metadata_chksum);
 
-    /* Release resources */
-    if(wb && H5WB_unwrap(wb) < 0)
-	H5E_THROW(H5E_CLOSEERROR, "can't close wrapped buffer")
+    /* Sanity check */
+    HDassert((size_t)(image - (uint8_t *)_image) <= len);
 
-END_FUNC(STATIC)   /* end H5FA__cache_hdr_flush() */
+END_FUNC(STATIC)   /* end H5FA__cache_hdr_serialize() */
 
 
 /*-------------------------------------------------------------------------
- * Function:	H5FA__cache_hdr_clear
+ * Function:	H5FA__cache_hdr_free_icr
  *
- * Purpose:	Mark a fixed array header in memory as non-dirty.
+ * Purpose:	Destroy/release an "in core representation" of a data
+ *              structure
  *
  * Return:	Non-negative on success/Negative on failure
  *
- * Programmer:	Vailin Choi
- *              Thursday, April 30, 2009
+ * Programmer:	Quincey Koziol
+ *              koziol@hdfgroup.org
+ *              August 12, 2013
  *
  *-------------------------------------------------------------------------
  */
 BEGIN_FUNC(STATIC, ERR,
 herr_t, SUCCEED, FAIL,
-H5FA__cache_hdr_clear(H5F_t *f, H5FA_hdr_t *hdr, hbool_t destroy))
-
-    /* Sanity check */
-    HDassert(hdr);
+H5FA__cache_hdr_free_icr(void *thing))
 
-    /* Reset the dirty flag.  */
-    hdr->cache_info.is_dirty = FALSE;
+    /* Check arguments */
+    HDassert(thing);
 
-    if(destroy)
-        if(H5FA__cache_hdr_dest(f, hdr) < 0)
-            H5E_THROW(H5E_CANTFREE, "unable to destroy fixed array header")
+    /* Release the extensible array header */
+    if(H5FA__hdr_dest((H5FA_hdr_t *)thing) < 0)
+        H5E_THROW(H5E_CANTFREE, "can't free fixed array header")
 
 CATCH
 
-END_FUNC(STATIC)   /* end H5FA__cache_hdr_clear() */
+END_FUNC(STATIC)   /* end H5FA__cache_hdr_free_icr() */
 
 
 /*-------------------------------------------------------------------------
- * Function:	H5FA__cache_hdr_size
+ * Function:    H5FA__cache_dblock_get_load_size
  *
- * Purpose:	Compute the size in bytes of a fixed array header
- *		on disk, and return it in *size_ptr.  On failure,
- *		the value of *size_ptr is undefined.
+ * Purpose:     Compute the size of the data structure on disk.
  *
- * Return:	Non-negative on success/Negative on failure
+ * Return:      Non-negative on success/Negative on failure
  *
- * Programmer:	Vailin Choi
- *              Thursday, April 30, 2009
+ * Programmer:  Quincey Koziol
+ *              koziol@hdfgroup.org
+ *              August 12, 2013
  *
  *-------------------------------------------------------------------------
  */
-/* ARGSUSED */
 BEGIN_FUNC(STATIC, NOERR,
 herr_t, SUCCEED, -,
-H5FA__cache_hdr_size(const H5F_t H5_ATTR_UNUSED *f, const H5FA_hdr_t *hdr,
-    size_t *size_ptr))
-
-    /* Sanity check */
-    HDassert(f);
-    HDassert(hdr);
-    HDassert(size_ptr);
-
-    /* Set size value */
-    *size_ptr = hdr->size;
-
-END_FUNC(STATIC)   /* end H5FA__cache_hdr_size() */
+H5FA__cache_dblock_get_load_size(const void *_udata, size_t *image_len))
 
-
-/*-------------------------------------------------------------------------
- * Function:	H5FA__cache_hdr_dest
- *
- * Purpose:	Destroys a fixed array header in memory.
- *
- * Return:	Non-negative on success/Negative on failure
- *
- * Programmer:	Vailin Choi
- *              Thursday, April 30, 2009
- *
- *-------------------------------------------------------------------------
- */
-/* ARGSUSED */
-BEGIN_FUNC(STATIC, ERR,
-herr_t, SUCCEED, FAIL,
-H5FA__cache_hdr_dest(H5F_t *f, H5FA_hdr_t *hdr))
+    /* Local variables */
+    const H5FA_dblock_cache_ud_t *udata = (const H5FA_dblock_cache_ud_t *)_udata;      /* User data */
+    H5FA_dblock_t dblock;           /* Fake data block for computing size */
+    size_t	dblk_page_nelmts;	/* # of elements per data block page */
 
     /* Check arguments */
-    HDassert(f);
-    HDassert(hdr);
-
-    /* Verify that header is clean */
-    HDassert(hdr->cache_info.is_dirty == FALSE);
-
-    /* If we're going to free the space on disk, the address must be valid */
-    HDassert(!hdr->cache_info.free_file_space_on_destroy || H5F_addr_defined(hdr->cache_info.addr));
-
-    /* Check for freeing file space for fixed array header */
-    if(hdr->cache_info.free_file_space_on_destroy) {
-        /* Sanity check address */
-        HDassert(H5F_addr_eq(hdr->addr, hdr->cache_info.addr));
-
-        /* Release the space on disk */
-        /* (XXX: Nasty usage of internal DXPL value! -QAK) */
-        if(H5MF_xfree(f, H5FD_MEM_FARRAY_HDR, H5AC_dxpl_id, hdr->cache_info.addr, (hsize_t)hdr->size) < 0)
-            H5E_THROW(H5E_CANTFREE, "unable to free fixed array header")
+    HDassert(udata);
+    HDassert(udata->hdr);
+    HDassert(image_len);
+
+    /* Set up fake data block for computing size on disk */
+    /* (Note: extracted from H5FA__dblock_alloc) */
+    HDmemset(&dblock, 0, sizeof(dblock));
+
+    /* Set up fake data block for computing size on disk
+     *
+     * need: dblock->hdr
+     *       dblock->npages
+     *       dblock->dblk_page_init_size
+     */
+
+    dblock.hdr = udata->hdr;
+    dblk_page_nelmts = (size_t)1 << udata->hdr->cparam.max_dblk_page_nelmts_bits;
+    if(udata->hdr->cparam.nelmts > dblk_page_nelmts) {
+        dblock.npages = (size_t)(((udata->hdr->cparam.nelmts + dblk_page_nelmts) - 1) / dblk_page_nelmts);
+        dblock.dblk_page_init_size = (dblock.npages + 7) / 8;
     } /* end if */
 
-    /* Release the fixed array header */
-    if(H5FA__hdr_dest(hdr) < 0)
-        H5E_THROW(H5E_CANTFREE, "can't free fixed array header")
-
-CATCH
+    /* Set the image length size */
+    if(!dblock.npages)
+        *image_len = (size_t)H5FA_DBLOCK_SIZE(&dblock);
+    else
+        *image_len = (size_t)H5FA_DBLOCK_PREFIX_SIZE(&dblock);
 
-END_FUNC(STATIC)   /* end H5FA__cache_hdr_dest() */
+END_FUNC(STATIC)   /* end H5FA__cache_dblock_get_load_size() */
 
 
 /*-------------------------------------------------------------------------
- * Function:	H5FA__cache_dblock_load
+ * Function:	H5FA__cache_dblock_deserialize
  *
- * Purpose:	Loads a fixed array data block from the disk.
+ * Purpose:	Loads a data structure from the disk.
  *
- * Return:	Success:	Pointer to a new fixed array data block
+ * Return:	Success:	Pointer to a new B-tree.
  *		Failure:	NULL
  *
- * Programmer:	Vailin Choi
- *              Thursday, April 30, 2009
+ * Programmer:	Quincey Koziol
+ *              koziol@hdfgroup.org
+ *              August 14, 2013
  *
  *-------------------------------------------------------------------------
  */
 BEGIN_FUNC(STATIC, ERR,
-H5FA_dblock_t *, NULL, NULL,
-H5FA__cache_dblock_load(H5F_t *f, hid_t dxpl_id, haddr_t addr, void *_udata))
+void *, NULL, NULL,
+H5FA__cache_dblock_deserialize(const void *_image, size_t len,
+    void *_udata, hbool_t H5_ATTR_UNUSED *dirty))
 
     /* Local variables */
     H5FA_dblock_t  *dblock = NULL;  /* Data block info */
     H5FA_dblock_cache_ud_t *udata = (H5FA_dblock_cache_ud_t *)_udata; /* User data for loading data block */
-    size_t	   size;            /* Data block size */
-    H5WB_t         *wb = NULL;      /* Wrapped buffer for data block data */
-    uint8_t        dblock_buf[H5FA_DBLOCK_BUF_SIZE]; /* Buffer for data block */
-    uint8_t	   *buf;             /* Pointer to data block buffer */
-    const uint8_t  *p;              /* Pointer into raw data buffer */
+    const uint8_t  *image = (const uint8_t *)_image;    /* Pointer into raw data buffer */
     uint32_t       stored_chksum;   /* Stored metadata checksum value */
     uint32_t       computed_chksum; /* Computed metadata checksum value */
     haddr_t        arr_addr;        /* Address of array header in the file */
 
     /* Sanity check */
-    HDassert(f);
-    HDassert(H5F_addr_defined(addr));
-    HDassert(udata && udata->hdr);
+    HDassert(udata);
+    HDassert(udata->hdr);
 
     /* Allocate the fixed array data block */
     if(NULL == (dblock = H5FA__dblock_alloc(udata->hdr)))
 	H5E_THROW(H5E_CANTALLOC, "memory allocation failed for fixed array data block")
 
-    /* Set the fixed 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 fixed array data block on disk */
-    if(!dblock->npages)
-        size = (size_t)H5FA_DBLOCK_SIZE(dblock);
-    else
-        size = H5FA_DBLOCK_PREFIX_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")
+    HDassert(((!dblock->npages) && (len == (size_t)H5FA_DBLOCK_SIZE(dblock))) 
+             || (len == (size_t)H5FA_DBLOCK_PREFIX_SIZE(dblock)));
 
-    /* Read data block from disk */
-    if(H5F_block_read(f, H5FD_MEM_FARRAY_DBLOCK, addr, size, dxpl_id, buf) < 0)
-	H5E_THROW(H5E_READERROR, "can't read fixed array data block")
-
-    /* Get temporary pointer to serialized header */
-    p = buf;
+    /* Set the fixed array data block's information */
+    dblock->addr = udata->dblk_addr;
 
     /* Magic number */
-    if(HDmemcmp(p, H5FA_DBLOCK_MAGIC, (size_t)H5_SIZEOF_MAGIC))
+    if(HDmemcmp(image, H5FA_DBLOCK_MAGIC, (size_t)H5_SIZEOF_MAGIC))
 	H5E_THROW(H5E_BADVALUE, "wrong fixed array data block signature")
-    p += H5_SIZEOF_MAGIC;
+    image += H5_SIZEOF_MAGIC;
 
     /* Version */
-    if(*p++ != H5FA_DBLOCK_VERSION)
+    if(*image++ != H5FA_DBLOCK_VERSION)
 	H5E_THROW(H5E_VERSION, "wrong fixed array data block version")
 
     /* Fixed array type */
-    if(*p++ != (uint8_t)udata->hdr->cparam.cls->id)
+    if(*image++ != (uint8_t)udata->hdr->cparam.cls->id)
 	H5E_THROW(H5E_BADTYPE, "incorrect fixed array class")
 
     /* Address of header for array that owns this block (just for file integrity checks) */
-    H5F_addr_decode(f, &p, &arr_addr);
+    H5F_addr_decode(udata->hdr->f, &image, &arr_addr);
     if(H5F_addr_ne(arr_addr, udata->hdr->addr))
 	H5E_THROW(H5E_BADVALUE, "wrong fixed array header address")
 
     /* Page initialization flags */
     if(dblock->npages > 0) {
-	HDmemcpy(dblock->dblk_page_init, p, dblock->dblk_page_init_size);
-        p += dblock->dblk_page_init_size;
+	HDmemcpy(dblock->dblk_page_init, image, dblock->dblk_page_init_size);
+        image += dblock->dblk_page_init_size;
     } /* end if */
 
     /* Only decode elements if the data block is not paged */
     if(!dblock->npages) {
         /* Decode elements in data block */
         /* Convert from raw elements on disk into native elements in memory */
-        if((udata->hdr->cparam.cls->decode)(p, dblock->elmts, (size_t)udata->hdr->stats.nelmts, udata->hdr->cb_ctx) < 0)
+        if((udata->hdr->cparam.cls->decode)(image, dblock->elmts, (size_t)udata->hdr->cparam.nelmts, udata->hdr->cb_ctx) < 0)
             H5E_THROW(H5E_CANTDECODE, "can't decode fixed array data elements")
-        p += (udata->hdr->stats.nelmts * udata->hdr->cparam.raw_elmt_size);
+        image += (udata->hdr->cparam.nelmts * udata->hdr->cparam.raw_elmt_size);
     } /* end if */
 
     /* Sanity check */
     /* (allow for checksum not decoded yet) */
-    HDassert((size_t)(p - buf) == (size - H5FA_SIZEOF_CHKSUM));
+    HDassert((size_t)(image - (const uint8_t *)_image) == (len - H5FA_SIZEOF_CHKSUM));
 
     /* Set the data block's size */
     dblock->size = H5FA_DBLOCK_SIZE(dblock);
 
     /* Compute checksum on data block */
-    computed_chksum = H5_checksum_metadata(buf, (size_t)(p - buf), 0);
+    computed_chksum = H5_checksum_metadata(_image, (size_t)(image - (const uint8_t *)_image), 0);
 
     /* Metadata checksum */
-    UINT32DECODE(p, stored_chksum);
+    UINT32DECODE(image, stored_chksum);
 
     /* Sanity check */
-    HDassert((size_t)(p - buf) == size);
+    HDassert((size_t)(image - (const uint8_t *)_image) == len);
 
     /* Verify checksum */
     if(stored_chksum != computed_chksum)
@@ -608,317 +596,292 @@ H5FA__cache_dblock_load(H5F_t *f, hid_t dxpl_id, haddr_t addr, void *_udata))
 CATCH
 
     /* Release resources */
-    if(wb && H5WB_unwrap(wb) < 0)
-	H5E_THROW(H5E_CLOSEERROR, "can't close wrapped buffer")
     if(!ret_value)
         if(dblock && H5FA__dblock_dest(dblock) < 0)
             H5E_THROW(H5E_CANTFREE, "unable to destroy fixed array data block")
 
-END_FUNC(STATIC)   /* end H5FA__cache_dblock_load() */
+END_FUNC(STATIC)   /* end H5FA__cache_dblock_deserialize() */
 
 
 /*-------------------------------------------------------------------------
- * Function:	H5FA__cache_dblock_flush
+ * Function:    H5FA__cache_dblock_image_len
  *
- * Purpose:	Flushes a dirty fixed array data block to disk.
+ * Purpose:     Compute the size of the data structure on disk.
  *
- * Return:	Non-negative on success/Negative on failure
+ * Return:      Non-negative on success/Negative on failure
  *
- * Programmer:	Vailin Choi
- *              Thursday, April 30, 2009
+ * Programmer:  Quincey Koziol
+ *              koziol@hdfgroup.org
+ *              August 14, 2013
  *
  *-------------------------------------------------------------------------
  */
-BEGIN_FUNC(STATIC, ERR,
-herr_t, SUCCEED, FAIL,
-H5FA__cache_dblock_flush(H5F_t *f, hid_t dxpl_id, hbool_t destroy, haddr_t addr,
-    H5FA_dblock_t *dblock, unsigned H5_ATTR_UNUSED * flags_ptr))
+BEGIN_FUNC(STATIC, NOERR,
+herr_t, SUCCEED, -,
+H5FA__cache_dblock_image_len(const void *_thing, size_t *image_len,
+    hbool_t H5_ATTR_UNUSED *compressed_ptr, size_t H5_ATTR_UNUSED *compressed_image_len_ptr))
 
     /* Local variables */
-    H5WB_t *wb = NULL;                     /* Wrapped buffer for serializing data */
-    uint8_t ser_buf[H5FA_DBLOCK_BUF_SIZE]; /* Serialization buffer */
+    const H5FA_dblock_t *dblock = (const H5FA_dblock_t *)_thing;      /* Pointer to the object */
 
-    /* Sanity check */
-    HDassert(f);
-    HDassert(H5F_addr_defined(addr));
+    /* Check arguments */
     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 */
+    HDassert(image_len);
 
-        /* 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 */
-        if(!dblock->npages)
-            size = (size_t)dblock->size;
-        else
-            size = H5FA_DBLOCK_PREFIX_SIZE(dblock);
+    /* Set the image length size */
+    if(!dblock->npages)
+        *image_len = (size_t)dblock->size;
+    else
+        *image_len = H5FA_DBLOCK_PREFIX_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")
+END_FUNC(STATIC)   /* end H5FA__cache_dblock_image_len() */
 
-        /* Get temporary pointer to serialized info */
-        p = buf;
+
+/*-------------------------------------------------------------------------
+ * Function:	H5FA__cache_dblock_serialize
+ *
+ * Purpose:	Flushes a dirty object to disk.
+ *
+ * Return:	Non-negative on success/Negative on failure
+ *
+ * Programmer:	Quincey Koziol
+ *              koziol@hdfgroup.org
+ *              August 14, 2013
+ *
+ *-------------------------------------------------------------------------
+ */
+BEGIN_FUNC(STATIC, ERR,
+herr_t, SUCCEED, FAIL,
+H5FA__cache_dblock_serialize(const H5F_t *f, void *_image, size_t H5_ATTR_UNUSED len,
+    void *_thing))
 
-        /* Magic number */
-        HDmemcpy(p, H5FA_DBLOCK_MAGIC, (size_t)H5_SIZEOF_MAGIC);
-        p += H5_SIZEOF_MAGIC;
+    /* Local variables */
+    H5FA_dblock_t *dblock = (H5FA_dblock_t *)_thing;      /* Pointer to the object to serialize */
+    uint8_t *image = (uint8_t *)_image;         /* Pointer into raw data buffer */
+    uint32_t metadata_chksum; /* Computed metadata checksum value */
 
-        /* Version # */
-        *p++ = H5FA_DBLOCK_VERSION;
+    /* Check arguments */
+    HDassert(f);
+    HDassert(image);
+    HDassert(dblock);
+    HDassert(dblock->hdr);
 
-        /* Fixed array type */
-        *p++ = dblock->hdr->cparam.cls->id;
+    /* Magic number */
+    HDmemcpy(image, H5FA_DBLOCK_MAGIC, (size_t)H5_SIZEOF_MAGIC);
+    image += H5_SIZEOF_MAGIC;
 
-        /* Address of array header for array which owns this block */
-        H5F_addr_encode(f, &p, dblock->hdr->addr);
+    /* Version # */
+    *image++ = H5FA_DBLOCK_VERSION;
 
-        /* Page init flags */
-	if(dblock->npages > 0) {
-	    /* Store the 'page init' bitmasks */
-            HDmemcpy(p, dblock->dblk_page_init, dblock->dblk_page_init_size);
-            p += dblock->dblk_page_init_size;
-	} /* end if */
+    /* Fixed array type */
+    *image++ = dblock->hdr->cparam.cls->id;
 
-        /* Only encode elements if the data block is not paged */
-        if(!dblock->npages) {
-            /* Encode elements in data block */
+    /* Address of array header for array which owns this block */
+    H5F_addr_encode(f, &image, dblock->hdr->addr);
 
-            /* Convert from native elements in memory into raw elements on disk */
-            H5_CHECK_OVERFLOW(dblock->hdr->cparam.nelmts, /* From: */hsize_t, /* To: */size_t);
-            if((dblock->hdr->cparam.cls->encode)(p, dblock->elmts, (size_t)dblock->hdr->cparam.nelmts, dblock->hdr->cb_ctx) < 0)
-                H5E_THROW(H5E_CANTENCODE, "can't encode fixed array data elements")
-            p += (dblock->hdr->cparam.nelmts * dblock->hdr->cparam.raw_elmt_size);
-        } /* end if */
+    /* Page init flags */
+    if(dblock->npages > 0) {
+        /* Store the 'page init' bitmasks */
+        HDmemcpy(image, dblock->dblk_page_init, dblock->dblk_page_init_size);
+        image += dblock->dblk_page_init_size;
+    } /* end if */
 
-        /* Compute metadata checksum */
-        metadata_chksum = H5_checksum_metadata(buf, (size_t)(p - buf), 0);
+    /* Only encode elements if the data block is not paged */
+    if(!dblock->npages) {
+        /* Encode elements in data block */
 
-        /* Metadata checksum */
-        UINT32ENCODE(p, metadata_chksum);
+        /* Convert from native elements in memory into raw elements on disk */
+        H5_CHECK_OVERFLOW(dblock->hdr->cparam.nelmts, /* From: */hsize_t, /* To: */size_t);
+        if((dblock->hdr->cparam.cls->encode)(image, dblock->elmts, (size_t)dblock->hdr->cparam.nelmts, dblock->hdr->cb_ctx) < 0)
+            H5E_THROW(H5E_CANTENCODE, "can't encode fixed array data elements")
+        image += (dblock->hdr->cparam.nelmts * dblock->hdr->cparam.raw_elmt_size);
+    } /* end if */
 
-	/* Write the data block */
-        HDassert((size_t)(p - buf) == size);
-	if(H5F_block_write(f, H5FD_MEM_FARRAY_DBLOCK, addr, size, dxpl_id, buf) < 0)
-            H5E_THROW(H5E_WRITEERROR, "unable to save fixed array data block to disk")
+    /* Compute metadata checksum */
+    metadata_chksum = H5_checksum_metadata(_image, (size_t)(image - (uint8_t *)_image), 0);
 
-	dblock->cache_info.is_dirty = FALSE;
-    } /* end if */
+    /* Metadata checksum */
+    UINT32ENCODE(image, metadata_chksum);
 
-    if(destroy)
-        if(H5FA__cache_dblock_dest(f, dblock) < 0)
-            H5E_THROW(H5E_CANTFREE, "unable to destroy fixed array data block")
+    /* Sanity check */
+    HDassert((size_t)(image - (uint8_t *)_image) <= len);
 
 CATCH
 
-    /* Release resources */
-    if(wb && H5WB_unwrap(wb) < 0)
-	H5E_THROW(H5E_CLOSEERROR, "can't close wrapped buffer")
-
-END_FUNC(STATIC)   /* end H5FA__cache_dblock_flush() */
+END_FUNC(STATIC)   /* end H5FA__cache_dblock_serialize() */
 
 
 /*-------------------------------------------------------------------------
- * Function:	H5FA__cache_dblock_clear
+ * Function:	H5FA__cache_dblock_free_icr
  *
- * Purpose:	Mark a fixed array data block in memory as non-dirty.
+ * Purpose:	Destroy/release an "in core representation" of a data
+ *              structure
  *
  * Return:	Non-negative on success/Negative on failure
  *
- * Programmer:	Vailin Choi
- *              Thursday, April 30, 2009
+ * Programmer:	Quincey Koziol
+ *              koziol@hdfgroup.org
+ *              August 14, 2013
  *
  *-------------------------------------------------------------------------
  */
 BEGIN_FUNC(STATIC, ERR,
 herr_t, SUCCEED, FAIL,
-H5FA__cache_dblock_clear(H5F_t *f, H5FA_dblock_t *dblock, hbool_t destroy))
+H5FA__cache_dblock_free_icr(void *_thing))
 
-    /* Sanity check */
-    HDassert(dblock);
+    H5FA_dblock_t *dblock = (H5FA_dblock_t *)_thing;    /* Pointer to the object */
 
-    /* Reset the dirty flag */
-    dblock->cache_info.is_dirty = FALSE;
+    /* Check arguments */
+    HDassert(dblock);
 
-    if(destroy)
-        if(H5FA__cache_dblock_dest(f, dblock) < 0)
-            H5E_THROW(H5E_CANTFREE, "unable to destroy fixed array data block")
+    /* Release the fixed array data block */
+    if(H5FA__dblock_dest(dblock) < 0)
+        H5E_THROW(H5E_CANTFREE, "can't free fixed array data block")
 
 CATCH
 
-END_FUNC(STATIC)   /* end H5FA__cache_dblock_clear() */
+END_FUNC(STATIC)   /* end H5FA__cache_dblock_free_icr() */
 
 
 /*-------------------------------------------------------------------------
- * Function:	H5FA__cache_dblock_size
- *
- * Purpose:	Compute the size in bytes of a fixed array data block
- *		on disk, and return it in *size_ptr.  On failure,
- *		the value of *size_ptr is undefined.
- *
+ * Function:	H5FA__cache_dblock_fsf_size
+ *
+ * Purpose:	Tell the metadata cache the actual amount of file space
+ *		to free when a dblock entry is destroyed with the free
+ *		file space block set.
+ *
+ *		This function is needed when the data block is paged, as 
+ *		the datablock header and all its pages are allocted as a
+ *		single contiguous chunk of file space, and must be 
+ *		deallocated the same way.
+ *
+ *		The size of the chunk of memory in which the dblock
+ *		header and all its pages is stored in the size field,
+ *		so we simply pass that value back to the cache.
+ *
+ *		If the datablock is not paged, then the size field of 
+ *		the cache_info contains the correct size.  However this
+ *		value will be the same as the size field, so we return
+ *		the contents of the size field to the cache in this case
+ *		as well.
+ *		
  * Return:	Non-negative on success/Negative on failure
  *
- * Programmer:	Vailin Choi
- *              Thursday, April 30, 2009
+ * Programmer:	John Mainzer
+ *              12/5/14
  *
  *-------------------------------------------------------------------------
  */
-/* ARGSUSED */
 BEGIN_FUNC(STATIC, NOERR,
 herr_t, SUCCEED, -,
-H5FA__cache_dblock_size(const H5F_t H5_ATTR_UNUSED *f, const H5FA_dblock_t *dblock,
-    size_t *size_ptr))
+H5FA__cache_dblock_fsf_size(const void *_thing, size_t *fsf_size))
 
-    /* Sanity check */
-    HDassert(f);
+    const H5FA_dblock_t *dblock = (const H5FA_dblock_t *)_thing;    /* Pointer to the object */
+
+    /* Check arguments */
     HDassert(dblock);
-    HDassert(size_ptr);
+    HDassert(dblock->cache_info.magic == H5C__H5C_CACHE_ENTRY_T_MAGIC);
+    HDassert(dblock->cache_info.type == H5AC_FARRAY_DBLOCK);
+    HDassert(fsf_size);
 
-    /* Set size value */
-    if(!dblock->npages)
-        *size_ptr = (size_t)dblock->size;
-    else
-        *size_ptr = H5FA_DBLOCK_PREFIX_SIZE(dblock);
+    *fsf_size = dblock->size;
 
-END_FUNC(STATIC)   /* end H5FA__cache_dblock_size() */
+END_FUNC(STATIC)   /* end H5FA__cache_dblock_fsf_size() */
 
 
 /*-------------------------------------------------------------------------
- * Function:	H5FA__cache_dblock_dest
+ * Function:    H5FA__cache_dblk_page_get_load_size
  *
- * Purpose:	Destroys a fixed array data block in memory.
+ * Purpose:     Compute the size of the data structure on disk.
  *
- * Return:	Non-negative on success/Negative on failure
+ * Return:      Non-negative on success/Negative on failure
  *
- * Programmer:	Vailin Choi
- *              Thursday, April 30, 2009
+ * Programmer:  Quincey Koziol
+ *              koziol@hdfgroup.org
+ *              August 14, 2013
  *
  *-------------------------------------------------------------------------
  */
-/* ARGSUSED */
-BEGIN_FUNC(STATIC, ERR,
-herr_t, SUCCEED, FAIL,
-H5FA__cache_dblock_dest(H5F_t *f, H5FA_dblock_t *dblock))
-
-    /* Sanity check */
-    HDassert(f);
-    HDassert(dblock);
-
-    /* Verify that data block is clean */
-    HDassert(dblock->cache_info.is_dirty == FALSE);
-
-    /* If we're going to free the space on disk, the address must be valid */
-    HDassert(!dblock->cache_info.free_file_space_on_destroy || H5F_addr_defined(dblock->cache_info.addr));
-
-    /* Check for freeing file space for fixed array data block */
-    if(dblock->cache_info.free_file_space_on_destroy) {
-        /* Sanity check address */
-        HDassert(H5F_addr_eq(dblock->addr, dblock->cache_info.addr));
+BEGIN_FUNC(STATIC, NOERR,
+herr_t, SUCCEED, -,
+H5FA__cache_dblk_page_get_load_size(const void *_udata, size_t *image_len))
 
-        /* Release the space on disk */
-        /* (Includes space for pages!) */
-        /* (XXX: Nasty usage of internal DXPL value! -QAK) */
-        if(H5MF_xfree(f, H5FD_MEM_FARRAY_DBLOCK, H5AC_dxpl_id, dblock->cache_info.addr, (hsize_t)dblock->size) < 0)
-            H5E_THROW(H5E_CANTFREE, "unable to free fixed array data block")
-    } /* end if */
+    /* Local variables */
+    const H5FA_dblk_page_cache_ud_t *udata = (const H5FA_dblk_page_cache_ud_t *)_udata;      /* User data */
 
-    /* Release the data block */
-    if(H5FA__dblock_dest(dblock) < 0)
-        H5E_THROW(H5E_CANTFREE, "can't free fixed array data block")
+    /* Check arguments */
+    HDassert(udata);
+    HDassert(udata->hdr);
+    HDassert(udata->nelmts > 0);
+    HDassert(image_len);
 
-CATCH
+    *image_len = (size_t)H5FA_DBLK_PAGE_SIZE(udata->hdr, udata->nelmts);
 
-END_FUNC(STATIC)   /* end H5FA__cache_dblock_dest() */
+END_FUNC(STATIC)   /* end H5FA__cache_dblk_page_get_load_size() */
 
 
 /*-------------------------------------------------------------------------
- * Function:	H5FA__cache_dblk_page_load
+ * Function:	H5FA__cache_dblk_page_deserialize
  *
- * Purpose:	Loads a fixed array data block page from the disk.
+ * Purpose:	Loads a data structure from the disk.
  *
- * Return:	Success:	Pointer to a new fixed array data block page
+ * Return:	Success:	Pointer to a new B-tree.
  *		Failure:	NULL
  *
- * Programmer:	Vailin Choi
- *              Thursday, April 30, 2009
+ * Programmer:	Quincey Koziol
+ *              koziol@hdfgroup.org
+ *              August 14, 2013
  *
  *-------------------------------------------------------------------------
  */
 BEGIN_FUNC(STATIC, ERR,
-H5FA_dblk_page_t *, NULL, NULL,
-H5FA__cache_dblk_page_load(H5F_t *f, hid_t dxpl_id, haddr_t addr, void *_udata))
+void *, NULL, NULL,
+H5FA__cache_dblk_page_deserialize(const void *_image, size_t len,
+    void *_udata, hbool_t H5_ATTR_UNUSED *dirty))
 
     /* Local variables */
     H5FA_dblk_page_t	*dblk_page = NULL; /* Data block page info */
     H5FA_dblk_page_cache_ud_t *udata = (H5FA_dblk_page_cache_ud_t *)_udata; /* User data for loading data block page */
-    size_t		size;           /* Data block page size */
-    H5WB_t              *wb = NULL;     /* Wrapped buffer for data block page data */
-    uint8_t             dblk_page_buf[H5FA_DBLK_PAGE_BUF_SIZE]; /* Buffer for data block page */
-    uint8_t		*buf;           /* Pointer to data block page buffer */
-    const uint8_t	*p;             /* Pointer into raw data buffer */
+    const uint8_t	*image = (const uint8_t *)_image;       /* Pointer into raw data buffer */
     uint32_t            stored_chksum;  /* Stored metadata checksum value */
     uint32_t            computed_chksum; /* Computed metadata checksum value */
 
     /* Sanity check */
-    HDassert(f);
-    HDassert(H5F_addr_defined(addr));
-    HDassert(udata && udata->hdr && udata->nelmts > 0);
+    HDassert(udata);
+    HDassert(udata->hdr);
+    HDassert(udata->nelmts > 0);
+    HDassert(H5F_addr_defined(udata->dblk_page_addr));
 
     /* Allocate the fixed array data block page */
     if(NULL == (dblk_page = H5FA__dblk_page_alloc(udata->hdr, udata->nelmts)))
 	H5E_THROW(H5E_CANTALLOC, "memory allocation failed for fixed array data block page")
 
     /* Set the fixed array data block's information */
-    dblk_page->addr = addr;
-
-    /* Wrap the local buffer for serialized info */
-    if(NULL == (wb = H5WB_wrap(dblk_page_buf, sizeof(dblk_page_buf))))
-	H5E_THROW(H5E_CANTINIT, "can't wrap buffer")
-
-    /* Compute the size of the fixed array data block page on disk */
-    size = H5FA_DBLK_PAGE_SIZE(udata->hdr, udata->nelmts);
-
-    /* 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 page from disk */
-    if(H5F_block_read(f, H5FD_MEM_FARRAY_DBLK_PAGE, addr, size, dxpl_id, buf) < 0)
-	H5E_THROW(H5E_READERROR, "can't read fixed array data block page")
-
-    /* Get temporary pointer to serialized header */
-    p = buf;
+    dblk_page->addr = udata->dblk_page_addr;
 
     /* Internal information */
 
     /* Decode elements in data block page */
     /* Convert from raw elements on disk into native elements in memory */
-    if((udata->hdr->cparam.cls->decode)(p, dblk_page->elmts, udata->nelmts, udata->hdr->cb_ctx) < 0)
+    if((udata->hdr->cparam.cls->decode)(image, dblk_page->elmts, udata->nelmts, udata->hdr->cb_ctx) < 0)
         H5E_THROW(H5E_CANTDECODE, "can't decode fixed array data elements")
-    p += (udata->nelmts * udata->hdr->cparam.raw_elmt_size);
+    image += (udata->nelmts * udata->hdr->cparam.raw_elmt_size);
 
     /* Sanity check */
     /* (allow for checksum not decoded yet) */
-    HDassert((size_t)(p - buf) == (size - H5FA_SIZEOF_CHKSUM));
+    HDassert((size_t)(image - (const uint8_t *)_image) == (len - H5FA_SIZEOF_CHKSUM));
 
     /* Set the data block page's size */
-    dblk_page->size = size;
+    dblk_page->size = len;
 
     /* Compute checksum on data block */
-    computed_chksum = H5_checksum_metadata(buf, (size_t)(p - buf), 0);
+    computed_chksum = H5_checksum_metadata(_image, (size_t)(image - (const uint8_t *)_image), 0);
 
     /* Metadata checksum */
-    UINT32DECODE(p, stored_chksum);
+    UINT32DECODE(image, stored_chksum);
 
     /* Sanity check */
-    HDassert((size_t)(p - buf) == dblk_page->size);
+    HDassert((size_t)(image - (const uint8_t *)_image) == dblk_page->size);
 
     /* Verify checksum */
     if(stored_chksum != computed_chksum)
@@ -930,192 +893,122 @@ H5FA__cache_dblk_page_load(H5F_t *f, hid_t dxpl_id, haddr_t addr, void *_udata))
 CATCH
 
     /* Release resources */
-    if(wb && H5WB_unwrap(wb) < 0)
-	H5E_THROW(H5E_CLOSEERROR, "can't close wrapped buffer")
     if(!ret_value)
         if(dblk_page && H5FA__dblk_page_dest(dblk_page) < 0)
             H5E_THROW(H5E_CANTFREE, "unable to destroy fixed array data block page")
 
-END_FUNC(STATIC)   /* end H5FA__cache_dblk_page_load() */
+END_FUNC(STATIC)   /* end H5FA__cache_dblk_page_deserialize() */
 
 
 /*-------------------------------------------------------------------------
- * Function:	H5FA__cache_dblk_page_flush
+ * Function:    H5FA__cache_dblk_page_image_len
  *
- * Purpose:	Flushes a dirty fixed array data block page to disk.
+ * Purpose:     Compute the size of the data structure on disk.
  *
- * Return:	Non-negative on success/Negative on failure
+ * Return:      Non-negative on success/Negative on failure
  *
- * Programmer:	Vailin Choi
- *              Thursday, April 30, 2009
+ * Programmer:  Quincey Koziol
+ *              koziol@hdfgroup.org
+ *              August 14, 2013
  *
  *-------------------------------------------------------------------------
  */
-BEGIN_FUNC(STATIC, ERR,
-herr_t, SUCCEED, FAIL,
-H5FA__cache_dblk_page_flush(H5F_t *f, hid_t dxpl_id, hbool_t destroy, haddr_t addr,
-    H5FA_dblk_page_t *dblk_page, unsigned H5_ATTR_UNUSED * flags_ptr))
+BEGIN_FUNC(STATIC, NOERR,
+herr_t, SUCCEED, -,
+H5FA__cache_dblk_page_image_len(const void *_thing, size_t *image_len,
+    hbool_t H5_ATTR_UNUSED *compressed_ptr, size_t H5_ATTR_UNUSED *compressed_image_len_ptr))
 
     /* Local variables */
-    H5WB_t *wb = NULL;                  /* Wrapped buffer for serializing data */
-    uint8_t ser_buf[H5FA_DBLK_PAGE_BUF_SIZE]; /* Serialization buffer */
+    const H5FA_dblk_page_t *dblk_page = (const H5FA_dblk_page_t *)_thing;      /* Pointer to the object */
 
-    /* Sanity check */
-    HDassert(f);
-    HDassert(H5F_addr_defined(addr));
+    /* Check arguments */
     HDassert(dblk_page);
-    HDassert(dblk_page->hdr);
-
-    if(dblk_page->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 = dblk_page->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;
-
-        /* Internal information */
-
-        /* Encode elements in data block page */
-
-        /* Convert from native elements in memory into raw elements on disk */
-        if((dblk_page->hdr->cparam.cls->encode)(p, dblk_page->elmts, dblk_page->nelmts, dblk_page->hdr->cb_ctx) < 0)
-            H5E_THROW(H5E_CANTENCODE, "can't encode fixed array data elements")
-        p += (dblk_page->nelmts * dblk_page->hdr->cparam.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 data block */
-        HDassert((size_t)(p - buf) == size);
-	if(H5F_block_write(f, H5FD_MEM_FARRAY_DBLK_PAGE, addr, size, dxpl_id, buf) < 0)
-            H5E_THROW(H5E_WRITEERROR, "unable to save fixed array data block page to disk")
-
-	dblk_page->cache_info.is_dirty = FALSE;
-    } /* end if */
-
-    if(destroy)
-        if(H5FA__cache_dblk_page_dest(f, dblk_page) < 0)
-            H5E_THROW(H5E_CANTFREE, "unable to destroy fixed array data block page")
+    HDassert(image_len);
 
-CATCH
-
-    /* Release resources */
-    if(wb && H5WB_unwrap(wb) < 0)
-	H5E_THROW(H5E_CLOSEERROR, "can't close wrapped buffer")
+    /* Set the image length size */
+    *image_len = dblk_page->size; 
 
-END_FUNC(STATIC)   /* end H5FA__cache_dblk_page_flush() */
+END_FUNC(STATIC)   /* end H5FA__cache_dblk_page_image_len() */
 
 
 /*-------------------------------------------------------------------------
- * Function:	H5FA__cache_dblk_page_clear
+ * Function:	H5FA__cache_dblk_page_serialize
  *
- * Purpose:	Mark a fixed array data block page in memory as non-dirty.
+ * Purpose:	Flushes a dirty object to disk.
  *
  * Return:	Non-negative on success/Negative on failure
  *
- * Programmer:	Vailin Choi
- *              Thursday, April 30, 2009
+ * Programmer:	Quincey Koziol
+ *              koziol@hdfgroup.org
+ *              August 14, 2013
  *
  *-------------------------------------------------------------------------
  */
 BEGIN_FUNC(STATIC, ERR,
 herr_t, SUCCEED, FAIL,
-H5FA__cache_dblk_page_clear(H5F_t *f, H5FA_dblk_page_t *dblk_page, hbool_t destroy))
+H5FA__cache_dblk_page_serialize(const H5F_t *f, void *_image, size_t H5_ATTR_UNUSED len,
+    void *_thing))
+
+    /* Local variables */
+    H5FA_dblk_page_t *dblk_page = (H5FA_dblk_page_t *)_thing;      /* Pointer to the object to serialize */
+    uint8_t *image = (uint8_t *)_image;         /* Pointer into raw data buffer */
+    uint32_t metadata_chksum;   /* Computed metadata checksum value */
 
     /* Sanity check */
+    HDassert(f);
+    HDassert(image);
     HDassert(dblk_page);
+    HDassert(dblk_page->hdr);
 
-    /* Reset the dirty flag */
-    dblk_page->cache_info.is_dirty = FALSE;
+    /* Internal information */
 
-    if(destroy)
-        if(H5FA__cache_dblk_page_dest(f, dblk_page) < 0)
-            H5E_THROW(H5E_CANTFREE, "unable to destroy fixed array data block page")
+    /* Encode elements in data block page */
 
-CATCH
+    /* Convert from native elements in memory into raw elements on disk */
+    if((dblk_page->hdr->cparam.cls->encode)(image, dblk_page->elmts, dblk_page->nelmts, dblk_page->hdr->cb_ctx) < 0)
+        H5E_THROW(H5E_CANTENCODE, "can't encode fixed array data elements")
+    image += (dblk_page->nelmts * dblk_page->hdr->cparam.raw_elmt_size);
 
-END_FUNC(STATIC)   /* end H5FA__cache_dblk_page_clear() */
+    /* Compute metadata checksum */
+    metadata_chksum = H5_checksum_metadata(_image, (size_t)(image - (uint8_t *)_image), 0);
 
-
-/*-------------------------------------------------------------------------
- * Function:	H5FA__cache_dblk_page_size
- *
- * Purpose:	Compute the size in bytes of a fixed array data block page
- *		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:	Vailin Choi
- *              Thursday, April 30, 2009
- *
- *-------------------------------------------------------------------------
- */
-/* ARGSUSED */
-BEGIN_FUNC(STATIC, NOERR,
-herr_t, SUCCEED, -,
-H5FA__cache_dblk_page_size(const H5F_t H5_ATTR_UNUSED *f, const H5FA_dblk_page_t *dblk_page,
-    size_t *size_ptr))
+    /* Metadata checksum */
+    UINT32ENCODE(image, metadata_chksum);
 
     /* Sanity check */
-    HDassert(f);
-    HDassert(dblk_page);
-    HDassert(size_ptr);
+    HDassert((size_t)(image - (uint8_t *)_image) <= len);
 
-    /* Set size value */
-    *size_ptr = dblk_page->size;
+CATCH
 
-END_FUNC(STATIC)   /* end H5FA__cache_dblk_page_size() */
+END_FUNC(STATIC)   /* end H5FA__cache_dblk_page_serialize() */
 
 
 /*-------------------------------------------------------------------------
- * Function:	H5FA__cache_dblk_page_dest
- *
- * Purpose:	Destroys a fixed array data block page in memory.
+ * Function:	H5FA__cache_dblk_page_free_icr
  *
- * Note:	Does _not_ free the space for the page on disk, that is
- *              handled through the data block that "owns" the page.
+ * Purpose:	Destroy/release an "in core representation" of a data
+ *              structure
  *
  * Return:	Non-negative on success/Negative on failure
  *
- * Programmer:	Vailin Choi
- *              Thursday, April 30, 2009
+ * Programmer:	Quincey Koziol
+ *              koziol@hdfgroup.org
+ *              August 14, 2013
  *
  *-------------------------------------------------------------------------
  */
-/* ARGSUSED */
 BEGIN_FUNC(STATIC, ERR,
 herr_t, SUCCEED, FAIL,
-H5FA__cache_dblk_page_dest(H5F_t H5_ATTR_UNUSED *f, H5FA_dblk_page_t *dblk_page))
+H5FA__cache_dblk_page_free_icr(void *thing))
 
-    /* Sanity check */
-    HDassert(f);
-    HDassert(dblk_page);
-
-    /* Verify that data block page is clean */
-    HDassert(dblk_page->cache_info.is_dirty == FALSE);
+    /* Check arguments */
+    HDassert(thing);
 
-    /* Release the data block page */
-    if(H5FA__dblk_page_dest(dblk_page) < 0)
+    /* Release the fixed array data block page */
+    if(H5FA__dblk_page_dest((H5FA_dblk_page_t *)thing) < 0)
         H5E_THROW(H5E_CANTFREE, "can't free fixed array data block page")
 
 CATCH
 
-END_FUNC(STATIC)   /* end H5FA__cache_dblk_page_dest() */
+END_FUNC(STATIC)   /* end H5FA__cache_dblk_page_free_icr() */