Import upstream hdf5-1.10.1HEADupstream/1.10.1upstreammaster

Upstream repository is
https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-1.10/hdf5-1.10.1/src/

Change-Id: I4ec4c291940b7bb75722ea16813fbe55736374a6
Signed-off-by: Tae-Young Chung <ty83.chung@samsung.com>

1 files changed, 2206 insertions, 0 deletions

diff --git a/test/page_buffer.c b/test/page_buffer.c
new file mode 100644
index 0000000..853ef93
--- /dev/null
+++ b/test/page_buffer.c
@@ -0,0 +1,2206 @@
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+ * 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 COPYING file, which can be found at the root of the source code       *
+ * distribution tree, or in https://support.hdfgroup.org/ftp/HDF5/releases.  *
+ * If you do not have access to either file, you may request a copy from     *
+ * help@hdfgroup.org.                                                        *
+ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+
+/***********************************************************
+*
+* Test program:	 cache_page_buffer
+*
+* Tests the Page Buffer Feature.
+*
+*************************************************************/
+
+#include "h5test.h"
+
+#include "H5PBprivate.h"
+#include "H5Iprivate.h"
+
+/*
+ * This file needs to access private information from the H5F package.
+ */
+#define H5MF_FRIEND		/*suppress error about including H5MFpkg	  */
+#include "H5MFpkg.h"
+
+#define H5F_FRIEND		/*suppress error about including H5Fpkg	  */
+#define H5F_TESTING
+#include "H5Fpkg.h"
+
+
+#define FILENAME_LEN		1024
+#define NUM_DSETS               5
+#define NX                      100
+#define NY                      50
+
+/* helper routines */
+static unsigned create_file(char *filename, hid_t fcpl, hid_t fapl);
+static unsigned open_file(char *filename, hid_t fapl, hsize_t page_size, size_t page_buffer_size);
+
+/* test routines */
+static unsigned test_args(hid_t fapl, const char *env_h5_drvr);
+static unsigned test_raw_data_handling(hid_t orig_fapl, const char *env_h5_drvr);
+static unsigned test_lru_processing(hid_t orig_fapl, const char *env_h5_drvr);
+static unsigned test_min_threshold(hid_t orig_fapl, const char *env_h5_drvr);
+static unsigned test_stats_collection(hid_t orig_fapl, const char *env_h5_drvr);
+#ifdef H5_HAVE_PARALLEL
+static unsigned verify_page_buffering_disabled(hid_t orig_fapl, 
+    const char *env_h5_drvr);
+#endif /* H5_HAVE_PARALLEL */
+
+const char *FILENAME[] = {
+    "filepaged",
+    NULL
+};
+
+
+/*-------------------------------------------------------------------------
+ * Function:    create_file()
+ *
+ * Purpose:     The purpose of this function appears to be a smoke check
+ *              intended to exercise the page buffer.
+ *
+ *              Specifically, the function creates a file, and then goes 
+ *              through a loop in which it creates four data sets, write 
+ *              data to one of them, verifies the data written, and then 
+ *              deletes the three that it didn't write to.
+ *
+ *              Any data mis-matches or failures reported by the HDF5
+ *              library result in test failure.
+ *
+ * Return:      0 if test is sucessful
+ *              1 if test fails
+ *
+ * Programmer:  unknown
+ *              ?? / ?? / ??
+ *
+ *-------------------------------------------------------------------------
+ */
+static unsigned
+create_file(char *filename, hid_t fcpl, hid_t fapl)
+{
+    hid_t       file_id = -1;
+    hid_t       dset_id = -1;
+    hid_t       grp_id = -1;
+    hid_t       filespace = -1;
+    hsize_t     dimsf[2] = {NX, NY};       /* dataset dimensions */
+    int         *data = NULL;                     /* pointer to data buffer to write */
+    hid_t       dcpl = -1;
+    int         i;
+    int         num_elements;
+    int         j;
+    char        dset_name[10];
+
+    if((file_id = H5Fcreate(filename, H5F_ACC_TRUNC, fcpl, fapl)) < 0)
+        FAIL_STACK_ERROR;
+
+    if((grp_id = H5Gcreate2(file_id, "GROUP", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+        FAIL_STACK_ERROR;
+
+    num_elements  = NX * NY;
+    if((data = (int *)HDcalloc((size_t)num_elements, sizeof(int))) == NULL)
+        TEST_ERROR
+    for (i=0; i < (int)num_elements; i++)
+        data[i] = i;
+
+    if((filespace = H5Screate_simple(2, dimsf, NULL)) < 0)
+        FAIL_STACK_ERROR;
+
+    if((dcpl = H5Pcreate(H5P_DATASET_CREATE)) < 0)
+       FAIL_STACK_ERROR;
+    if(H5Pset_alloc_time(dcpl, H5D_ALLOC_TIME_EARLY) < 0)
+        FAIL_STACK_ERROR;
+
+    for(i=0 ; i<NUM_DSETS; i++) {
+
+        HDsprintf(dset_name, "D1dset%d", i);
+        if((dset_id = H5Dcreate2(grp_id, dset_name, H5T_NATIVE_INT, filespace,
+                                 H5P_DEFAULT, dcpl, H5P_DEFAULT)) < 0)
+            FAIL_STACK_ERROR;
+        if(H5Dclose(dset_id) < 0)
+            FAIL_STACK_ERROR;
+
+        HDsprintf(dset_name, "D2dset%d", i);
+        if((dset_id = H5Dcreate2(grp_id, dset_name, H5T_NATIVE_INT, filespace,
+                                 H5P_DEFAULT, dcpl, H5P_DEFAULT)) < 0)
+            FAIL_STACK_ERROR;
+        if(H5Dclose(dset_id) < 0)
+            FAIL_STACK_ERROR;
+
+        HDsprintf(dset_name, "D3dset%d", i);
+        if((dset_id = H5Dcreate2(grp_id, dset_name, H5T_NATIVE_INT, filespace,
+                                 H5P_DEFAULT, dcpl, H5P_DEFAULT)) < 0)
+            FAIL_STACK_ERROR;
+        if(H5Dclose(dset_id) < 0)
+            FAIL_STACK_ERROR;
+
+        HDsprintf(dset_name, "dset%d", i);
+        if((dset_id = H5Dcreate2(grp_id, dset_name, H5T_NATIVE_INT, filespace,
+                                 H5P_DEFAULT, dcpl, H5P_DEFAULT)) < 0)
+            FAIL_STACK_ERROR;
+
+        if(H5Dwrite(dset_id, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, data) < 0)
+            FAIL_STACK_ERROR;
+        if(H5Dclose(dset_id) < 0)
+            FAIL_STACK_ERROR;
+
+        HDmemset(data, 0, (size_t)num_elements * sizeof(int));
+        if((dset_id = H5Dopen2(grp_id, dset_name, H5P_DEFAULT)) < 0)
+            FAIL_STACK_ERROR;        
+        if(H5Dread(dset_id, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, data) < 0)
+            FAIL_STACK_ERROR;
+        if(H5Dclose(dset_id) < 0)
+            FAIL_STACK_ERROR;
+
+        for (j=0; j < num_elements; j++) {
+            if(data[j] != j) {
+                HDfprintf(stderr, "Read different values than written\n");
+                FAIL_STACK_ERROR;
+            }
+        }
+
+        HDsprintf(dset_name, "D1dset%d", i);
+        if(H5Ldelete(grp_id, dset_name, H5P_DEFAULT) < 0)
+            FAIL_STACK_ERROR;
+        HDsprintf(dset_name, "D2dset%d", i);
+        if(H5Ldelete(grp_id, dset_name, H5P_DEFAULT) < 0)
+            FAIL_STACK_ERROR;
+        HDsprintf(dset_name, "D3dset%d", i);
+        if(H5Ldelete(grp_id, dset_name, H5P_DEFAULT) < 0)
+            FAIL_STACK_ERROR;
+    }
+
+    if(H5Gclose(grp_id) < 0)
+        FAIL_STACK_ERROR;
+    if(H5Fclose(file_id) < 0)
+        FAIL_STACK_ERROR;
+    if(H5Pclose(dcpl) < 0)
+        FAIL_STACK_ERROR;
+    if(H5Sclose(filespace) < 0)
+        FAIL_STACK_ERROR;
+
+    HDfree(data);
+    return 0;
+
+error:
+    H5E_BEGIN_TRY {
+        H5Pclose(dcpl);
+        H5Sclose(filespace);
+        H5Gclose(grp_id);
+        H5Fclose(file_id);
+        if(data)
+            HDfree(data);
+    } H5E_END_TRY;
+    return(1);
+} /* create_file */
+
+
+/*-------------------------------------------------------------------------
+ * Function:    open_file()
+ *
+ * Purpose:     The purpose of this function appears to be a smoke check
+ *              intended to exercise the page buffer.
+ *
+ *              Specifically, the function opens a file (created by 
+ *              create_file()?), and verify the contents of its datasets.
+ *
+ *              Any data mis-matches or failures reported by the HDF5
+ *              library result in test failure.
+ *
+ * Return:      0 if test is sucessful
+ *              1 if test fails
+ *
+ * Programmer:  unknown
+ *              ?? / ?? / ??
+ *
+ *-------------------------------------------------------------------------
+ */
+static unsigned
+open_file(char *filename, hid_t fapl, hsize_t page_size, 
+    size_t page_buffer_size)
+{
+    hid_t       file_id = -1;
+    hid_t       dset_id = -1;
+    hid_t       grp_id = -1;
+    int         *data = NULL;                    /* pointer to data buffer to write */
+    int         i;
+    int         j;
+    int         num_elements;
+    char        dset_name[10];
+    H5F_t       *f = NULL;
+
+    if((file_id = H5Fopen(filename, H5F_ACC_RDONLY, fapl)) < 0)
+        FAIL_STACK_ERROR;
+
+    /* Get a pointer to the internal file object */
+    if(NULL == (f = (H5F_t *)H5I_object(file_id)))
+        FAIL_STACK_ERROR;
+
+    if(f->shared->page_buf == NULL)
+        FAIL_STACK_ERROR;
+    if(f->shared->page_buf->page_size != page_size)
+        FAIL_STACK_ERROR;
+    if(f->shared->page_buf->max_size != page_buffer_size)
+        FAIL_STACK_ERROR;
+
+    if((grp_id = H5Gopen2(file_id, "GROUP", H5P_DEFAULT)) < 0)
+        FAIL_STACK_ERROR;
+
+    num_elements  = NX * NY;
+    if((data = (int *)HDcalloc((size_t)num_elements, sizeof(int))) == NULL)
+        TEST_ERROR
+
+    for(i=0 ; i<NUM_DSETS; i++) {
+
+        HDsprintf(dset_name, "dset%d", i);
+        if((dset_id = H5Dopen2(grp_id, dset_name, H5P_DEFAULT)) < 0)
+            FAIL_STACK_ERROR;
+
+        if(H5Dread(dset_id, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, data) < 0)
+            FAIL_STACK_ERROR;
+
+        if(H5Dclose(dset_id) < 0)
+            FAIL_STACK_ERROR;
+
+        for (j=0; j < num_elements; j++) {
+            if(data[j] != j) {
+                HDfprintf(stderr, "Read different values than written\n");
+                FAIL_STACK_ERROR;
+            }
+        }
+    }
+
+    if(H5Gclose(grp_id) < 0)
+        FAIL_STACK_ERROR;
+    if(H5Fclose(file_id) < 0)
+        FAIL_STACK_ERROR;
+    HDfree(data);
+
+    return 0;
+
+error:
+    H5E_BEGIN_TRY {
+        H5Gclose(grp_id);
+        H5Fclose(file_id);
+        if(data)
+            HDfree(data);
+    } H5E_END_TRY;
+    return 1;
+}
+
+/*
+ *
+ *  set_multi_split():
+ *      Internal routine to set up page-aligned address space for multi/split driver
+ *      when testing paged aggregation.
+ *
+ */
+static unsigned
+set_multi_split(const char *env_h5_drvr, hid_t fapl, hsize_t pagesize)
+{
+    hbool_t split = FALSE;
+    hbool_t multi = FALSE;
+    H5FD_mem_t memb_map[H5FD_MEM_NTYPES];
+    hid_t memb_fapl_arr[H5FD_MEM_NTYPES];
+    char *memb_name[H5FD_MEM_NTYPES];
+    haddr_t memb_addr[H5FD_MEM_NTYPES];
+    hbool_t relax;
+    H5FD_mem_t  mt;
+
+    /* Check for split or multi driver */
+    if(!HDstrcmp(env_h5_drvr, "split"))
+        split = TRUE;
+    else if(!HDstrcmp(env_h5_drvr, "multi"))
+        multi = TRUE;
+
+    if(split || multi) {
+
+        HDmemset(memb_name, 0, sizeof memb_name);
+
+        /* Get current split settings */
+        if(H5Pget_fapl_multi(fapl, memb_map, memb_fapl_arr, memb_name, memb_addr, &relax) < 0)
+            TEST_ERROR
+
+        if(split) {
+            /* Set memb_addr aligned */
+            memb_addr[H5FD_MEM_SUPER] = ((memb_addr[H5FD_MEM_SUPER] + pagesize - 1) / pagesize) * pagesize;
+            memb_addr[H5FD_MEM_DRAW] = ((memb_addr[H5FD_MEM_DRAW] + pagesize - 1) / pagesize) * pagesize;
+        } else {
+            /* Set memb_addr aligned */
+            for(mt = H5FD_MEM_DEFAULT; mt < H5FD_MEM_NTYPES; H5_INC_ENUM(H5FD_mem_t, mt))
+                memb_addr[mt] = ((memb_addr[mt] + pagesize - 1) / pagesize) * pagesize;
+        } /* end else */
+
+        /* Set multi driver with new FAPLs */
+        if(H5Pset_fapl_multi(fapl, memb_map, memb_fapl_arr, (const char * const *)memb_name, memb_addr, relax) < 0)
+            TEST_ERROR
+
+        /* Free memb_name */
+        for(mt = H5FD_MEM_DEFAULT; mt < H5FD_MEM_NTYPES; H5_INC_ENUM(H5FD_mem_t, mt))
+            free(memb_name[mt]);
+
+    } /* end if */
+
+    return 0;
+
+error:
+    return 1;
+
+} /* set_multi_split() */
+
+
+/*-------------------------------------------------------------------------
+ * Function:    test_args()
+ *
+ * Purpose:     This test appears to be a quick smoke check directed at:
+ *
+ *              1) verifying that API errors are caught.
+ *
+ *              2) verifying that the page buffer behaves more or less 
+ *                 as advertized.
+ *
+ *              Any data mis-matches or unexpected failures or successes
+ *              reported by the HDF5 library result in test failure.
+ *
+ * Return:      0 if test is sucessful
+ *              1 if test fails
+ *
+ * Programmer:  unknown
+ *              ?? / ?? / ??
+ *
+ *-------------------------------------------------------------------------
+ */
+static unsigned
+test_args(hid_t orig_fapl, const char *env_h5_drvr)
+{
+    char filename[FILENAME_LEN]; /* Filename to use */
+    hid_t file_id = -1;          /* File ID */
+    hid_t fcpl = -1;
+    hid_t fapl = -1;
+    herr_t ret;
+
+    TESTING("Settings for Page Buffering");
+
+    h5_fixname(FILENAME[0], orig_fapl, filename, sizeof(filename));
+
+    if((fapl = H5Pcopy(orig_fapl)) < 0) TEST_ERROR
+
+    if((fcpl = H5Pcreate(H5P_FILE_CREATE)) < 0)
+        TEST_ERROR;
+
+
+    /* Test setting a page buffer without Paged Aggregation enabled - 
+     * should fail 
+     */
+    if(H5Pset_page_buffer_size(fapl, 512, 0, 0) < 0)
+        TEST_ERROR;
+
+    H5E_BEGIN_TRY {
+        file_id = H5Fcreate(filename, H5F_ACC_TRUNC, fcpl, fapl);
+    } H5E_END_TRY;
+
+    if(file_id >= 0)
+        TEST_ERROR;
+
+
+    /* Test setting a page buffer with a size smaller than a single 
+     * page size - should fail 
+     */
+    if(H5Pset_file_space_strategy(fcpl, H5F_FSPACE_STRATEGY_PAGE, 0, (hsize_t)1) < 0)
+        TEST_ERROR;
+
+    if(H5Pset_file_space_page_size(fcpl, 512) < 0)
+        TEST_ERROR;
+
+    if(H5Pset_page_buffer_size(fapl, 511, 0, 0) < 0)
+        TEST_ERROR;
+
+    H5E_BEGIN_TRY {
+        file_id = H5Fcreate(filename, H5F_ACC_TRUNC, fcpl, fapl);
+    } H5E_END_TRY;
+
+    if(file_id >= 0)
+        TEST_ERROR;
+
+
+    /* Test setting a page buffer with sum of min meta and raw 
+     * data percentage > 100 - should fail 
+     */
+    H5E_BEGIN_TRY {
+        ret = H5Pset_page_buffer_size(fapl, 512, 50, 51);
+    } H5E_END_TRY;
+
+    if(ret >= 0)
+        TEST_ERROR;
+
+    if(set_multi_split(env_h5_drvr, fapl, 512)  != 0)
+        TEST_ERROR;
+
+    /* Test setting a page buffer with a size equal to a single page size */
+    if(H5Pset_file_space_strategy(fcpl, H5F_FSPACE_STRATEGY_PAGE, 0, (hsize_t)1) < 0)
+        TEST_ERROR;
+
+    if(H5Pset_file_space_page_size(fcpl, 512) < 0)
+        TEST_ERROR;
+
+    if(H5Pset_page_buffer_size(fapl, 512, 0, 0) < 0)
+        TEST_ERROR;
+
+    if(create_file(filename, fcpl, fapl) != 0)
+        TEST_ERROR;
+
+    if(open_file(filename, fapl, 512, 512) != 0)
+        TEST_ERROR;
+
+
+    /* Test setting a page buffer with a size slightly larger than a 
+     * single page size 
+     */
+    if(H5Pset_file_space_strategy(fcpl, H5F_FSPACE_STRATEGY_PAGE, 0, (hsize_t)1) < 0)
+        TEST_ERROR;
+
+    if(H5Pset_file_space_page_size(fcpl, 512) < 0)
+        TEST_ERROR;
+
+    if(H5Pset_page_buffer_size(fapl, 513, 0, 0) < 0)
+        TEST_ERROR;
+
+    if(create_file(filename, fcpl, fapl) != 0)
+        TEST_ERROR;
+
+    if(open_file(filename, fapl, 512, 512) != 0)
+        TEST_ERROR;
+
+    if(set_multi_split(env_h5_drvr, fapl, 4194304)  != 0)
+        TEST_ERROR;
+
+
+    /* Test setting a large page buffer size and page size */
+    if(H5Pset_file_space_strategy(fcpl, H5F_FSPACE_STRATEGY_PAGE, 0, (hsize_t)1) < 0)
+        TEST_ERROR;
+
+    if(H5Pset_file_space_page_size(fcpl, 4194304) < 0)
+        TEST_ERROR;
+
+    if(H5Pset_page_buffer_size(fapl, 16777216, 0, 0) < 0)
+        TEST_ERROR;
+
+    if(create_file(filename, fcpl, fapl) != 0)
+        TEST_ERROR;
+
+    if(open_file(filename, fapl, 4194304, 16777216) != 0)
+        TEST_ERROR;
+
+    if(set_multi_split(env_h5_drvr, fapl, 1)  != 0)
+        TEST_ERROR;
+
+
+    /* Test setting a 512 byte page buffer size and page size */
+    if(H5Pset_file_space_strategy(fcpl, H5F_FSPACE_STRATEGY_PAGE, 0, (hsize_t)1) < 0)
+        TEST_ERROR;
+
+    if(H5Pset_file_space_page_size(fcpl, 512) < 0)
+        TEST_ERROR;
+    if(H5Pset_page_buffer_size(fapl, 512, 0, 0) < 0)
+        TEST_ERROR;
+    if(create_file(filename, fcpl, fapl) != 0)
+        TEST_ERROR;
+    if(open_file(filename, fapl, 512, 512) != 0)
+        TEST_ERROR;
+
+
+    if(H5Pclose(fcpl) < 0)
+        FAIL_STACK_ERROR;
+    if(H5Pclose(fapl) < 0)
+        FAIL_STACK_ERROR;
+
+    PASSED()
+    return 0;
+
+error:
+    H5E_BEGIN_TRY {
+        H5Pclose(fapl);
+        H5Pclose(fcpl);
+    } H5E_END_TRY;
+    return 1;
+} /* test_args */
+
+
+/*-------------------------------------------------------------------------
+ * Function:    test_raw_data_handling()
+ *
+ * Purpose:     The purpose of this function appears to be a smoke check
+ *              of raw data reads and writes via the page buffer.
+ *
+ *              Any data mis-matches or failures reported by the HDF5
+ *              library result in test failure.
+ *
+ * Return:      0 if test is sucessful
+ *              1 if test fails
+ *
+ * Programmer:  unknown
+ *              ?? / ?? / ??
+ *              
+ * Changes:     Added base_page_cnt field as supporting code.  This allows
+ *              the test to adjust to the number of page buffer pages
+ *              accessed during file open / create.
+ *
+ *              The test for the value of base_page_cnt just after file 
+ *              open exists detect changes in library behavior.  Assuming
+ *              any such change is not indicative of other issues, these 
+ *              tests can be modified to reflect the change.
+ *
+ *                                                    JRM -- 2/23/17
+ *
+ *-------------------------------------------------------------------------
+ */
+
+/* Changes due to file space page size has a minimum size of 512 */
+static unsigned
+test_raw_data_handling(hid_t orig_fapl, const char *env_h5_drvr)
+{
+    char filename[FILENAME_LEN]; /* Filename to use */
+    hid_t file_id = -1;          /* File ID */
+    hid_t fcpl = -1;
+    hid_t fapl = -1;
+    H5FD_io_info_t fdio_info;
+    H5P_genplist_t *meta_plist = (H5P_genplist_t *)H5I_object(H5AC_ind_read_dxpl_id);
+    H5P_genplist_t *raw_plist = (H5P_genplist_t *)H5I_object(H5AC_rawdata_dxpl_id);
+    size_t base_page_cnt;
+    size_t page_count = 0;
+    int i, num_elements = 2000;
+    haddr_t addr = HADDR_UNDEF;
+    int *data = NULL;
+    H5F_t *f = NULL;
+
+    TESTING("Raw Data Handling");
+
+    h5_fixname(FILENAME[0], orig_fapl, filename, sizeof(filename));
+
+    if((fapl = H5Pcopy(orig_fapl)) < 0)
+        TEST_ERROR
+
+    if(set_multi_split(env_h5_drvr, fapl, sizeof(int)*200)  != 0)
+        TEST_ERROR;
+
+    if((data = (int *)HDcalloc((size_t)num_elements, sizeof(int))) == NULL)
+        TEST_ERROR;
+
+    if((fcpl = H5Pcreate(H5P_FILE_CREATE)) < 0)
+        TEST_ERROR;
+    if(H5Pset_file_space_strategy(fcpl, H5F_FSPACE_STRATEGY_PAGE, 0, (hsize_t)1) < 0)
+        TEST_ERROR;
+    if(H5Pset_file_space_page_size(fcpl, sizeof(int)*200) < 0)
+        TEST_ERROR;
+    if(H5Pset_page_buffer_size(fapl, sizeof(int)*2000, 0, 0) < 0)
+        TEST_ERROR;
+
+    if((file_id = H5Fcreate(filename, H5F_ACC_TRUNC, fcpl, fapl)) < 0)
+        FAIL_STACK_ERROR;
+
+    /* Get a pointer to the internal file object */
+    if(NULL == (f = (H5F_t *)H5I_object(file_id)))
+        FAIL_STACK_ERROR;
+
+    /* opening the file inserts one or more pages into the page buffer.
+     * Get the number of pages inserted, and verify that it is the 
+     * the expected value.
+     */
+    base_page_cnt = H5SL_count(f->shared->page_buf->slist_ptr);
+    if(base_page_cnt != 1)
+        TEST_ERROR;
+
+    /* allocate space for a 2000 elements */
+    if(HADDR_UNDEF == (addr = H5MF_alloc(f, H5FD_MEM_DRAW, H5AC_ind_read_dxpl_id, sizeof(int)*(size_t)num_elements)))
+        FAIL_STACK_ERROR;
+
+    /* intialize all the elements to have a value of -1 */
+    for(i=0 ; i<num_elements ; i++)
+        data[i] = -1;
+    if(H5F_block_write(f, H5FD_MEM_DRAW, addr, sizeof(int)*(size_t)num_elements, H5AC_rawdata_dxpl_id, data) < 0)
+        FAIL_STACK_ERROR;
+
+    /* update the first 50 elements to have values 0-49 - this will be
+       a page buffer update with 1 page resulting in the page
+       buffer. */
+    /* Changes: 100 */
+    for(i=0 ; i<100 ; i++)
+        data[i] = i;
+
+    if(H5F_block_write(f, H5FD_MEM_DRAW, addr, sizeof(int)*100, H5AC_rawdata_dxpl_id, data) < 0)
+        FAIL_STACK_ERROR;
+
+    page_count ++;
+
+    if(H5SL_count(f->shared->page_buf->slist_ptr) != page_count + base_page_cnt)
+        FAIL_STACK_ERROR;
+
+    /* update elements 300 - 450, with values 300 -  - this will
+       bring two more pages into the page buffer. */
+    for(i=0 ; i<150 ; i++)
+        data[i] = i+300;
+    if(H5F_block_write(f, H5FD_MEM_DRAW, addr+(sizeof(int)*300), sizeof(int)*150, H5AC_rawdata_dxpl_id, data) < 0)
+        FAIL_STACK_ERROR;
+    page_count += 2;
+    if(H5SL_count(f->shared->page_buf->slist_ptr) != page_count + base_page_cnt)
+        FAIL_STACK_ERROR;
+
+    /* update elements 100 - 300, this will go to disk but also update
+       existing pages in the page buffer. */
+    for(i=0 ; i<200 ; i++)
+        data[i] = i+100;
+    if(H5F_block_write(f, H5FD_MEM_DRAW, addr+(sizeof(int)*100), sizeof(int)*200, H5AC_rawdata_dxpl_id, data) < 0)
+        FAIL_STACK_ERROR;
+    if(H5SL_count(f->shared->page_buf->slist_ptr) != page_count + base_page_cnt)
+        FAIL_STACK_ERROR;
+
+    /* Update elements 225-300 - this will update an existing page in the PB */
+    /* Changes: 450 - 600; 150 */
+    for(i=0 ; i<150 ; i++)
+        data[i] = i+450;
+    if(H5F_block_write(f, H5FD_MEM_DRAW, addr+(sizeof(int)*450), sizeof(int)*150, H5AC_rawdata_dxpl_id, data) < 0)
+        FAIL_STACK_ERROR;
+    if(H5SL_count(f->shared->page_buf->slist_ptr) != page_count + base_page_cnt)
+        FAIL_STACK_ERROR;
+
+    /* Do a full page write to block 600-800 - should bypass the PB */
+    for(i=0 ; i<200 ; i++)
+        data[i] = i+600;
+    if(H5F_block_write(f, H5FD_MEM_DRAW, addr+(sizeof(int)*600), sizeof(int)*200, H5AC_rawdata_dxpl_id, data) < 0)
+        FAIL_STACK_ERROR;
+    if(H5SL_count(f->shared->page_buf->slist_ptr) != page_count + base_page_cnt)
+        FAIL_STACK_ERROR;
+
+    /* read elements 800 - 1200, this should not affect the PB, and should read -1s */
+    if(H5F_block_read(f, H5FD_MEM_DRAW, addr+(sizeof(int)*800), sizeof(int)*400, H5AC_rawdata_dxpl_id, data) < 0)
+        FAIL_STACK_ERROR;
+    for (i=0; i < 400; i++) {
+        if(data[i] != -1) {
+            HDfprintf(stderr, "Read different values than written\n");
+            FAIL_STACK_ERROR;
+        }
+    }
+    if(H5SL_count(f->shared->page_buf->slist_ptr) != page_count + base_page_cnt)
+        FAIL_STACK_ERROR;
+
+    /* read elements 1200 - 1201, this should read -1 and bring in an 
+     * entire page of addr 1200 
+     */
+    if(H5F_block_read(f, H5FD_MEM_DRAW, addr+(sizeof(int)*1200), sizeof(int)*1, H5AC_rawdata_dxpl_id, data) < 0)
+        FAIL_STACK_ERROR;
+    for (i=0; i < 1; i++) {
+        if(data[i] != -1) {
+            HDfprintf(stderr, "Read different values than written\n");
+            TEST_ERROR;
+        }
+    }
+    page_count ++;
+    if(H5SL_count(f->shared->page_buf->slist_ptr) != page_count + base_page_cnt)
+        TEST_ERROR;
+
+    /* read elements 175 - 225, this should use the PB existing pages */
+    /* Changes: 350 - 450 */
+    /* read elements 175 - 225, this should use the PB existing pages */
+    if(H5F_block_read(f, H5FD_MEM_DRAW, addr+(sizeof(int)*350), sizeof(int)*100, H5AC_rawdata_dxpl_id, data) < 0)
+        FAIL_STACK_ERROR;
+    for (i=0; i < 100; i++) {
+        if(data[i] != i+350) {
+            HDfprintf(stderr, "Read different values than written\n");
+            TEST_ERROR;
+        }
+    }
+    if(H5SL_count(f->shared->page_buf->slist_ptr) != page_count + base_page_cnt)
+        TEST_ERROR;
+
+    /* read elements 0 - 800 using the VFD.. this should result in -1s
+       except for the writes that went through the PB (100-300 & 600-800) */
+    fdio_info.file = f->shared->lf;
+    fdio_info.meta_dxpl = meta_plist;
+    fdio_info.raw_dxpl = raw_plist;
+    if(H5FD_read(&fdio_info, H5FD_MEM_DRAW, addr, sizeof(int)*800, data) < 0)
+        FAIL_STACK_ERROR;
+    i = 0;
+    while (i < 800) {
+        if((i>=100 && i<300) || (i>=600)) {
+            if(data[i] != i) {
+                HDfprintf(stderr, "Read different values than written\n");
+                TEST_ERROR;
+            }
+        }
+        else {
+            if(data[i] != -1) {
+                HDfprintf(stderr, "Read different values than written\n");
+                TEST_ERROR;
+            }
+        }
+        i++;
+    }
+
+    /* read elements 0 - 800 using the PB.. this should result in all
+     * what we have written so far and should get the updates from the PB 
+     */
+    if(H5F_block_read(f, H5FD_MEM_DRAW, addr, sizeof(int)*800, H5AC_rawdata_dxpl_id, data) < 0)
+        FAIL_STACK_ERROR;
+    if(H5SL_count(f->shared->page_buf->slist_ptr) != page_count + base_page_cnt)
+        TEST_ERROR;
+    for (i=0; i < 800; i++) {
+        if(data[i] != i) {
+            HDfprintf(stderr, "Read different values than written\n");
+            TEST_ERROR;
+        }
+    }
+
+    /* update elements 400 - 1400 to value 0, this will go to disk but
+     * also evict existing pages from the PB (page 400 & 1200 that are
+     * existing). 
+     */
+    for(i=0 ; i<1000 ; i++)
+        data[i] = 0;
+    if(H5F_block_write(f, H5FD_MEM_DRAW, addr+(sizeof(int)*400), sizeof(int)*1000, H5AC_rawdata_dxpl_id, data) < 0)
+        FAIL_STACK_ERROR;
+    page_count -= 2;
+    if(H5SL_count(f->shared->page_buf->slist_ptr) != page_count + base_page_cnt)
+        TEST_ERROR;
+
+    /* read elements 0 - 1000.. this should go to disk then update the
+     * buffer result 200-400 with existing pages
+     */
+    if(H5F_block_read(f, H5FD_MEM_DRAW, addr, sizeof(int)*1000, H5AC_rawdata_dxpl_id, data) < 0)
+        FAIL_STACK_ERROR;
+    i=0;
+    while (i < 1000) {
+        if(i<400) {
+            if(data[i] != i) {
+                HDfprintf(stderr, "Read different values than written\n");
+                TEST_ERROR;
+            }
+        }
+        else {
+            if(data[i] != 0) {
+                HDfprintf(stderr, "Read different values than written\n");
+                TEST_ERROR;
+            }
+        }
+        i++;
+    }
+    if(H5SL_count(f->shared->page_buf->slist_ptr) != page_count + base_page_cnt)
+        TEST_ERROR;
+
+    if(H5Fclose(file_id) < 0)
+        FAIL_STACK_ERROR;
+    if(H5Pclose(fcpl) < 0)
+        FAIL_STACK_ERROR;
+    if(H5Pclose(fapl) < 0)
+        FAIL_STACK_ERROR;
+    HDfree(data);
+
+    PASSED()
+    return 0;
+
+error:
+    H5E_BEGIN_TRY {
+        H5Pclose(fapl);
+        H5Pclose(fcpl);
+        H5Fclose(file_id);
+        if(data)
+            HDfree(data);
+    } H5E_END_TRY;
+    return 1;
+} /* test_raw_data_handling */
+
+
+/*-------------------------------------------------------------------------
+ * Function:    test_lru_processing()
+ *
+ * Purpose:     Basic set of tests verifying expected page buffer LRU
+ *              management.
+ *
+ *              Any data mis-matches or failures reported by the HDF5
+ *              library result in test failure.
+ *
+ * Return:      0 if test is sucessful
+ *              1 if test fails
+ *
+ * Programmer:  unknown
+ *              ?? / ?? / ??
+ *              
+ * Changes:     Added base_page_cnt field as supporting code.  This allows
+ *              the test to adjust to the number of page buffer pages
+ *              accessed during file open / create.
+ *
+ *              The test for the value of base_page_cnt just after file 
+ *              open exists detect changes in library behavior.  Assuming
+ *              any such change is not indicative of other issues, these 
+ *              tests can be modified to reflect the change.
+ *
+ *                                                    JRM -- 2/23/17
+ *
+ *
+ *-------------------------------------------------------------------------
+ */
+
+static unsigned
+test_lru_processing(hid_t orig_fapl, const char *env_h5_drvr)
+{
+    char filename[FILENAME_LEN]; /* Filename to use */
+    hid_t file_id = -1;          /* File ID */
+    hid_t fcpl = -1;
+    hid_t fapl = -1;
+    size_t base_page_cnt;
+    size_t page_count = 0;
+    int i;
+    int num_elements = 2000;
+    haddr_t addr = HADDR_UNDEF;
+    haddr_t search_addr = HADDR_UNDEF;
+    int *data = NULL;
+    H5F_t *f = NULL;
+
+    TESTING("LRU Processing");
+
+    h5_fixname(FILENAME[0], orig_fapl, filename, sizeof(filename));
+
+    if((fapl = H5Pcopy(orig_fapl)) < 0)
+        FAIL_STACK_ERROR
+
+    if(set_multi_split(env_h5_drvr, fapl, sizeof(int)*200)  != 0)
+        TEST_ERROR;
+
+    if((data = (int *)HDcalloc((size_t)num_elements, sizeof(int))) == NULL)
+        TEST_ERROR;
+
+    if((fcpl = H5Pcreate(H5P_FILE_CREATE)) < 0)
+        FAIL_STACK_ERROR;
+
+    if(H5Pset_file_space_strategy(fcpl, H5F_FSPACE_STRATEGY_PAGE, 0, (hsize_t)1) < 0)
+        FAIL_STACK_ERROR;
+
+    if(H5Pset_file_space_page_size(fcpl, sizeof(int)*200) < 0)
+        FAIL_STACK_ERROR;
+
+    /* keep 2 pages at max in the page buffer */
+    if(H5Pset_page_buffer_size(fapl, sizeof(int)*400, 20, 0) < 0)
+        FAIL_STACK_ERROR;
+
+    if((file_id = H5Fcreate(filename, H5F_ACC_TRUNC, fcpl, fapl)) < 0)
+        FAIL_STACK_ERROR;
+
+    /* Get a pointer to the internal file object */
+    if(NULL == (f = (H5F_t *)H5I_object(file_id)))
+        FAIL_STACK_ERROR;
+
+    /* opening the file inserts one or more pages into the page buffer.
+     * Get the number of pages inserted, and verify that it is the 
+     * the expected value.
+     */
+    base_page_cnt = H5SL_count(f->shared->page_buf->slist_ptr);
+    if(base_page_cnt != 1)
+        TEST_ERROR;
+
+    /* allocate space for a 2000 elements */
+    if(HADDR_UNDEF == (addr = H5MF_alloc(f, H5FD_MEM_DRAW, H5AC_ind_read_dxpl_id, sizeof(int)*(size_t)num_elements)))
+        FAIL_STACK_ERROR;
+
+    /* intialize all the elements to have a value of -1 */
+    for(i=0 ; i<num_elements ; i++)
+        data[i] = -1;
+
+    if(H5F_block_write(f, H5FD_MEM_DRAW, addr, sizeof(int)*(size_t)num_elements, H5AC_rawdata_dxpl_id, data) < 0)
+        FAIL_STACK_ERROR;
+
+    /* update the first 100 elements to have values 0-99 - this will be
+     * a page buffer update with 1 page resulting in the page
+     * buffer. 
+     */
+    for(i=0 ; i<100 ; i++)
+        data[i] = i;
+
+    if(H5F_block_write(f, H5FD_MEM_DRAW, addr, sizeof(int)*100, H5AC_rawdata_dxpl_id, data) < 0)
+        FAIL_STACK_ERROR;
+
+    page_count ++;
+
+    if(H5SL_count(f->shared->page_buf->slist_ptr) != page_count + base_page_cnt)
+        TEST_ERROR;
+
+    /* update elements 300 - 450, with values 300 - 449 - this will
+     * bring two pages into the page buffer and evict 0. 
+     */
+    for(i=0 ; i<150 ; i++)
+        data[i] = i+300;
+
+    if(H5F_block_write(f, H5FD_MEM_DRAW, addr+(sizeof(int)*300), sizeof(int)*150, H5AC_rawdata_dxpl_id, data) < 0)
+        FAIL_STACK_ERROR;
+
+    page_count = 2;
+
+    /* at this point, the page buffer entry created at file open should
+     * have been evicted -- thus no further need to consider base_page_cnt.
+     */
+    if(H5SL_count(f->shared->page_buf->slist_ptr) != page_count)
+        FAIL_STACK_ERROR;
+
+    /* The two pages should be the ones with address 100 and 200; 0
+       should have been evicted */
+    /* Changes: 200, 400 */
+    search_addr = addr;
+    if(NULL != H5SL_search(f->shared->page_buf->slist_ptr, &(search_addr)))
+        FAIL_STACK_ERROR;
+    search_addr = addr + sizeof(int)*200;
+    if(NULL == H5SL_search(f->shared->page_buf->slist_ptr, &(search_addr)))
+        FAIL_STACK_ERROR;
+    search_addr = addr + sizeof(int)*400;
+    if(NULL == H5SL_search(f->shared->page_buf->slist_ptr, &(search_addr)))
+        FAIL_STACK_ERROR;
+
+    /* update elements 150-151, this will update existing pages in the
+       page buffer and move it to the top of the LRU. */
+    /* Changes: 300 - 301 */
+    for(i=0 ; i<1 ; i++)
+        data[i] = i+300;
+    if(H5F_block_write(f, H5FD_MEM_DRAW, addr+(sizeof(int)*300), sizeof(int)*1, H5AC_rawdata_dxpl_id, data) < 0)
+        FAIL_STACK_ERROR;
+    if(H5SL_count(f->shared->page_buf->slist_ptr) != page_count)
+        FAIL_STACK_ERROR;
+
+    /* read elements 600 - 601, this should read -1 and bring in an
+       entire page of addr 600, and evict page 200 */
+    /* Changes: 1200 - 1201; 1200, 400 */
+    if(H5F_block_read(f, H5FD_MEM_DRAW, addr+(sizeof(int)*1200), sizeof(int)*1, H5AC_rawdata_dxpl_id, data) < 0)
+        FAIL_STACK_ERROR;
+    for (i=0; i < 1; i++) {
+        if(data[i] != -1) {
+            HDfprintf(stderr, "Read different values than written\n");
+            TEST_ERROR;
+        } /* end if */
+    } /* end for */
+    if(H5SL_count(f->shared->page_buf->slist_ptr) != page_count)
+        FAIL_STACK_ERROR;
+
+    /* Changes: 400 */
+    search_addr = addr + sizeof(int)*400;
+    if(NULL != H5SL_search(f->shared->page_buf->slist_ptr, &(search_addr)))
+        FAIL_STACK_ERROR;
+
+    /* Changes: 200 */
+    search_addr = addr + sizeof(int)*200;
+    if(NULL == H5SL_search(f->shared->page_buf->slist_ptr, &(search_addr)))
+        FAIL_STACK_ERROR;
+
+    /* Changes: 1200 */
+    search_addr = addr + sizeof(int)*1200;
+    if(NULL == H5SL_search(f->shared->page_buf->slist_ptr, &(search_addr)))
+        FAIL_STACK_ERROR;
+    /* read elements 175 - 225, this should move 100 to the top, evict 600 and bring in 200 */
+    /* Changes: 350 - 450; 200, 1200, 400 */
+    if(H5F_block_read(f, H5FD_MEM_DRAW, addr+(sizeof(int)*350), sizeof(int)*100, H5AC_rawdata_dxpl_id, data) < 0)
+        FAIL_STACK_ERROR;
+    for (i=0; i < 100; i++) {
+        if(data[i] != i+350) {
+            HDfprintf(stderr, "Read different values than written\n");
+            TEST_ERROR;
+        } /* end if */
+    } /* end for */
+    if(H5SL_count(f->shared->page_buf->slist_ptr) != page_count)
+        FAIL_STACK_ERROR;
+
+    /* Changes: 1200 */
+    search_addr = addr + sizeof(int)*1200;
+    if(NULL != H5SL_search(f->shared->page_buf->slist_ptr, &(search_addr)))
+        FAIL_STACK_ERROR;
+
+    /* Changes: 200 */
+    search_addr = addr + sizeof(int)*200;
+    if(NULL == H5SL_search(f->shared->page_buf->slist_ptr, &(search_addr)))
+        FAIL_STACK_ERROR;
+
+    /* Changes: 400 */
+    search_addr = addr + sizeof(int)*400;
+    if(NULL == H5SL_search(f->shared->page_buf->slist_ptr, &(search_addr)))
+        FAIL_STACK_ERROR;
+
+    /* update elements 200 - 700 to value 0, this will go to disk but
+       also discarding existing pages from the PB (page 200). */
+    /* Changes: 400 - 1400; 400 */
+    for(i=0 ; i<1000 ; i++)
+        data[i] = 0;
+    if(H5F_block_write(f, H5FD_MEM_DRAW, addr+(sizeof(int)*400), sizeof(int)*1000, H5AC_rawdata_dxpl_id, data) < 0)
+        FAIL_STACK_ERROR;
+    page_count -= 1;
+    if(H5SL_count(f->shared->page_buf->slist_ptr) != page_count)
+        FAIL_STACK_ERROR;
+
+    /* Changes: 200 */
+    search_addr = addr + sizeof(int)*200;
+    if(NULL == H5SL_search(f->shared->page_buf->slist_ptr, &(search_addr)))
+        FAIL_STACK_ERROR;
+
+    /* Changes: 400 */
+    search_addr = addr + sizeof(int)*400;
+    if(NULL != H5SL_search(f->shared->page_buf->slist_ptr, &(search_addr)))
+        FAIL_STACK_ERROR;
+
+    if(H5Fclose(file_id) < 0)
+        FAIL_STACK_ERROR;
+    if(H5Pclose(fcpl) < 0)
+        FAIL_STACK_ERROR;
+    if(H5Pclose(fapl) < 0)
+        FAIL_STACK_ERROR;
+    HDfree(data);
+
+    PASSED()
+    return 0;
+
+error:
+    H5E_BEGIN_TRY {
+        H5Pclose(fapl);
+        H5Pclose(fcpl);
+        H5Fclose(file_id);
+        if(data)
+            HDfree(data);
+    } H5E_END_TRY;
+    return 1;
+} /* test_lru_processing */
+
+
+/*-------------------------------------------------------------------------
+ * Function:    test_min_threshold()
+ *
+ * Purpose:     Tests verifying observation of minimum and maximum 
+ *              raw and metadata page counts in the page buffer.
+ *
+ *              Any data mis-matches or failures reported by the HDF5
+ *              library result in test failure.
+ *
+ * Return:      0 if test is sucessful
+ *              1 if test fails
+ *
+ * Programmer:  unknown
+ *              ?? / ?? / ??
+ *              
+ * Changes:     Added the base_raw_cnt and base_meta_cnt fields and
+ *              supporting code.  This allows the test to adjust to the 
+ *              number of page buffer pages accessed during file open / 
+ *              create.
+ *
+ *              The tests for the values of base_raw_cnt and base_meta_cnt
+ *              just after file open exist detect changes in library 
+ *              behavior.  Assuming any such change is not indicative of 
+ *              other issues, these tests can be modified to reflect the 
+ *              change.
+ *
+ *                                                    JRM -- 2/23/17
+ *
+ *-------------------------------------------------------------------------
+ */
+
+static unsigned
+test_min_threshold(hid_t orig_fapl, const char *env_h5_drvr)
+{
+    char filename[FILENAME_LEN]; /* Filename to use */
+    hid_t file_id = -1;          /* File ID */
+    hid_t fcpl = -1;
+    hid_t fapl = -1;
+    size_t base_raw_cnt = 0;
+    size_t base_meta_cnt = 0;
+    size_t page_count = 0;
+    int i;
+    int num_elements = 1000;
+    H5PB_t *page_buf;
+    haddr_t meta_addr = HADDR_UNDEF;
+    haddr_t raw_addr = HADDR_UNDEF;
+    int *data = NULL;
+    H5F_t *f = NULL;
+
+    TESTING("Minimum Metadata threshold Processing");
+    HDprintf("\n");
+    h5_fixname(FILENAME[0], orig_fapl, filename, sizeof(filename));
+
+    if((fapl = H5Pcopy(orig_fapl)) < 0)
+        TEST_ERROR
+
+    if(set_multi_split(env_h5_drvr, fapl, sizeof(int)*200)  != 0)
+        TEST_ERROR;
+
+    if((data = (int *)HDcalloc((size_t)num_elements, sizeof(int))) == NULL)
+        TEST_ERROR;
+
+    if((fcpl = H5Pcreate(H5P_FILE_CREATE)) < 0)
+        FAIL_STACK_ERROR;
+
+    if(H5Pset_file_space_strategy(fcpl, H5F_FSPACE_STRATEGY_PAGE, 0, (hsize_t)1) < 0)
+        FAIL_STACK_ERROR;
+
+    if(H5Pset_file_space_page_size(fcpl, sizeof(int)*200) < 0)
+        FAIL_STACK_ERROR;
+
+    HDprintf("\tMinimum metadata threshold = 100%%\n");
+
+    /* keep 5 pages at max in the page buffer and 5 meta page minimum */
+    if(H5Pset_page_buffer_size(fapl, sizeof(int)*1000, 100, 0) < 0)
+        FAIL_STACK_ERROR;
+
+    /* create the file */
+    if((file_id = H5Fcreate(filename, H5F_ACC_TRUNC, fcpl, fapl)) < 0)
+        FAIL_STACK_ERROR;
+
+    /* Get a pointer to the internal file object */
+    if(NULL == (f = (H5F_t *)H5I_object(file_id)))
+        FAIL_STACK_ERROR;
+
+    /* opening the file inserts one or more pages into the page buffer.
+     * Get the raw and meta counts now, so we can adjust tests accordingly.
+     */
+    HDassert(f);
+    HDassert(f->shared);
+    HDassert(f->shared->page_buf);
+
+    base_raw_cnt = f->shared->page_buf->raw_count;
+    base_meta_cnt = f->shared->page_buf->meta_count;
+
+    if(base_raw_cnt != 0)
+        TEST_ERROR;
+
+    if(base_meta_cnt != 1)
+        TEST_ERROR;
+
+    page_buf = f->shared->page_buf;
+
+    if(page_buf->min_meta_count != 5)
+        TEST_ERROR;
+
+    if(page_buf->min_raw_count != 0)
+        TEST_ERROR;
+
+    if(HADDR_UNDEF == (meta_addr = H5MF_alloc(f, H5FD_MEM_SUPER, H5AC_ind_read_dxpl_id, sizeof(int)*(size_t)num_elements)))
+        FAIL_STACK_ERROR;
+
+    if(HADDR_UNDEF == (raw_addr = H5MF_alloc(f, H5FD_MEM_DRAW, H5AC_ind_read_dxpl_id, sizeof(int)*(size_t)num_elements)))
+        FAIL_STACK_ERROR;
+
+    /* write all raw data, this would end up in page buffer since there 
+     * is no metadata yet
+     *
+     * Not necessarily -- opening the file may may load a metadata page.
+     */
+    for(i=0 ; i<100 ; i++)
+        data[i] = i;
+
+    if(H5F_block_write(f, H5FD_MEM_DRAW, raw_addr, sizeof(int)*100, H5AC_rawdata_dxpl_id, data) < 0)
+        FAIL_STACK_ERROR;
+
+    if(H5F_block_write(f, H5FD_MEM_DRAW, raw_addr+(sizeof(int)*200), sizeof(int)*100, H5AC_rawdata_dxpl_id, data) < 0)
+        FAIL_STACK_ERROR;
+
+    if(H5F_block_write(f, H5FD_MEM_DRAW, raw_addr+(sizeof(int)*400), sizeof(int)*100, H5AC_rawdata_dxpl_id, data) < 0)
+        FAIL_STACK_ERROR;
+
+    if(H5F_block_write(f, H5FD_MEM_DRAW, raw_addr+(sizeof(int)*600), sizeof(int)*100, H5AC_rawdata_dxpl_id, data) < 0)
+        FAIL_STACK_ERROR;
+
+    if(H5F_block_write(f, H5FD_MEM_DRAW, raw_addr+(sizeof(int)*800), sizeof(int)*100, H5AC_rawdata_dxpl_id, data) < 0)
+        FAIL_STACK_ERROR;
+
+    page_count += 5;
+
+    if(H5SL_count(f->shared->page_buf->slist_ptr) != page_count)
+        FAIL_STACK_ERROR;
+
+    if(page_buf->raw_count != 5 - base_meta_cnt)
+        TEST_ERROR;
+
+    /* write all meta data, this would end up in page buffer */
+    if(H5F_block_write(f, H5FD_MEM_SUPER, meta_addr, sizeof(int)*100, H5AC_ind_read_dxpl_id, data) < 0)
+        FAIL_STACK_ERROR;
+
+    if(H5F_block_write(f, H5FD_MEM_SUPER, meta_addr+(sizeof(int)*200), sizeof(int)*50, H5AC_ind_read_dxpl_id, data) < 0)
+        FAIL_STACK_ERROR;
+
+    if(H5F_block_write(f, H5FD_MEM_SUPER, meta_addr+(sizeof(int)*400), sizeof(int)*50, H5AC_ind_read_dxpl_id, data) < 0)
+        FAIL_STACK_ERROR;
+
+    if(H5F_block_read(f, H5FD_MEM_SUPER, meta_addr+(sizeof(int)*600), sizeof(int)*50, H5AC_ind_read_dxpl_id, data) < 0)
+        FAIL_STACK_ERROR;
+
+    if(H5F_block_read(f, H5FD_MEM_SUPER, meta_addr+(sizeof(int)*800), sizeof(int)*50, H5AC_ind_read_dxpl_id, data) < 0)
+        FAIL_STACK_ERROR;
+
+    if(H5SL_count(f->shared->page_buf->slist_ptr) != page_count)
+        FAIL_STACK_ERROR;
+
+    if(page_buf->meta_count != 5)
+        TEST_ERROR;
+
+    if(page_buf->raw_count != 0)
+        TEST_ERROR;
+
+    /* write and read more raw data and make sure that they don't end up in
+     * page buffer since the minimum metadata is actually the entire
+     * page buffer 
+     */
+    if(H5F_block_write(f, H5FD_MEM_DRAW, raw_addr+(sizeof(int)*200), sizeof(int)*100, H5AC_rawdata_dxpl_id, data) < 0)
+        FAIL_STACK_ERROR;
+
+    if(H5F_block_write(f, H5FD_MEM_DRAW, raw_addr+(sizeof(int)*350), sizeof(int)*100, H5AC_rawdata_dxpl_id, data) < 0)
+        FAIL_STACK_ERROR;
+
+    if(H5F_block_read(f, H5FD_MEM_DRAW, raw_addr+(sizeof(int)*500), sizeof(int)*100, H5AC_rawdata_dxpl_id, data) < 0)
+        FAIL_STACK_ERROR;
+
+    if(H5F_block_read(f, H5FD_MEM_DRAW, raw_addr+(sizeof(int)*750), sizeof(int)*100, H5AC_rawdata_dxpl_id, data) < 0)
+        FAIL_STACK_ERROR;
+
+    if(H5F_block_read(f, H5FD_MEM_DRAW, raw_addr+(sizeof(int)*900), sizeof(int)*100, H5AC_rawdata_dxpl_id, data) < 0)
+        FAIL_STACK_ERROR;
+
+    if(H5SL_count(f->shared->page_buf->slist_ptr) != page_count)
+        FAIL_STACK_ERROR;
+
+    if(page_buf->meta_count != 5)
+        TEST_ERROR;
+
+    if(page_buf->raw_count != 0)
+        TEST_ERROR;
+
+    if(H5Fclose(file_id) < 0)
+        FAIL_STACK_ERROR;
+
+
+    HDprintf("\tMinimum raw data threshold = 100%%\n");
+
+    page_count = 0;
+
+    /* keep 5 pages at max in the page buffer and 5 raw page minimum */
+    /* Changes: 1000 */
+    if(H5Pset_page_buffer_size(fapl, sizeof(int)*1000, 0, 100) < 0)
+        TEST_ERROR;
+
+    /* create the file */
+    if((file_id = H5Fcreate(filename, H5F_ACC_TRUNC, fcpl, fapl)) < 0)
+        FAIL_STACK_ERROR;
+
+    /* Get a pointer to the internal file object */
+    if(NULL == (f = (H5F_t *)H5I_object(file_id)))
+        FAIL_STACK_ERROR;
+
+    /* opening the file inserts one or more pages into the page buffer.
+     * Get the raw and meta counts now, so we can adjust tests accordingly.
+     */
+    HDassert(f);
+    HDassert(f->shared);
+    HDassert(f->shared->page_buf);
+
+    base_raw_cnt = f->shared->page_buf->raw_count;
+    base_meta_cnt = f->shared->page_buf->meta_count;
+
+    if(base_raw_cnt != 0)
+        TEST_ERROR;
+
+    if(base_meta_cnt != 1)
+        TEST_ERROR;
+
+    page_buf = f->shared->page_buf;
+
+    if(page_buf->min_meta_count != 0)
+        TEST_ERROR;
+    if(page_buf->min_raw_count != 5)
+        FAIL_STACK_ERROR;
+
+    if(HADDR_UNDEF == (meta_addr = H5MF_alloc(f, H5FD_MEM_SUPER, H5AC_ind_read_dxpl_id, sizeof(int)*(size_t)num_elements)))
+        FAIL_STACK_ERROR;
+
+    if(HADDR_UNDEF == (raw_addr = H5MF_alloc(f, H5FD_MEM_DRAW, H5AC_ind_read_dxpl_id, sizeof(int)*(size_t)num_elements)))
+        TEST_ERROR;
+
+    /* write all meta data, this would end up in page buffer since there 
+     * is no raw data yet
+     */
+    for(i=0 ; i<100 ; i++)
+        data[i] = i;
+
+    if(H5F_block_write(f, H5FD_MEM_SUPER, meta_addr, sizeof(int)*100, H5AC_ind_read_dxpl_id, data) < 0)
+        FAIL_STACK_ERROR;
+
+    if(H5F_block_write(f, H5FD_MEM_SUPER, meta_addr+(sizeof(int)*200), sizeof(int)*100, H5AC_ind_read_dxpl_id, data) < 0)
+        FAIL_STACK_ERROR;
+
+    if(H5F_block_write(f, H5FD_MEM_SUPER, meta_addr+(sizeof(int)*400), sizeof(int)*100, H5AC_ind_read_dxpl_id, data) < 0)
+        FAIL_STACK_ERROR;
+
+    if(H5F_block_write(f, H5FD_MEM_SUPER, meta_addr+(sizeof(int)*600), sizeof(int)*100, H5AC_ind_read_dxpl_id, data) < 0)
+        FAIL_STACK_ERROR;
+
+    if(H5F_block_write(f, H5FD_MEM_SUPER, meta_addr+(sizeof(int)*800), sizeof(int)*100, H5AC_ind_read_dxpl_id, data) < 0)
+        FAIL_STACK_ERROR;
+
+    page_count += 5;
+
+    if(H5SL_count(f->shared->page_buf->slist_ptr) != page_count)
+        FAIL_STACK_ERROR;
+    if(page_buf->meta_count != 5 - base_raw_cnt)
+        TEST_ERROR;
+
+    /* write/read all raw data, this would end up in page buffer */
+    if(H5F_block_write(f, H5FD_MEM_DRAW, raw_addr, sizeof(int)*100, H5AC_rawdata_dxpl_id, data) < 0)
+        FAIL_STACK_ERROR;
+
+    if(H5F_block_write(f, H5FD_MEM_DRAW, raw_addr+(sizeof(int)*200), sizeof(int)*100, H5AC_rawdata_dxpl_id, data) < 0)
+        FAIL_STACK_ERROR;
+
+    if(H5F_block_write(f, H5FD_MEM_DRAW, raw_addr+(sizeof(int)*400), sizeof(int)*100, H5AC_rawdata_dxpl_id, data) < 0)
+        FAIL_STACK_ERROR;
+
+    if(H5F_block_read(f, H5FD_MEM_DRAW, raw_addr+(sizeof(int)*600), sizeof(int)*100, H5AC_rawdata_dxpl_id, data) < 0)
+        FAIL_STACK_ERROR;
+
+    if(H5F_block_read(f, H5FD_MEM_DRAW, raw_addr+(sizeof(int)*800), sizeof(int)*100, H5AC_rawdata_dxpl_id, data) < 0)
+        FAIL_STACK_ERROR;
+
+    if(H5SL_count(f->shared->page_buf->slist_ptr) != page_count)
+        FAIL_STACK_ERROR;
+
+    if(page_buf->raw_count != 5)
+        TEST_ERROR;
+
+    if(page_buf->meta_count != 0)
+        TEST_ERROR;
+
+    /* write and read more meta data and make sure that they don't end up in
+     * page buffer since the minimum metadata is actually the entire
+     * page buffer 
+     */
+    if(H5F_block_write(f, H5FD_MEM_SUPER, meta_addr+(sizeof(int)*100), sizeof(int)*50, H5AC_ind_read_dxpl_id, data) < 0)
+        FAIL_STACK_ERROR;
+
+    if(H5F_block_write(f, H5FD_MEM_SUPER, meta_addr+(sizeof(int)*350), sizeof(int)*50, H5AC_ind_read_dxpl_id, data) < 0)
+        FAIL_STACK_ERROR;
+
+    if(H5F_block_read(f, H5FD_MEM_SUPER, meta_addr+(sizeof(int)*500), sizeof(int)*50, H5AC_ind_read_dxpl_id, data) < 0)
+        FAIL_STACK_ERROR;
+
+    if(H5F_block_read(f, H5FD_MEM_SUPER, meta_addr+(sizeof(int)*750), sizeof(int)*50, H5AC_ind_read_dxpl_id, data) < 0)
+        FAIL_STACK_ERROR;
+
+    if(H5F_block_read(f, H5FD_MEM_SUPER, meta_addr+(sizeof(int)*900), sizeof(int)*50, H5AC_ind_read_dxpl_id, data) < 0)
+        FAIL_STACK_ERROR;
+
+    if(H5SL_count(f->shared->page_buf->slist_ptr) != page_count)
+        FAIL_STACK_ERROR;
+
+    if(page_buf->raw_count != 5)
+        TEST_ERROR;
+
+    if(page_buf->meta_count != 0)
+        TEST_ERROR;
+
+    if(H5Fclose(file_id) < 0)
+        FAIL_STACK_ERROR;
+
+
+    HDprintf("\tMinimum metadata threshold = 40%%, Minimum rawdata threshold = 40%%\n");
+    page_count = 0;
+    /* keep 5 pages at max in the page buffer 2 meta pages, 2 raw pages  
+     * minimum 
+     */
+    if(H5Pset_page_buffer_size(fapl, sizeof(int)*1000, 40, 40) < 0)
+        TEST_ERROR;
+
+    /* create the file */
+    if((file_id = H5Fcreate(filename, H5F_ACC_TRUNC, fcpl, fapl)) < 0)
+        FAIL_STACK_ERROR;
+
+    /* Get a pointer to the internal file object */
+    if(NULL == (f = (H5F_t *)H5I_object(file_id)))
+        FAIL_STACK_ERROR;
+
+    /* opening the file inserts one or more pages into the page buffer.
+     *
+     * However, with the current 1 metadata page inserted into the 
+     * the page buffer, it is not necessary to track the base raw and 
+     * metadata entry counts.
+     */
+
+    if(base_raw_cnt != 0)
+        TEST_ERROR;
+
+    if(base_meta_cnt != 1)
+        TEST_ERROR;
+    page_buf = f->shared->page_buf;
+
+    if(page_buf->min_meta_count != 2)
+        TEST_ERROR;
+
+    if(page_buf->min_raw_count != 2)
+        TEST_ERROR;
+
+    if(HADDR_UNDEF == (meta_addr = H5MF_alloc(f, H5FD_MEM_SUPER, H5AC_ind_read_dxpl_id, sizeof(int)*(size_t)num_elements)))
+        FAIL_STACK_ERROR;
+
+    if(HADDR_UNDEF == (raw_addr = H5MF_alloc(f, H5FD_MEM_DRAW, H5AC_ind_read_dxpl_id, sizeof(int)*(size_t)num_elements)))
+        FAIL_STACK_ERROR;
+
+    /* intialize all the elements to have a value of -1 */
+    for(i=0 ; i<num_elements ; i++)
+        data[i] = -1;
+
+    if(H5F_block_write(f, H5FD_MEM_DRAW, raw_addr, sizeof(int)*(size_t)num_elements, H5AC_rawdata_dxpl_id, data) < 0)
+        FAIL_STACK_ERROR;
+
+    if(H5F_block_write(f, H5FD_MEM_SUPER, meta_addr, sizeof(int)*(size_t)num_elements, H5AC_ind_read_dxpl_id, data) < 0)
+        FAIL_STACK_ERROR;
+
+    /* fill the page buffer with raw data */
+    for(i=0 ; i<100 ; i++)
+        data[i] = i;
+
+    if(H5F_block_write(f, H5FD_MEM_DRAW, raw_addr, sizeof(int)*100, H5AC_rawdata_dxpl_id, data) < 0)
+        FAIL_STACK_ERROR;
+
+    if(H5F_block_write(f, H5FD_MEM_DRAW, raw_addr+(sizeof(int)*200), sizeof(int)*100, H5AC_rawdata_dxpl_id, data) < 0)
+        FAIL_STACK_ERROR;
+
+    if(H5F_block_write(f, H5FD_MEM_DRAW, raw_addr+(sizeof(int)*400), sizeof(int)*100, H5AC_rawdata_dxpl_id, data) < 0)
+        FAIL_STACK_ERROR;
+
+    if(H5F_block_write(f, H5FD_MEM_DRAW, raw_addr+(sizeof(int)*600), sizeof(int)*100, H5AC_rawdata_dxpl_id, data) < 0)
+        FAIL_STACK_ERROR;
+
+    if(H5F_block_write(f, H5FD_MEM_DRAW, raw_addr+(sizeof(int)*800), sizeof(int)*100, H5AC_rawdata_dxpl_id, data) < 0)
+        FAIL_STACK_ERROR;
+
+    page_count += 5;
+
+    if(H5SL_count(f->shared->page_buf->slist_ptr) != page_count)
+        TEST_ERROR;
+
+    if(f->shared->page_buf->raw_count != 5 - base_meta_cnt)
+        TEST_ERROR;
+
+    /* add 3 meta entries evicting 3 raw entries */
+    if(H5F_block_write(f, H5FD_MEM_SUPER, meta_addr, sizeof(int)*100, H5AC_ind_read_dxpl_id, data) < 0)
+        FAIL_STACK_ERROR;
+
+    if(H5F_block_write(f, H5FD_MEM_SUPER, meta_addr+(sizeof(int)*200), sizeof(int)*100, H5AC_ind_read_dxpl_id, data) < 0)
+        FAIL_STACK_ERROR;
+
+    if(H5F_block_write(f, H5FD_MEM_SUPER, meta_addr+(sizeof(int)*400), sizeof(int)*100, H5AC_ind_read_dxpl_id, data) < 0)
+        FAIL_STACK_ERROR;
+
+    if(H5SL_count(f->shared->page_buf->slist_ptr) != page_count)
+        FAIL_STACK_ERROR;
+
+    if(f->shared->page_buf->meta_count != 3)
+        TEST_ERROR;
+
+    if(f->shared->page_buf->raw_count != 2)
+        TEST_ERROR;
+
+    /* adding more meta entires should replace meta entries since raw data 
+     * is at its minimum 
+     */
+    if(H5F_block_write(f, H5FD_MEM_SUPER, meta_addr+(sizeof(int)*600), sizeof(int)*100, H5AC_ind_read_dxpl_id, data) < 0)
+        FAIL_STACK_ERROR;
+
+    if(H5F_block_write(f, H5FD_MEM_SUPER, meta_addr+(sizeof(int)*800), sizeof(int)*100, H5AC_ind_read_dxpl_id, data) < 0)
+        FAIL_STACK_ERROR;
+
+    if(f->shared->page_buf->meta_count != 3)
+        TEST_ERROR;
+
+    if(f->shared->page_buf->raw_count != 2)
+        TEST_ERROR;
+
+    /* bring existing raw entires up the LRU */
+    if(H5F_block_read(f, H5FD_MEM_DRAW, raw_addr+(sizeof(int)*750), sizeof(int)*100, H5AC_rawdata_dxpl_id, data) < 0)
+        FAIL_STACK_ERROR;
+
+    /* adding 2 raw entries (even with 1 call) should only evict 1 meta 
+     * entry and another raw entry 
+     */
+    if(H5F_block_read(f, H5FD_MEM_DRAW, raw_addr+(sizeof(int)*350), sizeof(int)*100, H5AC_rawdata_dxpl_id, data) < 0)
+        FAIL_STACK_ERROR;
+
+    if(f->shared->page_buf->meta_count != 2)
+        TEST_ERROR;
+
+    if(f->shared->page_buf->raw_count != 3)
+        TEST_ERROR;
+
+    /* adding 2 meta entries should replace 2 entires at the bottom of the LRU */
+    if(H5F_block_read(f, H5FD_MEM_SUPER, meta_addr+(sizeof(int)*98), sizeof(int)*100, H5AC_ind_read_dxpl_id, data) < 0)
+        FAIL_STACK_ERROR;
+
+    if(H5F_block_read(f, H5FD_MEM_SUPER, meta_addr+(sizeof(int)*242), sizeof(int)*100, H5AC_ind_read_dxpl_id, data) < 0)
+        FAIL_STACK_ERROR;
+
+    if(f->shared->page_buf->meta_count != 2)
+        TEST_ERROR;
+
+    if(f->shared->page_buf->raw_count != 3)
+        TEST_ERROR;
+
+    if(H5Fclose(file_id) < 0)
+        FAIL_STACK_ERROR;
+
+    HDprintf("\tMinimum metadata threshold = 20%%\n");
+    page_count = 0;
+    /* keep 5 pages at max in the page buffer and 1 meta page minimum */
+    if(H5Pset_page_buffer_size(fapl, sizeof(int)*1000, 39, 0) < 0)
+        TEST_ERROR;
+    /* create the file */
+    if((file_id = H5Fcreate(filename, H5F_ACC_TRUNC, fcpl, fapl)) < 0)
+        FAIL_STACK_ERROR;
+    /* Get a pointer to the internal file object */
+    if(NULL == (f = (H5F_t *)H5I_object(file_id)))
+        FAIL_STACK_ERROR;
+    page_buf = f->shared->page_buf;
+
+    if(page_buf->min_meta_count != 1)
+        TEST_ERROR;
+    if(page_buf->min_raw_count != 0)
+        TEST_ERROR;
+
+    if(HADDR_UNDEF == (meta_addr = H5MF_alloc(f, H5FD_MEM_SUPER, H5AC_ind_read_dxpl_id, sizeof(int)*(size_t)num_elements)))
+        FAIL_STACK_ERROR;
+
+    if(HADDR_UNDEF == (raw_addr = H5MF_alloc(f, H5FD_MEM_DRAW, H5AC_ind_read_dxpl_id, sizeof(int)*(size_t)num_elements)))
+        FAIL_STACK_ERROR;
+
+    /* intialize all the elements to have a value of -1 */
+    for(i=0 ; i<num_elements ; i++)
+        data[i] = -1;
+
+    if(H5F_block_write(f, H5FD_MEM_DRAW, raw_addr, sizeof(int)*(size_t)num_elements, H5AC_rawdata_dxpl_id, data) < 0)
+        FAIL_STACK_ERROR;
+
+    if(H5F_block_write(f, H5FD_MEM_SUPER, meta_addr, sizeof(int)*(size_t)num_elements, H5AC_ind_read_dxpl_id, data) < 0)
+        FAIL_STACK_ERROR;
+
+    /* fill the page buffer with raw data */
+    for(i=0 ; i<100 ; i++)
+        data[i] = i;
+
+    if(H5F_block_write(f, H5FD_MEM_DRAW, raw_addr, sizeof(int)*100, H5AC_rawdata_dxpl_id, data) < 0)
+        FAIL_STACK_ERROR;
+
+    if(H5F_block_write(f, H5FD_MEM_DRAW, raw_addr+(sizeof(int)*200), sizeof(int)*100, H5AC_rawdata_dxpl_id, data) < 0)
+        FAIL_STACK_ERROR;
+
+    if(H5F_block_write(f, H5FD_MEM_DRAW, raw_addr+(sizeof(int)*400), sizeof(int)*100, H5AC_rawdata_dxpl_id, data) < 0)
+        FAIL_STACK_ERROR;
+
+    if(H5F_block_write(f, H5FD_MEM_DRAW, raw_addr+(sizeof(int)*600), sizeof(int)*100, H5AC_rawdata_dxpl_id, data) < 0)
+        FAIL_STACK_ERROR;
+
+    if(H5F_block_write(f, H5FD_MEM_DRAW, raw_addr+(sizeof(int)*800), sizeof(int)*100, H5AC_rawdata_dxpl_id, data) < 0)
+        FAIL_STACK_ERROR;
+
+    page_count += 5;
+
+    if(H5SL_count(f->shared->page_buf->slist_ptr) != page_count)
+        FAIL_STACK_ERROR;
+
+    /* add 2 meta entries evicting 2 raw entries */
+    if(H5F_block_write(f, H5FD_MEM_SUPER, meta_addr, sizeof(int)*100, H5AC_ind_read_dxpl_id, data) < 0)
+        FAIL_STACK_ERROR;
+
+    if(H5F_block_write(f, H5FD_MEM_SUPER, meta_addr+(sizeof(int)*200), sizeof(int)*100, H5AC_ind_read_dxpl_id, data) < 0)
+        FAIL_STACK_ERROR;
+
+    if(H5SL_count(f->shared->page_buf->slist_ptr) != page_count)
+        FAIL_STACK_ERROR;
+
+    if(f->shared->page_buf->meta_count != 2)
+        TEST_ERROR;
+
+    if(f->shared->page_buf->raw_count != 3)
+        TEST_ERROR;
+
+    /* bring the rest of the raw entries up the LRU */
+    if(H5F_block_write(f, H5FD_MEM_DRAW, raw_addr+(sizeof(int)*500), sizeof(int)*100, H5AC_rawdata_dxpl_id, data) < 0)
+        FAIL_STACK_ERROR;
+
+    if(H5F_block_write(f, H5FD_MEM_DRAW, raw_addr+(sizeof(int)*700), sizeof(int)*100, H5AC_rawdata_dxpl_id, data) < 0)
+        FAIL_STACK_ERROR;
+
+    if(H5F_block_write(f, H5FD_MEM_DRAW, raw_addr+(sizeof(int)*900), sizeof(int)*100, H5AC_rawdata_dxpl_id, data) < 0)
+        FAIL_STACK_ERROR;
+
+    /* write one more raw entry which replace one meta entry */
+    if(H5F_block_write(f, H5FD_MEM_DRAW, raw_addr+(sizeof(int)*100), sizeof(int)*100, H5AC_rawdata_dxpl_id, data) < 0)
+        FAIL_STACK_ERROR;
+
+    if(H5SL_count(f->shared->page_buf->slist_ptr) != page_count)
+        FAIL_STACK_ERROR;
+
+    if(f->shared->page_buf->meta_count != 1)
+        TEST_ERROR;
+
+    if(f->shared->page_buf->raw_count != 4)
+        TEST_ERROR;
+
+    /* write one more raw entry which should replace another raw entry 
+     * keeping min threshold of meta entries 
+     */
+    if(H5F_block_write(f, H5FD_MEM_DRAW, raw_addr+(sizeof(int)*300), sizeof(int)*100, H5AC_rawdata_dxpl_id, data) < 0)
+        FAIL_STACK_ERROR;
+
+    if(H5SL_count(f->shared->page_buf->slist_ptr) != page_count)
+        FAIL_STACK_ERROR;
+
+    if(f->shared->page_buf->meta_count != 1)
+        TEST_ERROR;
+
+    if(f->shared->page_buf->raw_count != 4)
+        TEST_ERROR;
+
+    /* write a metadata entry that should replace the metadata entry 
+     * at the bottom of the LRU 
+     */
+    if(H5F_block_write(f, H5FD_MEM_SUPER, meta_addr+(sizeof(int)*500), sizeof(int)*100, H5AC_ind_read_dxpl_id, data) < 0)
+        FAIL_STACK_ERROR;
+
+    if(H5SL_count(f->shared->page_buf->slist_ptr) != page_count)
+        FAIL_STACK_ERROR;
+
+    if(f->shared->page_buf->meta_count != 1)
+        TEST_ERROR;
+
+    if(f->shared->page_buf->raw_count != 4)
+        TEST_ERROR;
+
+    if(H5Fclose(file_id) < 0)
+        FAIL_STACK_ERROR;
+
+    if(H5Pclose(fcpl) < 0)
+        FAIL_STACK_ERROR;
+
+    if(H5Pclose(fapl) < 0)
+        FAIL_STACK_ERROR;
+
+    HDfree(data);
+
+    PASSED()
+
+    return 0;
+
+error:
+
+    H5E_BEGIN_TRY {
+        H5Pclose(fapl);
+        H5Pclose(fcpl);
+        H5Fclose(file_id);
+        if(data)
+            HDfree(data);
+    } H5E_END_TRY;
+
+    return 1;
+
+} /* test_min_threshold */
+
+
+/*-------------------------------------------------------------------------
+ * Function:    test_stats_collection()
+ *
+ * Purpose:     Tests verifying correct collection of statistics
+ *              by the page buffer.
+ *
+ *              Any data mis-matches or failures reported by the HDF5
+ *              library result in test failure.
+ *
+ * Return:      0 if test is sucessful
+ *              1 if test fails
+ *
+ * Programmer:  unknown
+ *              ?? / ?? / ??
+ *              
+ * Changes:     Added the base_raw_cnt and base_meta_cnt fields and
+ *              supporting code.  This allows the test to adjust to the 
+ *              number of page buffer pages accessed during file open / 
+ *              create.
+ *
+ *              The tests for the values of base_raw_cnt and base_meta_cnt
+ *              just after file open exist detect changes in library 
+ *              behavior.  Assuming any such change is not indicative of 
+ *              other issues, these tests can be modified to reflect the 
+ *              change.
+ *
+ *                                                    JRM -- 2/23/17
+ *
+ *-------------------------------------------------------------------------
+ */
+static unsigned
+test_stats_collection(hid_t orig_fapl, const char *env_h5_drvr)
+{
+    char filename[FILENAME_LEN]; /* Filename to use */
+    hid_t file_id = -1;          /* File ID */
+    hid_t fcpl = -1;
+    hid_t fapl = -1;
+    int i;
+    int num_elements = 1000;
+    size_t base_raw_cnt = 0;
+    size_t base_meta_cnt = 0;
+    haddr_t meta_addr = HADDR_UNDEF;
+    haddr_t raw_addr = HADDR_UNDEF;
+    int *data = NULL;
+    H5F_t *f = NULL;
+
+    TESTING("Statistics Collection");
+
+    h5_fixname(FILENAME[0], orig_fapl, filename, sizeof(filename));
+
+    if((fapl = H5Pcopy(orig_fapl)) < 0)
+        TEST_ERROR
+
+    if(set_multi_split(env_h5_drvr, fapl, sizeof(int)*200)  != 0)
+        TEST_ERROR;
+
+    if((data = (int *)HDcalloc((size_t)num_elements, sizeof(int))) == NULL)
+        TEST_ERROR
+
+    if((fcpl = H5Pcreate(H5P_FILE_CREATE)) < 0)
+        TEST_ERROR;
+
+    if(H5Pset_file_space_strategy(fcpl, H5F_FSPACE_STRATEGY_PAGE, 0, (hsize_t)1) < 0)
+        TEST_ERROR;
+
+    if(H5Pset_file_space_page_size(fcpl, sizeof(int)*200) < 0)
+        TEST_ERROR;
+
+    /* keep 5 pages at max in the page buffer */
+    if(H5Pset_page_buffer_size(fapl, sizeof(int)*1000, 20, 0) < 0)
+        TEST_ERROR;
+
+    if((file_id = H5Fcreate(filename, H5F_ACC_TRUNC, fcpl, fapl)) < 0)
+        FAIL_STACK_ERROR;
+
+    /* Get a pointer to the internal file object */
+    if(NULL == (f = (H5F_t *)H5I_object(file_id)))
+        FAIL_STACK_ERROR;
+
+    /* opening the file inserts one or more pages into the page buffer.
+     * Get the raw and meta counts now, so we can adjust the expected 
+     * statistics accordingly.
+     */
+    HDassert(f);
+    HDassert(f->shared);
+    HDassert(f->shared->page_buf);
+
+    base_raw_cnt = f->shared->page_buf->raw_count;
+    base_meta_cnt = f->shared->page_buf->meta_count;
+
+    if(base_raw_cnt != 0)
+        TEST_ERROR;
+
+    if(base_meta_cnt != 1)
+        TEST_ERROR;
+
+    /* reset statistics before we begin the tests */
+    if(H5Freset_page_buffering_stats(file_id) < 0)
+        FAIL_STACK_ERROR;
+
+    if(HADDR_UNDEF == (meta_addr = H5MF_alloc(f, H5FD_MEM_SUPER, H5AC_ind_read_dxpl_id, sizeof(int)*(size_t)num_elements)))
+        FAIL_STACK_ERROR;
+
+    if(HADDR_UNDEF == (raw_addr = H5MF_alloc(f, H5FD_MEM_DRAW, H5AC_ind_read_dxpl_id, sizeof(int)*(size_t)num_elements)))
+        FAIL_STACK_ERROR;
+
+
+    /* intialize all the elements to have a value of -1 */
+    for(i=0 ; i<num_elements ; i++)
+        data[i] = -1;
+
+    if(H5F_block_write(f, H5FD_MEM_DRAW, raw_addr, sizeof(int)*(size_t)num_elements, H5AC_rawdata_dxpl_id, data) < 0)
+        FAIL_STACK_ERROR;
+
+    if(H5F_block_write(f, H5FD_MEM_SUPER, meta_addr, sizeof(int)*(size_t)num_elements, H5AC_ind_read_dxpl_id, data) < 0)
+        FAIL_STACK_ERROR;
+
+    for(i=0 ; i<200 ; i++)
+        data[i] = i;
+
+    if(H5F_block_write(f, H5FD_MEM_DRAW, raw_addr, sizeof(int)*100, H5AC_rawdata_dxpl_id, data) < 0)
+        FAIL_STACK_ERROR;
+
+    if(H5F_block_write(f, H5FD_MEM_DRAW, raw_addr+(sizeof(int)*200), sizeof(int)*100, H5AC_rawdata_dxpl_id, data) < 0)
+        FAIL_STACK_ERROR;
+
+    if(H5F_block_write(f, H5FD_MEM_DRAW, raw_addr+(sizeof(int)*400), sizeof(int)*100, H5AC_rawdata_dxpl_id, data) < 0)
+        FAIL_STACK_ERROR;
+
+    if(H5F_block_write(f, H5FD_MEM_SUPER, meta_addr, sizeof(int)*100, H5AC_ind_read_dxpl_id, data) < 0)
+        FAIL_STACK_ERROR;
+
+    if(H5F_block_write(f, H5FD_MEM_SUPER, meta_addr+(sizeof(int)*200), sizeof(int)*100, H5AC_ind_read_dxpl_id, data) < 0)
+        FAIL_STACK_ERROR;
+
+    if(H5F_block_write(f, H5FD_MEM_DRAW, raw_addr+(sizeof(int)*600), sizeof(int)*100, H5AC_rawdata_dxpl_id, data) < 0)
+        FAIL_STACK_ERROR;
+
+    if(H5F_block_write(f, H5FD_MEM_DRAW, raw_addr+(sizeof(int)*800), sizeof(int)*100, H5AC_rawdata_dxpl_id, data) < 0)
+        FAIL_STACK_ERROR;
+
+    if(H5F_block_write(f, H5FD_MEM_SUPER, meta_addr+(sizeof(int)*600), sizeof(int)*100, H5AC_ind_read_dxpl_id, data) < 0)
+        FAIL_STACK_ERROR;
+
+    if(H5F_block_write(f, H5FD_MEM_DRAW, raw_addr+(sizeof(int)*500), sizeof(int)*100, H5AC_rawdata_dxpl_id, data) < 0)
+        FAIL_STACK_ERROR;
+
+    if(H5F_block_write(f, H5FD_MEM_DRAW, raw_addr+(sizeof(int)*700), sizeof(int)*100, H5AC_rawdata_dxpl_id, data) < 0)
+        FAIL_STACK_ERROR;
+
+    if(H5F_block_write(f, H5FD_MEM_DRAW, raw_addr+(sizeof(int)*900), sizeof(int)*100, H5AC_rawdata_dxpl_id, data) < 0)
+        FAIL_STACK_ERROR;
+
+    if(H5F_block_write(f, H5FD_MEM_SUPER, meta_addr+(sizeof(int)*400), sizeof(int)*200, H5AC_ind_read_dxpl_id, data) < 0)
+        FAIL_STACK_ERROR;
+
+    if(H5F_block_write(f, H5FD_MEM_DRAW, raw_addr+(sizeof(int)*100), sizeof(int)*100, H5AC_rawdata_dxpl_id, data) < 0)
+        FAIL_STACK_ERROR;
+
+    if(H5F_block_write(f, H5FD_MEM_DRAW, raw_addr+(sizeof(int)*300), sizeof(int)*100, H5AC_rawdata_dxpl_id, data) < 0)
+        FAIL_STACK_ERROR;
+
+    if(H5F_block_write(f, H5FD_MEM_SUPER, meta_addr+(sizeof(int)*800), sizeof(int)*182, H5AC_ind_read_dxpl_id, data) < 0)
+        FAIL_STACK_ERROR;
+
+    if(H5F_block_read(f, H5FD_MEM_DRAW, raw_addr, sizeof(int)*100, H5AC_rawdata_dxpl_id, data) < 0)
+        FAIL_STACK_ERROR;
+
+    if(H5F_block_read(f, H5FD_MEM_DRAW, raw_addr+(sizeof(int)*200), sizeof(int)*100, H5AC_rawdata_dxpl_id, data) < 0)
+        FAIL_STACK_ERROR;
+
+    if(H5F_block_read(f, H5FD_MEM_DRAW, raw_addr+(sizeof(int)*400), sizeof(int)*100, H5AC_rawdata_dxpl_id, data) < 0)
+        FAIL_STACK_ERROR;
+
+    if(H5F_block_read(f, H5FD_MEM_SUPER, meta_addr, sizeof(int)*100, H5AC_ind_read_dxpl_id, data) < 0)
+        FAIL_STACK_ERROR;
+
+    if(H5F_block_read(f, H5FD_MEM_SUPER, meta_addr+(sizeof(int)*200), sizeof(int)*100, H5AC_ind_read_dxpl_id, data) < 0)
+        FAIL_STACK_ERROR;
+
+    if(H5F_block_read(f, H5FD_MEM_DRAW, raw_addr+(sizeof(int)*600), sizeof(int)*100, H5AC_rawdata_dxpl_id, data) < 0)
+        FAIL_STACK_ERROR;
+
+    if(H5F_block_read(f, H5FD_MEM_DRAW, raw_addr+(sizeof(int)*800), sizeof(int)*100, H5AC_rawdata_dxpl_id, data) < 0)
+        FAIL_STACK_ERROR;
+
+    if(H5F_block_read(f, H5FD_MEM_SUPER, meta_addr+(sizeof(int)*400), sizeof(int)*100, H5AC_ind_read_dxpl_id, data) < 0)
+        FAIL_STACK_ERROR;
+
+    if(H5F_block_read(f, H5FD_MEM_SUPER, meta_addr+(sizeof(int)*600), sizeof(int)*200, H5AC_ind_read_dxpl_id, data) < 0)
+        FAIL_STACK_ERROR;
+
+    if(H5F_block_read(f, H5FD_MEM_SUPER, meta_addr+(sizeof(int)*800), sizeof(int)*100, H5AC_ind_read_dxpl_id, data) < 0)
+        FAIL_STACK_ERROR;
+
+    if(f->shared->page_buf->accesses[0] != 8)
+        TEST_ERROR;
+    if(f->shared->page_buf->accesses[1] != 16)
+        TEST_ERROR;
+
+    if(f->shared->page_buf->bypasses[0] != 3)
+        TEST_ERROR;
+    if(f->shared->page_buf->bypasses[1] != 1)
+        TEST_ERROR;
+
+    if(f->shared->page_buf->hits[0] != 0)
+        TEST_ERROR;
+    if(f->shared->page_buf->hits[1] != 4)
+        TEST_ERROR;
+
+    if(f->shared->page_buf->misses[0] != 8)
+        TEST_ERROR;
+    if(f->shared->page_buf->misses[1] != 11)
+        TEST_ERROR;
+
+    if(f->shared->page_buf->evictions[0] != 5 + base_meta_cnt)
+        TEST_ERROR;
+    if(f->shared->page_buf->evictions[1] != 9 + base_raw_cnt)
+        TEST_ERROR;
+
+    {
+        unsigned accesses[2];
+        unsigned hits[2];
+        unsigned misses[2];
+        unsigned evictions[2];
+        unsigned bypasses[2];
+
+        if(H5Fget_page_buffering_stats(file_id, accesses, hits, misses, evictions, bypasses) < 0)
+            FAIL_STACK_ERROR;
+
+        if(accesses[0] != 8)
+            TEST_ERROR;
+        if(accesses[1] != 16)
+            TEST_ERROR;
+        if(bypasses[0] != 3)
+            TEST_ERROR;
+        if(bypasses[1] != 1)
+            TEST_ERROR;
+        if(hits[0] != 0)
+            TEST_ERROR;
+        if(hits[1] != 4)
+            TEST_ERROR;
+        if(misses[0] != 8)
+            TEST_ERROR;
+        if(misses[1] != 11)
+            TEST_ERROR;
+        if(evictions[0] != 5 + base_meta_cnt)
+            TEST_ERROR;
+        if(evictions[1] != 9 + base_raw_cnt)
+            TEST_ERROR;
+
+        if(H5Freset_page_buffering_stats(file_id) < 0)
+            FAIL_STACK_ERROR;
+        if(H5Fget_page_buffering_stats(file_id, accesses, hits, misses, evictions, bypasses) < 0)
+            FAIL_STACK_ERROR;
+
+        if(accesses[0] != 0)
+            TEST_ERROR;
+        if(accesses[1] != 0)
+            TEST_ERROR;
+        if(bypasses[0] != 0)
+            TEST_ERROR;
+        if(bypasses[1] != 0)
+            TEST_ERROR;
+        if(hits[0] != 0)
+            TEST_ERROR;
+        if(hits[1] != 0)
+            TEST_ERROR;
+        if(misses[0] != 0)
+            TEST_ERROR;
+        if(misses[1] != 0)
+            TEST_ERROR;
+        if(evictions[0] != 0)
+            TEST_ERROR;
+        if(evictions[1] != 0)
+            TEST_ERROR;
+    } /* end block */
+
+    if(H5Fclose(file_id) < 0)
+        FAIL_STACK_ERROR;
+    if(H5Pclose(fcpl) < 0)
+        FAIL_STACK_ERROR;
+    if(H5Pclose(fapl) < 0)
+        FAIL_STACK_ERROR;
+    HDfree(data);
+
+
+    PASSED()
+    return 0;
+
+error:
+    H5E_BEGIN_TRY {
+        H5Pclose(fapl);
+        H5Pclose(fcpl);
+        H5Fclose(file_id);
+        if(data)
+            HDfree(data);
+    } H5E_END_TRY;
+
+    return 1;
+} /* test_stats_collection */
+
+
+/*-------------------------------------------------------------------------
+ * Function:    verify_page_buffering_disabled()
+ *
+ * Purpose:     This function should only be called in parallel 
+ *              builds.
+ *
+ *              At present, page buffering should be disabled in parallel
+ *              builds.  Verify this.
+ *
+ * Return:      0 if test is sucessful
+ *              1 if test fails
+ *
+ * Programmer:  John Mainzer
+ *              03/21/17
+ *              
+ * Changes:     None.
+ *
+ *-------------------------------------------------------------------------
+ */
+
+#ifdef H5_HAVE_PARALLEL
+static unsigned
+verify_page_buffering_disabled(hid_t orig_fapl, const char *env_h5_drvr)
+{
+    char filename[FILENAME_LEN]; /* Filename to use */
+    hid_t file_id = -1;          /* File ID */
+    hid_t fcpl = -1;
+    hid_t fapl = -1;
+
+    TESTING("Page Buffering Disabled");
+    h5_fixname(FILENAME[0], orig_fapl, filename, sizeof(filename));
+
+
+    /* first, try to create a file with page buffering enabled */
+
+    if((fapl = H5Pcopy(orig_fapl)) < 0)
+        TEST_ERROR
+
+    if(set_multi_split(env_h5_drvr, fapl, 4096)  != 0)
+        TEST_ERROR;
+
+    if((fcpl = H5Pcreate(H5P_FILE_CREATE)) < 0)
+        FAIL_STACK_ERROR;
+
+    if(H5Pset_file_space_strategy(fcpl, H5F_FSPACE_STRATEGY_PAGE, 0, (hsize_t)1) < 0)
+        FAIL_STACK_ERROR;
+
+    if(H5Pset_file_space_page_size(fcpl, 4096) < 0)
+        FAIL_STACK_ERROR;
+
+    if(H5Pset_page_buffer_size(fapl, 4096*8, 0, 0) < 0)
+        FAIL_STACK_ERROR;
+
+    /* try to create  the file -- should fail */
+    H5E_BEGIN_TRY {
+        file_id = H5Fcreate(filename, H5F_ACC_TRUNC, fcpl, fapl);
+    } H5E_END_TRY;
+
+    if(file_id >= 0)
+        TEST_ERROR;
+
+    /* now, create a file, close it, and then try to open it with page 
+     * buffering enabled.
+     */
+    if((fcpl = H5Pcreate(H5P_FILE_CREATE)) < 0)
+        FAIL_STACK_ERROR;
+
+    if(H5Pset_file_space_strategy(fcpl, H5F_FSPACE_STRATEGY_PAGE, 0, (hsize_t)1) < 0)
+        FAIL_STACK_ERROR;
+
+    if(H5Pset_file_space_page_size(fcpl, 4096) < 0)
+        FAIL_STACK_ERROR;
+
+    /* create the file */
+    if((file_id = H5Fcreate(filename, H5F_ACC_TRUNC, fcpl, H5P_DEFAULT)) < 0)
+        FAIL_STACK_ERROR;
+
+    /* close the file */
+    if(H5Fclose(file_id) < 0)
+        FAIL_STACK_ERROR;
+
+    /* try to open the file using the fapl prepared above which enables 
+     * page buffering.  Should fail.
+     */
+    H5E_BEGIN_TRY {
+        file_id = H5Fopen(filename, H5F_ACC_RDWR, fapl);
+    } H5E_END_TRY;
+
+    if(file_id >= 0)
+        TEST_ERROR;
+
+    if(H5Pclose(fcpl) < 0)
+        FAIL_STACK_ERROR;
+
+    if(H5Pclose(fapl) < 0)
+        FAIL_STACK_ERROR;
+
+    PASSED()
+
+    return 0;
+
+error:
+
+    H5E_BEGIN_TRY {
+        H5Pclose(fapl);
+        H5Pclose(fcpl);
+        H5Fclose(file_id);
+    } H5E_END_TRY;
+
+    return 1;
+
+} /* verify_page_buffering_disabled() */
+#endif /* H5_HAVE_PARALLEL */
+
+
+/*-------------------------------------------------------------------------
+ * Function:    main()
+ *
+ * Purpose:     Main function for the page buffer tests.
+ *
+ * Return:      0 if test is sucessful
+ *              1 if test fails
+ *
+ * Programmer:  unknown
+ *              ?? / ?? / ??
+ *
+ *-------------------------------------------------------------------------
+ */
+int
+main(void)
+{
+    hid_t       fapl = -1;              /* File access property list for data files */
+    unsigned    nerrors = 0;            /* Cumulative error count */
+    const char  *env_h5_drvr = NULL;    /* File Driver value from environment */
+
+    h5_reset();
+
+    /* Get the VFD to use */
+    env_h5_drvr = HDgetenv("HDF5_DRIVER");
+    if(env_h5_drvr == NULL)
+        env_h5_drvr = "nomatch";
+
+    /* Temporary skip testing with multi/split drivers:
+     * Page buffering depends on paged aggregation which is
+     * currently disabled for multi/split drivers.
+     */
+    if((0 == HDstrcmp(env_h5_drvr, "multi")) || 
+       (0 == HDstrcmp(env_h5_drvr, "split"))) {
+
+        SKIPPED()
+        HDputs("Skip page buffering test because paged aggregation is disabled for multi/split drivers");
+        HDexit(EXIT_SUCCESS);
+    } /* end if */
+
+    if((fapl = h5_fileaccess()) < 0) {
+        nerrors++;
+        PUTS_ERROR("Can't get VFD-dependent fapl")
+    } /* end if */
+
+#ifdef H5_HAVE_PARALLEL 
+
+    HDputs("Page Buffering is disabled for parallel.");
+    nerrors += verify_page_buffering_disabled(fapl, env_h5_drvr);
+
+#else /* H5_HAVE_PARALLEL */
+
+    nerrors += test_args(fapl, env_h5_drvr);
+    nerrors += test_raw_data_handling(fapl, env_h5_drvr);
+    nerrors += test_lru_processing(fapl, env_h5_drvr);
+    nerrors += test_min_threshold(fapl, env_h5_drvr);
+    nerrors += test_stats_collection(fapl, env_h5_drvr);
+
+#endif /* H5_HAVE_PARALLEL */
+
+    h5_clean_files(FILENAME, fapl);
+
+    if(nerrors)
+        goto error;
+
+    HDputs("All Page Buffering tests passed.");
+
+    HDexit(EXIT_SUCCESS);
+
+error:
+
+    HDprintf("***** %d Page Buffering TEST%s FAILED! *****\n",
+        nerrors, nerrors > 1 ? "S" : "");
+
+    H5E_BEGIN_TRY {
+        H5Pclose(fapl);
+    } H5E_END_TRY;
+
+    HDexit(EXIT_FAILURE);
+
+} /* main() */
+