[svn-r15800] Description:

	Bring file free space branch changes through r15795 into trunk, which
includes a fair bit of code cleanup & rearrangement along with a couple of
bug fixes also.

Tested on:
        Mac OS X/32 10.5.5 (amazon) in debug mode
        Mac OS X/32 10.5.5 (amazon) w/C++ & FORTRAN, w/threadsafe,
                                in production mode
        FreeBSD/32 6.3 (duty) in debug mode
        FreeBSD/64 6.3 (liberty) w/C++ & FORTRAN, in debug mode
        Linux/32 2.6 (kagiso) w/PGI compilers, w/C++ & FORTRAN, w/threadsafe,
                                in debug mode
        Linux/64-amd64 2.6 (smirom) w/Intel compilers w/default API=1.6.x,
                                w/C++ & FORTRAN, in production mode
        Solaris/32 2.10 (linew) w/deprecated symbols disabled, w/C++ & FORTRAN,
                                w/szip filter, in production mode
        Linux/64-ia64 2.6 (cobalt) w/Intel compilers, w/C++ & FORTRAN,
                                in production mode
        Linux/64-ia64 2.4 (tg-login3) w/parallel, w/FORTRAN, in production mode
        Linux/64-amd64 2.6 (abe) w/parallel, w/FORTRAN, in production mode

1 files changed, 75 insertions, 41 deletions

diff --git a/src/H5FDmpio.c b/src/H5FDmpio.c
index 2bc0754..ea5a768 100644
--- a/src/H5FDmpio.c
+++ b/src/H5FDmpio.c
@@ -82,6 +82,7 @@ static herr_t H5FD_mpio_read(H5FD_t *_file, H5FD_mem_t type, hid_t dxpl_id, hadd
 static herr_t H5FD_mpio_write(H5FD_t *_file, H5FD_mem_t type, hid_t dxpl_id, haddr_t addr,
             size_t size, const void *buf);
 static herr_t H5FD_mpio_flush(H5FD_t *_file, hid_t dxpl_id, unsigned closing);
+static herr_t H5FD_mpio_truncate(H5FD_t *_file, hid_t dxpl_id, hbool_t closing);
 static int H5FD_mpio_mpi_rank(const H5FD_t *_file);
 static int H5FD_mpio_mpi_size(const H5FD_t *_file);
 static MPI_Comm H5FD_mpio_communicator(const H5FD_t *_file);
@@ -121,6 +122,7 @@ static const H5FD_class_mpi_t H5FD_mpio_g = {
     H5FD_mpio_read,				/*read			*/
     H5FD_mpio_write,				/*write			*/
     H5FD_mpio_flush,				/*flush			*/
+    H5FD_mpio_truncate,				/*truncate		*/
     NULL,                                       /*lock                  */
     NULL,                                       /*unlock                */
     H5FD_FLMAP_SINGLE                           /*fl_map                */
@@ -1859,68 +1861,106 @@ done:
  *
  * 		Failure:	Negative
  *
- * Programmer:  Unknown
+ * Programmer:  Robb Matzke
  *              January 30, 1998
  *
- * Modifications:
- * 		Robb Matzke, 1998-02-18
- *		Added the ACCESS_PARMS argument.
+ *-------------------------------------------------------------------------
+ */
+static herr_t
+H5FD_mpio_flush(H5FD_t *_file, hid_t UNUSED dxpl_id, unsigned closing)
+{
+    H5FD_mpio_t		*file = (H5FD_mpio_t*)_file;
+    int			mpi_code;	/* mpi return code */
+    herr_t              ret_value = SUCCEED;
+
+    FUNC_ENTER_NOAPI(H5FD_mpio_flush, FAIL)
+
+#ifdef H5FDmpio_DEBUG
+    if(H5FD_mpio_Debug[(int)'t'])
+    	HDfprintf(stdout, "Entering %s\n", FUNC);
+#endif
+    HDassert(file);
+    HDassert(H5FD_MPIO == file->pub.driver_id);
+
+    /* Only sync the file if we are not going to immediately close it */
+    if(!closing) {
+        if(MPI_SUCCESS != (mpi_code = MPI_File_sync(file->f)))
+            HMPI_GOTO_ERROR(FAIL, "MPI_File_sync failed", mpi_code)
+    } /* end if */
+
+done:
+#ifdef H5FDmpio_DEBUG
+    if(H5FD_mpio_Debug[(int)'t'])
+    	HDfprintf(stdout, "Leaving %s\n", FUNC);
+#endif
+
+    FUNC_LEAVE_NOAPI(ret_value)
+} /* end H5FD_mpio_flush() */
+
+
+/*-------------------------------------------------------------------------
+ * Function:    H5FD_mpio_truncate
  *
- * 		Robb Matzke, 1999-08-06
- *		Modified to work with the virtual file layer.
+ * Purpose:     Make certain the file's size matches it's allocated size
  *
- *              Robb Matzke, 2000-12-29
- *              Make sure file size is at least as large as the last
- *              allocated byte.
+ * Return:      Success:	Non-negative
+ * 		Failure:	Negative
  *
- *              Quincey Koziol, 2002-06-??
- *              Changed file extension method to use MPI_File_set_size instead
- *              read->write method.
+ * Programmer:  Quincey Koziol
+ *              January 31, 2008
  *
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5FD_mpio_flush(H5FD_t *_file, hid_t UNUSED dxpl_id, unsigned closing)
+H5FD_mpio_truncate(H5FD_t *_file, hid_t UNUSED dxpl_id, hbool_t closing)
 {
     H5FD_mpio_t		*file = (H5FD_mpio_t*)_file;
-    int			mpi_code;	/* mpi return code */
-    MPI_Offset          mpi_off;
-    herr_t              ret_value=SUCCEED;
+    herr_t              ret_value = SUCCEED;
 
-    FUNC_ENTER_NOAPI(H5FD_mpio_flush, FAIL)
+    FUNC_ENTER_NOAPI(H5FD_mpio_truncate, FAIL)
 
 #ifdef H5FDmpio_DEBUG
-    if (H5FD_mpio_Debug[(int)'t'])
-    	fprintf(stdout, "Entering H5FD_mpio_flush\n" );
+    if(H5FD_mpio_Debug[(int)'t'])
+    	HDfprintf(stdout, "Entering %s\n", FUNC);
 #endif
-    assert(file);
-    assert(H5FD_MPIO==file->pub.driver_id);
+    HDassert(file);
+    HDassert(H5FD_MPIO == file->pub.driver_id);
 
     /* Extend the file to make sure it's large enough, then sync.
      * Unfortunately, keeping track of EOF is an expensive operation, so
      * we can't just check whether EOF<EOA like with other drivers.
      * Therefore we'll just read the byte at EOA-1 and then write it back. */
-    if(file->eoa>file->last_eoa) {
+    if(file->eoa > file->last_eoa) {
+        int		mpi_code;	/* mpi return code */
+        MPI_Offset      mpi_off;
+
 #ifdef H5_MPI_FILE_SET_SIZE_BIG
-        if (H5FD_mpi_haddr_to_MPIOff(file->eoa, &mpi_off)<0)
+        if(H5FD_mpi_haddr_to_MPIOff(file->eoa, &mpi_off) < 0)
             HGOTO_ERROR(H5E_INTERNAL, H5E_BADRANGE, FAIL, "cannot convert from haddr_t to MPI_Offset")
 
         /* Extend the file's size */
-        if (MPI_SUCCESS != (mpi_code=MPI_File_set_size(file->f, mpi_off)))
+        if(MPI_SUCCESS != (mpi_code = MPI_File_set_size(file->f, mpi_off)))
             HMPI_GOTO_ERROR(FAIL, "MPI_File_set_size failed", mpi_code)
 #else /* H5_MPI_FILE_SET_SIZE_BIG */
-        if (0==file->mpi_rank) {
-            uint8_t             byte=0;
+	/* Wait until all processes are here before reading/writing the byte at
+         * process 0's end of address space.  The window for corruption is
+         * probably tiny, but does exist...
+         */
+        if(MPI_SUCCESS != (mpi_code = MPI_Barrier(file->comm)))
+            HMPI_GOTO_ERROR(FAIL, "MPI_Barrier failed", mpi_code)
+
+        if(0 == file->mpi_rank) {
+            uint8_t             byte = 0;
             MPI_Status          mpi_stat;
 
             /* Portably initialize MPI status variable */
-            HDmemset(&mpi_stat,0,sizeof(MPI_Status));
+            HDmemset(&mpi_stat, 0, sizeof(MPI_Status));
 
-            if (H5FD_mpi_haddr_to_MPIOff(file->eoa-1, &mpi_off)<0)
+            if(H5FD_mpi_haddr_to_MPIOff(file->eoa-1, &mpi_off) < 0)
                 HGOTO_ERROR(H5E_INTERNAL, H5E_BADRANGE, FAIL, "cannot convert from haddr_t to MPI_Offset")
-            if (MPI_SUCCESS != (mpi_code=MPI_File_read_at(file->f, mpi_off, &byte, 1, MPI_BYTE, &mpi_stat)))
+            if(MPI_SUCCESS != (mpi_code = MPI_File_read_at(file->f, mpi_off, &byte, 1, MPI_BYTE, &mpi_stat)))
                 HMPI_GOTO_ERROR(FAIL, "MPI_File_read_at failed", mpi_code)
-            if (MPI_SUCCESS != (mpi_code=MPI_File_write_at(file->f, mpi_off, &byte, 1, MPI_BYTE, &mpi_stat)))
+            if(MPI_SUCCESS != (mpi_code = MPI_File_write_at(file->f, mpi_off, &byte, 1, MPI_BYTE, &mpi_stat)))
                 HMPI_GOTO_ERROR(FAIL, "MPI_File_write_at failed", mpi_code)
         } /* end if */
 #endif /* H5_MPI_FILE_SET_SIZE_BIG */
@@ -1931,27 +1971,21 @@ H5FD_mpio_flush(H5FD_t *_file, hid_t UNUSED dxpl_id, unsigned closing)
          * it the shorter length, potentially truncating the file and dropping
          * the new data written)
          */
-        if (MPI_SUCCESS!= (mpi_code=MPI_Barrier(file->comm)))
+        if(MPI_SUCCESS != (mpi_code = MPI_Barrier(file->comm)))
             HMPI_GOTO_ERROR(FAIL, "MPI_Barrier failed", mpi_code)
 
         /* Update the 'last' eoa value */
-        file->last_eoa=file->eoa;
-    } /* end if */
-
-    /* Only sync the file if we are not going to immediately close it */
-    if(!closing) {
-        if (MPI_SUCCESS != (mpi_code=MPI_File_sync(file->f)))
-            HMPI_GOTO_ERROR(FAIL, "MPI_File_sync failed", mpi_code)
+        file->last_eoa = file->eoa;
     } /* end if */
 
 done:
 #ifdef H5FDmpio_DEBUG
-    if (H5FD_mpio_Debug[(int)'t'])
-    	fprintf(stdout, "Leaving H5FD_mpio_flush\n" );
+    if(H5FD_mpio_Debug[(int)'t'])
+    	HDfprintf(stdout, "Leaving %s\n", FUNC);
 #endif
 
     FUNC_LEAVE_NOAPI(ret_value)
-}
+} /* end H5FD_mpio_truncate() */
 
 
 /*-------------------------------------------------------------------------