[svn-r11965] Purpose:

    Maintenance

Description:
    Remove half-built (half-baked? :-) implementation of B+tree, block tracker
and segmented heaps.   (In preparation for starting the new heap coding)

Platforms tested:
    FreeBSD 4.11 (sleipnir)
    Linux 2.4 (heping)

1 files changed, 28 insertions, 54 deletions

diff --git a/test/Makefile.in b/test/Makefile.in
index f8dac31..2be16e9 100644
--- a/test/Makefile.in
+++ b/test/Makefile.in
@@ -31,7 +31,7 @@
 #
 
 
-SOURCES = $(libh5test_la_SOURCES) b+tree.c big.c bittests.c blocktrack.c btree2.c cache.c cache_api.c cmpd_dset.c dangle.c dsets.c dt_arith.c dtransform.c dtypes.c enum.c err_compat.c error_test.c extend.c external.c fillval.c flush1.c flush2.c gen_deflate.c gen_filters.c gen_new_array.c gen_new_fill.c gen_new_group.c gen_new_mtime.c gen_new_super.c gen_noencoder.c gen_nullspace.c getname.c gheap.c hyperslab.c istore.c lheap.c links.c mount.c mtime.c ntypes.c objcopy.c ohdr.c pool.c reserved.c set_extent.c sheap.c space_overflow.c stab.c stream_test.c $(testhdf5_SOURCES) testmeta.c $(ttsafe_SOURCES) unlink.c vfd.c
+SOURCES = $(libh5test_la_SOURCES) big.c bittests.c btree2.c cache.c cache_api.c cmpd_dset.c dangle.c dsets.c dt_arith.c dtransform.c dtypes.c enum.c err_compat.c error_test.c extend.c external.c fillval.c flush1.c flush2.c gen_deflate.c gen_filters.c gen_new_array.c gen_new_fill.c gen_new_group.c gen_new_mtime.c gen_new_super.c gen_noencoder.c gen_nullspace.c getname.c gheap.c hyperslab.c istore.c lheap.c links.c mount.c mtime.c ntypes.c objcopy.c ohdr.c pool.c reserved.c set_extent.c space_overflow.c stab.c stream_test.c $(testhdf5_SOURCES) testmeta.c $(ttsafe_SOURCES) unlink.c vfd.c
 
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
@@ -75,8 +75,7 @@ am_libh5test_la_OBJECTS = h5test.lo testframe.lo cache_common.lo
 libh5test_la_OBJECTS = $(am_libh5test_la_OBJECTS)
 am__EXEEXT_1 = testhdf5$(EXEEXT) lheap$(EXEEXT) ohdr$(EXEEXT) \
 	stab$(EXEEXT) gheap$(EXEEXT) btree2$(EXEEXT) cache$(EXEEXT) \
-	cache_api$(EXEEXT) b+tree$(EXEEXT) blocktrack$(EXEEXT) \
-	sheap$(EXEEXT) pool$(EXEEXT) hyperslab$(EXEEXT) \
+	cache_api$(EXEEXT) pool$(EXEEXT) hyperslab$(EXEEXT) \
 	istore$(EXEEXT) bittests$(EXEEXT) dt_arith$(EXEEXT) \
 	dtypes$(EXEEXT) dsets$(EXEEXT) cmpd_dset$(EXEEXT) \
 	extend$(EXEEXT) external$(EXEEXT) objcopy$(EXEEXT) \
@@ -97,23 +96,15 @@ am__EXEEXT_1 = testhdf5$(EXEEXT) lheap$(EXEEXT) ohdr$(EXEEXT) \
 @BUILD_ALL_CONDITIONAL_TRUE@	gen_nullspace$(EXEEXT) \
 @BUILD_ALL_CONDITIONAL_TRUE@	space_overflow$(EXEEXT)
 PROGRAMS = $(noinst_PROGRAMS)
-b_tree_SOURCES = b+tree.c
-b_tree_OBJECTS = b+tree.$(OBJEXT)
-b_tree_LDADD = $(LDADD)
-am__DEPENDENCIES_1 = $(top_builddir)/src/libhdf5.la
-b_tree_DEPENDENCIES = libh5test.la $(am__DEPENDENCIES_1)
 big_SOURCES = big.c
 big_OBJECTS = big.$(OBJEXT)
 big_LDADD = $(LDADD)
+am__DEPENDENCIES_1 = $(top_builddir)/src/libhdf5.la
 big_DEPENDENCIES = libh5test.la $(am__DEPENDENCIES_1)
 bittests_SOURCES = bittests.c
 bittests_OBJECTS = bittests.$(OBJEXT)
 bittests_LDADD = $(LDADD)
 bittests_DEPENDENCIES = libh5test.la $(am__DEPENDENCIES_1)
-blocktrack_SOURCES = blocktrack.c
-blocktrack_OBJECTS = blocktrack.$(OBJEXT)
-blocktrack_LDADD = $(LDADD)
-blocktrack_DEPENDENCIES = libh5test.la $(am__DEPENDENCIES_1)
 btree2_SOURCES = btree2.c
 btree2_OBJECTS = btree2.$(OBJEXT)
 btree2_LDADD = $(LDADD)
@@ -274,10 +265,6 @@ set_extent_SOURCES = set_extent.c
 set_extent_OBJECTS = set_extent.$(OBJEXT)
 set_extent_LDADD = $(LDADD)
 set_extent_DEPENDENCIES = libh5test.la $(am__DEPENDENCIES_1)
-sheap_SOURCES = sheap.c
-sheap_OBJECTS = sheap.$(OBJEXT)
-sheap_LDADD = $(LDADD)
-sheap_DEPENDENCIES = libh5test.la $(am__DEPENDENCIES_1)
 space_overflow_SOURCES = space_overflow.c
 space_overflow_OBJECTS = space_overflow.$(OBJEXT)
 space_overflow_LDADD = $(LDADD)
@@ -330,28 +317,28 @@ LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
 CCLD = $(CC)
 LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-SOURCES = $(libh5test_la_SOURCES) b+tree.c big.c bittests.c \
-	blocktrack.c btree2.c cache.c cache_api.c cmpd_dset.c dangle.c \
-	dsets.c dt_arith.c dtransform.c dtypes.c enum.c err_compat.c \
-	error_test.c extend.c external.c fillval.c flush1.c flush2.c \
-	gen_deflate.c gen_filters.c gen_new_array.c gen_new_fill.c \
-	gen_new_group.c gen_new_mtime.c gen_new_super.c \
-	gen_noencoder.c gen_nullspace.c getname.c gheap.c hyperslab.c \
-	istore.c lheap.c links.c mount.c mtime.c ntypes.c objcopy.c \
-	ohdr.c pool.c reserved.c set_extent.c sheap.c space_overflow.c \
-	stab.c stream_test.c $(testhdf5_SOURCES) testmeta.c \
-	$(ttsafe_SOURCES) unlink.c vfd.c
-DIST_SOURCES = $(libh5test_la_SOURCES) b+tree.c big.c bittests.c \
-	blocktrack.c btree2.c cache.c cache_api.c cmpd_dset.c dangle.c \
-	dsets.c dt_arith.c dtransform.c dtypes.c enum.c err_compat.c \
-	error_test.c extend.c external.c fillval.c flush1.c flush2.c \
-	gen_deflate.c gen_filters.c gen_new_array.c gen_new_fill.c \
-	gen_new_group.c gen_new_mtime.c gen_new_super.c \
-	gen_noencoder.c gen_nullspace.c getname.c gheap.c hyperslab.c \
-	istore.c lheap.c links.c mount.c mtime.c ntypes.c objcopy.c \
-	ohdr.c pool.c reserved.c set_extent.c sheap.c space_overflow.c \
-	stab.c stream_test.c $(testhdf5_SOURCES) testmeta.c \
-	$(ttsafe_SOURCES) unlink.c vfd.c
+SOURCES = $(libh5test_la_SOURCES) big.c bittests.c btree2.c cache.c \
+	cache_api.c cmpd_dset.c dangle.c dsets.c dt_arith.c \
+	dtransform.c dtypes.c enum.c err_compat.c error_test.c \
+	extend.c external.c fillval.c flush1.c flush2.c gen_deflate.c \
+	gen_filters.c gen_new_array.c gen_new_fill.c gen_new_group.c \
+	gen_new_mtime.c gen_new_super.c gen_noencoder.c \
+	gen_nullspace.c getname.c gheap.c hyperslab.c istore.c lheap.c \
+	links.c mount.c mtime.c ntypes.c objcopy.c ohdr.c pool.c \
+	reserved.c set_extent.c space_overflow.c stab.c stream_test.c \
+	$(testhdf5_SOURCES) testmeta.c $(ttsafe_SOURCES) unlink.c \
+	vfd.c
+DIST_SOURCES = $(libh5test_la_SOURCES) big.c bittests.c btree2.c \
+	cache.c cache_api.c cmpd_dset.c dangle.c dsets.c dt_arith.c \
+	dtransform.c dtypes.c enum.c err_compat.c error_test.c \
+	extend.c external.c fillval.c flush1.c flush2.c gen_deflate.c \
+	gen_filters.c gen_new_array.c gen_new_fill.c gen_new_group.c \
+	gen_new_mtime.c gen_new_super.c gen_noencoder.c \
+	gen_nullspace.c getname.c gheap.c hyperslab.c istore.c lheap.c \
+	links.c mount.c mtime.c ntypes.c objcopy.c ohdr.c pool.c \
+	reserved.c set_extent.c space_overflow.c stab.c stream_test.c \
+	$(testhdf5_SOURCES) testmeta.c $(ttsafe_SOURCES) unlink.c \
+	vfd.c
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -612,9 +599,8 @@ CHECK_CLEANFILES = *.chkexe *.chklog *.clog cmpd_dset.h5 \
 	family_file000[0-3][0-9].h5 multi_file-[rs].h5 core_file \
 	new_move_[ab].h5 ntypes.h5 dangle.h5 error_test.h5 \
 	err_compat.h5 dtransform.h5 test_filters.h5 get_file_name.h5 \
-	tstint[1-2].h5 unlink_chunked.h5 btree2.h5 blocktrack.h5 \
-	sheap.h5 b+tree.h5 objcopy_src.h5 objcopy_dst.h5 \
-	objcopy_ext.dat
+	tstint[1-2].h5 unlink_chunked.h5 btree2.h5 objcopy_src.h5 \
+	objcopy_dst.h5 objcopy_ext.dat
 INCLUDES = -I$(top_srcdir)/src -I$(top_builddir)/src
 
 # Test script for error_test and err_compat
@@ -626,7 +612,7 @@ SCRIPT_DEPEND = error_test$(EXEEXT) err_compat$(EXEEXT)
 # executed, generally most specific tests to least specific tests.
 # As an exception, long-running tests should occur earlier in the list.
 # This gives them more time to run when tests are executing in parallel.
-TEST_PROG = testhdf5 lheap ohdr stab gheap btree2 cache cache_api b+tree blocktrack sheap \
+TEST_PROG = testhdf5 lheap ohdr stab gheap btree2 cache cache_api \
            pool hyperslab istore bittests dt_arith \
            dtypes dsets cmpd_dset extend external objcopy links unlink big mtime     \
            fillval mount flush1 flush2 enum \
@@ -739,18 +725,12 @@ clean-noinstPROGRAMS:
 	  echo " rm -f $$p $$f"; \
 	  rm -f $$p $$f ; \
 	done
-b+tree$(EXEEXT): $(b_tree_OBJECTS) $(b_tree_DEPENDENCIES) 
-	@rm -f b+tree$(EXEEXT)
-	$(LINK) $(b_tree_LDFLAGS) $(b_tree_OBJECTS) $(b_tree_LDADD) $(LIBS)
 big$(EXEEXT): $(big_OBJECTS) $(big_DEPENDENCIES) 
 	@rm -f big$(EXEEXT)
 	$(LINK) $(big_LDFLAGS) $(big_OBJECTS) $(big_LDADD) $(LIBS)
 bittests$(EXEEXT): $(bittests_OBJECTS) $(bittests_DEPENDENCIES) 
 	@rm -f bittests$(EXEEXT)
 	$(LINK) $(bittests_LDFLAGS) $(bittests_OBJECTS) $(bittests_LDADD) $(LIBS)
-blocktrack$(EXEEXT): $(blocktrack_OBJECTS) $(blocktrack_DEPENDENCIES) 
-	@rm -f blocktrack$(EXEEXT)
-	$(LINK) $(blocktrack_LDFLAGS) $(blocktrack_OBJECTS) $(blocktrack_LDADD) $(LIBS)
 btree2$(EXEEXT): $(btree2_OBJECTS) $(btree2_DEPENDENCIES) 
 	@rm -f btree2$(EXEEXT)
 	$(LINK) $(btree2_LDFLAGS) $(btree2_OBJECTS) $(btree2_LDADD) $(LIBS)
@@ -871,9 +851,6 @@ reserved$(EXEEXT): $(reserved_OBJECTS) $(reserved_DEPENDENCIES)
 set_extent$(EXEEXT): $(set_extent_OBJECTS) $(set_extent_DEPENDENCIES) 
 	@rm -f set_extent$(EXEEXT)
 	$(LINK) $(set_extent_LDFLAGS) $(set_extent_OBJECTS) $(set_extent_LDADD) $(LIBS)
-sheap$(EXEEXT): $(sheap_OBJECTS) $(sheap_DEPENDENCIES) 
-	@rm -f sheap$(EXEEXT)
-	$(LINK) $(sheap_LDFLAGS) $(sheap_OBJECTS) $(sheap_LDADD) $(LIBS)
 space_overflow$(EXEEXT): $(space_overflow_OBJECTS) $(space_overflow_DEPENDENCIES) 
 	@rm -f space_overflow$(EXEEXT)
 	$(LINK) $(space_overflow_LDFLAGS) $(space_overflow_OBJECTS) $(space_overflow_LDADD) $(LIBS)
@@ -905,10 +882,8 @@ mostlyclean-compile:
 distclean-compile:
 	-rm -f *.tab.c
 
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/b+tree.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/big.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bittests.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/blocktrack.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/btree2.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cache.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cache_api.Po@am__quote@
@@ -951,7 +926,6 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pool.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/reserved.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/set_extent.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sheap.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/space_overflow.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/stab.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/stream_test.Po@am__quote@