[svn-r290] Changes since 19980206

----------------------

./configure.in
./src/H5Fprivate.h
./src/H5Fsec2.c
	We now detect and use lseek64() on systems that have it (e.g.,
	Irix64) and are able to generate >2GB files on Irix XFS file
	systems (and anything else that supports large files).  This
	change also removed some warning messages from the Irix `-64'
	compiler.

	> $ ls -l istore.h5
	> -rw-r--r--    1 matzke   meshtv   8605436856 Feb 17 14:03 istore.h5

./configure.in
./src/H5Fprivate.h
./src/H5Fstdio.h
	We now detect and use fseek64() on systems that have it (e.g.,
	Irix64) and are able to generate >2GB files on Irix XFS file
	systems (and anything else that supports large files).  This
	change also removed some warning messages from the Iris `-64'
	compiler.

./src/H5E.c
./src/H5Epublic.h
	Added the H5E_OVERFLOW error to signal file address overflow.

./src/H5Fpublic.h
./examples/h5_chunk_read.c
./examples/h5_compound.c
./examples/h5_extend_write.c
./examples/h5_group.c
./examples/h5_read.c
./examples/h5_write.c
./html/Datasets.html
./html/Files.html
./html/H5.api.html
./html/H5.intro.html
./html/H5.sample_code.html
./html/ph5example.c
./html/review1.html
./test/cmpd_dset.c
./test/dsets.c
./test/extend.c
./test/tfile.c
./test/th5p.c
./test/theap.c
./test/tohdr.c
./test/tstab.c
./testpar/phdf5.c
	Renamed file access constants to follow the naming scheme.
	Also changed the base names a little to be more accurate as to
	what they do.  The old names H5ACC_WRITE and H5ACC_OVERWRITE
	will temporarily work.

	     H5ACC_DEFAULT     --> H5F_ACC_RDONLY for H5Fopen()
	     H5ACC_DEFAULT     --> H5F_ACC_EXCL   for H5Fcreate()
	     H5ACC_WRITE       --> H5F_ACC_RDWR
	     H5ACC_OVERWRITE   --> H5F_ACC_TRUNC

	Albert or Kim: The H5ACC_INDEPENDENT and H5ACC_COLLECTIVE
	macros in H5Fpublic.h should be an enum typedef and have names
	more like H5F_MPIO_INDEPENDENT and H5F_MPIO_COLLECTIVE.  Also
	change the access_mode argument of H5Cset_mpio().

	H5Fcreate() and H5Fopen() are more strict now about which
	flags are acceptable for the operation.

./src/H5Fprivate.h
./src/H5F.c
./src/H5C.c
	Changed the file access template to make it more general.  A
	union contains a struct for each type of low-level driver and
	the default template is initialized at run-time.

./src/H5Fpublic.h
./src/H5F.c
	Added H5Fget_access_template() and cleaned up
	H5Fget_create_template().

./src/H5C.c
	The H5Cset_mpi() no longer trashes the file access template
	when an error is detected.  We check for errors and *then*
	update the file access template.

	Added H5C_close() so Albert and Kim have a place to release
	the MPI communicator and info from the file access property
	list.

	Kim or Albert: I notice in H5Cset_mpi() you copy the MPI
	communicator.  Do you need to do something similar in
	H5C_copy()?

./src/H5F.c
	Added more error checking for the file creation and access
	property lists because it used to be possible to make the
	library dump core by swapping the creation and access property
	list ID numbers of H5Fcreate().

./test/istore.c
./test/tfile.c
./test/th5p.c
./test/theap.c
./test/tohdr.c
./test/tstab.c
./testpar/testphdf5.c
	One must pass H5C_DEFAULT as the file creation or access
	property list in order to get the default property list.  It
	is no longer possible to pass zero or any other arbitrary bad
	object ID.

./src/H5Fcore.c
./src/H5Ffamly.c
./src/H5Flow.c
./src/H5Fmpio.c
./src/H5Fsec2.c
./src/H5Fsplit.c
./src/H5Fstdio.c
./src/H5MF.c
	The file access property list is passed to all H5F_low_...()
	functions and to the drivers.

./src/H5Fcore.c
	The block size can be set at run time on a per-file basis
	instead of at compile time across all files. The "5000 items in
	a group test" now takes 1.6 seconds.

./src/H5private.h
	Removed inclusion of mpi.h and mpio.h since they're included
	from H5public.h.

./src/H5Cpublic.h
./src/H5C.c
	Added H5Cset_stdio(), H5Cset_sec2(), H5Cset_core(),
	H5Cset_split(), and H5Cset_family() in addition to the
	H5Cset_mpio() that Kim and Albert already wrote.  We still
	need the H5Cget_driver() and an H5Cget...() counterpart for
	each of those functions.  The split and family drivers still
	need a little work but I'm checking this in anyway.

1 files changed, 57 insertions, 33 deletions

diff --git a/src/H5Fcore.c b/src/H5Fcore.c
index 9069df5..d274422 100644
--- a/src/H5Fcore.c
+++ b/src/H5Fcore.c
@@ -19,32 +19,35 @@
 #include <H5Fprivate.h>
 #include <H5MMprivate.h>
 
-#define H5F_CORE_INC    10240   /*amount by which to grow file            */
 #define H5F_CORE_DEV    0xffff  /*pseudo dev for core until we fix things */
 
 #define PABLO_MASK      H5F_core
 static hbool_t          interface_initialize_g = FALSE;
 #define INTERFACE_INIT NULL
 
-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, const haddr_t *addr, size_t size,
-                                      uint8 *buf);
-static herr_t           H5F_core_write(H5F_low_t *lf, const haddr_t *addr, size_t size,
-                                       const uint8 *buf);
+static hbool_t H5F_core_access(const char *name,
+			       const H5F_access_t *access_parms, int mode,
+			       H5F_search_t *key/*out*/);
+static H5F_low_t *H5F_core_open(const char *name,
+				const H5F_access_t *access_parms, uintn flags,
+				H5F_search_t *key/*out*/);
+static herr_t H5F_core_close(H5F_low_t *lf, const H5F_access_t *access_parms);
+static herr_t H5F_core_read(H5F_low_t *lf, const H5F_access_t *access_parms,
+			    const haddr_t *addr, size_t size, uint8 *buf);
+static herr_t H5F_core_write(H5F_low_t *lf, const H5F_access_t *access_parms,
+			     const haddr_t *addr, size_t size,
+			     const uint8 *buf);
+
+const H5F_low_class_t   H5F_LOW_CORE_g[1] = {{
+    H5F_core_access,        /* access method                        */
+    H5F_core_open,          /* open method                          */
+    H5F_core_close,         /* close method                         */
+    H5F_core_read,          /* read method                          */
+    H5F_core_write,         /* write method                         */
+    NULL,                   /* flush method                         */
+    NULL,                   /* extend method                        */
+}};
 
-const H5F_low_class_t   H5F_LOW_CORE[1] =
-{
-    {
-        H5F_core_access,        /* access method                        */
-        H5F_core_open,          /* open method                          */
-        H5F_core_close,         /* close method                         */
-        H5F_core_read,          /* read method                          */
-        H5F_core_write,         /* write method                         */
-        NULL,                   /* flush method                         */
-        NULL,                   /* extend method                        */
-    }};
 
 /*-------------------------------------------------------------------------
  * Function:    H5F_core_access
@@ -66,11 +69,13 @@ const H5F_low_class_t   H5F_LOW_CORE[1] =
  *-------------------------------------------------------------------------
  */
 static hbool_t
-H5F_core_access(const char *name, int mode, H5F_search_t *key /*out */ )
+H5F_core_access(const char *name, const H5F_access_t *access_parms,
+		int mode, H5F_search_t *key/*out*/)
 {
     FUNC_ENTER(H5F_core_access, FAIL);
     FUNC_LEAVE(FALSE);
 }
+
 
 /*-------------------------------------------------------------------------
  * Function:    H5F_core_open
@@ -93,21 +98,23 @@ H5F_core_access(const char *name, int mode, H5F_search_t *key /*out */ )
  *
  *-------------------------------------------------------------------------
  */
-static H5F_low_t       *
-H5F_core_open(const char *name, uintn flags, H5F_search_t *key)
+static H5F_low_t *
+H5F_core_open(const char *name, const H5F_access_t *access_parms,
+	      uintn flags, H5F_search_t *key/*out*/)
 {
     H5F_low_t              *lf = NULL;
     static ino_t            ino = 0;
 
     FUNC_ENTER(H5F_core_open, NULL);
 
-    if (0 == (flags & H5F_ACC_WRITE) || 0 == (flags & H5F_ACC_CREAT)) {
+    if (0 == (flags & H5F_ACC_RDWR) || 0 == (flags & H5F_ACC_CREAT)) {
         HRETURN_ERROR(H5E_IO, H5E_CANTOPENFILE, NULL,
                       "must creat file with write access");
     }
+    
     lf = H5MM_xcalloc(1, sizeof(H5F_low_t));
-    lf->u.core.mem = H5MM_xmalloc(H5F_CORE_INC);
-    lf->u.core.alloc = H5F_CORE_INC;
+    lf->u.core.mem = NULL;
+    lf->u.core.alloc = 0;
     lf->u.core.size = 0;
     H5F_addr_reset(&(lf->eof));
 
@@ -115,8 +122,10 @@ H5F_core_open(const char *name, uintn flags, H5F_search_t *key)
         key->dev = H5F_CORE_DEV;
         key->ino = ino++;
     }
+    
     FUNC_LEAVE(lf);
 }
+
 
 /*-------------------------------------------------------------------------
  * Function:    H5F_core_close
@@ -137,7 +146,7 @@ H5F_core_open(const char *name, uintn flags, H5F_search_t *key)
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5F_core_close(H5F_low_t *lf)
+H5F_core_close(H5F_low_t *lf, const H5F_access_t *access_parms)
 {
     FUNC_ENTER(H5F_core_close, FAIL);
 
@@ -147,6 +156,7 @@ H5F_core_close(H5F_low_t *lf)
 
     FUNC_LEAVE(SUCCEED);
 }
+
 
 /*-------------------------------------------------------------------------
  * Function:    H5F_core_read
@@ -169,7 +179,8 @@ H5F_core_close(H5F_low_t *lf)
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5F_core_read(H5F_low_t *lf, const haddr_t *addr, size_t size, uint8 *buf)
+H5F_core_read(H5F_low_t *lf, const H5F_access_t *access_parms,
+	      const haddr_t *addr, size_t size, uint8 *buf)
 {
     size_t                  n;
     size_t                  eof;
@@ -192,6 +203,7 @@ H5F_core_read(H5F_low_t *lf, const haddr_t *addr, size_t size, uint8 *buf)
 
     FUNC_LEAVE(SUCCEED);
 }
+
 
 /*-------------------------------------------------------------------------
  * Function:    H5F_core_write
@@ -214,27 +226,39 @@ 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, const haddr_t *addr, size_t size,
-               const uint8 *buf)
+H5F_core_write(H5F_low_t *lf, const H5F_access_t *access_parms,
+	       const haddr_t *addr, size_t size, const uint8 *buf)
 {
-    size_t                  inc_amount;
+    size_t		need_more;
+    size_t		increment = 1;
+    
 
     FUNC_ENTER(H5F_core_write, FAIL);
 
     assert(lf);
     assert(addr && H5F_addr_defined(addr));
     assert(buf);
+    assert (!access_parms || H5F_LOW_CORE==access_parms->driver);
 
-    /* Allocate more space */
+    /*
+     * Allocate more space.  We always allocate a multiple of the increment
+     * size, which is either defined in the file access property list or
+     * which defaults to one.
+     */
     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;
+	if (access_parms) increment = access_parms->u.core.increment;
+	need_more = addr->offset+size - lf->u.core.alloc;
+	need_more = increment*((need_more+increment-1)/increment);
+
+        lf->u.core.alloc = lf->u.core.alloc + need_more;
         lf->u.core.mem = H5MM_xrealloc(lf->u.core.mem, lf->u.core.alloc);
     }
+    
     /* 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->offset, buf, size);