[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, 76 insertions, 36 deletions

diff --git a/src/H5Fmpio.c b/src/H5Fmpio.c
index 4c24621..c36500e 100644
--- a/src/H5Fmpio.c
+++ b/src/H5Fmpio.c
@@ -15,15 +15,16 @@
  *		  and to infer the access flags.  If the file is opened,
  *		  we close it without reading or writing it.
  *		- It is not possible within MPI-IO to determine whether or not
- *		  the names "file1" and "file2" refer to the same physical fileC
+ *		  the names "file1" and "file2" refer to the same physical file
  *		  (at least not without writing one and reading the other).
  *		  So we do what H5F_core_open() does: return a bogus device
  *		  number and a unique inode number.
  *		  This has the side effect that calling H5Fopen() twice
  *		  with the same name really does open the file twice
  *		  and the two handles don't communicate with each other,
- *		  resulting in trashing the file.  It also runs the (very small)
- *		  risk of having two unrelated names be seen as the same file.
+ *		  resulting in trashing the file.  It also runs the (very
+ *		  small) risk of having two unrelated names be seen as the
+ *		  same file.
  *
  *	H5F_mpio_open
  *		- should take MPI communicator and MPI info as parameters
@@ -57,32 +58,35 @@ static hbool_t          interface_initialize_g = FALSE;	/* rky??? */
 #define H5F_MPIO_DEV    0xfffe  /*pseudo dev for MPI-IO until we fix things */
 				/* Make sure this differs from H5F_CORE_DEV */
 
-static hbool_t          H5F_mpio_access(const char *name, int mode,
-                                       H5F_search_t *key /*out */ );
-static H5F_low_t       *H5F_mpio_open(const char *name, uintn flags,
-                                       H5F_search_t *key);
-static herr_t           H5F_mpio_close(H5F_low_t *lf);
-static herr_t           H5F_mpio_read(H5F_low_t *lf, const haddr_t *addr,
-				       size_t size, uint8 *buf);
-static herr_t           H5F_mpio_write(H5F_low_t *lf, const haddr_t *addr,
-				       size_t size, const uint8 *buf);
-static herr_t           H5F_mpio_flush(H5F_low_t *lf);
-static herr_t		H5F_MPIOff_to_haddr( MPI_Offset mpi_off, haddr_t *addr);
-static herr_t		H5F_haddr_to_MPIOff( haddr_t addr, MPI_Offset *mpi_off);
-
-const H5F_low_class_t   H5F_LOW_MPIO[1] =
-{
-    {
-        H5F_mpio_access,       /* access method                        */
-        H5F_mpio_open,         /* open method                          */
-        H5F_mpio_close,        /* close method                         */
-        H5F_mpio_read,         /* read method                          */
-        H5F_mpio_write,        /* write method                         */
-        H5F_mpio_flush,        /* flush method                         */
-        NULL                   /* extend method                        */
-    }};
+static hbool_t H5F_mpio_access(const char *name,
+			       const H5F_access_t *access_parms, int mode,
+			       H5F_search_t *key/*out*/);
+static H5F_low_t *H5F_mpio_open(const char *name,
+				const H5F_access_t *access_parms, uintn flags,
+				H5F_search_t *key/*out*/);
+static herr_t H5F_mpio_close(H5F_low_t *lf, const H5F_access_t *access_parms);
+static herr_t H5F_mpio_read(H5F_low_t *lf, const H5F_access_t *access_parms,
+			    const haddr_t *addr, size_t size,
+			    uint8 *buf/*out*/);
+static herr_t H5F_mpio_write(H5F_low_t *lf, const H5F_access_t *access_parms,
+			     const haddr_t *addr, size_t size,
+			     const uint8 *buf);
+static herr_t H5F_mpio_flush(H5F_low_t *lf, const H5F_access_t *access_parms);
+static herr_t H5F_MPIOff_to_haddr(MPI_Offset mpi_off, haddr_t *addr);
+static herr_t H5F_haddr_to_MPIOff(haddr_t addr, MPI_Offset *mpi_off);
+
+const H5F_low_class_t   H5F_LOW_MPIO_g[1] = {{
+    H5F_mpio_access,       /* access method                        */
+    H5F_mpio_open,         /* open method                          */
+    H5F_mpio_close,        /* close method                         */
+    H5F_mpio_read,         /* read method                          */
+    H5F_mpio_write,        /* write method                         */
+    H5F_mpio_flush,        /* flush method                         */
+    NULL                   /* extend method                        */
+}};
 
 ino_t mpio_inode_num = 0;      /* fake "inode" number */
+
 
 /*-------------------------------------------------------------------------
  * Function:    H5F_mpio_access
@@ -121,10 +125,14 @@ ino_t mpio_inode_num = 0;      /* fake "inode" number */
  *
  * Modifications:
  *
+ * 	Robb Matzke, 18 Feb 1998
+ *	Added the ACCESS_PARMS argument.
+ *
  *-------------------------------------------------------------------------
  */
 static hbool_t
-H5F_mpio_access(const char *name, int mode, H5F_search_t *key /*out */ )
+H5F_mpio_access(const char *name, const H5F_access_t *access_parms, int mode,
+		H5F_search_t *key/*out*/)
 {
     hbool_t		   ret_val = FALSE;
     MPI_File		   fh;
@@ -209,10 +217,15 @@ H5F_mpio_access(const char *name, int mode, H5F_search_t *key /*out */ )
  *
  * Modifications:
  *
+ * 	Robb Matzke, 18 Feb 1998
+ *	Added the ACCESS_PARMS argument.  Moved some error checking here from
+ *	elsewhere.
+ *
  *-------------------------------------------------------------------------
  */
-static H5F_low_t       *
-H5F_mpio_open(const char *name, uintn flags, H5F_search_t *key /*out */ )
+static H5F_low_t *
+H5F_mpio_open(const char *name, const H5F_access_t *access_parms, uintn flags,
+	      H5F_search_t *key/*out*/)
 {
     H5F_low_t              *lf = NULL;
     MPI_File                fh;
@@ -226,9 +239,22 @@ H5F_mpio_open(const char *name, uintn flags, H5F_search_t *key /*out */ )
     fprintf(stdout, "Entering H5F_mpio_open name=%s flags=%x\n", name, flags );
 #endif
 
+    switch (access_parms->u.mpio.access_mode){
+    case H5ACC_INDEPENDENT:
+	/*void*/
+	break;
+	
+    case H5ACC_COLLECTIVE:
+	HRETURN_ERROR(H5E_IO, H5E_UNSUPPORTED, NULL,
+		      "collective I/O is not supported yet");
+
+    default:
+	HRETURN_ERROR(H5E_IO, H5E_BADVALUE, NULL, "invalid file access mode");
+    }
+
     /* convert HDF5 flags to MPI-IO flags */
     /* some combinations are illegal; let MPI-IO figure it out */
-    mpi_amode  = (flags&H5F_ACC_WRITE) ? MPI_MODE_RDWR : MPI_MODE_RDONLY;
+    mpi_amode  = (flags&H5F_ACC_RDWR) ? MPI_MODE_RDWR : MPI_MODE_RDONLY;
     if (flags&H5F_ACC_CREAT)	mpi_amode |= MPI_MODE_CREATE;
     if (flags&H5F_ACC_EXCL)	mpi_amode |= MPI_MODE_EXCL;
 
@@ -303,10 +329,13 @@ H5F_mpio_open(const char *name, uintn flags, H5F_search_t *key /*out */ )
  *
  * Modifications:
  *
+ * 	Robb Matzke, 18 Feb 1998
+ *	Added the ACCESS_PARMS argument.
+ *
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5F_mpio_close(H5F_low_t *lf)
+H5F_mpio_close(H5F_low_t *lf, const H5F_access_t *access_parms)
 {
     int                     mpierr;
     char                    mpierrmsg[MPI_MAX_ERROR_STRING];
@@ -351,10 +380,14 @@ H5F_mpio_close(H5F_low_t *lf)
  *
  * Modifications:
  *
+ * 	Robb Matzke, 18 Feb 1998
+ *	Added the ACCESS_PARMS argument.
+ *
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5F_mpio_read(H5F_low_t *lf, const haddr_t *addr, size_t size, uint8 *buf)
+H5F_mpio_read(H5F_low_t *lf, const H5F_access_t *access_parms,
+	      const haddr_t *addr, size_t size, uint8 *buf/*out*/)
 {
     MPI_Offset              mpi_off;
     int                     size_i, bytes_read, n;
@@ -449,11 +482,15 @@ H5F_mpio_read(H5F_low_t *lf, const haddr_t *addr, size_t size, uint8 *buf)
  *
  * Modifications:
  *
+ * 	Robb Matzke, 18 Feb 1998
+ *	Added the ACCESS_PARMS argument.
+ *
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5F_mpio_write(H5F_low_t *lf, const haddr_t *addr, size_t size,
-                const uint8 *buf)
+H5F_mpio_write(H5F_low_t *lf, const H5F_access_t *access_parms,
+	       const haddr_t *addr, size_t size,
+	       const uint8 *buf)
 {
     MPI_Offset              mpi_off;
     MPI_Status              mpi_stat;
@@ -511,10 +548,13 @@ H5F_mpio_write(H5F_low_t *lf, const haddr_t *addr, size_t size,
  *
  * Modifications:
  *
+ * 	Robb Matzke, 18 Feb 1998
+ *	Added the ACCESS_PARMS argument.
+ *
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5F_mpio_flush(H5F_low_t *lf)
+H5F_mpio_flush(H5F_low_t *lf, const H5F_access_t *access_parms)
 {
     int                     mpierr;
     char                    mpierrmsg[MPI_MAX_ERROR_STRING];