[svn-r10191] Purpose:

    New tests

Description:
    Add some internal validation routines and make certain that the max & min
block sizes get tracked accurately, at least for a simple series of insertions

Platforms tested:
    FreeBSD 4.11 (sleipnir)
    Solaris 2.9 (shanti)

5 files changed, 152 insertions, 13 deletions

diff --git a/src/H5BT.c b/src/H5BT.c
index bef571c..88377cc 100644
--- a/src/H5BT.c
+++ b/src/H5BT.c
@@ -39,16 +39,6 @@
 #define H5BT_BT2_SPLIT_PERC     100
 #define H5BT_BT2_MERGE_PERC     40
 
-/* Bit flags for block tracker size status */
-#define H5BT_STATUS_MAX_VALID   0x01    /* Maximum block size valid over all blocks tracked */
-    /* If this flag is not set, then only part of the blocks have been */
-    /* searched to determine the current maximum block size.  This can happen */
-    /* during block shrinks or removals */
-#define H5BT_STATUS_MIN_VALID   0x02    /* Minimum block size valid over all blocks tracked */
-    /* If this flag is not set, then only part of the blocks have been */
-    /* searched to determine the current minimum block size.  This can happen */
-    /* during block expansions or removals */
-
 /* Local typedefs */
 
 /* Local prototypes */
diff --git a/src/H5BTpkg.h b/src/H5BTpkg.h
index 83dfbe0..5ceb904 100644
--- a/src/H5BTpkg.h
+++ b/src/H5BTpkg.h
@@ -57,6 +57,16 @@
     H5F_SIZEOF_SIZE(f) +        /* Total number of bytes tracked */           \
     H5F_SIZEOF_ADDR(f))         /* Address of v2 B-tree which holds block inf */
 
+/* Bit flags for block tracker size status */
+#define H5BT_STATUS_MAX_VALID   0x01    /* Maximum block size valid over all blocks tracked */
+    /* If this flag is not set, then only part of the blocks have been */
+    /* searched to determine the current maximum block size.  This can happen */
+    /* during block shrinks or removals */
+#define H5BT_STATUS_MIN_VALID   0x02    /* Minimum block size valid over all blocks tracked */
+    /* If this flag is not set, then only part of the blocks have been */
+    /* searched to determine the current minimum block size.  This can happen */
+    /* during block expansions or removals */
+
 
 /****************************/
 /* Package Private Typedefs */
@@ -104,6 +114,12 @@ H5FL_EXTERN(H5BT_t);
 H5_DLL herr_t H5BT_cache_dest(H5F_t *f, H5BT_t *b);
 H5_DLL herr_t H5BT_hdr_debug(H5F_t *f, hid_t dxpl_id, haddr_t addr, FILE *stream,
     int indent, int fwidth);
+#ifdef H5BT_TESTING
+H5_DLL herr_t H5BT_get_max_info(H5F_t *f, hid_t dxpl_id, haddr_t addr,
+    hsize_t *size, uint32_t *count, hbool_t *valid);
+H5_DLL herr_t H5BT_get_min_info(H5F_t *f, hid_t dxpl_id, haddr_t addr,
+    hsize_t *size, uint32_t *count, hbool_t *valid);
+#endif /* H5B2_TESTING */
 
 #endif /* _H5BTpkg_H */
 
diff --git a/src/H5BTtest.c b/src/H5BTtest.c
new file mode 100644
index 0000000..974cfb3
--- /dev/null
+++ b/src/H5BTtest.c
@@ -0,0 +1,132 @@
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+ * Copyright by the Board of Trustees of the University of Illinois.         *
+ * All rights reserved.                                                      *
+ *                                                                           *
+ * This file is part of HDF5.  The full HDF5 copyright notice, including     *
+ * terms governing use, modification, and redistribution, is contained in    *
+ * the files COPYING and Copyright.html.  COPYING can be found at the root   *
+ * of the source code distribution tree; Copyright.html can be found at the  *
+ * root level of an installed copy of the electronic HDF5 document set and   *
+ * is linked from the top-level documents page.  It can also be found at     *
+ * http://hdf.ncsa.uiuc.edu/HDF5/doc/Copyright.html.  If you do not have     *
+ * access to either file, you may request a copy from hdfhelp@ncsa.uiuc.edu. *
+ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+
+/* Programmer:  Quincey Koziol <koziol@ncsa.uiuc.edu>
+ *              Thursday, March 10, 2005
+ *
+ * Purpose:	Block tracker testing functions.
+ */
+
+#define H5BT_PACKAGE		/*suppress error about including H5BTpkg  */
+#define H5BT_TESTING		/*suppress warning about H5BT testing funcs*/
+
+/* Private headers */
+#include "H5private.h"		/* Generic Functions			*/
+#include "H5BTpkg.h"		/* Block tracker			*/
+#include "H5Eprivate.h"		/* Error handling		  	*/
+
+/* Static Prototypes */
+
+/* Package variables */
+
+
+/*-------------------------------------------------------------------------
+ * Function:	H5B2_get_max_info
+ *
+ * Purpose:	Retrieve the information about the maximum size block tracked
+ *
+ * Return:	Success:	non-negative
+ *
+ *		Failure:	negative
+ *
+ * Programmer:	Quincey Koziol
+ *              Thursday, March 10, 2005
+ *
+ * Modifications:
+ *
+ *-------------------------------------------------------------------------
+ */
+herr_t
+H5BT_get_max_info(H5F_t *f, hid_t dxpl_id, haddr_t addr, hsize_t *size,
+    uint32_t *count, hbool_t *valid)
+{
+    H5BT_t	*bt=NULL;               /* Pointer to the block tracker info */
+    herr_t	ret_value = SUCCEED;
+
+    FUNC_ENTER_NOAPI_NOINIT(H5BT_get_max_info)
+
+    /* Check arguments. */
+    HDassert(f);
+    HDassert(H5F_addr_defined(addr));
+    HDassert(size);
+    HDassert(count);
+    HDassert(valid);
+
+    /* Look up the block tracker header */
+    if (NULL == (bt = H5AC_protect(f, dxpl_id, H5AC_BLTR, addr, NULL, NULL, H5AC_READ)))
+	HGOTO_ERROR(H5E_BLKTRK, H5E_CANTPROTECT, FAIL, "unable to load block tracker info")
+
+    /* Save max. block size info */
+    *size = bt->max_block_size;
+    *count = bt->max_block_cnt;
+    *valid = (bt->status & H5BT_STATUS_MAX_VALID) > 0;
+
+done:
+    /* Release the block tracker info */
+    if (bt && H5AC_unprotect(f, dxpl_id, H5AC_BLTR, addr, bt, H5AC__NO_FLAGS_SET) < 0)
+        HDONE_ERROR(H5E_BLKTRK, H5E_CANTUNPROTECT, FAIL, "unable to release block tracker info")
+
+    FUNC_LEAVE_NOAPI(ret_value)
+} /* H5BT_get_max_info() */
+
+
+/*-------------------------------------------------------------------------
+ * Function:	H5B2_get_min_info
+ *
+ * Purpose:	Retrieve the information about the minimum size block tracked
+ *
+ * Return:	Success:	non-negative
+ *
+ *		Failure:	negative
+ *
+ * Programmer:	Quincey Koziol
+ *              Thursday, March 10, 2005
+ *
+ * Modifications:
+ *
+ *-------------------------------------------------------------------------
+ */
+herr_t
+H5BT_get_min_info(H5F_t *f, hid_t dxpl_id, haddr_t addr, hsize_t *size,
+    uint32_t *count, hbool_t *valid)
+{
+    H5BT_t	*bt=NULL;               /* Pointer to the block tracker info */
+    herr_t	ret_value = SUCCEED;
+
+    FUNC_ENTER_NOAPI_NOINIT(H5BT_get_min_info)
+
+    /* Check arguments. */
+    HDassert(f);
+    HDassert(H5F_addr_defined(addr));
+    HDassert(size);
+    HDassert(count);
+    HDassert(valid);
+
+    /* Look up the block tracker header */
+    if (NULL == (bt = H5AC_protect(f, dxpl_id, H5AC_BLTR, addr, NULL, NULL, H5AC_READ)))
+	HGOTO_ERROR(H5E_BLKTRK, H5E_CANTPROTECT, FAIL, "unable to load block tracker info")
+
+    /* Save min. block size info */
+    *size = bt->min_block_size;
+    *count = bt->min_block_cnt;
+    *valid = (bt->status & H5BT_STATUS_MIN_VALID) > 0;
+
+done:
+    /* Release the block tracker info */
+    if (bt && H5AC_unprotect(f, dxpl_id, H5AC_BLTR, addr, bt, H5AC__NO_FLAGS_SET) < 0)
+        HDONE_ERROR(H5E_BLKTRK, H5E_CANTUNPROTECT, FAIL, "unable to release block tracker info")
+
+    FUNC_LEAVE_NOAPI(ret_value)
+} /* H5BT_get_min_info() */
+
diff --git a/src/Makefile.am b/src/Makefile.am
index 8d65b31..40cd853 100755
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -37,7 +37,7 @@ DISTCLEAN=libhdf5.settings
 
 # library sources
 libhdf5_la_SOURCES= H5.c H5A.c H5AC.c H5B.c H5B2.c H5B2cache.c H5B2dbg.c      \
-        H5B2test.c H5BT.c H5BTbtree2.c H5BTcache.c H5BTdbg.c H5C.c \
+        H5B2test.c H5BT.c H5BTbtree2.c H5BTcache.c H5BTdbg.c H5BTtest.c H5C.c \
         H5D.c \
         H5Dcontig.c \
         H5Dcompact.c \
diff --git a/src/Makefile.in b/src/Makefile.in
index e096942..f8220fe 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -83,7 +83,7 @@ LTLIBRARIES = $(lib_LTLIBRARIES)
 libhdf5_la_LIBADD =
 am_libhdf5_la_OBJECTS = H5.lo H5A.lo H5AC.lo H5B.lo H5B2.lo \
 	H5B2cache.lo H5B2dbg.lo H5B2test.lo H5BT.lo H5BTbtree2.lo \
-	H5BTcache.lo H5BTdbg.lo H5C.lo H5D.lo H5Dcontig.lo \
+	H5BTcache.lo H5BTdbg.lo H5BTtest.lo H5C.lo H5D.lo H5Dcontig.lo \
 	H5Dcompact.lo H5Defl.lo H5Dio.lo H5Distore.lo H5Dmpio.lo \
 	H5Dselect.lo H5Dtest.lo H5E.lo H5F.lo H5Fdbg.lo H5FD.lo \
 	H5FDcore.lo H5FDfamily.lo H5FDfphdf5.lo H5FDlog.lo H5FDmpi.lo \
@@ -333,7 +333,7 @@ DISTCLEAN = libhdf5.settings
 
 # library sources
 libhdf5_la_SOURCES = H5.c H5A.c H5AC.c H5B.c H5B2.c H5B2cache.c H5B2dbg.c      \
-        H5B2test.c H5BT.c H5BTbtree2.c H5BTcache.c H5BTdbg.c H5C.c \
+        H5B2test.c H5BT.c H5BTbtree2.c H5BTcache.c H5BTdbg.c H5BTtest.c H5C.c \
         H5D.c \
         H5Dcontig.c \
         H5Dcompact.c \
@@ -507,6 +507,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5BTbtree2.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5BTcache.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5BTdbg.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5BTtest.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5C.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5D.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Dcompact.Plo@am__quote@