Removes unused memory pool (H5MP) package (#1547)

10 files changed, 2 insertions, 1657 deletions

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index da99dc6..9208532 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -441,16 +441,6 @@ set (H5MM_HDRS
 IDE_GENERATED_PROPERTIES ("H5MM" "${H5MM_HDRS}" "${H5MM_SOURCES}" )
 
 
-set (H5MP_SOURCES
-    ${HDF5_SRC_DIR}/H5MP.c
-    ${HDF5_SRC_DIR}/H5MPtest.c
-)
-
-set (H5MP_HDRS
-)
-IDE_GENERATED_PROPERTIES ("H5MP" "${H5MP_HDRS}" "${H5MP_SOURCES}" )
-
-
 set (H5O_SOURCES
     ${HDF5_SRC_DIR}/H5O.c
     ${HDF5_SRC_DIR}/H5Oainfo.c
@@ -749,7 +739,6 @@ set (H5_MODULE_HEADERS
     ${HDF5_SRC_DIR}/H5Lmodule.h
     ${HDF5_SRC_DIR}/H5Mmodule.h
     ${HDF5_SRC_DIR}/H5MFmodule.h
-    ${HDF5_SRC_DIR}/H5MPmodule.h
     ${HDF5_SRC_DIR}/H5Omodule.h
     ${HDF5_SRC_DIR}/H5Pmodule.h
     ${HDF5_SRC_DIR}/H5PBmodule.h
@@ -793,7 +782,6 @@ set (common_SRCS
     ${H5M_SOURCES}
     ${H5MF_SOURCES}
     ${H5MM_SOURCES}
-    ${H5MP_SOURCES}
     ${H5O_SOURCES}
     ${H5P_SOURCES}
     ${H5PB_SOURCES}
@@ -836,7 +824,6 @@ set (H5_PUBLIC_HEADERS
     ${H5M_HDRS}
     ${H5MF_HDRS}
     ${H5MM_HDRS}
-    ${H5MP_HDRS}
     ${H5O_HDRS}
     ${H5P_HDRS}
     ${H5PB_HDRS}
@@ -933,9 +920,6 @@ set (H5_PRIVATE_HEADERS
 
     ${HDF5_SRC_DIR}/H5MMprivate.h
 
-    ${HDF5_SRC_DIR}/H5MPpkg.h
-    ${HDF5_SRC_DIR}/H5MPprivate.h
-
     ${HDF5_SRC_DIR}/H5Opkg.h
     ${HDF5_SRC_DIR}/H5Oprivate.h
     ${HDF5_SRC_DIR}/H5Oshared.h
diff --git a/src/H5MP.c b/src/H5MP.c
deleted file mode 100644
index 397d26b..0000000
--- a/src/H5MP.c
+++ /dev/null
@@ -1,443 +0,0 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
- * 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://www.hdfgroup.org/licenses.               *
- * If you do not have access to either file, you may request a copy from     *
- * help@hdfgroup.org.                                                        *
- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-/*-------------------------------------------------------------------------
- *
- * Created:		H5MP.c
- *			May  2 2005
- *			Quincey Koziol
- *
- * Purpose:		Implements memory pools.  (Similar to Apache's APR
- *                      memory pools)
- *
- *                      Please see the documentation in:
- *                      doc/html/TechNotes/MemoryPools.html for a full description
- *                      of how they work, etc.
- *
- *-------------------------------------------------------------------------
- */
-
-#include "H5MPmodule.h" /* This source code file is part of the H5MP module */
-
-/* Private headers */
-#include "H5private.h"   /* Generic Functions			*/
-#include "H5Eprivate.h"  /* Error handling		  	*/
-#include "H5MMprivate.h" /* Memory management			*/
-#include "H5MPpkg.h"     /* Memory Pools				*/
-
-/****************/
-/* Local Macros */
-/****************/
-
-/* Minimum sized block */
-#define H5MP_MIN_BLOCK (H5MP_BLOCK_ALIGN(sizeof(H5MP_page_blk_t)) + H5MP_BLOCK_ALIGNMENT)
-
-/* First block in page */
-#define H5MP_PAGE_FIRST_BLOCK(p)                                                                             \
-    (H5MP_page_blk_t *)((void *)((unsigned char *)(p) + H5MP_BLOCK_ALIGN(sizeof(H5MP_page_t))))
-
-/******************/
-/* Local Typedefs */
-/******************/
-
-/********************/
-/* Local Prototypes */
-/********************/
-
-/********************************/
-/* Package Variable Definitions */
-/********************************/
-
-/********************/
-/* Static Variables */
-/********************/
-
-/* Declare a free list to manage the H5MP_pool_t struct */
-H5FL_DEFINE(H5MP_pool_t);
-
-/*-------------------------------------------------------------------------
- * Function:	H5MP_create
- *
- * Purpose:	Create a new memory pool
- *
- * Return:	Pointer to the memory pool "header" on success/NULL on failure
- *
- * Programmer:	Quincey Koziol
- *		May  2 2005
- *
- *-------------------------------------------------------------------------
- */
-H5MP_pool_t *
-H5MP_create(size_t page_size, unsigned flags)
-{
-    H5MP_pool_t *mp        = NULL; /* New memory pool header */
-    H5MP_pool_t *ret_value = NULL; /* Return value */
-
-    FUNC_ENTER_NOAPI(NULL)
-
-    /* Allocate space for the pool header */
-    if (NULL == (mp = H5FL_MALLOC(H5MP_pool_t)))
-        HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed for memory pool header")
-
-    /* Assign information */
-    mp->page_size = H5MP_BLOCK_ALIGN(page_size);
-    mp->flags     = flags;
-
-    /* Initialize information */
-    mp->free_size = 0;
-    mp->first     = NULL;
-    mp->max_size  = mp->page_size - H5MP_BLOCK_ALIGN(sizeof(H5MP_page_t));
-
-    /* Create factory for pool pages */
-    if (NULL == (mp->page_fac = H5FL_fac_init(page_size)))
-        HGOTO_ERROR(H5E_RESOURCE, H5E_CANTINIT, NULL, "can't create page factory")
-
-    /* Set return value */
-    ret_value = mp;
-
-done:
-    if (NULL == ret_value && mp)
-        if (H5MP_close(mp) < 0)
-            HDONE_ERROR(H5E_RESOURCE, H5E_CANTFREE, NULL, "unable to free memory pool header")
-
-    FUNC_LEAVE_NOAPI(ret_value)
-} /* end H5MP_create() */
-
-/*-------------------------------------------------------------------------
- * Function:	H5MP__new_page
- *
- * Purpose:	Allocate new page for a memory pool
- *
- * Return:	Pointer to the page allocated on success/NULL on failure
- *
- * Programmer:	Quincey Koziol
- *		May  4 2005
- *
- *-------------------------------------------------------------------------
- */
-static H5MP_page_t *
-H5MP__new_page(H5MP_pool_t *mp, size_t page_size)
-{
-    H5MP_page_t *    new_page;         /* New page created */
-    H5MP_page_blk_t *first_blk;        /* Pointer to first block in page */
-    H5MP_page_t *    ret_value = NULL; /* Return value */
-
-    FUNC_ENTER_STATIC
-
-    /* Sanity check */
-    HDassert(mp);
-    HDassert(page_size >= mp->page_size);
-
-    /* Allocate page */
-    if (page_size > mp->page_size) {
-        if (NULL == (new_page = (H5MP_page_t *)H5MM_malloc(page_size)))
-            HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed for page")
-        new_page->free_size = page_size - H5MP_BLOCK_ALIGN(sizeof(H5MP_page_t));
-        new_page->fac_alloc = FALSE;
-    } /* end if */
-    else {
-        if (NULL == (new_page = (H5MP_page_t *)H5FL_FAC_MALLOC(mp->page_fac)))
-            HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed for page")
-        new_page->free_size = mp->max_size;
-        new_page->fac_alloc = TRUE;
-    } /* end else */
-
-    /* Initialize page information */
-    first_blk          = H5MP_PAGE_FIRST_BLOCK(new_page);
-    first_blk->size    = new_page->free_size;
-    first_blk->page    = new_page;
-    first_blk->is_free = TRUE;
-    first_blk->prev    = NULL;
-    first_blk->next    = NULL;
-
-    /* Insert into page list */
-    new_page->prev = NULL;
-    new_page->next = mp->first;
-    if (mp->first)
-        mp->first->prev = new_page;
-    mp->first = new_page;
-
-    /* Account for new free space */
-    new_page->free_blk = first_blk;
-    mp->free_size += new_page->free_size;
-
-    /* Assign return value */
-    ret_value = new_page;
-
-done:
-    FUNC_LEAVE_NOAPI(ret_value)
-} /* end H5MP__new_page() */
-
-/*-------------------------------------------------------------------------
- * Function:	H5MP_malloc
- *
- * Purpose:	Allocate space in a memory pool
- *
- * Return:	Pointer to the space allocated on success/NULL on failure
- *
- * Programmer:	Quincey Koziol
- *		May  2 2005
- *
- *-------------------------------------------------------------------------
- */
-void *
-H5MP_malloc(H5MP_pool_t *mp, size_t request)
-{
-    H5MP_page_t *    alloc_page = NULL; /* Page to allocate space from */
-    H5MP_page_blk_t *alloc_free;        /* Pointer to free space in page */
-    size_t           needed;            /* Size requested, plus block header and alignment */
-    void *           ret_value = NULL;  /* Return value */
-
-    FUNC_ENTER_NOAPI(NULL)
-
-    /* Sanity check */
-    HDassert(mp);
-    HDassert(request > 0);
-
-    /* Compute actual size needed */
-    needed = H5MP_BLOCK_ALIGN(request) + H5MP_BLOCK_ALIGN(sizeof(H5MP_page_blk_t));
-
-    /* See if the request can be handled by existing free space */
-    if (needed <= mp->free_size) {
-        size_t pool_free_avail; /* Amount of free space possibly available in pool */
-
-        /* Locate page with enough free space */
-        alloc_page      = mp->first;
-        pool_free_avail = mp->free_size;
-        while (alloc_page && pool_free_avail >= needed) {
-            /* If we found a page with enough free space, search for large
-             * enough free block on that page */
-            if (alloc_page->free_size >= needed) {
-                size_t page_free_avail; /* Amount of free space possibly available */
-
-                /* Locate large enough block */
-                alloc_free      = alloc_page->free_blk;
-                page_free_avail = alloc_page->free_size;
-                while (alloc_free && page_free_avail >= needed) {
-                    if (alloc_free->is_free) {
-                        /* If we found a large enough block, leave now */
-                        if (alloc_free->size >= needed)
-                            goto found; /* Needed to escape double "while" loop */
-
-                        /* Decrement amount of potential space left */
-                        page_free_avail -= alloc_free->size;
-                    } /* end if */
-
-                    /* Go to next block */
-                    alloc_free = alloc_free->next;
-                } /* end while */
-            }     /* end if */
-
-            /* Decrement amount of potential space left */
-            pool_free_avail -= alloc_page->free_size;
-
-            /* Go to next page */
-            alloc_page = alloc_page->next;
-        } /* end while */
-    }     /* end if */
-
-    {
-        size_t page_size; /* Size of page needed */
-
-        /* Check if the request is too large for a standard page */
-        page_size =
-            (needed > mp->max_size) ? (needed + H5MP_BLOCK_ALIGN(sizeof(H5MP_page_t))) : mp->page_size;
-
-        /* Allocate new page */
-        if (NULL == (alloc_page = H5MP__new_page(mp, page_size)))
-            HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed for page")
-
-        /* Set the block to allocate from */
-        alloc_free = alloc_page->free_blk;
-    } /* end block */
-
-    /* Allocate space in page */
-found:
-
-    /* Sanity check */
-    HDassert(alloc_page);
-    HDassert(alloc_free);
-
-    /* Check if we can subdivide the free space */
-    if (alloc_free->size > (needed + H5MP_MIN_BLOCK)) {
-        H5MP_page_blk_t *new_free; /* New free block created */
-
-        /* Carve out new free block after block to allocate */
-        new_free = (H5MP_page_blk_t *)((void *)(((unsigned char *)alloc_free) + needed));
-
-        /* Link into existing lists */
-        new_free->next = alloc_free->next;
-        if (alloc_free->next)
-            alloc_free->next->prev = new_free;
-        new_free->prev   = alloc_free;
-        alloc_free->next = new_free;
-
-        /* Set blocks' information */
-        new_free->size      = alloc_free->size - needed;
-        new_free->is_free   = TRUE;
-        new_free->page      = alloc_free->page;
-        alloc_free->size    = needed;
-        alloc_free->is_free = FALSE;
-    } /* end if */
-    else {
-        /* Use whole free space block for new block */
-        alloc_free->is_free = FALSE;
-    } /* end else */
-
-    /* Update page & pool's free size information */
-    alloc_page->free_size -= alloc_free->size;
-    if (alloc_page->free_blk == alloc_free)
-        alloc_page->free_blk = alloc_free->next;
-    mp->free_size -= alloc_free->size;
-
-    /* Set new space pointer for the return value */
-    ret_value = ((unsigned char *)alloc_free) + H5MP_BLOCK_ALIGN(sizeof(H5MP_page_blk_t));
-
-done:
-    FUNC_LEAVE_NOAPI(ret_value)
-} /* end H5MP_malloc() */
-
-/*-------------------------------------------------------------------------
- * Function:	H5MP_free
- *
- * Purpose:	Release space in a memory pool
- *
- * Return:	NULL on success/NULL on failure
- *
- * Programmer:	Quincey Koziol
- *		May  3 2005
- *
- * Note:        Should we release pages that have no used blocks?
- *
- *-------------------------------------------------------------------------
- */
-void *
-H5MP_free(H5MP_pool_t *mp, void *spc)
-{
-    H5MP_page_blk_t *spc_blk;          /* Block for space to free */
-    H5MP_page_t *    spc_page;         /* Page containing block to free */
-    void *           ret_value = NULL; /* Return value */
-
-    FUNC_ENTER_NOAPI_NOINIT_NOERR
-
-    /* Sanity check */
-    HDassert(mp);
-    HDassert(spc);
-
-    /* Get block header for space to free */
-    spc_blk =
-        (H5MP_page_blk_t *)((void *)(((unsigned char *)spc) - H5MP_BLOCK_ALIGN(sizeof(H5MP_page_blk_t))));
-
-    /* Mark block as free */
-    HDassert(spc_blk->is_free == FALSE);
-    spc_blk->is_free = TRUE;
-
-    /* Add it's space to the amount of free space in the page & pool */
-    spc_page = spc_blk->page;
-    spc_page->free_size += spc_blk->size;
-    mp->free_size += spc_blk->size;
-
-    /* Move page with newly freed space to front of list of pages in pool */
-    if (spc_page != mp->first) {
-        /* Remove page from list */
-        spc_page->prev->next = spc_page->next;
-        if (spc_page->next)
-            spc_page->next->prev = spc_page->prev;
-
-        /* Insert page at beginning of list */
-        spc_page->prev  = NULL;
-        spc_page->next  = mp->first;
-        mp->first->prev = spc_page;
-        mp->first       = spc_page;
-    } /* end if */
-
-    /* Check if block can be merged with free space after it on page */
-    if (spc_blk->next != NULL) {
-        H5MP_page_blk_t *next_blk; /* Block following space to free */
-
-        next_blk = spc_blk->next;
-        HDassert(next_blk->prev == spc_blk);
-        if (next_blk->is_free) {
-            spc_blk->size += next_blk->size;
-            spc_blk->next = next_blk->next;
-        } /* end if */
-    }     /* end if */
-
-    /* Check if block can be merged with free space before it on page */
-    if (spc_blk->prev != NULL) {
-        H5MP_page_blk_t *prev_blk; /* Block before space to free */
-
-        prev_blk = spc_blk->prev;
-        HDassert(prev_blk->next == spc_blk);
-        if (prev_blk->is_free) {
-            prev_blk->size += spc_blk->size;
-            prev_blk->next = spc_blk->next;
-        } /* end if */
-    }     /* end if */
-
-    /* Check if the block freed becomes the first free block on the page */
-    if (spc_page->free_blk == NULL || spc_blk < spc_page->free_blk)
-        spc_page->free_blk = spc_blk;
-
-    FUNC_LEAVE_NOAPI(ret_value)
-} /* end H5MP_free() */
-
-/*-------------------------------------------------------------------------
- * Function:	H5MP_close
- *
- * Purpose:	Release all memory for a pool and destroy pool
- *
- * Return:	Non-negative on success/negative on failure
- *
- * Programmer:	Quincey Koziol
- *		May  3 2005
- *
- *-------------------------------------------------------------------------
- */
-herr_t
-H5MP_close(H5MP_pool_t *mp)
-{
-    herr_t ret_value = SUCCEED; /* Return value */
-
-    FUNC_ENTER_NOAPI(FAIL)
-
-    /* Release memory for pool pages */
-    if (mp->first != NULL) {
-        H5MP_page_t *page, *next_page; /* Pointer to pages in pool */
-
-        /* Iterate through pages, releasing them */
-        page = mp->first;
-        while (page) {
-            next_page = page->next;
-
-            /* Free the page appropriately */
-            if (page->fac_alloc)
-                page = (H5MP_page_t *)H5FL_FAC_FREE(mp->page_fac, page);
-            else
-                page = (H5MP_page_t *)H5MM_xfree(page);
-
-            page = next_page;
-        } /* end while */
-    }     /* end if */
-
-    /* Release page factory */
-    if (mp->page_fac)
-        if (H5FL_fac_term(mp->page_fac) < 0)
-            HGOTO_ERROR(H5E_RESOURCE, H5E_CANTRELEASE, FAIL, "can't destroy page factory")
-
-done:
-    /* Free the memory pool itself */
-    mp = H5FL_FREE(H5MP_pool_t, mp);
-
-    FUNC_LEAVE_NOAPI(ret_value)
-} /* end H5MP_close() */
diff --git a/src/H5MPmodule.h b/src/H5MPmodule.h
deleted file mode 100644
index 8e34598..0000000
--- a/src/H5MPmodule.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
- * Copyright by The HDF Group.                                               *
- * 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://www.hdfgroup.org/licenses.               *
- * If you do not have access to either file, you may request a copy from     *
- * help@hdfgroup.org.                                                        *
- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-/*
- * Programmer:	Quincey Koziol
- *		Saturday, September 12, 2015
- *
- * Purpose:	This file contains declarations which define macros for the
- *		H5MP package.  Including this header means that the source file
- *		is part of the H5MP package.
- */
-#ifndef H5MPmodule_H
-#define H5MPmodule_H
-
-/* Define the proper control macros for the generic FUNC_ENTER/LEAVE and error
- *      reporting macros.
- */
-#define H5MP_MODULE
-#define H5_MY_PKG      H5MP
-#define H5_MY_PKG_ERR  H5E_RESOURCE
-#define H5_MY_PKG_INIT NO
-
-#endif /* H5MPmodule_H */
diff --git a/src/H5MPpkg.h b/src/H5MPpkg.h
deleted file mode 100644
index 64c5293..0000000
--- a/src/H5MPpkg.h
+++ /dev/null
@@ -1,99 +0,0 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
- * 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://www.hdfgroup.org/licenses.               *
- * If you do not have access to either file, you may request a copy from     *
- * help@hdfgroup.org.                                                        *
- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-/*
- * Programmer:	Quincey Koziol
- *		Monday, May  2, 2005
- *
- * Purpose:	This file contains declarations which are visible only within
- *		the H5MP package.  Source files outside the H5MP package should
- *		include H5MPprivate.h instead.
- */
-#if !(defined H5MP_FRIEND || defined H5MP_MODULE)
-#error "Do not include this file outside the H5MP package!"
-#endif
-
-#ifndef H5MPpkg_H
-#define H5MPpkg_H
-
-/* Get package's private header */
-#include "H5MPprivate.h" /* Memory Pools				*/
-
-/* Other private headers needed by this file */
-#include "H5FLprivate.h" /* Free Lists                           */
-
-/**************************/
-/* Package Private Macros */
-/**************************/
-
-/* Alignment macros */
-/* (Ideas from Apache APR :-) */
-
-/* Default alignment necessary */
-#define H5MP_BLOCK_ALIGNMENT 8
-
-/* General alignment macro */
-/* (this only works for aligning to power of 2 boundary) */
-#define H5MP_ALIGN(x, a) (((x) + ((size_t)(a)) - 1) & ~(((size_t)(a)) - 1))
-
-/* Default alignment */
-#define H5MP_BLOCK_ALIGN(x) H5MP_ALIGN(x, H5MP_BLOCK_ALIGNMENT)
-
-/****************************/
-/* Package Private Typedefs */
-/****************************/
-
-/* Free block in pool */
-typedef struct H5MP_page_blk_t {
-    size_t                  size;        /* Size of block (includes this H5MP_page_blk_t info) */
-    unsigned                is_free : 1; /* Flag to indicate the block is free */
-    struct H5MP_page_t *    page;        /* Pointer to page block is located in */
-    struct H5MP_page_blk_t *prev;        /* Pointer to previous block in page */
-    struct H5MP_page_blk_t *next;        /* Pointer to next block in page */
-} H5MP_page_blk_t;
-
-/* Memory pool page */
-typedef struct H5MP_page_t {
-    size_t              free_size;     /* Total amount of free space in page */
-    unsigned            fac_alloc : 1; /* Flag to indicate the page was allocated by the pool's factory */
-    H5MP_page_blk_t *   free_blk;      /* Pointer to first free block in page */
-    struct H5MP_page_t *next;          /* Pointer to next page in pool */
-    struct H5MP_page_t *prev;          /* Pointer to previous page in pool */
-} H5MP_page_t;
-
-/* Memory pool header */
-struct H5MP_pool_t {
-    H5FL_fac_head_t *page_fac;  /* Free-list factory for pages */
-    size_t           page_size; /* Page size for pool */
-    size_t           free_size; /* Total amount of free space in pool */
-    size_t           max_size;  /* Maximum block that will fit in a standard page */
-    H5MP_page_t *    first;     /* Pointer to first page in pool */
-    unsigned         flags;     /* Bit flags for pool settings */
-};
-
-/*****************************************/
-/* Package Private Variable Declarations */
-/*****************************************/
-
-/******************************/
-/* Package Private Prototypes */
-/******************************/
-#ifdef H5MP_TESTING
-H5_DLL herr_t H5MP_get_pool_free_size(const H5MP_pool_t *mp, size_t *free_size);
-H5_DLL htri_t H5MP_pool_is_free_size_correct(const H5MP_pool_t *mp);
-H5_DLL herr_t H5MP_get_pool_first_page(const H5MP_pool_t *mp, H5MP_page_t **page);
-H5_DLL herr_t H5MP_get_page_free_size(const H5MP_page_t *mp, size_t *page);
-H5_DLL herr_t H5MP_get_page_next_page(const H5MP_page_t *page, H5MP_page_t **next_page);
-#endif /* H5MP_TESTING */
-
-#endif /* H5MPpkg_H */
diff --git a/src/H5MPprivate.h b/src/H5MPprivate.h
deleted file mode 100644
index 2b06650..0000000
--- a/src/H5MPprivate.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
- * 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://www.hdfgroup.org/licenses.               *
- * If you do not have access to either file, you may request a copy from     *
- * help@hdfgroup.org.                                                        *
- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-/*-------------------------------------------------------------------------
- *
- * Created:		H5MPprivate.h
- *			May  2 2005
- *			Quincey Koziol
- *
- * Purpose:		Private header for memory pool routines.
- *
- *-------------------------------------------------------------------------
- */
-
-#ifndef H5MPprivate_H
-#define H5MPprivate_H
-
-/* Include package's public header (not yet) */
-/* #include "H5MPpublic.h" */
-
-/* Private headers needed by this file */
-
-/**************************/
-/* Library Private Macros */
-/**************************/
-
-/* Pool creation flags */
-/* Default settings */
-#define H5MP_FLG_DEFAULT       0
-#define H5MP_PAGE_SIZE_DEFAULT 4096 /* (bytes) */
-
-/****************************/
-/* Library Private Typedefs */
-/****************************/
-
-/* Memory pool header (defined in H5MPpkg.c) */
-typedef struct H5MP_pool_t H5MP_pool_t;
-
-/***************************************/
-/* Library-private Function Prototypes */
-/***************************************/
-H5_DLL H5MP_pool_t *H5MP_create(size_t page_size, unsigned flags);
-H5_DLL void *       H5MP_malloc(H5MP_pool_t *mp, size_t request);
-H5_DLL void *       H5MP_free(H5MP_pool_t *mp, void *spc);
-H5_DLL herr_t       H5MP_close(H5MP_pool_t *mp);
-
-#endif /* H5MPprivate_H */
diff --git a/src/H5MPtest.c b/src/H5MPtest.c
deleted file mode 100644
index 27e7bbe..0000000
--- a/src/H5MPtest.c
+++ /dev/null
@@ -1,213 +0,0 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
- * 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://www.hdfgroup.org/licenses.               *
- * If you do not have access to either file, you may request a copy from     *
- * help@hdfgroup.org.                                                        *
- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-/* Programmer:  Quincey Koziol
- *              Tuesday, May  3, 2005
- *
- * Purpose:	Memory pool testing functions.
- */
-
-#include "H5MPmodule.h" /* This source code file is part of the H5MP module */
-#define H5MP_TESTING    /*include H5MP testing funcs*/
-
-/* Private headers */
-#include "H5private.h"  /* Generic Functions			*/
-#include "H5MPpkg.h"    /* Memory Pools				*/
-#include "H5Eprivate.h" /* Error handling		  	*/
-
-/* Static Prototypes */
-
-/* Package variables */
-
-/*-------------------------------------------------------------------------
- * Function:	H5MP_get_pool_free_size
- *
- * Purpose:	Retrieve the total amount of free space in entire pool
- *
- * Return:	Success:	non-negative
- *
- *		Failure:	negative
- *
- * Programmer:	Quincey Koziol
- *              Tuesday, May  3, 2005
- *
- *-------------------------------------------------------------------------
- */
-herr_t
-H5MP_get_pool_free_size(const H5MP_pool_t *mp, size_t *free_size)
-{
-    FUNC_ENTER_NOAPI_NOINIT_NOERR
-
-    /* Check arguments. */
-    HDassert(mp);
-    HDassert(free_size);
-
-    /* Get memory pool's free space */
-    *free_size = mp->free_size;
-
-    FUNC_LEAVE_NOAPI(SUCCEED)
-} /* H5MP_get_pool_free_size() */
-
-/*-------------------------------------------------------------------------
- * Function:	H5MP_get_pool_first_page
- *
- * Purpose:	Retrieve the first page in a memory pool
- *
- * Return:	Success:	non-negative
- *
- *		Failure:	negative
- *
- * Programmer:	Quincey Koziol
- *              Tuesday, May  3, 2005
- *
- *-------------------------------------------------------------------------
- */
-herr_t
-H5MP_get_pool_first_page(const H5MP_pool_t *mp, H5MP_page_t **page)
-{
-    FUNC_ENTER_NOAPI_NOINIT_NOERR
-
-    /* Check arguments. */
-    HDassert(mp);
-    HDassert(page);
-
-    /* Get memory pool's first page */
-    *page = mp->first;
-
-    FUNC_LEAVE_NOAPI(SUCCEED)
-} /* H5MP_get_pool_first_page() */
-
-/*-------------------------------------------------------------------------
- * Function:	H5MP_pool_is_free_size_correct
- *
- * Purpose:	Check that the free space reported in each page corresponds
- *              to the free size in each page and that the free space in the
- *              free blocks for a page corresponds with the free space for
- *              the page.
- *
- * Return:	Success:	non-negative
- *
- *		Failure:	negative
- *
- * Programmer:	Quincey Koziol
- *              Wednesday, May  3, 2005
- *
- *-------------------------------------------------------------------------
- */
-htri_t
-H5MP_pool_is_free_size_correct(const H5MP_pool_t *mp)
-{
-    H5MP_page_t *page;             /* Pointer to current page */
-    size_t       pool_free;        /* Size of pages' free space */
-    htri_t       ret_value = TRUE; /* Return value */
-
-    FUNC_ENTER_NOAPI_NOINIT_NOERR
-
-    /* Check arguments. */
-    HDassert(mp);
-
-    /* Iterate through pages, checking the free size & accumulating the
-     * free space for all the pages */
-    page      = mp->first;
-    pool_free = 0;
-    while (page != NULL) {
-        H5MP_page_blk_t *blk;       /* Pointer to current free block */
-        size_t           page_free; /* Size of blocks on free list */
-
-        /* Iterate through the blocks in page, accumulating free space */
-        blk = (H5MP_page_blk_t *)((void *)((unsigned char *)page + H5MP_BLOCK_ALIGN(sizeof(H5MP_page_t))));
-        page_free = 0;
-        while (blk != NULL) {
-            if (blk->is_free)
-                page_free += blk->size;
-            blk = blk->next;
-        } /* end while */
-
-        /* Check that the free space from the blocks on the free list
-         * corresponds to space in page */
-        if (page_free != page->free_size)
-            HGOTO_DONE(FALSE)
-
-        /* Increment the amount of free space in pool */
-        pool_free += page->free_size;
-
-        /* Advance to next page */
-        page = page->next;
-    } /* end while */
-
-    /* Check that the free space from the pages
-     * corresponds to free space in pool */
-    if (pool_free != mp->free_size)
-        HGOTO_DONE(FALSE)
-
-done:
-    FUNC_LEAVE_NOAPI(ret_value)
-} /* H5MP_pool_is_free_size_correct() */
-
-/*-------------------------------------------------------------------------
- * Function:	H5MP_get_page_free_size
- *
- * Purpose:	Retrieve the amount of free space in given page
- *
- * Return:	Success:	non-negative
- *
- *		Failure:	negative
- *
- * Programmer:	Quincey Koziol
- *              Tuesday, May  3, 2005
- *
- *-------------------------------------------------------------------------
- */
-herr_t
-H5MP_get_page_free_size(const H5MP_page_t *page, size_t *free_size)
-{
-    FUNC_ENTER_NOAPI_NOINIT_NOERR
-
-    /* Check arguments. */
-    HDassert(page);
-    HDassert(free_size);
-
-    /* Get memory page's free space */
-    *free_size = page->free_size;
-
-    FUNC_LEAVE_NOAPI(SUCCEED)
-} /* H5MP_get_page_free_size() */
-
-/*-------------------------------------------------------------------------
- * Function:	H5MP_get_page_next_page
- *
- * Purpose:	Retrieve the next page in the pool
- *
- * Return:	Success:	non-negative
- *
- *		Failure:	negative
- *
- * Programmer:	Quincey Koziol
- *              Tuesday, May  3, 2005
- *
- *-------------------------------------------------------------------------
- */
-herr_t
-H5MP_get_page_next_page(const H5MP_page_t *page, H5MP_page_t **next_page)
-{
-    FUNC_ENTER_NOAPI_NOINIT_NOERR
-
-    /* Check arguments. */
-    HDassert(page);
-    HDassert(next_page);
-
-    /* Get next memory page */
-    *next_page = page->next;
-
-    FUNC_LEAVE_NOAPI(SUCCEED)
-} /* H5MP_get_page_next_page() */
diff --git a/src/Makefile.am b/src/Makefile.am
index c4023ae..dfed557 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -79,7 +79,7 @@ libhdf5_la_SOURCES= H5.c H5checksum.c H5dbg.c H5lib_settings.c H5system.c \
         H5L.c H5Ldeprec.c H5Lexternal.c H5Lint.c \
         H5M.c \
         H5MF.c H5MFaggr.c H5MFdbg.c H5MFsection.c \
-        H5MM.c H5MP.c H5MPtest.c \
+        H5MM.c \
         H5O.c H5Odeprec.c H5Oainfo.c H5Oalloc.c H5Oattr.c H5Oattribute.c \
         H5Obogus.c H5Obtreek.c H5Ocache.c H5Ocache_image.c H5Ochunk.c \
         H5Ocont.c H5Ocopy.c H5Ocopy_ref.c H5Odbg.c H5Odrvinfo.c H5Odtype.c \
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 4e543fd..7e69c09 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -318,7 +318,6 @@ set (H5_TESTS
     earray
     btree2
     fheap
-    pool
     accum
     hyperslab
     istore
diff --git a/test/Makefile.am b/test/Makefile.am
index 1d31525..63d8f43 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -63,7 +63,7 @@ check_SCRIPTS = $(TEST_SCRIPT)
 TEST_PROG= testhdf5 \
            cache cache_api cache_image cache_tagging lheap ohdr \
            stab gheap evict_on_close farray earray btree2 fheap \
-           pool accum hyperslab istore bittests dt_arith page_buffer \
+           accum hyperslab istore bittests dt_arith page_buffer \
            dtypes dsets chunk_info cmpd_dset cmpd_dtransform filter_fail extend direct_chunk \
            external efc objcopy objcopy_ref links unlink twriteorder big mtime \
            fillval mount \
diff --git a/test/pool.c b/test/pool.c
deleted file mode 100644
index c508025..0000000
--- a/test/pool.c
+++ /dev/null
@@ -1,794 +0,0 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
- * 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://www.hdfgroup.org/licenses.               *
- * If you do not have access to either file, you may request a copy from     *
- * help@hdfgroup.org.                                                        *
- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-/* Programmer:  Quincey Koziol
- *              Tuesday, May 3, 2005
- */
-#include "h5test.h"
-
-/*
- * This file needs to access private datatypes from the H5MP package.
- * This file also needs to access the memory pool testing code.
- */
-#define H5MP_FRIEND /*suppress error about including H5MPpkg	  */
-#define H5MP_TESTING
-#include "H5MPpkg.h" /* Memory Pools				*/
-
-/* Other private headers that this test requires */
-
-/* Local macros */
-#define MPOOL_PAGE_SIZE         H5MP_PAGE_SIZE_DEFAULT
-#define MPOOL_FLAGS             H5MP_FLG_DEFAULT
-#define MPOOL_NUM_NORMAL_BLOCKS 15
-#define MPOOL_NORMAL_BLOCK      512
-#define MPOOL_LARGE_BLOCK       (MPOOL_PAGE_SIZE * 3)
-#define MPOOL_NUM_SMALL_BLOCKS  64
-#define MPOOL_SMALL_BLOCK       1
-#define MPOOL_NUM_RANDOM        (10 * 1024)
-#define MPOOL_RANDOM_MAX_SIZE   (MPOOL_PAGE_SIZE * 2)
-
-/*-------------------------------------------------------------------------
- * Function:	test_create
- *
- * Purpose:	Test trivial creating & closing memory pool
- *
- * Return:	Success:	0
- *		Failure:	1
- *
- * Programmer:	Quincey Koziol
- *              Tuesday, May 3, 2005
- *
- *-------------------------------------------------------------------------
- */
-static int
-test_create(void)
-{
-    H5MP_pool_t *mp;        /* Memory pool */
-    H5MP_page_t *page;      /* Memory pool page */
-    size_t       free_size; /* Free size in pool */
-
-    /*
-     * Test memory pool creation
-     */
-    TESTING("memory pool creation");
-
-    /* Create a memory pool */
-    if (NULL == (mp = H5MP_create((size_t)MPOOL_PAGE_SIZE, MPOOL_FLAGS)))
-        TEST_ERROR
-
-    /* Check free space */
-    if (H5MP_get_pool_free_size(mp, &free_size) < 0)
-        TEST_ERROR
-    if (free_size != 0)
-        TEST_ERROR
-
-    /* Check first page */
-    if (H5MP_get_pool_first_page(mp, &page) < 0)
-        TEST_ERROR
-    if (page != NULL)
-        TEST_ERROR
-
-    /* Close the memory pool */
-    if (H5MP_close(mp) < 0)
-        TEST_ERROR
-
-    PASSED();
-
-    return 0;
-
-error:
-    H5E_BEGIN_TRY
-    {
-        if (mp)
-            H5MP_close(mp);
-    }
-    H5E_END_TRY;
-
-    return 1;
-} /* test_create() */
-
-/*-------------------------------------------------------------------------
- * Function:	test_close_one
- *
- * Purpose:	Tests closing pool with one block allocated
- *
- * Return:	Success:	0
- *		Failure:	1
- *
- * Programmer:	Quincey Koziol
- *              Friday, May 6, 2005
- *
- *-------------------------------------------------------------------------
- */
-static int
-test_close_one(void)
-{
-    H5MP_pool_t *mp; /* Memory pool */
-
-    /*
-     * Test memory pool closing
-     */
-    TESTING("closing pool with blocks still allocated in one page");
-
-    /* Create a memory pool */
-    if (NULL == (mp = H5MP_create((size_t)MPOOL_PAGE_SIZE, MPOOL_FLAGS)))
-        TEST_ERROR
-
-    /* Allocate space in pool */
-    if (NULL == H5MP_malloc(mp, (size_t)MPOOL_NORMAL_BLOCK))
-        TEST_ERROR
-
-    /* Close the memory pool */
-    if (H5MP_close(mp) < 0)
-        TEST_ERROR
-
-    PASSED();
-
-    return 0;
-
-error:
-    H5E_BEGIN_TRY
-    {
-        if (mp)
-            H5MP_close(mp);
-    }
-    H5E_END_TRY;
-
-    return 1;
-} /* test_close_one() */
-
-/*-------------------------------------------------------------------------
- * Function:	test_allocate_first
- *
- * Purpose:	Tests allocating first block in pool
- *
- * Return:	Success:	0
- *		Failure:	1
- *
- * Programmer:	Quincey Koziol
- *              Tuesday, May 3, 2005
- *
- *-------------------------------------------------------------------------
- */
-static int
-test_allocate_first(void)
-{
-    H5MP_pool_t *mp;        /* Memory pool */
-    H5MP_page_t *page;      /* Memory pool page */
-    size_t       free_size; /* Free size in pool */
-    void *       spc;       /* Pointer to space allocated */
-
-    /*
-     * Test memory pool allocation
-     */
-    TESTING("allocating first block in pool");
-
-    /* Create a memory pool */
-    if (NULL == (mp = H5MP_create((size_t)MPOOL_PAGE_SIZE, MPOOL_FLAGS)))
-        TEST_ERROR
-
-    /* Allocate space in pool */
-    if (NULL == (spc = H5MP_malloc(mp, (size_t)MPOOL_NORMAL_BLOCK)))
-        TEST_ERROR
-
-    /* Check pool's free space */
-    if (H5MP_get_pool_free_size(mp, &free_size) < 0)
-        TEST_ERROR
-    if (free_size !=
-        MPOOL_PAGE_SIZE - (H5MP_BLOCK_ALIGN(MPOOL_NORMAL_BLOCK) + H5MP_BLOCK_ALIGN(sizeof(H5MP_page_blk_t)) +
-                           H5MP_BLOCK_ALIGN(sizeof(H5MP_page_t))))
-        TEST_ERROR
-
-    /* Get first page */
-    if (H5MP_get_pool_first_page(mp, &page) < 0)
-        TEST_ERROR
-    if (page == NULL)
-        TEST_ERROR
-
-    /* Check page's free space */
-    if (H5MP_get_page_free_size(page, &free_size) < 0)
-        TEST_ERROR
-    if (free_size !=
-        MPOOL_PAGE_SIZE - (H5MP_BLOCK_ALIGN(MPOOL_NORMAL_BLOCK) + H5MP_BLOCK_ALIGN(sizeof(H5MP_page_blk_t)) +
-                           H5MP_BLOCK_ALIGN(sizeof(H5MP_page_t))))
-        TEST_ERROR
-
-    /* Check that free space totals match */
-    if (H5MP_pool_is_free_size_correct(mp) <= 0)
-        TEST_ERROR
-
-    /* Check next page */
-    if (H5MP_get_page_next_page(page, &page) < 0)
-        TEST_ERROR
-    if (page != NULL)
-        TEST_ERROR
-
-    /* Free space in pool */
-    H5MP_free(mp, spc);
-
-    /* Check pool's free space */
-    if (H5MP_get_pool_free_size(mp, &free_size) < 0)
-        TEST_ERROR
-    if (free_size != MPOOL_PAGE_SIZE - H5MP_BLOCK_ALIGN(sizeof(H5MP_page_t)))
-        TEST_ERROR
-
-    /* Check that free space totals match */
-    if (H5MP_pool_is_free_size_correct(mp) <= 0)
-        TEST_ERROR
-
-    /* Close the memory pool */
-    if (H5MP_close(mp) < 0)
-        TEST_ERROR
-
-    PASSED();
-
-    TESTING("allocating large first block in pool");
-
-    /* Create a memory pool */
-    if (NULL == (mp = H5MP_create((size_t)MPOOL_PAGE_SIZE, MPOOL_FLAGS)))
-        TEST_ERROR
-
-    /* Allocate space in pool */
-    if (NULL == (spc = H5MP_malloc(mp, (size_t)MPOOL_LARGE_BLOCK)))
-        TEST_ERROR
-
-    /* Check pool's free space */
-    if (H5MP_get_pool_free_size(mp, &free_size) < 0)
-        TEST_ERROR
-    if (free_size != 0)
-        TEST_ERROR
-
-    /* Get first page */
-    if (H5MP_get_pool_first_page(mp, &page) < 0)
-        TEST_ERROR
-    if (page == NULL)
-        TEST_ERROR
-
-    /* Check page's free space */
-    if (H5MP_get_page_free_size(page, &free_size) < 0)
-        TEST_ERROR
-    if (free_size != 0)
-        TEST_ERROR
-
-    /* Check that free space totals match */
-    if (H5MP_pool_is_free_size_correct(mp) <= 0)
-        TEST_ERROR
-
-    /* Check next page */
-    if (H5MP_get_page_next_page(page, &page) < 0)
-        TEST_ERROR
-    if (page != NULL)
-        TEST_ERROR
-
-    /* Free space in pool */
-    H5MP_free(mp, spc);
-
-    /* Check pool's free space */
-    if (H5MP_get_pool_free_size(mp, &free_size) < 0)
-        TEST_ERROR
-    if (free_size != MPOOL_LARGE_BLOCK + H5MP_BLOCK_ALIGN(sizeof(H5MP_page_blk_t)))
-        TEST_ERROR
-
-    /* Check that free space totals match */
-    if (H5MP_pool_is_free_size_correct(mp) <= 0)
-        TEST_ERROR
-
-    /* Close the memory pool */
-    if (H5MP_close(mp) < 0)
-        TEST_ERROR
-
-    PASSED();
-
-    return 0;
-
-error:
-    H5E_BEGIN_TRY
-    {
-        if (mp)
-            H5MP_close(mp);
-    }
-    H5E_END_TRY;
-
-    return 1;
-} /* test_allocate_first() */
-
-/*-------------------------------------------------------------------------
- * Function:	test_allocate_split
- *
- * Purpose:	Tests allocating block in pool that requires splitting
- *              existing block
- *
- * Return:	Success:	0
- *		Failure:	1
- *
- * Programmer:	Quincey Koziol
- *              Tuesday, May 3, 2005
- *
- *-------------------------------------------------------------------------
- */
-static int
-test_allocate_split(void)
-{
-    H5MP_pool_t *mp;        /* Memory pool */
-    size_t       free_size; /* Free size in pool */
-    void *       spc1;      /* Pointer to space allocated */
-    void *       spc2;      /* Pointer to space allocated */
-
-    /*
-     * Test memory pool allocation
-     */
-    TESTING("splitting block in pool");
-
-    /* Create a memory pool */
-    if (NULL == (mp = H5MP_create((size_t)MPOOL_PAGE_SIZE, MPOOL_FLAGS)))
-        TEST_ERROR
-
-    /* Allocate space in pool */
-    if (NULL == (spc1 = H5MP_malloc(mp, (size_t)MPOOL_NORMAL_BLOCK)))
-        TEST_ERROR
-
-    /* Check pool's free space */
-    if (H5MP_get_pool_free_size(mp, &free_size) < 0)
-        TEST_ERROR
-    if (free_size !=
-        MPOOL_PAGE_SIZE - (H5MP_BLOCK_ALIGN(MPOOL_NORMAL_BLOCK) + H5MP_BLOCK_ALIGN(sizeof(H5MP_page_blk_t)) +
-                           H5MP_BLOCK_ALIGN(sizeof(H5MP_page_t))))
-        TEST_ERROR
-
-    /* Check that free space totals match */
-    if (H5MP_pool_is_free_size_correct(mp) <= 0)
-        TEST_ERROR
-
-    /* Allocate more space in pool */
-    if (NULL == (spc2 = H5MP_malloc(mp, (size_t)MPOOL_NORMAL_BLOCK)))
-        TEST_ERROR
-
-    /* Check pool's free space */
-    if (H5MP_get_pool_free_size(mp, &free_size) < 0)
-        TEST_ERROR
-    if (free_size !=
-        MPOOL_PAGE_SIZE -
-            (((H5MP_BLOCK_ALIGN(MPOOL_NORMAL_BLOCK) + H5MP_BLOCK_ALIGN(sizeof(H5MP_page_blk_t))) * 2) +
-             H5MP_BLOCK_ALIGN(sizeof(H5MP_page_t))))
-        TEST_ERROR
-
-    /* Check that free space totals match */
-    if (H5MP_pool_is_free_size_correct(mp) <= 0)
-        TEST_ERROR
-
-    /* Free first block in pool */
-    H5MP_free(mp, spc1);
-
-    /* Check pool's free space */
-    if (H5MP_get_pool_free_size(mp, &free_size) < 0)
-        TEST_ERROR
-    if (free_size !=
-        MPOOL_PAGE_SIZE - (H5MP_BLOCK_ALIGN(MPOOL_NORMAL_BLOCK) + H5MP_BLOCK_ALIGN(sizeof(H5MP_page_blk_t)) +
-                           H5MP_BLOCK_ALIGN(sizeof(H5MP_page_t))))
-        TEST_ERROR
-
-    /* Check that free space totals match */
-    if (H5MP_pool_is_free_size_correct(mp) <= 0)
-        TEST_ERROR
-
-    /* Free second block in pool (should merge with first block) */
-    H5MP_free(mp, spc2);
-
-    /* Check pool's free space */
-    if (H5MP_get_pool_free_size(mp, &free_size) < 0)
-        TEST_ERROR
-    if (free_size != MPOOL_PAGE_SIZE - H5MP_BLOCK_ALIGN(sizeof(H5MP_page_t)))
-        TEST_ERROR
-
-    /* Check that free space totals match */
-    if (H5MP_pool_is_free_size_correct(mp) <= 0)
-        TEST_ERROR
-
-    /* Close the memory pool */
-    if (H5MP_close(mp) < 0)
-        TEST_ERROR
-
-    PASSED();
-
-    return 0;
-
-error:
-    H5E_BEGIN_TRY
-    {
-        if (mp)
-            H5MP_close(mp);
-    }
-    H5E_END_TRY;
-
-    return 1;
-} /* test_allocate_split() */
-
-/*-------------------------------------------------------------------------
- * Function:	test_allocate_many_small
- *
- * Purpose:	Tests allocating many small blocks in a pool
- *
- * Return:	Success:	0
- *		Failure:	1
- *
- * Programmer:	Quincey Koziol
- *              Tuesday, May 6, 2005
- *
- *-------------------------------------------------------------------------
- */
-static int
-test_allocate_many_small(void)
-{
-    H5MP_pool_t *mp;                          /* Memory pool */
-    size_t       free_size;                   /* Free size in pool */
-    void *       spc[MPOOL_NUM_SMALL_BLOCKS]; /* Pointers to space allocated */
-    int          i;                           /* Local index variable */
-
-    /*
-     * Test memory pool allocation
-     */
-    TESTING("allocating many small blocks");
-
-    /* Create a memory pool */
-    if (NULL == (mp = H5MP_create((size_t)MPOOL_PAGE_SIZE, MPOOL_FLAGS)))
-        TEST_ERROR
-
-    /* Allocate space in pool */
-    for (i = 0; i < MPOOL_NUM_SMALL_BLOCKS; i++)
-        if (NULL == (spc[i] = H5MP_malloc(mp, (size_t)MPOOL_SMALL_BLOCK)))
-            TEST_ERROR
-
-    /* Check pool's free space */
-    if (H5MP_get_pool_free_size(mp, &free_size) < 0)
-        TEST_ERROR
-    if (free_size != MPOOL_PAGE_SIZE -
-                         (((H5MP_BLOCK_ALIGN(MPOOL_SMALL_BLOCK) + H5MP_BLOCK_ALIGN(sizeof(H5MP_page_blk_t))) *
-                           MPOOL_NUM_SMALL_BLOCKS) +
-                          H5MP_BLOCK_ALIGN(sizeof(H5MP_page_t))))
-        TEST_ERROR
-
-    /* Check that free space totals match */
-    if (H5MP_pool_is_free_size_correct(mp) <= 0)
-        TEST_ERROR
-
-    /* Free blocks in pool */
-    /* (Tests free block merging with block after it */
-    for (i = (MPOOL_NUM_SMALL_BLOCKS - 1); i >= 0; i--)
-        H5MP_free(mp, spc[i]);
-
-    /* Check pool's free space */
-    if (H5MP_get_pool_free_size(mp, &free_size) < 0)
-        TEST_ERROR
-    if (free_size != MPOOL_PAGE_SIZE - H5MP_BLOCK_ALIGN(sizeof(H5MP_page_t)))
-        TEST_ERROR
-
-    /* Check that free space totals match */
-    if (H5MP_pool_is_free_size_correct(mp) <= 0)
-        TEST_ERROR
-
-    /* Close the memory pool */
-    if (H5MP_close(mp) < 0)
-        TEST_ERROR
-
-    PASSED();
-
-    return 0;
-
-error:
-    H5E_BEGIN_TRY
-    {
-        if (mp)
-            H5MP_close(mp);
-    }
-    H5E_END_TRY;
-
-    return 1;
-} /* test_allocate_many_small() */
-
-/*-------------------------------------------------------------------------
- * Function:	test_allocate_new_page
- *
- * Purpose:	Tests allocating block in pool that requires allocating
- *              new page
- *
- * Return:	Success:	0
- *		Failure:	1
- *
- * Programmer:	Quincey Koziol
- *              Friday, May 6, 2005
- *
- *-------------------------------------------------------------------------
- */
-static int
-test_allocate_new_page(void)
-{
-    H5MP_pool_t *mp;                           /* Memory pool */
-    size_t       free_size;                    /* Free size in pool */
-    size_t       u;                            /* Local index variable */
-    void *       spc[MPOOL_NUM_NORMAL_BLOCKS]; /* Pointer to space allocated */
-    void *       spc1;                         /* Pointer to space allocated */
-    void *       spc2;                         /* Pointer to space allocated */
-
-    /*
-     * Test memory pool allocation
-     */
-    TESTING("allocate normal-sized block in new page");
-
-    /* Create a memory pool */
-    if (NULL == (mp = H5MP_create((size_t)MPOOL_PAGE_SIZE, MPOOL_FLAGS)))
-        TEST_ERROR
-
-    /* Allocate space in pool */
-    for (u = 0; u < MPOOL_NUM_NORMAL_BLOCKS; u++)
-        if (NULL == (spc[u] = H5MP_malloc(mp, (size_t)MPOOL_NORMAL_BLOCK)))
-            TEST_ERROR
-
-    /* Check pool's free space */
-    if (H5MP_get_pool_free_size(mp, &free_size) < 0)
-        TEST_ERROR
-    if (free_size != (MPOOL_PAGE_SIZE * 3) - (((H5MP_BLOCK_ALIGN(MPOOL_NORMAL_BLOCK) +
-                                                H5MP_BLOCK_ALIGN(sizeof(H5MP_page_blk_t))) *
-                                               MPOOL_NUM_NORMAL_BLOCKS) +
-                                              (H5MP_BLOCK_ALIGN(sizeof(H5MP_page_t)) * 3)))
-        TEST_ERROR
-
-    /* Check that free space totals match */
-    if (H5MP_pool_is_free_size_correct(mp) <= 0)
-        TEST_ERROR
-
-    /* Free blocks in pool */
-    /* (Free alternating blocks, in two passes, which tests block merging w/both neighbors) */
-    for (u = 0; u < MPOOL_NUM_NORMAL_BLOCKS; u += 2)
-        H5MP_free(mp, spc[u]);
-    for (u = 1; u < MPOOL_NUM_NORMAL_BLOCKS; u += 2)
-        H5MP_free(mp, spc[u]);
-
-    /* Check pool's free space */
-    if (H5MP_get_pool_free_size(mp, &free_size) < 0)
-        TEST_ERROR
-    if (free_size != ((MPOOL_PAGE_SIZE - H5MP_BLOCK_ALIGN(sizeof(H5MP_page_t))) * 3))
-        TEST_ERROR
-
-    /* Check that free space totals match */
-    if (H5MP_pool_is_free_size_correct(mp) <= 0)
-        TEST_ERROR
-
-    /* Close the memory pool */
-    if (H5MP_close(mp) < 0)
-        TEST_ERROR
-
-    PASSED();
-
-    TESTING("allocate large-sized block in new page");
-
-    /* Create a memory pool */
-    if (NULL == (mp = H5MP_create((size_t)MPOOL_PAGE_SIZE, MPOOL_FLAGS)))
-        TEST_ERROR
-
-    /* Allocate space in pool */
-    /* (Normal sized block) */
-    if (NULL == (spc1 = H5MP_malloc(mp, (size_t)MPOOL_NORMAL_BLOCK)))
-        TEST_ERROR
-    /* (Larger sized block) */
-    if (NULL == (spc2 = H5MP_malloc(mp, (size_t)MPOOL_LARGE_BLOCK)))
-        TEST_ERROR
-
-    /* Check pool's free space */
-    if (H5MP_get_pool_free_size(mp, &free_size) < 0)
-        TEST_ERROR
-    if (free_size !=
-        MPOOL_PAGE_SIZE - (H5MP_BLOCK_ALIGN(MPOOL_NORMAL_BLOCK) + H5MP_BLOCK_ALIGN(sizeof(H5MP_page_blk_t)) +
-                           H5MP_BLOCK_ALIGN(sizeof(H5MP_page_t))))
-        TEST_ERROR
-
-    /* Check that free space totals match */
-    if (H5MP_pool_is_free_size_correct(mp) <= 0)
-        TEST_ERROR
-
-    /* Free blocks in pool */
-    H5MP_free(mp, spc1);
-    H5MP_free(mp, spc2);
-
-    /* Check pool's free space */
-    if (H5MP_get_pool_free_size(mp, &free_size) < 0)
-        TEST_ERROR
-    if (free_size != ((MPOOL_PAGE_SIZE - H5MP_BLOCK_ALIGN(sizeof(H5MP_page_t))) + MPOOL_LARGE_BLOCK +
-                      H5MP_BLOCK_ALIGN(sizeof(H5MP_page_blk_t))))
-        TEST_ERROR
-
-    /* Check that free space totals match */
-    if (H5MP_pool_is_free_size_correct(mp) <= 0)
-        TEST_ERROR
-
-    /* Close the memory pool */
-    if (H5MP_close(mp) < 0)
-        TEST_ERROR
-
-    PASSED();
-
-    return 0;
-
-error:
-    H5E_BEGIN_TRY
-    {
-        if (mp)
-            H5MP_close(mp);
-    }
-    H5E_END_TRY;
-
-    return 1;
-} /* test_allocate_new_page() */
-
-/*-------------------------------------------------------------------------
- * Function:	test_allocate_random
- *
- * Purpose:	Tests allocating random sized blocks in pool
- *
- * Return:	Success:	0
- *		Failure:	1
- *
- * Programmer:	Quincey Koziol
- *              Friday, May 6, 2005
- *
- *-------------------------------------------------------------------------
- */
-static int
-test_allocate_random(void)
-{
-    H5MP_pool_t *mp;              /* Memory pool */
-    size_t       u;               /* Local index variable */
-    time_t       curr_time;       /* Current time, for seeding random number generator */
-    size_t *     blk_size = NULL; /* Pointer to block sizes */
-    void **      spc      = NULL; /* Pointer to space allocated */
-    size_t       swap_idx;        /* Location to swap with when shuffling */
-    void *       swap_ptr;        /* Pointer to swap when shuffling */
-
-    /*
-     * Test memory pool allocation
-     */
-    TESTING("allocate many random sized blocks");
-
-    /* Initialize random number seed */
-    curr_time = HDtime(NULL);
-#if 0
-curr_time=1115412944;
-HDfprintf(stderr,"curr_time=%lu\n",(unsigned long)curr_time);
-#endif
-    HDsrandom((unsigned)curr_time);
-
-    /* Create a memory pool */
-    if (NULL == (mp = H5MP_create((size_t)MPOOL_PAGE_SIZE, MPOOL_FLAGS)))
-        TEST_ERROR
-
-    /* Allocate space for the block sizes */
-    if (NULL == (blk_size = (size_t *)HDmalloc(sizeof(size_t) * MPOOL_NUM_RANDOM)))
-        TEST_ERROR
-
-    /* Allocate space for the block pointers */
-    if (NULL == (spc = (void **)HDmalloc(sizeof(void *) * MPOOL_NUM_RANDOM)))
-        TEST_ERROR
-
-    /* Initialize the block sizes with random values */
-    for (u = 0; u < MPOOL_NUM_RANDOM; u++)
-        blk_size[u] = (size_t)(HDrandom() % MPOOL_RANDOM_MAX_SIZE) + 1;
-
-    /* Allocate space in pool */
-    for (u = 0; u < MPOOL_NUM_RANDOM; u++)
-        if (NULL == (spc[u] = H5MP_malloc(mp, blk_size[u])))
-            TEST_ERROR
-
-    /* Check that free space totals match */
-    if (H5MP_pool_is_free_size_correct(mp) <= 0)
-        TEST_ERROR
-
-    /* Shuffle pointers to free */
-    for (u = 0; u < MPOOL_NUM_RANDOM; u++) {
-        swap_idx      = (size_t)(HDrandom() % (int)(MPOOL_NUM_RANDOM - u)) + u;
-        swap_ptr      = spc[u];
-        spc[u]        = spc[swap_idx];
-        spc[swap_idx] = swap_ptr;
-    } /* end for */
-
-    /* Free blocks in pool */
-    for (u = 0; u < MPOOL_NUM_RANDOM; u++)
-        H5MP_free(mp, spc[u]);
-
-    /* Check that free space totals match */
-    if (H5MP_pool_is_free_size_correct(mp) <= 0)
-        TEST_ERROR
-
-    /* Initialize the block sizes with random values */
-    for (u = 0; u < MPOOL_NUM_RANDOM; u++)
-        blk_size[u] = (size_t)(HDrandom() % MPOOL_RANDOM_MAX_SIZE) + 1;
-
-    /* Allocate space in pool (again) */
-    /* (Leave allocated to test closing pool with many blocks still allocated) */
-    for (u = 0; u < MPOOL_NUM_RANDOM; u++)
-        if (NULL == (spc[u] = H5MP_malloc(mp, blk_size[u])))
-            TEST_ERROR
-
-    /* Check that free space totals match */
-    if (H5MP_pool_is_free_size_correct(mp) <= 0)
-        TEST_ERROR
-
-    /* Close the memory pool */
-    if (H5MP_close(mp) < 0)
-        TEST_ERROR
-
-    /* Free memory for block sizes & pointers */
-    HDfree(blk_size);
-    HDfree(spc);
-
-    PASSED();
-
-    return 0;
-
-error:
-    if (blk_size)
-        HDfree(blk_size);
-    if (spc)
-        HDfree(spc);
-    H5E_BEGIN_TRY
-    {
-        if (mp)
-            H5MP_close(mp);
-    }
-    H5E_END_TRY;
-
-    return 1;
-} /* test_allocate_random() */
-
-/*-------------------------------------------------------------------------
- * Function:	main
- *
- * Purpose:	Test the memory pool code
- *
- * Return:	Success:
- *		Failure:
- *
- * Programmer:	Quincey Koziol
- *              Tuesday, May 3, 2005
- *
- *-------------------------------------------------------------------------
- */
-int
-main(void)
-{
-    int nerrors = 0;
-
-    /* Reset library */
-    h5_reset();
-
-    /* Test memory pool creation */
-    nerrors += test_create();
-
-    /* Test memory pool space closing */
-    nerrors += test_close_one();
-
-    /* Test memory pool space allocation */
-    nerrors += test_allocate_first();
-    nerrors += test_allocate_split();
-    nerrors += test_allocate_many_small();
-    nerrors += test_allocate_new_page();
-    nerrors += test_allocate_random();
-
-    if (nerrors)
-        goto error;
-    HDputs("All memory pool tests passed.");
-
-    return 0;
-
-error:
-    HDputs("*** TESTS FAILED ***");
-    return 1;
-}