[svn-r136] ./MANIFEST

./src/Makefile.in
	Added H5Ffamily.c and H5Fsplit.c

./src/H5B.c
./src/H5Bprivate.h
./src/H5Gnode.c
	Added `const' to sublass arguments.

./src/H5F.c
./src/H5Flow.c
./src/H5Fsec2.c
	Make sure file buffers get flushed during a call to
	H5Fflush().  Check for overflow in address encoding and decoding.

./src/H5Ffam.c
./src/H5Fprivate.c
./test/istore.c
	Implementation of file families so 32-bit machines can access
	64-bit files.

./src/H5Oprivate.h
	Removed H5O_NO_ADDR constant.

./config/freebsd2.2.1
./config/linux
	Added -DH5G_DEBUG and -DH5F_DEBUG to the list of debugging flags.

./html/H5.format.html
	Changed some <offset>-sized things to <length>-sized things.

./src/H5AC.c
./src/H5ACprivate.h
./src/H5B.c
./src/H5Bprivate.h
./src/H5C.c
./src/H5D.c
./src/H5F.c
./src/H5Fcore.c
./src/H5Fistore.c
./src/H5Flow.c
./src/H5Fprivate.h
./src/H5Fsec2.c
./src/H5Fstdio.c
./src/H5G.c
./src/H5Gent.c
./src/H5Gnode.c
./src/H5Gpkg.h
./src/H5Gprivate.h
./src/H5Gshad.c
./src/H5Gstab.c
./src/H5H.c
./src/H5Hprivate.h
./src/H5MF.c
./src/H5MFprivate.h
./src/H5O.c
./src/H5Ocont.c
./src/H5Oistore.c
./src/H5Oprivate.h
./src/H5Ostab.c
./src/H5Ostdst.c
./src/H5pivate.h
./src/debug.c
./test/istore.c
./test/theap.c
./test/tohdr.c
./test/tstab.c
	Lots of changes caused by generalizing addresses.  The haddr_t
	is now a struct, so you can no longer perform arithmetic on
	it. But since it's small, simple, and often used, storage is
	allocated like with an integer.  But we always pass them
	around by reference.  That is, when using an address in
	another struct, allocate space:

		struct my_struct {
		   char *name;
		   haddr_t address;
                } x;

	But when passing it to a function, pass by reference:

		H5F_addr_print (stderr, &(x.address));

	Addresses should be initialized with

		H5F_addr_undef (&(x.address));

	Functions for operating on addresses are in H5Flow.c and begin
	with H5F_addr_...  Functions never return haddr_t or haddr_t*;
	they always pass them through arguments instead. A function
	that returns an address through an argument does so with its
	last argument and it is marked with `/*out*/'.  Calls to such
	functions also mark output-only arguments with `/*out*/'

./src/H5Fsplit.c       (new)
	A two-member family where all meta data goes in the first
	member and all raw data goes in the second member.

./src/H5B.c
./src/H5D.c
./src/H5F.c
./src/H5Ffamily.c
./src/H5Fistore.c
./src/H5Flow.c
./src/H5Fprivate.h
./src/H5Fsec2.c
./src/H5Fstdio.c
./src/H5Gnode.c
./src/H5H.c
./src/H5MF.c
./src/H5MFprivate.h
./src/H5O.c
	Differentiate between meta data storage and raw data
	storage. Provide a mechanism so that the file driver can
	extend the file to allocate more memory.

./src/H5E.c
./src/H5Epublic.c
	Added the error H5E_TRUNCATED to be reported when the file is
	shorter than the length recorded in the boot block.

./src/H5F.c
	Added H5F_locate_signature() so we only do it in one place
	now.

./INSTALL
./INSTALL_MAINT
	Just a couple clarifications.

./html/ExternalFiles.html
./html/storage.html
	Documents how external files work.

./test/hyperslab.c
./test/istore.c
	Fixed printf's on 64-bit machines.

./test/istore.c
	Added ifdef's to test the split file driver.

1 files changed, 37 insertions, 85 deletions

diff --git a/src/H5Fcore.c b/src/H5Fcore.c
index b28a12a..d520cc1 100644
--- a/src/H5Fcore.c
+++ b/src/H5Fcore.c
@@ -28,13 +28,10 @@ static hbool_t interface_initialize_g = FALSE;
 static hbool_t H5F_core_access (const char *name, int mode, H5F_search_t *key);
 static H5F_low_t *H5F_core_open (const char *name, uintn flags, H5F_search_t*);
 static herr_t H5F_core_close (H5F_low_t *lf);
-static herr_t H5F_core_read (H5F_low_t *lf, haddr_t addr, size_t size,
+static herr_t H5F_core_read (H5F_low_t *lf, const haddr_t *addr, size_t size,
 			     uint8 *buf);
-static herr_t H5F_core_write (H5F_low_t *lf, haddr_t addr, size_t size,
+static herr_t H5F_core_write (H5F_low_t *lf, const haddr_t *addr, size_t size,
 			      const uint8 *buf);
-static herr_t H5F_core_flush (H5F_low_t *lf);
-static size_t H5F_core_size (H5F_low_t *lf);
-
 
 const H5F_low_class_t H5F_LOW_CORE[1] = {{
    H5F_core_access, 		/* access method			*/
@@ -42,8 +39,8 @@ const H5F_low_class_t H5F_LOW_CORE[1] = {{
    H5F_core_close, 		/* close method				*/
    H5F_core_read,		/* read method				*/
    H5F_core_write, 		/* write method				*/
-   H5F_core_flush, 		/* flush method				*/
-   H5F_core_size, 		/* file size method			*/
+   NULL, 			/* flush method				*/
+   NULL, 			/* extend method			*/
 }};
 
 
@@ -53,7 +50,7 @@ const H5F_low_class_t H5F_LOW_CORE[1] = {{
  * Purpose:	Determines if the specified file already exists.  This driver
  *		doesn't use names, so every call to H5F_core_open() would
  *		create a new file.  Therefore, this function always returns
- *		false.
+ *		false and KEY is never initialized.
  *
  * Return:	Success:	FALSE
  *
@@ -67,7 +64,7 @@ const H5F_low_class_t H5F_LOW_CORE[1] = {{
  *-------------------------------------------------------------------------
  */
 static hbool_t
-H5F_core_access (const char *name, int mode, H5F_search_t *key)
+H5F_core_access (const char *name, int mode, H5F_search_t *key/*out*/)
 {
    FUNC_ENTER (H5F_core_access, NULL, FAIL);
    FUNC_LEAVE (FALSE);
@@ -112,6 +109,7 @@ H5F_core_open (const char *name, uintn flags, H5F_search_t *key)
    lf->u.core.mem = H5MM_xmalloc (H5F_CORE_INC);
    lf->u.core.alloc = H5F_CORE_INC;
    lf->u.core.size = 0;
+   H5F_addr_reset (&(lf->eof));
 
    if (key) {
       key->dev = H5F_CORE_DEV;
@@ -121,7 +119,6 @@ H5F_core_open (const char *name, uintn flags, H5F_search_t *key)
    FUNC_LEAVE (lf);
 }
 
-
 
 /*-------------------------------------------------------------------------
  * Function:	H5F_core_close
@@ -158,8 +155,8 @@ H5F_core_close (H5F_low_t *lf)
  * Function:	H5F_core_read
  *
  * Purpose:	Reads SIZE bytes beginning at address ADDR in file LF and
- *		places them in buffer BUF.  Reading past the end of the
- *		file returns zeros instead of failing.
+ *		places them in buffer BUF.  Reading past the logical or
+ *		physical end of the file returns zeros instead of failing.
  *
  * Errors:
  *
@@ -175,17 +172,24 @@ H5F_core_close (H5F_low_t *lf)
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5F_core_read (H5F_low_t *lf, haddr_t addr, size_t size, uint8 *buf)
+H5F_core_read (H5F_low_t *lf, const haddr_t *addr, size_t size, uint8 *buf)
 {
    size_t	n;
+   size_t	eof;
    
    FUNC_ENTER (H5F_core_read, NULL, FAIL);
 
-   if (addr>=lf->u.core.size) {
+   assert (lf);
+   assert (addr && H5F_addr_defined (addr));
+   assert (buf);
+
+   eof = MIN (lf->eof.offset, lf->u.core.size);
+
+   if (addr->offset>=eof) {
       HDmemset (buf, 0, size);
    } else {
-      n = MIN (size, lf->u.core.size - addr);
-      HDmemcpy (buf, lf->u.core.mem + addr, n);
+      n = MIN (size, eof - addr->offset);
+      HDmemcpy (buf, lf->u.core.mem + addr->offset, n);
       HDmemset (buf+n, 0, size-n);
    }
    
@@ -198,7 +202,8 @@ H5F_core_read (H5F_low_t *lf, haddr_t addr, size_t size, uint8 *buf)
  * Function:	H5F_core_write
  *
  * Purpose:	Writes SIZE bytes from the beginning of BUF into file LF at
- *		file address ADDR.
+ *		file address ADDR.  The file is extended as necessary to
+ *		accommodate the new data.
  *
  * Errors:
  *
@@ -214,84 +219,31 @@ H5F_core_read (H5F_low_t *lf, haddr_t addr, size_t size, uint8 *buf)
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5F_core_write (H5F_low_t *lf, haddr_t addr, size_t size, const uint8 *buf)
+H5F_core_write (H5F_low_t *lf, const haddr_t *addr, size_t size,
+		const uint8 *buf)
 {
+   size_t	inc_amount;
+   
    FUNC_ENTER (H5F_core_write, NULL, FAIL);
 
+   assert (lf);
+   assert (addr && H5F_addr_defined (addr));
+   assert (buf);
+
    /* Allocate more space */
-   if (addr+size>lf->u.core.alloc) {
-      lf->u.core.alloc = lf->u.core.alloc + MAX (addr+size-lf->u.core.alloc,
-						 H5F_CORE_INC);
+   if (addr->offset+size>lf->u.core.alloc) {
+      inc_amount = MAX (addr->offset+size-lf->u.core.alloc, H5F_CORE_INC);
+      lf->u.core.alloc = lf->u.core.alloc + inc_amount;
       lf->u.core.mem = H5MM_xrealloc (lf->u.core.mem, lf->u.core.alloc);
    }
 
-   /* Move EOF marker */
-   if (addr+size>lf->u.core.size) {
-      lf->u.core.size = addr + size;
+   /* Move the physical EOF marker */
+   if (addr->offset+size>lf->u.core.size) {
+      lf->u.core.size = addr->offset + size;
    }
 
    /* Copy data */
-   HDmemcpy (lf->u.core.mem+addr, buf, size);
+   HDmemcpy (lf->u.core.mem+addr->offset, buf, size);
 
    FUNC_LEAVE (SUCCEED);
 }
-
-
-
-/*-------------------------------------------------------------------------
- * Function:	H5F_core_flush
- *
- * Purpose:	Makes sure that all data is flushed.  This doesn't apply to
- *		this driver.
- *
- * Errors:
- *
- * Return:	Success:	SUCCEED
- *
- *		Failure:	FAIL
- *
- * Programmer:	Robb Matzke
- *              Wednesday, October 22, 1997
- *
- * Modifications:
- *
- *-------------------------------------------------------------------------
- */
-static herr_t
-H5F_core_flush (H5F_low_t *lf)
-{
-   FUNC_ENTER (H5F_core_flush, NULL, FAIL);
-
-   /* Not necessary with this driver */
-
-   FUNC_LEAVE (SUCCEED);
-}
-
-
-/*-------------------------------------------------------------------------
- * Function:	H5F_core_size
- *
- * Purpose:	Returns the current size of the file in bytes.
- *
- * Bugs:	There is no way to determine if this function failed.
- *
- * Errors:
- *
- * Return:	Success:	Size of file in bytes
- *
- *		Failure:	0
- *
- * Programmer:	Robb Matzke
- *              Wednesday, October 22, 1997
- *
- * Modifications:
- *
- *-------------------------------------------------------------------------
- */
-static size_t
-H5F_core_size (H5F_low_t *lf)
-{
-   FUNC_ENTER (H5F_core_size, NULL, 0);
-
-   FUNC_LEAVE (lf->u.core.size);
-}