[svn-r8126] Purpose:

    Bug fix/optimization

Description:
    Address slowdown in MPI-I/O file metadata operations that was introduced
mid-stream.  We now _require_ a POSIX compliant parallel file system for the
MPI-I/O file driver (as well as for the MPI-POSIX file driver).
    Also optimized file open operation when the file is being created by
reducing the number of collective & syncronizing calls.
    Additionally, refactor the MPI routines into a common place, eliminating
duplicated code.

Platforms tested:
    FreeBSD 4.9 (sleipnir) w/parallel
    h5committest

1 files changed, 8 insertions, 22 deletions

diff --git a/src/H5F.c b/src/H5F.c
index dffff0e..03b7163 100644
--- a/src/H5F.c
+++ b/src/H5F.c
@@ -35,18 +35,16 @@
 #include "H5Tprivate.h"		/* Datatypes				*/
 
 /* Predefined file drivers */
-#include "H5FDcore.h"		/*temporary in-memory files		  */
-#include "H5FDfamily.h"		/*family of files			  */
-#include "H5FDfphdf5.h"		/*FPHDF5                                  */
-#include "H5FDgass.h"           /*GASS I/O                                */
+#include "H5FDcore.h"		/*temporary in-memory files		*/
+#include "H5FDfamily.h"		/*family of files			*/
+#include "H5FDgass.h"           /*GASS I/O                              */
 #include "H5FDlog.h"            /* sec2 driver with logging, for debugging */
-#include "H5FDmpio.h"		/*MPI-2 I/O				  */
-#include "H5FDmpiposix.h"	/*MPI-2 & posix I/O			  */
+#include "H5FDmpi.h"            /* MPI-based file drivers		*/
 #include "H5FDmulti.h"		/*multiple files partitioned by mem usage */
-#include "H5FDsec2.h"		/*Posix unbuffered I/O			  */
-#include "H5FDsrb.h"            /*SRB I/O                                 */
-#include "H5FDstdio.h"		/* Standard C buffered I/O		  */
-#include "H5FDstream.h"         /*in-memory files streamed via sockets    */
+#include "H5FDsec2.h"		/*Posix unbuffered I/O			*/
+#include "H5FDsrb.h"            /*SRB I/O                               */
+#include "H5FDstdio.h"		/* Standard C buffered I/O		*/
+#include "H5FDstream.h"         /*in-memory files streamed via sockets  */
 
 /* Interface initialization */
 static int interface_initialize_g = 0;
@@ -229,18 +227,6 @@ H5F_init_interface(void)
     
     FUNC_ENTER_NOAPI_NOINIT(H5F_init_interface)
 
-#ifdef OLD_METADATA_WRITE
-#ifdef H5_HAVE_PARALLEL
-    {
-        /* Allow MPI buf-and-file-type optimizations? */
-        const char *s = HDgetenv ("HDF5_MPI_1_METAWRITE");
-        if (s && HDisdigit(*s)) {
-            H5_mpiposix_1_metawrite_g = H5_mpi_1_metawrite_g = (int)HDstrtol (s, NULL, 0);
-        }
-    }
-#endif /* H5_HAVE_PARALLEL */
-#endif /* OLD_METADATA_WRITE */
-
     /*
      * Initialize the atom group for the file IDs. There are two groups:
      * the H5I_FILE group contains all the ID's for files which are currently