[svn-r411] Added data-transfer-mode to various function to specify which

mode to use for data transfer.  Currently, INDEPENDENT transfer
is the default mode.  Collective is supported for files opened
via the MPIO driver.  Specific changes to individual files follow.


H5D.c:
    Replaced previous kludge of passing xfer_mode via the file access_mode
    with xfer_mode function parameter all the way to the low level I/O
    drivers.

H5Dprivate.h:
    The H5D_xfer_t.xfer_mode is now used in serial and parallel modes.
    Removed the "HAVE_PARALLEL" macro condition to support it.

H5Dpublic.h:
    Added H5D_XFER_DFLT as a new value for H5D_transfer_t and removed
    the HAVE_PARALLEL condition macro to make the H5D_transfer_t
    definition available to both serial and parallel version.

H5B.c:
H5F.c:
H5Farray.c:
H5Fcore.c:
H5Ffamily.c:
H5Fistore.c:
H5Flow.c:
H5Fmpio.c:
H5Fsec2.c:
H5Fsplit.c:
H5Fstdio.c:
H5Gnode.c:
H5HG.c:
H5HL.c:
H5O.c:
H5Sprivate.h:
H5Ssimp.c:
debug.c:
    Added xfer_mode to the argument lists of the following routines to
    specify data transfer mode.  Then updated calls to these routines
    with appropriate transfer mode.  Whenever cases that collective
    mode is inappropriate (e.g. object header read-write, flush),
    H5D_XFER_DFLT is used.  The H5D_XFER_DFLT mode is currently
    acting the same as the independent mode.

    H5F_block_read
    H5F_block_write
    H5F_arr_read
    H5F_arr_write
    H5F_core_read
    H5F_core_write
    H5F_fam_read
    H5F_fam_write
    H5F_mpio_read
    H5F_mpio_write
    H5F_low_write
    H5F_low_read
    H5F_sec2_read
    H5F_sec2_write
    H5F_split_read
    H5F_split_write
    H5F_stdio_read
    H5F_stdio_write
    H5S_simp_fgath
    H5S_simp_fscat
    H5S_simp_read
    H5S_simp_write

H5Fprivate.h:
H5P.c:
    Removed access_mode field from struct H5F_access_t type.
    The access-mode was the initial design to control independent
    or collective I/O mode.  It is now supported by the data
    transfer mode.

1 files changed, 13 insertions, 7 deletions

diff --git a/src/H5Fprivate.h b/src/H5Fprivate.h
index 26942ce..5b0ec5b 100644
--- a/src/H5Fprivate.h
+++ b/src/H5Fprivate.h
@@ -22,6 +22,7 @@
 
 /* This is a near top-level header! Try not to include much! */
 #include <H5private.h>
+#include <H5Dpublic.h>		/*for the H5D_transfer_t type  		     */
 
 /*
  * Feature: Define this constant to be non-zero if you want to enable code
@@ -266,7 +267,6 @@ typedef struct H5F_access_t {
 #ifdef HAVE_PARALLEL
 	/* Properties for parallel I/O */
 	struct {
-	    uintn access_mode;	/* independent or collective variety?   */
 	    MPI_Comm    comm;   /* communicator for file access         */
 	    MPI_Info    info;   /* optional info for MPI-IO             */
 	} mpio;
@@ -303,9 +303,10 @@ typedef struct H5F_low_class_t {
     herr_t	(*close)(struct H5F_low_t *lf,
 			 const H5F_access_t *access_parms);
     herr_t	(*read)(struct H5F_low_t *lf, const H5F_access_t *access_parms,
+    			const H5D_transfer_t xfer_mode,
 			const haddr_t *addr, size_t size, uint8 *buf);
-    herr_t	(*write)(struct H5F_low_t *lf,
-			 const H5F_access_t *access_parms,
+    herr_t	(*write)(struct H5F_low_t *lf, const H5F_access_t *access_parms,
+			 const H5D_transfer_t xfer_mode,
 			 const haddr_t *addr, size_t size, const uint8 *buf);
     herr_t	(*flush)(struct H5F_low_t *lf,
 			 const H5F_access_t *access_parms);
@@ -502,12 +503,14 @@ herr_t H5F_arr_read (H5F_t *f, const struct H5O_layout_t *layout,
 		     const struct H5O_compress_t *comp,
 		     const struct H5O_efl_t *efl, const hsize_t _hslab_size[],
 		     const hsize_t mem_size[], const hssize_t mem_offset[],
-		     const hssize_t file_offset[], void *_buf/*out*/);
+		     const hssize_t file_offset[],
+		     const H5D_transfer_t xfer_mode, void *_buf/*out*/);
 herr_t H5F_arr_write (H5F_t *f, const struct H5O_layout_t *layout,
 		      const struct H5O_compress_t *comp,
 		      const struct H5O_efl_t *efl, const hsize_t _hslab_size[],
 		      const hsize_t mem_size[], const hssize_t mem_offset[],
-		      const hssize_t file_offset[], const void *_buf);
+		      const hssize_t file_offset[],
+		      const H5D_transfer_t xfer_mode, const void *_buf);
 
 /* Functions that operate on indexed storage */
 herr_t H5F_istore_init (H5F_t *f);
@@ -525,9 +528,10 @@ herr_t H5F_istore_write(H5F_t *f, const struct H5O_layout_t *layout,
 			const void *buf);
 
 /* Functions that operate on contiguous storage wrt boot block */
-herr_t H5F_block_read(H5F_t *f, const haddr_t *addr, hsize_t size, void *buf);
+herr_t H5F_block_read(H5F_t *f, const haddr_t *addr, hsize_t size,
+		      const H5D_transfer_t xfer_mode, void *buf);
 herr_t H5F_block_write(H5F_t *f, const haddr_t *addr, hsize_t size,
-		       const void *buf);
+		       const H5D_transfer_t xfer_mode, const void *buf);
 
 /* Functions that operate directly on low-level files */
 const H5F_low_class_t *H5F_low_class (H5F_driver_t driver);
@@ -543,8 +547,10 @@ H5F_low_t *H5F_low_open(const H5F_low_class_t *type, const char *name,
 H5F_low_t *H5F_low_close(H5F_low_t *lf, const H5F_access_t *access_parms);
 hsize_t H5F_low_size(H5F_low_t *lf, haddr_t *addr);
 herr_t H5F_low_read(H5F_low_t *lf, const H5F_access_t *access_parms,
+		    const H5D_transfer_t xfer_mode,
 		    const haddr_t *addr, size_t size, uint8 *buf);
 herr_t H5F_low_write(H5F_low_t *lf, const H5F_access_t *access_parms,
+		     const H5D_transfer_t xfer_mode,
 		     const haddr_t *addr, size_t size, const uint8 *buf);
 herr_t H5F_low_flush(H5F_low_t *lf, const H5F_access_t *access_parms);