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

diff --git a/src/H5Fistore.c b/src/H5Fistore.c
index 90a9c11..b726c68 100644
--- a/src/H5Fistore.c
+++ b/src/H5Fistore.c
@@ -2195,45 +2195,19 @@ H5F_istore_allocate(H5F_t *f, hid_t dxpl_id, const H5O_layout_t *layout,
         HGOTO_ERROR(H5E_DATASET, H5E_CANTGET, FAIL, "can't get filter callback struct");
 
 #ifdef H5_HAVE_PARALLEL
-    /* Retrieve up MPI parameters */
-    if(IS_H5FD_MPIO(f)) {
+    /* Retrieve MPI parameters */
+    if(IS_H5FD_MPI(f)) {
         /* Get the MPI communicator */
-        if (MPI_COMM_NULL == (mpi_comm=H5FD_mpio_communicator(f->shared->lf)))
+        if (MPI_COMM_NULL == (mpi_comm=H5FD_mpi_get_comm(f->shared->lf)))
             HGOTO_ERROR(H5E_INTERNAL, H5E_MPI, FAIL, "Can't retrieve MPI communicator");
 
         /* Get the MPI rank & size */
-        if ((mpi_rank=H5FD_mpio_mpi_rank(f->shared->lf))<0)
+        if ((mpi_rank=H5FD_mpi_get_rank(f->shared->lf))<0)
             HGOTO_ERROR(H5E_INTERNAL, H5E_MPI, FAIL, "Can't retrieve MPI rank");
 
         /* Set the MPI-capable file driver flag */
         using_mpi=1;
     } /* end if */
-    else if(IS_H5FD_MPIPOSIX(f)) {
-        /* Get the MPI communicator */
-        if (MPI_COMM_NULL == (mpi_comm=H5FD_mpiposix_communicator(f->shared->lf)))
-            HGOTO_ERROR(H5E_INTERNAL, H5E_MPI, FAIL, "Can't retrieve MPI communicator");
-
-        /* Get the MPI rank & size */
-        if ((mpi_rank=H5FD_mpiposix_mpi_rank(f->shared->lf))<0)
-            HGOTO_ERROR(H5E_INTERNAL, H5E_MPI, FAIL, "Can't retrieve MPI rank");
-
-        /* Set the MPI-capable file driver flag */
-        using_mpi=1;
-    } /* end else */
-#ifdef H5_HAVE_FPHDF5
-    else if (IS_H5FD_FPHDF5(f)) {
-        /* Get the FPHDF5 barrier communicator */
-        if (MPI_COMM_NULL == (mpi_comm = H5FD_fphdf5_barrier_communicator(f->shared->lf)))
-            HGOTO_ERROR(H5E_INTERNAL, H5E_MPI, FAIL, "Can't retrieve MPI communicator");
-
-        /* Get the MPI rank & size */
-        if ((mpi_rank = H5FD_fphdf5_mpi_rank(f->shared->lf)) < 0)
-            HGOTO_ERROR(H5E_INTERNAL, H5E_MPI, FAIL, "Can't retrieve MPI rank");
-
-        /* Set the MPI-capable file driver flag */
-        using_mpi = 1;
-    } /* end if */
-#endif  /* H5_HAVE_FPHDF5 */
 #endif  /* H5_HAVE_PARALLEL */
 
     /*