[svn-r1568] Changes since 19990730

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

This extensive change is the virtual file layer implementation. I've
ported and tested the sec2, family, and core drivers and only ported
the mpio driver (Albert will test it).  So if you need MPIO I would
recommend sticking with the previous version for a while.

You will get a few compile warnings about split and stdio drivers not
being implemented and possibly tracing information not inserted in
some of the drivers. You can safely ignore them but I plan to fix
them.

I'm still working on the split driver because I just realized that it
needs a part of the VFL that isn't written yet.

Documentation is being updated also because there were some minor
changes (mostly just name changes). It should be available on my web
site later this week.

./MANIFEST
./src/Makefile.in
./src/hdf5.h
./src/H5Flow.c			[REMOVED]
./src/H5Fstdio.c		[REMOVED]
./src/H5Fsec2.c			[REMOVED]
./src/H5Fsplit.c		[REMOVED]
./src/H5Fmpio.c			[REMOVED]
./src/H5Ffamily.c		[REMOVED]
./src/H5Fcore.c			[REMOVED]
./src/H5MFpublic.h		[REMOVED]
./src/H5FD.c			[NEW]
./src/H5FDcore.c		[NEW]
./src/H5FDcore.h		[NEW]
./src/H5FDfamily.c		[NEW]
./src/H5FDfamily.h		[NEW]
./src/H5FDmpio.c		[NEW]
./src/H5FDmpio.h		[NEW]
./src/H5FDprivate.h		[NEW]
./src/H5FDpublic.h		[NEW]
./src/H5FDsec2.c		[NEW]
./src/H5FDsec2.h		[NEW]
	Removed/added files for virtual file layer.

./bin/trace
./src/H5.c
	Removed unused public datatypes and added new VFL public
	datatypes.

	Changed an error message.

./config/BlankForm
./config/dec-flags
./config/gnu-flags
./config/hpux10.20
./config/hpux9.03
./config/irix5.x
./config/irix6.x
./config/solaris2.x
./config/unicosmk
	Removed the H5F_OPT_SEEK and H5F_LOW_DFLT constants from the
	configuration since they're no longer applicable. The default
	file driver is always the sec2 driver and it always optimizes
	calls to lseek() or lseek64().

./config/depend.in
	C preprocessor errors generated during automatic dependency
	building are sent to /dev/null to prevent them from appearing
	twice in the make output.

./src/H5AC.c
./src/H5B.c
./src/H5D.c
./src/H5F.c
./src/H5G.c
./src/H5Gent.c
./src/H5Gnode.c
./src/H5HG.c
./src/H5HL.c
./src/H5O.c
./src/H5Oattr.c
./src/H5Odtype.c
./src/H5Oefl.c
./src/H5Oshared.c
./src/H5T.c
./src/H5detect.c
./test/ohdr.c
	Changed H5F_ADDR_UNDEF to HADDR_UNDEF to be more consistent
	with the `haddr_t' datatype which is now a public type.

./src/H5D.c
./src/H5P.c
./src/H5Ppublic.h
./src/H5Tconv.c
./test/cmpd_dset.c
./test/dsets.c
./test/overhead.c
./test/tselect.c
./test/tvltypes.c
	The H5P_DATASET_XFER constant was changed to H5P_DATA_XFER
	because the properties apply to all types of I/O operations,
	not just datasets.

./src/H5B.c
./src/H5Bprivate.h
./src/H5D.c
./src/H5Dpublic.h
./src/H5F.c
./src/H5Farray.c
./src/H5Fistore.c
./src/H5Fprivate.h
./src/H5Fpublic.h
./src/H5Gnode.c
./src/H5Gpkg.h
./src/H5HG.c
./src/H5HL.c
./src/H5O.c
./src/H5R.c
./src/H5Sall.c
./src/H5Shyper.c
./src/H5Smpio.c
./src/H5Spoint.c
./src/H5Sprivate.h
./test/big.c
./test/h5test.c
./test/istore.c
./testpar/t_dset.c
./testpar/t_file.c
./tools/h5debug.c
./tools/h5ls.c
	Modified to work with the virtual file layer by calling H5FD_*
	functions instead of H5F_low_* functions and by passing file
	access and data transfer properties by object ID instead of
	pointer.

	Changed H5D_transfer_t to H5FD_mpio_xfer_t since the
	COLLECTIVE vs. INDEPENDENT transfer mode is specific to the
	MPIO file driver.

	Moved MPIO-specific stuff into the MPIO driver.

./src/H5B.c
./src/H5D.c
./src/H5Fprivate.h
	The H5F_mpio_* private functions were renamed and placed in
	the H5FDmpio driver except those which appeared in H5Smpio.c.

./src/H5E.c
./src/H5Epublic.h
	Added major error number H5E_VFL for virtual file layer
	related errors.

./src/H5F.c
./src/H5Fprivate.h
	Changed the logic that controls whether the boot block is
	written. Instead of assuming that the first call to write the
	boot block is only to allocate space, I've added a function
	argument which makes this explicit.

	Changed the way files are compared so that a driver-defined
	comparison function can be called.  Files which belong to
	different drivers are always considered different.

	Removed H5F_driver_t since file drivers are now identified by
	object ID instead of a special non-user-extendible datatype.

	Removed all the hard-coded low-level file properties which
	have been replaced by the various file drivers.

./src/H5I.c
./src/H5Iprivate.h
	Added the H5I_inc_ref() which was removed a few months ago
	since we finally have a use for it.

./src/H5Ipublic.h
	Added the H5I_VFL object ID type to identify file drivers in
	the virtual file layer.

./src/H5MF.c
./src/H5MFprivate.h
	Moved all the allocation/deallocation code into the virtual
	file layer which allows file drivers to override much of it.

./src/H5P.c
./src/H5Ppublic.h
	Moved file driver-specific code into the various file driver
	files.

	The H5Pcopy() and H5Pclose() functions make calls into the
	virtual file driver to manage the memory for driver-specific
	file access and data transfer properties.

./src/H5private.h
./src/H5public.h
	The `haddr_t' type is now public.

./test/tfile.c
	Added a few more comments.

1 files changed, 43 insertions, 35 deletions

diff --git a/src/H5Smpio.c b/src/H5Smpio.c
index 91a42ba..e2c1375 100644
--- a/src/H5Smpio.c
+++ b/src/H5Smpio.c
@@ -12,8 +12,11 @@
 
 #include <H5private.h>
 #include <H5Eprivate.h>
+#include <H5FDprivate.h>
 #include <H5Sprivate.h>
 
+#include <H5FDmpio.h>		/*the MPIO file driver			*/
+
 #ifndef HAVE_PARALLEL
 /* 
  * The H5S_mpio_xxxx functions are for parallel I/O only and are
@@ -54,7 +57,7 @@ H5S_mpio_spaces_xfer(H5F_t *f, const struct H5O_layout_t *layout,
                      const struct H5O_pline_t UNUSED *pline,
                      const struct H5O_efl_t UNUSED *efl, size_t elmt_size,
                      const H5S_t *file_space, const H5S_t *mem_space,
-                     const H5F_xfer_t *xfer_parms, void *buf/*out*/,
+                     hid_t dxpl_id, void *buf/*out*/,
 		     hbool_t *must_convert/*out*/, const hbool_t do_write);
 
 /*-------------------------------------------------------------------------
@@ -105,7 +108,8 @@ H5S_mpio_all_type( const H5S_t *space, const size_t elmt_size,
     fprintf(stdout, "Leave %s total_bytes=%Hu\n", FUNC, total_bytes );
 #endif
     FUNC_LEAVE (SUCCEED);
-} /* H5S_mpio_all_type() */
+}
+
 
 /*-------------------------------------------------------------------------
  * Function:	H5S_mpio_hyper_type
@@ -140,7 +144,7 @@ H5S_mpio_hyper_type( const H5S_t *space, const size_t elmt_size,
 	hsize_t count;
     } d[32];
 
-    int			i, j, err, new_rank, num_to_collapse, stride_bytes;
+    int			i, err, new_rank, num_to_collapse;
     int			offset[32], max_xtent[32], block_length[2], displacement[2];
     H5S_hyper_dim_t	*diminfo;		/* [rank] */
     intn		rank;
@@ -403,7 +407,7 @@ H5S_mpio_hyper_type( const H5S_t *space, const size_t elmt_size,
     fprintf(stdout, "Leave %s\n", FUNC );
 #endif
     FUNC_LEAVE (SUCCEED);
-} /* H5S_mpio_hyper_type() */
+}
 
 
 /*-------------------------------------------------------------------------
@@ -488,7 +492,8 @@ H5S_mpio_space_type( const H5S_t *space, const size_t elmt_size,
     }
 
     FUNC_LEAVE (ret_value);
-} /* H5S_mpio_space_type() */
+}
+
 
 /*-------------------------------------------------------------------------
  * Function:	H5S_mpio_spaces_xfer
@@ -508,11 +513,11 @@ H5S_mpio_space_type( const H5S_t *space, const size_t elmt_size,
  *-------------------------------------------------------------------------
  */
 herr_t
-H5S_mpio_spaces_xfer (H5F_t *f, const struct H5O_layout_t *layout,
+H5S_mpio_spaces_xfer(H5F_t *f, const struct H5O_layout_t *layout,
                      const struct H5O_pline_t UNUSED *pline,
                      const struct H5O_efl_t UNUSED *efl, size_t elmt_size,
                      const H5S_t *file_space, const H5S_t *mem_space,
-                     const H5F_xfer_t *xfer_parms, void *buf /*out*/,
+		     hid_t dxpl_id, void *buf /*out*/,
 		     hbool_t *must_convert /*out*/,
 		     const hbool_t do_write )
 {
@@ -534,7 +539,7 @@ H5S_mpio_spaces_xfer (H5F_t *f, const struct H5O_layout_t *layout,
     assert (file_space);
     assert (mem_space);
     assert (buf);
-    assert (f->shared->access_parms->driver == H5F_LOW_MPIO);
+    assert (H5FD_MPIO==f->shared->fapl->driver_id);
 
     /* INCOMPLETE!!!  rky 980816 */
     /* Currently can only handle H5D_CONTIGUOUS layout */
@@ -556,8 +561,6 @@ H5S_mpio_spaces_xfer (H5F_t *f, const struct H5O_layout_t *layout,
 			       &mbt_is_derived );
     if (MPI_SUCCESS != err)
     	HRETURN_ERROR(H5E_DATASPACE, H5E_BADTYPE, FAIL,"couldn't create MPI buf type");
-    /* pass the buf type to low-level write via access_parms */
-    f->shared->access_parms->u.mpio.btype = mpi_buf_type;
 
     /* create the MPI file type */
     err = H5S_mpio_space_type( file_space, elmt_size,
@@ -567,12 +570,9 @@ H5S_mpio_spaces_xfer (H5F_t *f, const struct H5O_layout_t *layout,
 			       &mft_is_derived );
     if (MPI_SUCCESS != err)
     	HRETURN_ERROR(H5E_DATASPACE, H5E_BADTYPE, FAIL,"couldn't create MPI file type");
-    /* pass the file type to low-level write via access_parms */
-    f->shared->access_parms->u.mpio.ftype = mpi_file_type;
 
     /* calculate the absolute base addr (i.e., the file view disp) */
     disp = f->shared->base_addr + layout->addr;
-    f->shared->access_parms->u.mpio.disp = disp;
 #ifdef H5Smpi_DEBUG
     fprintf(stdout, "spaces_xfer: disp=%Hu\n", disp.offset );
 #endif
@@ -580,22 +580,26 @@ H5S_mpio_spaces_xfer (H5F_t *f, const struct H5O_layout_t *layout,
     /* Effective address determined by base addr and the MPI file type */
     addr = 0;
 
-    /* request a dataspace xfer (instead of an elementary byteblock xfer) */
-    f->shared->access_parms->u.mpio.use_types = 1;
+    /*
+     * Pass buf type, file type, and absolute base address (i.e., the file
+     * view disp) to the file driver. Request a dataspace transfer (instead
+     * of an elementary byteblock transfer).
+     */
+    H5FD_mpio_setup(f->shared->lf, mpi_buf_type, mpi_file_type, disp, 1);
 
     /* transfer the data */
     mpi_count = (size_t)mpi_buf_count;
-    if (mpi_count != mpi_buf_count)
-    	HRETURN_ERROR(H5E_DATASPACE, H5E_BADTYPE, FAIL,"transfer size overflows size_t");
+    if (mpi_count != mpi_buf_count) {
+    	HRETURN_ERROR(H5E_DATASPACE, H5E_BADTYPE, FAIL,
+		      "transfer size overflows size_t");
+    }
     if (do_write) {
-    	err = H5F_low_write( f->shared->lf, f->shared->access_parms,
-			     xfer_parms, addr, mpi_count, buf );
+    	err = H5FD_write(f->shared->lf, dxpl_id, addr, mpi_count, buf);
     	if (err) {
 	    HRETURN_ERROR(H5E_IO, H5E_WRITEERROR, FAIL,"MPI write failed");
 	}
     } else {
-    	err = H5F_low_read ( f->shared->lf, f->shared->access_parms,
-			     xfer_parms, addr, mpi_count, buf );
+    	err = H5FD_read (f->shared->lf, dxpl_id, addr, mpi_count, buf);
     	if (err) {
 	    HRETURN_ERROR(H5E_IO, H5E_READERROR, FAIL,"MPI read failed");
 	}
@@ -605,19 +609,22 @@ H5S_mpio_spaces_xfer (H5F_t *f, const struct H5O_layout_t *layout,
     if (mbt_is_derived) {
 	err = MPI_Type_free( &mpi_buf_type );
 	if (MPI_SUCCESS != err) {
-    	    HRETURN_ERROR(H5E_DATASPACE, H5E_MPI, FAIL,"couldn't free MPI file type");
+    	    HRETURN_ERROR(H5E_DATASPACE, H5E_MPI, FAIL,
+			  "unable to free MPI file type");
 	}
     }
     if (mft_is_derived) {
 	err = MPI_Type_free( &mpi_file_type );
 	if (MPI_SUCCESS != err) {
-    	    HRETURN_ERROR(H5E_DATASPACE, H5E_MPI, FAIL,"couldn't free MPI file type");
+    	    HRETURN_ERROR(H5E_DATASPACE, H5E_MPI, FAIL,
+			  "unable to free MPI file type");
 	}
     }
 
     done:
     FUNC_LEAVE (ret_value);
-} /* H5S_mpio_spaces_xfer() */
+}
+
 
 /*-------------------------------------------------------------------------
  * Function:	H5S_mpio_spaces_read
@@ -636,11 +643,11 @@ H5S_mpio_spaces_xfer (H5F_t *f, const struct H5O_layout_t *layout,
  *-------------------------------------------------------------------------
  */
 herr_t
-H5S_mpio_spaces_read (H5F_t *f, const struct H5O_layout_t *layout,
+H5S_mpio_spaces_read(H5F_t *f, const struct H5O_layout_t *layout,
                      const struct H5O_pline_t *pline,
                      const struct H5O_efl_t *efl, size_t elmt_size,
                      const H5S_t *file_space, const H5S_t *mem_space,
-                     const H5F_xfer_t *xfer_parms, void *buf/*out*/,
+                     hid_t dxpl_id, void *buf/*out*/,
 		     hbool_t *must_convert/*out*/)
 {
     herr_t ret_value = FAIL;
@@ -648,11 +655,12 @@ H5S_mpio_spaces_read (H5F_t *f, const struct H5O_layout_t *layout,
     FUNC_ENTER (H5S_mpio_spaces_read, FAIL);
 
     ret_value = H5S_mpio_spaces_xfer(f, layout, pline, efl, elmt_size,
-				     file_space, mem_space, xfer_parms,
+				     file_space, mem_space, dxpl_id,
 				     buf, must_convert/*out*/, 0/*read*/);
 
     FUNC_LEAVE (ret_value);
-} /* H5S_mpio_spaces_read() */
+}
+
 
 /*-------------------------------------------------------------------------
  * Function:	H5S_mpio_spaces_write
@@ -672,22 +680,22 @@ H5S_mpio_spaces_read (H5F_t *f, const struct H5O_layout_t *layout,
  */
 herr_t
 H5S_mpio_spaces_write(H5F_t *f, const struct H5O_layout_t *layout,
-                     const struct H5O_pline_t *pline,
-                     const struct H5O_efl_t *efl, size_t elmt_size,
-                     const H5S_t *file_space, const H5S_t *mem_space,
-                     const H5F_xfer_t *xfer_parms, const void *buf,
-		     hbool_t *must_convert/*out*/)
+		      const struct H5O_pline_t *pline,
+		      const struct H5O_efl_t *efl, size_t elmt_size,
+		      const H5S_t *file_space, const H5S_t *mem_space,
+		      hid_t dxpl_id, const void *buf,
+		      hbool_t *must_convert/*out*/)
 {
     herr_t ret_value = FAIL;
 
     FUNC_ENTER (H5S_mpio_spaces_write, FAIL);
 
     ret_value = H5S_mpio_spaces_xfer(f, layout, pline, efl, elmt_size,
-				     file_space, mem_space, xfer_parms,
+				     file_space, mem_space, dxpl_id,
 				     (void*)buf, must_convert/*out*/,
 				     1/*write*/);
 
     FUNC_LEAVE (ret_value);
-} /* H5S_mpio_spaces_write() */
+}
 
 #endif  /* HAVE_PARALLEL */