From 0813413a781cfc763317c7c5b4edaf13465fa5c0 Mon Sep 17 00:00:00 2001 From: Quincey Koziol Date: Thu, 10 Mar 2005 23:34:06 -0500 Subject: [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) --- src/H5BT.c | 10 -- src/H5BTpkg.h | 16 +++ src/H5BTtest.c | 132 +++++++++++++++++++++++ src/Makefile.am | 2 +- src/Makefile.in | 5 +- test/blocktrack.c | 316 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 6 files changed, 468 insertions(+), 13 deletions(-) create mode 100644 src/H5BTtest.c 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 + * 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@ diff --git a/test/blocktrack.c b/test/blocktrack.c index c297bca..e07e05d 100644 --- a/test/blocktrack.c +++ b/test/blocktrack.c @@ -19,8 +19,10 @@ /* * This file needs to access private datatypes from the H5BT package. + * This file also needs to access the block tracker testing code. */ #define H5BT_PACKAGE +#define H5BT_TESTING #include "H5BTpkg.h" /* Other private headers that this test requires */ @@ -58,6 +60,12 @@ test_create(hid_t fapl) H5F_t *f=NULL; haddr_t bt_addr; /* Address of block tracker created */ hsize_t tot_size; /* Total size of blocks tracked */ + hsize_t max_size; /* Max. size of blocks tracked */ + uint32_t max_count; /* Ref. count of max. size of blocks tracked */ + hbool_t max_valid; /* Is max. size valid over all blocks? */ + hsize_t min_size; /* Min. size of blocks tracked */ + uint32_t min_count; /* Ref. count of min. size of blocks tracked */ + hbool_t min_valid; /* Is min. size valid over all blocks? */ h5_fixname(FILENAME[0], fapl, filename, sizeof filename); @@ -88,6 +96,25 @@ test_create(hid_t fapl) /* Make certain that the size is correct */ if(tot_size != 0) TEST_ERROR; + if (H5BT_get_max_info(f, H5P_DATASET_XFER_DEFAULT, bt_addr, &max_size, &max_count, &max_valid)<0) { + H5_FAILED(); + H5Eprint_stack(H5E_DEFAULT, stdout); + goto error; + } /* end if */ + /* Make certain that the max. info is correct */ + if(max_size != 0) TEST_ERROR; + if(max_count != 0) TEST_ERROR; + if(max_valid != 0) TEST_ERROR; + + if (H5BT_get_min_info(f, H5P_DATASET_XFER_DEFAULT, bt_addr, &min_size, &min_count, &min_valid)<0) { + H5_FAILED(); + H5Eprint_stack(H5E_DEFAULT, stdout); + goto error; + } /* end if */ + /* Make certain that the max. info is correct */ + if(min_size != HSIZET_MAX) TEST_ERROR; + if(min_count != 0) TEST_ERROR; + if(min_valid != 0) TEST_ERROR; PASSED(); @@ -127,6 +154,12 @@ test_insert_one(hid_t fapl) H5F_t *f=NULL; haddr_t bt_addr; /* Address of block tracker created */ hsize_t tot_size; /* Total size of blocks tracked */ + hsize_t max_size; /* Max. size of blocks tracked */ + uint32_t max_count; /* Ref. count of max. size of blocks tracked */ + hbool_t max_valid; /* Is max. size valid over all blocks? */ + hsize_t min_size; /* Min. size of blocks tracked */ + uint32_t min_count; /* Ref. count of min. size of blocks tracked */ + hbool_t min_valid; /* Is min. size valid over all blocks? */ h5_fixname(FILENAME[0], fapl, filename, sizeof filename); @@ -163,6 +196,262 @@ test_insert_one(hid_t fapl) /* Make certain that the size is correct */ if(tot_size != 20) TEST_ERROR; + if (H5BT_get_max_info(f, H5P_DATASET_XFER_DEFAULT, bt_addr, &max_size, &max_count, &max_valid)<0) { + H5_FAILED(); + H5Eprint_stack(H5E_DEFAULT, stdout); + goto error; + } /* end if */ + /* Make certain that the max. info is correct */ + if(max_size != 20) TEST_ERROR; + if(max_count != 1) TEST_ERROR; + if(max_valid != 1) TEST_ERROR; + + if (H5BT_get_min_info(f, H5P_DATASET_XFER_DEFAULT, bt_addr, &min_size, &min_count, &min_valid)<0) { + H5_FAILED(); + H5Eprint_stack(H5E_DEFAULT, stdout); + goto error; + } /* end if */ + /* Make certain that the max. info is correct */ + if(min_size != 20) TEST_ERROR; + if(min_count != 1) TEST_ERROR; + if(min_valid != 1) TEST_ERROR; + + PASSED(); + + if (H5Fclose(file)<0) TEST_ERROR; + + return 0; + +error: + H5E_BEGIN_TRY { + H5Fclose(file); + } H5E_END_TRY; + return 1; +} /* test_insert_one() */ + + +/*------------------------------------------------------------------------- + * Function: test_insert_few + * + * Purpose: Basic tests for the block tracker code + * + * Return: Success: 0 + * + * Failure: 1 + * + * Programmer: Quincey Koziol + * Thursday, March 10, 2005 + * + * Modifications: + * + *------------------------------------------------------------------------- + */ +static int +test_insert_few(hid_t fapl) +{ + hid_t file=-1; + char filename[1024]; + H5F_t *f=NULL; + haddr_t bt_addr; /* Address of block tracker created */ + hsize_t tot_size; /* Total size of blocks tracked */ + hsize_t max_size; /* Max. size of blocks tracked */ + uint32_t max_count; /* Ref. count of max. size of blocks tracked */ + hbool_t max_valid; /* Is max. size valid over all blocks? */ + hsize_t min_size; /* Min. size of blocks tracked */ + uint32_t min_count; /* Ref. count of min. size of blocks tracked */ + hbool_t min_valid; /* Is min. size valid over all blocks? */ + + h5_fixname(FILENAME[0], fapl, filename, sizeof filename); + + /* Create the file to work on */ + if ((file=H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl))<0) TEST_ERROR; + + /* Get a pointer to the internal file object */ + if (NULL==(f=H5I_object(file))) { + H5Eprint_stack(H5E_DEFAULT, stdout); + TEST_ERROR; + } /* end if */ + + /* + * Test inserting one block + */ + TESTING("insert several blocks"); + if (H5BT_create(f, H5P_DATASET_XFER_DEFAULT, &bt_addr/*out*/)<0) { + H5_FAILED(); + H5Eprint_stack(H5E_DEFAULT, stdout); + goto error; + } /* end if */ + + if (H5BT_insert(f, H5P_DATASET_XFER_DEFAULT, bt_addr, (haddr_t)10, (hsize_t)20)<0) { + H5_FAILED(); + H5Eprint_stack(H5E_DEFAULT, stdout); + goto error; + } /* end if */ + + if (H5BT_get_total_size(f, H5P_DATASET_XFER_DEFAULT, bt_addr, &tot_size)<0) { + H5_FAILED(); + H5Eprint_stack(H5E_DEFAULT, stdout); + goto error; + } /* end if */ + /* Make certain that the size is correct */ + if(tot_size != 20) TEST_ERROR; + + if (H5BT_get_max_info(f, H5P_DATASET_XFER_DEFAULT, bt_addr, &max_size, &max_count, &max_valid)<0) { + H5_FAILED(); + H5Eprint_stack(H5E_DEFAULT, stdout); + goto error; + } /* end if */ + /* Make certain that the max. info is correct */ + if(max_size != 20) TEST_ERROR; + if(max_count != 1) TEST_ERROR; + if(max_valid != 1) TEST_ERROR; + + if (H5BT_get_min_info(f, H5P_DATASET_XFER_DEFAULT, bt_addr, &min_size, &min_count, &min_valid)<0) { + H5_FAILED(); + H5Eprint_stack(H5E_DEFAULT, stdout); + goto error; + } /* end if */ + /* Make certain that the max. info is correct */ + if(min_size != 20) TEST_ERROR; + if(min_count != 1) TEST_ERROR; + if(min_valid != 1) TEST_ERROR; + + if (H5BT_insert(f, H5P_DATASET_XFER_DEFAULT, bt_addr, (haddr_t)50, (hsize_t)30)<0) { + H5_FAILED(); + H5Eprint_stack(H5E_DEFAULT, stdout); + goto error; + } /* end if */ + + if (H5BT_get_total_size(f, H5P_DATASET_XFER_DEFAULT, bt_addr, &tot_size)<0) { + H5_FAILED(); + H5Eprint_stack(H5E_DEFAULT, stdout); + goto error; + } /* end if */ + /* Make certain that the size is correct */ + if(tot_size != 50) TEST_ERROR; + + if (H5BT_get_max_info(f, H5P_DATASET_XFER_DEFAULT, bt_addr, &max_size, &max_count, &max_valid)<0) { + H5_FAILED(); + H5Eprint_stack(H5E_DEFAULT, stdout); + goto error; + } /* end if */ + /* Make certain that the max. info is correct */ + if(max_size != 30) TEST_ERROR; + if(max_count != 1) TEST_ERROR; + if(max_valid != 1) TEST_ERROR; + + if (H5BT_get_min_info(f, H5P_DATASET_XFER_DEFAULT, bt_addr, &min_size, &min_count, &min_valid)<0) { + H5_FAILED(); + H5Eprint_stack(H5E_DEFAULT, stdout); + goto error; + } /* end if */ + /* Make certain that the max. info is correct */ + if(min_size != 20) TEST_ERROR; + if(min_count != 1) TEST_ERROR; + if(min_valid != 1) TEST_ERROR; + + if (H5BT_insert(f, H5P_DATASET_XFER_DEFAULT, bt_addr, (haddr_t)90, (hsize_t)30)<0) { + H5_FAILED(); + H5Eprint_stack(H5E_DEFAULT, stdout); + goto error; + } /* end if */ + + if (H5BT_get_total_size(f, H5P_DATASET_XFER_DEFAULT, bt_addr, &tot_size)<0) { + H5_FAILED(); + H5Eprint_stack(H5E_DEFAULT, stdout); + goto error; + } /* end if */ + /* Make certain that the size is correct */ + if(tot_size != 80) TEST_ERROR; + + if (H5BT_get_max_info(f, H5P_DATASET_XFER_DEFAULT, bt_addr, &max_size, &max_count, &max_valid)<0) { + H5_FAILED(); + H5Eprint_stack(H5E_DEFAULT, stdout); + goto error; + } /* end if */ + /* Make certain that the max. info is correct */ + if(max_size != 30) TEST_ERROR; + if(max_count != 2) TEST_ERROR; + if(max_valid != 1) TEST_ERROR; + + if (H5BT_get_min_info(f, H5P_DATASET_XFER_DEFAULT, bt_addr, &min_size, &min_count, &min_valid)<0) { + H5_FAILED(); + H5Eprint_stack(H5E_DEFAULT, stdout); + goto error; + } /* end if */ + /* Make certain that the max. info is correct */ + if(min_size != 20) TEST_ERROR; + if(min_count != 1) TEST_ERROR; + if(min_valid != 1) TEST_ERROR; + + if (H5BT_insert(f, H5P_DATASET_XFER_DEFAULT, bt_addr, (haddr_t)120, (hsize_t)20)<0) { + H5_FAILED(); + H5Eprint_stack(H5E_DEFAULT, stdout); + goto error; + } /* end if */ + + if (H5BT_get_total_size(f, H5P_DATASET_XFER_DEFAULT, bt_addr, &tot_size)<0) { + H5_FAILED(); + H5Eprint_stack(H5E_DEFAULT, stdout); + goto error; + } /* end if */ + /* Make certain that the size is correct */ + if(tot_size != 100) TEST_ERROR; + + if (H5BT_get_max_info(f, H5P_DATASET_XFER_DEFAULT, bt_addr, &max_size, &max_count, &max_valid)<0) { + H5_FAILED(); + H5Eprint_stack(H5E_DEFAULT, stdout); + goto error; + } /* end if */ + /* Make certain that the max. info is correct */ + if(max_size != 30) TEST_ERROR; + if(max_count != 2) TEST_ERROR; + if(max_valid != 1) TEST_ERROR; + + if (H5BT_get_min_info(f, H5P_DATASET_XFER_DEFAULT, bt_addr, &min_size, &min_count, &min_valid)<0) { + H5_FAILED(); + H5Eprint_stack(H5E_DEFAULT, stdout); + goto error; + } /* end if */ + /* Make certain that the max. info is correct */ + if(min_size != 20) TEST_ERROR; + if(min_count != 2) TEST_ERROR; + if(min_valid != 1) TEST_ERROR; + + if (H5BT_insert(f, H5P_DATASET_XFER_DEFAULT, bt_addr, (haddr_t)150, (hsize_t)10)<0) { + H5_FAILED(); + H5Eprint_stack(H5E_DEFAULT, stdout); + goto error; + } /* end if */ + + if (H5BT_get_total_size(f, H5P_DATASET_XFER_DEFAULT, bt_addr, &tot_size)<0) { + H5_FAILED(); + H5Eprint_stack(H5E_DEFAULT, stdout); + goto error; + } /* end if */ + /* Make certain that the size is correct */ + if(tot_size != 110) TEST_ERROR; + + if (H5BT_get_max_info(f, H5P_DATASET_XFER_DEFAULT, bt_addr, &max_size, &max_count, &max_valid)<0) { + H5_FAILED(); + H5Eprint_stack(H5E_DEFAULT, stdout); + goto error; + } /* end if */ + /* Make certain that the max. info is correct */ + if(max_size != 30) TEST_ERROR; + if(max_count != 2) TEST_ERROR; + if(max_valid != 1) TEST_ERROR; + + if (H5BT_get_min_info(f, H5P_DATASET_XFER_DEFAULT, bt_addr, &min_size, &min_count, &min_valid)<0) { + H5_FAILED(); + H5Eprint_stack(H5E_DEFAULT, stdout); + goto error; + } /* end if */ + /* Make certain that the max. info is correct */ + if(min_size != 10) TEST_ERROR; + if(min_count != 1) TEST_ERROR; + if(min_valid != 1) TEST_ERROR; + PASSED(); if (H5Fclose(file)<0) TEST_ERROR; @@ -202,6 +491,12 @@ test_insert_many(hid_t fapl) haddr_t bt_addr; /* Address of block tracker created */ unsigned u; /* Local index variable */ hsize_t tot_size; /* Total size of blocks tracked */ + hsize_t max_size; /* Max. size of blocks tracked */ + uint32_t max_count; /* Ref. count of max. size of blocks tracked */ + hbool_t max_valid; /* Is max. size valid over all blocks? */ + hsize_t min_size; /* Min. size of blocks tracked */ + uint32_t min_count; /* Ref. count of min. size of blocks tracked */ + hbool_t min_valid; /* Is min. size valid over all blocks? */ h5_fixname(FILENAME[0], fapl, filename, sizeof filename); @@ -239,6 +534,26 @@ test_insert_many(hid_t fapl) /* Make certain that the size is correct */ if(tot_size != ((u+1)*20)) TEST_ERROR; + if (H5BT_get_max_info(f, H5P_DATASET_XFER_DEFAULT, bt_addr, &max_size, &max_count, &max_valid)<0) { + H5_FAILED(); + H5Eprint_stack(H5E_DEFAULT, stdout); + goto error; + } /* end if */ + /* Make certain that the max. info is correct */ + if(max_size != 20) TEST_ERROR; + if(max_count != (u+1)) TEST_ERROR; + if(max_valid != 1) TEST_ERROR; + + if (H5BT_get_min_info(f, H5P_DATASET_XFER_DEFAULT, bt_addr, &min_size, &min_count, &min_valid)<0) { + H5_FAILED(); + H5Eprint_stack(H5E_DEFAULT, stdout); + goto error; + } /* end if */ + /* Make certain that the max. info is correct */ + if(min_size != 20) TEST_ERROR; + if(min_count != (u+1)) TEST_ERROR; + if(min_valid != 1) TEST_ERROR; + } /* end for */ PASSED(); @@ -286,6 +601,7 @@ main(void) /* Test block tracker insertion */ nerrors += test_insert_one(fapl); + nerrors += test_insert_few(fapl); nerrors += test_insert_many(fapl); if (nerrors) goto error; -- cgit v0.12