summaryrefslogtreecommitdiffstats
path: root/src/H5P.c
diff options
context:
space:
mode:
authorRobb Matzke <matzke@llnl.gov>1998-04-09 20:22:11 (GMT)
committerRobb Matzke <matzke@llnl.gov>1998-04-09 20:22:11 (GMT)
commitc96611f8b54caf83b386e78ebb398d3a69be752a (patch)
tree55a6e8e66c4e099dec84bb52eca725b9bae00d27 /src/H5P.c
parentc01750fa740943c0083711b353278143c79d50a3 (diff)
downloadhdf5-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 'src/H5P.c')
-rw-r--r--src/H5P.c11
1 files changed, 8 insertions, 3 deletions
diff --git a/src/H5P.c b/src/H5P.c
index 6e67b4f..25f9f31 100644
--- a/src/H5P.c
+++ b/src/H5P.c
@@ -1576,7 +1576,10 @@ H5Pget_split (hid_t tid, size_t meta_ext_size, char *meta_ext/*out*/,
* Function: H5Pset_family
*
* Purpose: Sets the low-level driver to stripe the hdf5 address space
- * across a family of files.
+ * across a family of files. The OFFSET_BITS argument indicates
+ * how many of the low-order bits of an address will be used for
+ * the offset within the file, and is only meaningful when
+ * creating new files.
*
* Return: Success: SUCCEED
*
@@ -1590,7 +1593,7 @@ H5Pget_split (hid_t tid, size_t meta_ext_size, char *meta_ext/*out*/,
*-------------------------------------------------------------------------
*/
herr_t
-H5Pset_family (hid_t tid, hid_t memb_tid)
+H5Pset_family (hid_t tid, size_t offset_bits, hid_t memb_tid)
{
H5F_access_t *tmpl = NULL;
@@ -1613,6 +1616,7 @@ H5Pset_family (hid_t tid, hid_t memb_tid)
/* Set driver */
tmpl->driver = H5F_LOW_FAMILY;
+ tmpl->u.fam.offset_bits = offset_bits;
tmpl->u.fam.memb_access = H5P_copy (H5P_FILE_ACCESS, memb_tmpl);
FUNC_LEAVE (SUCCEED);
@@ -1645,7 +1649,7 @@ H5Pset_family (hid_t tid, hid_t memb_tid)
*-------------------------------------------------------------------------
*/
herr_t
-H5Pget_family (hid_t tid, hid_t *memb_tid)
+H5Pget_family (hid_t tid, size_t *offset_bits/*out*/, hid_t *memb_tid/*out*/)
{
H5F_access_t *tmpl = NULL;
@@ -1670,6 +1674,7 @@ H5Pget_family (hid_t tid, hid_t *memb_tid)
} else if (memb_tid) {
*memb_tid = FAIL;
}
+ if (offset_bits) *offset_bits = tmpl->u.fam.offset_bits;
FUNC_LEAVE (SUCCEED);
}