[svn-r10506] Purpose:

    New feature

Description:
    Add first iteration of "segmented heap" code, which will be used to store
links in groups in a more flexible way than the previous "local heap" mechanism.

Platforms tested:
    FreeBSD 4.11 (sleipnir) w/parallel
    Solaris 2.9 (shanti)

1 files changed, 19 insertions, 9 deletions

diff --git a/test/Makefile.in b/test/Makefile.in
index 08975d3..89d5e5e 100644
--- a/test/Makefile.in
+++ b/test/Makefile.in
@@ -29,7 +29,7 @@
 #
 # HDF5 Library Test Makefile(.in)
 #
-SOURCES = $(libh5test_la_SOURCES) big.c bittests.c blocktrack.c btree2.c cache.c cmpd_dset.c dangle.c dsets.c dtransform.c dtypes.c enum.c err_compat.c error_test.c extend.c external.c file_handle.c filename.c fillval.c flush1.c flush2.c getname.c gheap.c hyperslab.c istore.c lheap.c links.c mount.c mtime.c ntypes.c ohdr.c reserved.c set_extent.c srb_append.c srb_read.c srb_write.c stab.c stream_test.c $(testhdf5_SOURCES) testmeta.c $(ttsafe_SOURCES) unlink.c
+SOURCES = $(libh5test_la_SOURCES) big.c bittests.c blocktrack.c btree2.c cache.c cmpd_dset.c dangle.c dsets.c dtransform.c dtypes.c enum.c err_compat.c error_test.c extend.c external.c file_handle.c filename.c fillval.c flush1.c flush2.c getname.c gheap.c hyperslab.c istore.c lheap.c links.c mount.c mtime.c ntypes.c ohdr.c reserved.c set_extent.c sheap.c srb_append.c srb_read.c srb_write.c stab.c stream_test.c $(testhdf5_SOURCES) testmeta.c $(ttsafe_SOURCES) unlink.c
 
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
@@ -74,7 +74,8 @@ libh5test_la_OBJECTS = $(am_libh5test_la_OBJECTS)
 @BUILD_SRB_CONDITIONAL_TRUE@	srb_append$(EXEEXT) \
 @BUILD_SRB_CONDITIONAL_TRUE@	srb_read$(EXEEXT)
 am__EXEEXT_2 = testhdf5$(EXEEXT) lheap$(EXEEXT) ohdr$(EXEEXT) \
-	stab$(EXEEXT) gheap$(EXEEXT) cache$(EXEEXT) hyperslab$(EXEEXT) \
+	stab$(EXEEXT) gheap$(EXEEXT) cache$(EXEEXT) btree2$(EXEEXT) \
+	blocktrack$(EXEEXT) sheap$(EXEEXT) hyperslab$(EXEEXT) \
 	istore$(EXEEXT) bittests$(EXEEXT) dtypes$(EXEEXT) \
 	dsets$(EXEEXT) cmpd_dset$(EXEEXT) extend$(EXEEXT) \
 	external$(EXEEXT) links$(EXEEXT) unlink$(EXEEXT) big$(EXEEXT) \
@@ -83,7 +84,7 @@ am__EXEEXT_2 = testhdf5$(EXEEXT) lheap$(EXEEXT) ohdr$(EXEEXT) \
 	ttsafe$(EXEEXT) stream_test$(EXEEXT) getname$(EXEEXT) \
 	file_handle$(EXEEXT) ntypes$(EXEEXT) dangle$(EXEEXT) \
 	dtransform$(EXEEXT) filename$(EXEEXT) reserved$(EXEEXT) \
-	btree2$(EXEEXT) blocktrack$(EXEEXT) $(am__EXEEXT_1)
+	$(am__EXEEXT_1)
 big_SOURCES = big.c
 big_OBJECTS = big.$(OBJEXT)
 big_LDADD = $(LDADD)
@@ -212,6 +213,10 @@ 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)
 srb_append_SOURCES = srb_append.c
 srb_append_OBJECTS = srb_append.$(OBJEXT)
 srb_append_LDADD = $(LDADD)
@@ -272,7 +277,7 @@ SOURCES = $(libh5test_la_SOURCES) big.c bittests.c blocktrack.c \
 	dtypes.c enum.c err_compat.c error_test.c extend.c external.c \
 	file_handle.c filename.c fillval.c flush1.c flush2.c getname.c \
 	gheap.c hyperslab.c istore.c lheap.c links.c mount.c mtime.c \
-	ntypes.c ohdr.c reserved.c set_extent.c srb_append.c \
+	ntypes.c ohdr.c reserved.c set_extent.c sheap.c srb_append.c \
 	srb_read.c srb_write.c stab.c stream_test.c \
 	$(testhdf5_SOURCES) testmeta.c $(ttsafe_SOURCES) unlink.c
 DIST_SOURCES = $(libh5test_la_SOURCES) big.c bittests.c blocktrack.c \
@@ -280,7 +285,7 @@ DIST_SOURCES = $(libh5test_la_SOURCES) big.c bittests.c blocktrack.c \
 	dtypes.c enum.c err_compat.c error_test.c extend.c external.c \
 	file_handle.c filename.c fillval.c flush1.c flush2.c getname.c \
 	gheap.c hyperslab.c istore.c lheap.c links.c mount.c mtime.c \
-	ntypes.c ohdr.c reserved.c set_extent.c srb_append.c \
+	ntypes.c ohdr.c reserved.c set_extent.c sheap.c srb_append.c \
 	srb_read.c srb_write.c stab.c stream_test.c \
 	$(testhdf5_SOURCES) testmeta.c $(ttsafe_SOURCES) unlink.c
 ETAGS = etags
@@ -492,12 +497,13 @@ check_SCRIPTS = $(TEST_SCRIPT)
 
 # These are our main targets. They should be listed in the order to be
 # executed, generally most specific tests to least specific tests.
-TEST_PROG = testhdf5 lheap ohdr stab gheap cache hyperslab istore bittests     \
+TEST_PROG = testhdf5 lheap ohdr stab gheap cache btree2 blocktrack sheap \
+           hyperslab istore bittests \
            dtypes dsets cmpd_dset extend external links unlink big mtime     \
            fillval mount flush1 flush2 enum \
-           set_extent ttsafe stream_test       \
+           set_extent ttsafe stream_test \
            getname file_handle ntypes dangle dtransform filename reserved    \
-           btree2 blocktrack $(SRB_TESTS)
+           $(SRB_TESTS)
 
 
 # The libh5test.a library provides common support code for the tests.
@@ -536,7 +542,7 @@ MOSTLYCLEANFILES = cmpd_dset.h5 compact_dataset.h5 dataset.h5 extend.h5 istore.h
             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
+            unlink_chunked.h5 btree2.h5 blocktrack.h5 sheap.h5
 
 
 # Sources for testhdf5 executable
@@ -704,6 +710,9 @@ 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)
 srb_append$(EXEEXT): $(srb_append_OBJECTS) $(srb_append_DEPENDENCIES) 
 	@rm -f srb_append$(EXEEXT)
 	$(LINK) $(srb_append_LDFLAGS) $(srb_append_OBJECTS) $(srb_append_LDADD) $(LIBS)
@@ -771,6 +780,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ohdr.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)/srb_append.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/srb_read.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/srb_write.Po@am__quote@