[mpich-commits] [mpich] MPICH primary repository branch, master, updated. v3.2b3-178-gb075fba

[Service Account]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "MPICH primary repository".

The branch, master has been updated
       via  b075fbaff7227a814e827b35571f5e4e22926157 (commit)
      from  fc296e18c2854197ed3f6f0fae60e61e379bb85a (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.mpich.org/mpich.git/commitdiff/b075fbaff7227a814e827b35571f5e4e22926157

commit b075fbaff7227a814e827b35571f5e4e22926157
Author: Rob Latham <robl at mcs.anl.gov>
Date:   Mon Jun 29 13:03:46 2015 -0500

    Revert "hoist ROMIO init into MPI_Init"
    
    I don't know why this change breaks with "disable weak symbols".  Until
    I figure it out, we'll have to back it out.
    
    This reverts commit a500a7dae4b5d10c42904751f7f5a45b7fb249cd.

diff --git a/src/include/mpiimpl.h b/src/include/mpiimpl.h
index 42979d6..a6cf10d 100644
--- a/src/include/mpiimpl.h
+++ b/src/include/mpiimpl.h
@@ -4341,7 +4341,6 @@ int MPIR_Type_size_x_impl(MPI_Datatype datatype, MPI_Count *size);
 /* random initializers */
 int MPIR_Group_init(void);
 int MPIR_Comm_init(MPID_Comm *);
-int MPIR_MPIOInit(int *error);
 
 
 /* Collective functions cannot be called from multiple threads. These
diff --git a/src/mpi/init/initthread.c b/src/mpi/init/initthread.c
index 1e876b3..6be0c7b 100644
--- a/src/mpi/init/initthread.c
+++ b/src/mpi/init/initthread.c
@@ -560,10 +560,6 @@ int MPIR_Init_thread(int * argc, char ***argv, int required, int * provided)
     if (mpi_errno == MPI_SUCCESS) 
 	mpi_errno = MPID_InitCompleted();
 
-#ifdef HAVE_ROMIO
-    MPIR_MPIOInit(&mpi_errno);
-#endif
-
 fn_exit:
     MPIU_THREAD_CS_EXIT(INIT,required);
     /* Make fields of MPIR_Process global visible and set mpich_state
diff --git a/src/mpi/romio/mpi-io/mpir-mpioinit.c b/src/mpi/romio/mpi-io/mpir-mpioinit.c
index 9a5512a..be78b45 100644
--- a/src/mpi/romio/mpi-io/mpir-mpioinit.c
+++ b/src/mpi/romio/mpi-io/mpir-mpioinit.c
@@ -19,8 +19,23 @@ extern int ADIO_Init_keyval;
 
 void MPIR_MPIOInit(int * error_code) {
 
+    int flag;
+    char myname[] = "MPIR_MPIOInit";
+
     /* first check if ADIO has been initialized. If not, initialize it */
     if (ADIO_Init_keyval == MPI_KEYVAL_INVALID) {
+        MPI_Initialized(&flag);
+
+	/* --BEGIN ERROR HANDLING-- */
+        if (!flag) {
+	    *error_code = MPIO_Err_create_code(MPI_SUCCESS, 
+		    MPIR_ERR_RECOVERABLE, myname, __LINE__, 
+		    MPI_ERR_OTHER, "**initialized", 0);
+	    *error_code = MPIO_Err_return_file(MPI_FILE_NULL, *error_code);
+	    return;
+	}
+	/* --END ERROR HANDLING-- */
+
         MPI_Keyval_create(MPI_NULL_COPY_FN, ADIOI_End_call, &ADIO_Init_keyval,
                           (void *) 0);  
 

-----------------------------------------------------------------------

Summary of changes:
 src/include/mpiimpl.h                |    1 -
 src/mpi/init/initthread.c            |    4 ----
 src/mpi/romio/mpi-io/mpir-mpioinit.c |   15 +++++++++++++++
 3 files changed, 15 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
MPICH primary repository