diff options
author | Robb Matzke <matzke@llnl.gov> | 1998-09-30 18:50:49 (GMT) |
---|---|---|
committer | Robb Matzke <matzke@llnl.gov> | 1998-09-30 18:50:49 (GMT) |
commit | beab7f66e5dd260732fad34b9c26ccb0d8d580a5 (patch) | |
tree | d4513e30c4d6b722d466b295e6d009272e937d54 /test | |
parent | 8460a082a4e1fc9ea9be15cfb6bbdd866ebf9f4b (diff) | |
download | hdf5-beab7f66e5dd260732fad34b9c26ccb0d8d580a5.zip hdf5-beab7f66e5dd260732fad34b9c26ccb0d8d580a5.tar.gz hdf5-beab7f66e5dd260732fad34b9c26ccb0d8d580a5.tar.bz2 |
[svn-r730] Changes since 19980928
----------------------
./MANIFEST
Changed freebsd2.2.1 to freebsd2.2.7 to match change in file name.
Added a few missing files. Are all of these supposed to be
distributed?
./tools/testfiles/h5dumptst.c
+ ./tools/testfiles/tall-1.ddl
+ ./tools/testfiles/tall-2.ddl
+ ./tools/testfiles/tall-3.ddl
./tools/testfiles/tall.ddl
./tools/testfiles/tall.h5
+ ./tools/testfiles/tattr-1.ddl
+ ./tools/testfiles/tattr-2.ddl
+ ./tools/testfiles/tattr-3.ddl
+ ./tools/testfiles/tattr-4.ddl
./tools/testfiles/tattr.ddl
./tools/testfiles/tattr.h5
+ ./tools/testfiles/tdset-1.ddl
+ ./tools/testfiles/tdset-2.ddl
+ ./tools/testfiles/tdset-3.ddl
+ ./tools/testfiles/tdset-4.ddl
./tools/testfiles/tdset.ddl
./tools/testfiles/tdset.h5
+ ./tools/testfiles/tgroup-1.ddl
+ ./tools/testfiles/tgroup-2.ddl
+ ./tools/testfiles/tgroup-3.ddl
./tools/testfiles/tgroup.ddl
./tools/testfiles/tgroup.h5
+ ./tools/testfiles/tslink-1.ddl
+ ./tools/testfiles/tslink-2.ddl
./tools/testfiles/tslink.ddl
./tools/testfiles/tslink.h5
./src/H5B.c
./src/H5Bprivate.h
./src/H5D.c
./src/H5Dprivate.h
./src/H5Farray.c
./src/H5Fistore.c
./src/H5Fprivate.h
./src/H5Gstab.c
./src/H5P.c
./src/H5Ppublic.h
./src/H5Sall.c
./src/H5Shyper.c
./src/H5Spoint.c
./src/H5Sprivate.h
./test/istore.c
Implemented split ratios as documented in previous
e-mails. Frank, the new API functions are H5Pget_btree_ratios()
and H5Pset_btree_ratios().
./src/H5Sall.c
./src/H5Shyper.c
./src/H5Spoint.c
./src/H5Sprivate.h
Added more type checking for the data transfer property list
passed to these functions.
./src/H5D.c
Added a dataset transfer property list as an argument to
H5D_allocate() for the parallel version in order to pass split
ratios down to H5F_istore_lock(). Eventually we won't need
the split ratios for H5D_allocate() because we'll build a
completely full B-tree from the leaves up, but it might be
useful to have other transfer properties at that level
anyway. I always caled H5D_allocate() with &H5D_dflt_xfer.
./MANIFEST
./test/Makefile.in
./test/overhead.c [NEW]
Added an `overhead' test run by `make timings'.
Diffstat (limited to 'test')
-rw-r--r-- | test/Makefile.in | 9 | ||||
-rw-r--r-- | test/istore.c | 17 |
2 files changed, 15 insertions, 11 deletions
diff --git a/test/Makefile.in b/test/Makefile.in index 1fe8030..fc671a4 100644 --- a/test/Makefile.in +++ b/test/Makefile.in @@ -13,7 +13,7 @@ CPPFLAGS=-I. -I../src @CPPFLAGS@ # executed, generally most specific tests to least specific tests. TESTS=testhdf5 gheap hyperslab istore bittests dtypes dsets cmpd_dset extend \ external shtype links unlink big mtime -TIMINGS=iopipe chunk ragged +TIMINGS=iopipe chunk ragged overhead # Temporary files MOSTLYCLEAN=cmpd_dset.h5 dataset.h5 extend.h5 istore.h5 tfile1.h5 tfile2.h5 \ @@ -24,7 +24,7 @@ MOSTLYCLEAN=cmpd_dset.h5 dataset.h5 extend.h5 istore.h5 tfile1.h5 tfile2.h5 \ gheap1.h5 gheap2.h5 gheap3.h5 gheap4.h5 shtype0.h5 shtype1.h5 \ shtype2a.h5 shtype2b.h5 shtype3.h5 links.h5 chunk.h5 big.data \ big[0-9][0-9][0-9][0-9][0-9].h5 dtypes1.h5 dtypes2.h5 tattr.h5 \ - tselect.h5 mtime.h5 ragged.h5 grptime.h5 unlink.h5 + tselect.h5 mtime.h5 ragged.h5 grptime.h5 unlink.h5 overhead.h5 CLEAN=$(TIMINGS) # Source and object files for programs... The TEST_SRC list contains all the @@ -34,7 +34,7 @@ CLEAN=$(TIMINGS) TEST_SRC=testhdf5.c tattr.c tfile.c theap.c tmeta.c tohdr.c tselect.c tstab.c \ th5s.c dtypes.c hyperslab.c istore.c dsets.c cmpd_dset.c extend.c \ external.c iopipe.c gheap.c shtype.c big.c links.c chunk.c bittests.c \ - mtime.c ragged.c unlink.c + mtime.c ragged.c unlink.c overhead.c TEST_OBJ=$(TEST_SRC:.c=.o) # Private header files (not to be installed)... @@ -109,4 +109,7 @@ ragged: ragged.o ../src/libhdf5.a unlink: unlink.o ../src/libhdf5.a $(CC) $(CFLAGS) -o $@ unlink.o ../src/libhdf5.a $(LIBS) +overhead: overhead.o ../src/libhdf5.a + $(CC) $(CFLAGS) -o $@ overhead.o ../src/libhdf5.a $(LIBS) + @CONCLUDE@ diff --git a/test/istore.c b/test/istore.c index 5af8075..7e3ef1d 100644 --- a/test/istore.c +++ b/test/istore.c @@ -8,6 +8,7 @@ * Purpose: Tests various aspects of indexed raw data storage. */ #include <H5private.h> +#include <H5Dprivate.h> #include <H5Iprivate.h> #include <H5Pprivate.h> #include <H5Fprivate.h> @@ -318,8 +319,8 @@ test_extend(H5F_t *f, const char *prefix, memset(buf, (signed)(128+ctr), (size_t)nelmts); /* Write to disk */ - if (H5F_arr_write(f, &layout, NULL, NULL, size, size, zero, offset, - H5D_XFER_DFLT, buf)<0) { + if (H5F_arr_write(f, &H5D_xfer_dflt, &layout, NULL, NULL, size, size, + zero, offset, buf)<0) { puts("*FAILED*"); if (!isatty(1)) { AT(); @@ -329,8 +330,8 @@ test_extend(H5F_t *f, const char *prefix, } /* Read from disk */ memset(check, 0xff, (size_t)nelmts); - if (H5F_arr_read(f, &layout, NULL, NULL, size, size, zero, offset, - H5D_XFER_DFLT, check)<0) { + if (H5F_arr_read(f, &H5D_xfer_dflt, &layout, NULL, NULL, size, size, + zero, offset, check)<0) { puts("*FAILED*"); if (!isatty(1)) { AT(); @@ -365,8 +366,8 @@ test_extend(H5F_t *f, const char *prefix, /* Now read the entire array back out and check it */ memset(buf, 0xff, nx * ny * nz); - if (H5F_arr_read(f, &layout, NULL, NULL, whole_size, whole_size, zero, - zero, H5D_XFER_DFLT, buf)<0) { + if (H5F_arr_read(f, &H5D_xfer_dflt, &layout, NULL, NULL, whole_size, + whole_size, zero, zero, buf)<0) { puts("*FAILED*"); if (!isatty(1)) { AT(); @@ -489,8 +490,8 @@ test_sparse(H5F_t *f, const char *prefix, size_t nblocks, memset(buf, (signed)(128+ctr), nx * ny * nz); /* write to disk */ - if (H5F_arr_write(f, &layout, NULL, NULL, size, size, zero, offset, - H5D_XFER_DFLT, buf)<0) { + if (H5F_arr_write(f, &H5D_xfer_dflt, &layout, NULL, NULL, size, size, + zero, offset, buf)<0) { puts("*FAILED*"); if (!isatty(1)) { AT(); |