[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, 12 insertions, 4 deletions

diff --git a/src/H5Ffamily.c b/src/H5Ffamily.c
index 73895b8..e887acc 100644
--- a/src/H5Ffamily.c
+++ b/src/H5Ffamily.c
@@ -43,8 +43,10 @@ static H5F_low_t *H5F_fam_open(const char *name,
 			       H5F_search_t *key/*out*/);
 static herr_t H5F_fam_close(H5F_low_t *lf, const H5F_access_t *access_parms);
 static herr_t H5F_fam_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);
 static herr_t H5F_fam_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);
 static herr_t H5F_fam_flush(H5F_low_t *lf, const H5F_access_t *access_parms);
@@ -292,11 +294,14 @@ H5F_fam_close(H5F_low_t *lf, const H5F_access_t *access_parms)
  *		Monday, November 10, 1997
  *
  * Modifications:
+ *		June 2, 1998	Albert Cheng
+ *		Added xfer_mode argument
  *
  *-------------------------------------------------------------------------
  */
 static herr_t
 H5F_fam_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)
 {
     size_t		nbytes;
@@ -324,7 +329,7 @@ H5F_fam_read(H5F_low_t *lf, const H5F_access_t *access_parms,
 	    nbytes = MIN(size, member_size.offset-offset.offset);
 	    cur_addr = offset;
 	    if (H5F_low_read(lf->u.fam.memb[membno],
-			     access_parms->u.fam.memb_access,
+			     access_parms->u.fam.memb_access, xfer_mode,
 			     &cur_addr, nbytes, buf) < 0) {
 		HRETURN_ERROR(H5E_IO, H5E_READERROR, FAIL,
 			      "can't read from family member");
@@ -356,11 +361,14 @@ H5F_fam_read(H5F_low_t *lf, const H5F_access_t *access_parms,
  *		Monday, November 10, 1997
  *
  * Modifications:
+ *		June 2, 1998	Albert Cheng
+ *		Added xfer_mode argument
  *
  *-------------------------------------------------------------------------
  */
 static herr_t
 H5F_fam_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)
 {
     size_t		   	nbytes;
@@ -438,7 +446,7 @@ H5F_fam_write(H5F_low_t *lf, const H5F_access_t *access_parms,
 
 	/* Write the data to the member */
 	if (H5F_low_write(lf->u.fam.memb[membno],
-			  access_parms->u.fam.memb_access,
+			  access_parms->u.fam.memb_access, xfer_mode,
 			  &cur_addr, nbytes, buf) < 0) {
 	    HRETURN_ERROR(H5E_IO, H5E_WRITEERROR, FAIL,
 			  "can't write to family member");
@@ -497,12 +505,12 @@ H5F_fam_flush(H5F_low_t *lf, const H5F_access_t *access_parms)
     H5F_addr_inc(&addr3, (hsize_t)1);
     H5F_low_seteof(lf->u.fam.memb[0], &addr3);	/*prevent a warning */
     if (H5F_low_read(lf->u.fam.memb[0], access_parms->u.fam.memb_access,
-		     &addr1, 1, buf) < 0) {
+		     H5D_XFER_DFLT, &addr1, 1, buf) < 0) {
 	HRETURN_ERROR(H5E_IO, H5E_READERROR, FAIL,
 		      "can't read from first family member");
     }
     if (H5F_low_write(lf->u.fam.memb[0], access_parms->u.fam.memb_access,
-		      &addr1, 1, buf) < 0) {
+		      H5D_XFER_DFLT, &addr1, 1, buf) < 0) {
 	HRETURN_ERROR(H5E_IO, H5E_WRITEERROR, FAIL,
 		      "can't write to first family member");
     }