From 327484d5031e566b9c4c12a26e6d5576b32262d6 Mon Sep 17 00:00:00 2001 From: Mike McGreevy Date: Mon, 15 Dec 2008 12:43:11 -0500 Subject: [svn-r16195] Purpose: Bug Fix Description: Resolved issues with broken sanity checks that were failing when the 'b2' debugging package was enabled (v2 b-tree debugging): - Fixed outdated assertions that would not compile. They now compile and function correctly. - Removed too far outdated assertions that would require too much unnecessary refactoring of code in order to satisfy their initial purpose. - Re-enabled b2 debugging package when "--enable-debug=all" is specified on the configure line. Tested: jam, smirom, linew --- configure | 4 ++-- configure.in | 4 +--- release_docs/RELEASE.txt | 3 +++ src/H5B2int.c | 30 ++++-------------------------- 4 files changed, 10 insertions(+), 31 deletions(-) diff --git a/configure b/configure index ca4d81e..46cfcdf 100755 --- a/configure +++ b/configure @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.in Id: configure.in 16102 2008-11-19 19:23:19Z epourmal . +# From configure.in Id: configure.in 16139 2008-11-30 23:58:27Z hdftest . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.61 for HDF5 1.8.2-post1. # @@ -47246,7 +47246,7 @@ if test "X-$DEBUG_PKG" = X- ; then fi -all_packages="ac,b,d,e,f,g,hg,hl,i,mf,mm,o,p,s,t,v,z" +all_packages="ac,b,b2,d,e,f,g,hg,hl,i,mf,mm,o,p,s,t,v,z" case "X-$DEBUG_PKG" in X-yes) DEBUG_PKG="d,e,f,g,hg,i,mm,o,p,s,t,v,z" diff --git a/configure.in b/configure.in index d9a0d3c..057fd02 100644 --- a/configure.in +++ b/configure.in @@ -2193,9 +2193,7 @@ if test "X-$DEBUG_PKG" = X- ; then fi AC_SUBST([DEBUG_PKG]) -dnl Removed b2 temporary since b2 code has errors. -dnl all_packages="ac,b,b2,d,e,f,g,hg,hl,i,mf,mm,o,p,s,t,v,z" -all_packages="ac,b,d,e,f,g,hg,hl,i,mf,mm,o,p,s,t,v,z" +all_packages="ac,b,b2,d,e,f,g,hg,hl,i,mf,mm,o,p,s,t,v,z" case "X-$DEBUG_PKG" in X-yes) DEBUG_PKG="d,e,f,g,hg,i,mm,o,p,s,t,v,z" diff --git a/release_docs/RELEASE.txt b/release_docs/RELEASE.txt index 428ab95..652e797 100644 --- a/release_docs/RELEASE.txt +++ b/release_docs/RELEASE.txt @@ -102,6 +102,9 @@ Bug Fixes since HDF5-1.8.2 Library ------- + - Fixed up some old v2 btree assertions that get run in debug mode that + were previously failing on compilation, and removed some of the + more heavily outdated and non-rewritable ones. MAM - 2008/12/15 - Fixed a bug that could cause problems when "automatically" unmounting multiple files. NAF - 2008/11/17 diff --git a/src/H5B2int.c b/src/H5B2int.c index 82185c0..8ce964c 100644 --- a/src/H5B2int.c +++ b/src/H5B2int.c @@ -3204,12 +3204,7 @@ H5B2_assert_leaf(H5B2_shared_t *shared, H5B2_leaf_t *leaf) unsigned u,v; /* Local index variables */ /* General sanity checking on node */ - HDassert(leaf->nrec<=shared->split_leaf_nrec); - - /* Sanity checking on records */ - for(u=0; unrec; u++) - for(v=0; vtype->compare)(H5B2_LEAF_NREC(leaf,shared,u), H5B2_LEAF_NREC(leaf,shared,v))>0); + HDassert(leaf->nrec<=shared->node_info->split_nrec); return(0); } /* end H5B2_assert_leaf() */ @@ -3234,14 +3229,7 @@ H5B2_assert_leaf2(H5B2_shared_t *shared, H5B2_leaf_t *leaf, H5B2_leaf_t *leaf2) unsigned u,v; /* Local index variables */ /* General sanity checking on node */ - HDassert(leaf->nrec<=shared->split_leaf_nrec); - - /* Sanity checking on records */ - for(u=0; unrec; u++) { - HDassert((shared->type->compare)(H5B2_LEAF_NREC(leaf2,shared,0), H5B2_LEAF_NREC(leaf,shared,u))>0); - for(v=0; vtype->compare)(H5B2_LEAF_NREC(leaf,shared,u), H5B2_LEAF_NREC(leaf,shared,v))>0); - } /* end for */ + HDassert(leaf->nrec<=shared->node_info->split_nrec); return(0); } /* end H5B2_assert_leaf() */ @@ -3267,12 +3255,7 @@ H5B2_assert_internal(hsize_t parent_all_nrec, H5B2_shared_t *shared, H5B2_intern unsigned u,v; /* Local index variables */ /* General sanity checking on node */ - HDassert(internal->nrec<=shared->split_int_nrec); - - /* Sanity checking on records */ - for(u=0; unrec; u++) - for(v=0; vtype->compare)(H5B2_INT_NREC(internal,shared,u), H5B2_INT_NREC(internal,shared,v))>0); + HDassert(internal->nrec<=shared->node_info->split_nrec); /* Sanity checking on node pointers */ tot_all_nrec=internal->nrec; @@ -3313,12 +3296,7 @@ H5B2_assert_internal2(hsize_t parent_all_nrec, H5B2_shared_t *shared, H5B2_inter unsigned u,v; /* Local index variables */ /* General sanity checking on node */ - HDassert(internal->nrec<=shared->split_int_nrec); - - /* Sanity checking on records */ - for(u=0; unrec; u++) - for(v=0; vtype->compare)(H5B2_INT_NREC(internal,shared,u), H5B2_INT_NREC(internal,shared,v))>0); + HDassert(internal->nrec<=shared->node_info->split_nrec); /* Sanity checking on node pointers */ tot_all_nrec=internal->nrec; -- cgit v0.12