diff options
author | Robb Matzke <matzke@llnl.gov> | 1998-04-09 20:22:11 (GMT) |
---|---|---|
committer | Robb Matzke <matzke@llnl.gov> | 1998-04-09 20:22:11 (GMT) |
commit | c96611f8b54caf83b386e78ebb398d3a69be752a (patch) | |
tree | 55a6e8e66c4e099dec84bb52eca725b9bae00d27 /test | |
parent | c01750fa740943c0083711b353278143c79d50a3 (diff) | |
download | hdf5-c96611f8b54caf83b386e78ebb398d3a69be752a.zip hdf5-c96611f8b54caf83b386e78ebb398d3a69be752a.tar.gz hdf5-c96611f8b54caf83b386e78ebb398d3a69be752a.tar.bz2 |
[svn-r339] Changes since 19980408
----------------------
./src/H5Osdspace.c
./html/H5.format.html
In the past we were allowed to have >2GB files on a 32-bit
machine as long as no dataset within the file was larger than
4GB (or whatever sizeof(size_t) is). That's been fixed now.
All dataset size calculations are done with `hsize_t' which is
normally defined as `unsigned long long'.
./src/H5F.c
./src/H5Ffamily.c
./src/H5Fprivate.h
./src/H5P.c
./src/H5Ppublic.h
The file family member size can now be set/queried. The
default is still 64MB, but it can be set to 1GB by saying:
H5Pset_family (plist, 30, H5P_DEFAULT);
When opening an existing file family the specified
bits-per-member is ignored and the first member of the family
determines the bits-per-member, which can be retrieved with
H5Pget_family().
./acconfig.h
./configure.in
./src/H5config.h
./src/H5public.h
Added `--disable-hsizet' so that those with old GCC compilers
(<2.8.1) can still compile the code.
./src/H5.c
./src/H5private.h
Added HDfprintf() which works just like fprintf() except you
can give `H' as a size modifier for the integer conversions
and supply an `hsize_t' or `hssize_t' argument without casting
it. For instance:
hsize_t npoints = H5Sget_npoints(space);
HDfprintf(stdout,"Dataset has %Hd (%#018Hx) points\n",
npoints, npoints);
You can now give `%a' as a format to print an address, but all
formating flags are ignored and it causes the return value of
HDfprintf() to not include the characters in the address (but
who uses the return value anyway :-). Example:
H5G_t *grp;
HDfprintf(stdout, "Group object header at %a\n",
&(grp->ent.header));
Added HDstrtoll() which works exactly like [HD]strtol() except
the result is an int64.
./src/debug.c
Large addresses can now be entered from the command-line. Use
either decimal, octal (leading `0') or hexadecimal (leading
`0x') when giving the address.
./src/h5ls.c
The printf format for dataset dimensions was changed to `%Hu'
to support large datasets.
./test/big.c [NEW]
A test for big datasets on 32-bit machines. This test is not
run by default. Don't try to run it on an nfs-mounted file
system or other file system that doesn't support holes because
it creates two 32GB datasets of all zero.
Diffstat (limited to 'test')
-rw-r--r-- | test/.distdep | 81 | ||||
-rw-r--r-- | test/Makefile.in | 10 | ||||
-rw-r--r-- | test/big.c | 63 |
3 files changed, 121 insertions, 33 deletions
diff --git a/test/.distdep b/test/.distdep index 45b0ac7..409acbb 100644 --- a/test/.distdep +++ b/test/.distdep @@ -148,6 +148,13 @@ dtypes.o: \ ../src/H5private.h \ ../src/H5Tprivate.h \ ../src/H5Gprivate.h +hyperslab.o: \ + hyperslab.c \ + ../src/H5private.h \ + ../src/H5public.h \ + ../src/H5config.h \ + ../src/H5MMprivate.h \ + ../src/H5MMpublic.h istore.o: \ istore.c \ ../src/H5private.h \ @@ -193,6 +200,26 @@ dsets.o: \ ../src/H5Ppublic.h \ ../src/H5Spublic.h \ ../src/H5Tpublic.h +cmpd_dset.o: \ + cmpd_dset.c \ + ../src/hdf5.h \ + ../src/H5public.h \ + ../src/H5config.h \ + ../src/H5ACpublic.h \ + ../src/H5Bpublic.h \ + ../src/H5Dpublic.h \ + ../src/H5Ipublic.h \ + ../src/H5Epublic.h \ + ../src/H5Fpublic.h \ + ../src/H5Gpublic.h \ + ../src/H5HGpublic.h \ + ../src/H5HLpublic.h \ + ../src/H5MFpublic.h \ + ../src/H5MMpublic.h \ + ../src/H5Opublic.h \ + ../src/H5Ppublic.h \ + ../src/H5Spublic.h \ + ../src/H5Tpublic.h extend.o: \ extend.c \ ../src/hdf5.h \ @@ -212,6 +239,26 @@ extend.o: \ ../src/H5Opublic.h \ ../src/H5Ppublic.h \ ../src/H5Spublic.h +external.o: \ + external.c \ + ../src/hdf5.h \ + ../src/H5public.h \ + ../src/H5config.h \ + ../src/H5ACpublic.h \ + ../src/H5Bpublic.h \ + ../src/H5Dpublic.h \ + ../src/H5Ipublic.h \ + ../src/H5Epublic.h \ + ../src/H5Fpublic.h \ + ../src/H5Gpublic.h \ + ../src/H5HGpublic.h \ + ../src/H5HLpublic.h \ + ../src/H5MFpublic.h \ + ../src/H5MMpublic.h \ + ../src/H5Opublic.h \ + ../src/H5Ppublic.h \ + ../src/H5Spublic.h \ + ../src/H5Tpublic.h iopipe.o: \ iopipe.c \ ../src/hdf5.h \ @@ -267,15 +314,8 @@ shtype.o: \ ../src/H5Opublic.h \ ../src/H5Ppublic.h \ ../src/H5Spublic.h -hyperslab.o: \ - hyperslab.c \ - ../src/H5private.h \ - ../src/H5public.h \ - ../src/H5config.h \ - ../src/H5MMprivate.h \ - ../src/H5MMpublic.h -external.o: \ - external.c \ +big.o: \ + big.c \ ../src/hdf5.h \ ../src/H5public.h \ ../src/H5config.h \ @@ -292,25 +332,4 @@ external.o: \ ../src/H5MMpublic.h \ ../src/H5Opublic.h \ ../src/H5Ppublic.h \ - ../src/H5Spublic.h \ - ../src/H5Tpublic.h -cmpd_dset.o: \ - cmpd_dset.c \ - ../src/hdf5.h \ - ../src/H5public.h \ - ../src/H5config.h \ - ../src/H5ACpublic.h \ - ../src/H5Bpublic.h \ - ../src/H5Dpublic.h \ - ../src/H5Ipublic.h \ - ../src/H5Epublic.h \ - ../src/H5Fpublic.h \ - ../src/H5Gpublic.h \ - ../src/H5HGpublic.h \ - ../src/H5HLpublic.h \ - ../src/H5MFpublic.h \ - ../src/H5MMpublic.h \ - ../src/H5Opublic.h \ - ../src/H5Ppublic.h \ - ../src/H5Spublic.h \ - ../src/H5Tpublic.h + ../src/H5Spublic.h diff --git a/test/Makefile.in b/test/Makefile.in index 10e9135..6ee08ad 100644 --- a/test/Makefile.in +++ b/test/Makefile.in @@ -12,7 +12,7 @@ CPPFLAGS=-I. -I../src @CPPFLAGS@ # These are our main targets. They should be listed in the order to be # executed, generally most specific tests to least specific tests. PROGS=testhdf5 gheap hyperslab istore dtypes dsets cmpd_dset extend external \ - shtype iopipe + shtype iopipe big TESTS=testhdf5 gheap hyperslab istore dtypes dsets cmpd_dset extend external \ shtype TIMINGS=iopipe @@ -32,7 +32,7 @@ MOSTLYCLEAN=cmpd_dset.h5 dataset.h5 extend.h5 istore.h5 tfile1.h5 tfile2.h5 \ # overlap with other tests. PROG_SRC=testhdf5.c tfile.c theap.c tmeta.c tohdr.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 + iopipe.c gheap.c shtype.c big.c PROG_OBJ=$(PROG_SRC:.c=.o) TESTHDF5_SRC=testhdf5.c tfile.c theap.c tmeta.c tohdr.c tstab.c th5s.c @@ -71,6 +71,9 @@ SHTYPE_OBJ=$(SHTYPE_SRC:.c=.o) IOPIPE_SRC=iopipe.c IOPIPE_OBJ=$(IOPIPE_SRC:.c=.o) +BIG_SRC=big.c +BIG_OBJ=$(BIG_SRC:.c=.o) + # Private header files (not to be installed)... PRIVATE_HDR=testhdf5.h @@ -121,4 +124,7 @@ iopipe: $(IOPIPE_OBJ) ../src/libhdf5.a grptime: $(GRPTIME_OBJ) ../src/libhdf5.a $(CC) $(CFLAGS) -o $@ $(GRPTIME_OBJ) ../src/libhdf5.a $(LIBS) +big: $(BIG_OBJ) ../src/libhdf5.a + $(CC) $(CFLAGS) -o $@ $(BIG_OBJ) ../src/libhdf5.a $(LIBS) + @CONCLUDE@ diff --git a/test/big.c b/test/big.c new file mode 100644 index 0000000..44d550f --- /dev/null +++ b/test/big.c @@ -0,0 +1,63 @@ +/* + * Copyright (C) 1998 NCSA + * All rights reserved. + * + * Programmer: Robb Matzke <matzke@llnl.gov> + * Wednesday, April 8, 1998 + */ +#include <assert.h> +#include <hdf5.h> + + +/*------------------------------------------------------------------------- + * Function: main + * + * Purpose: Creates a *big* dataset. + * + * Return: Success: + * + * Failure: + * + * Programmer: Robb Matzke + * Wednesday, April 8, 1998 + * + * Modifications: + * + *------------------------------------------------------------------------- + */ +int +main (void) +{ + hsize_t size1[4] = {8, 1024, 1024, 1024}; + hsize_t size2[1] = {8589934592LL}; + hid_t plist, file, space1, space2, dset; + + /* + * Make sure that `hsize_t' is large enough to represent the entire data + * space. + */ + assert (sizeof(hsize_t)>4); + + /* + * We might be on a machine that has 32-bit files, so create an HDF5 file + * which is a family of files. Each member of the family will be 1GB + */ + plist = H5Pcreate (H5P_FILE_ACCESS); + H5Pset_family (plist, 30, H5P_DEFAULT); + file = H5Fcreate ("big%05d.h5", H5F_ACC_TRUNC, H5P_DEFAULT, plist); + + /* Create simple data spaces according to the size specified above. */ + space1 = H5Screate_simple (4, size1, size1); + space2 = H5Screate_simple (1, size2, size2); + + /* Create the datasets */ + dset = H5Dcreate (file, "d1", H5T_NATIVE_INT, space1, H5P_DEFAULT); + H5Dclose (dset); + dset = H5Dcreate (file, "d2", H5T_NATIVE_INT, space2, H5P_DEFAULT); + H5Dclose (dset); + + H5Sclose (space1); + H5Sclose (space2); + H5Fclose (file); + exit (0); +} |