[mpich-commits] [mpich] MPICH primary repository branch, master, updated. v3.2-292-g636ba18

[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  636ba185897e059084a8f9f414800f78cc29eb35 (commit)
      from  81c1290e34122331dd44a41afd75347450c91256 (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/636ba185897e059084a8f9f414800f78cc29eb35

commit 636ba185897e059084a8f9f414800f78cc29eb35
Author: Ken Raffenetti <raffenet at mcs.anl.gov>
Date:   Fri Apr 22 11:45:49 2016 -0500

    Undo overagressive search/replace
    
    The MPID_Op -> MPIR_Op replacement accidentally grabbed MPID_Open_port,
    which needed to be reverted.
    
    Signed-off-by: Wesley Bland <wesley.bland at intel.com>

diff --git a/src/include/mpiimpl.h b/src/include/mpiimpl.h
index 1cb8a12..38d1b38 100644
--- a/src/include/mpiimpl.h
+++ b/src/include/mpiimpl.h
@@ -2781,7 +2781,7 @@ int MPID_Finalize(void);
 
 int MPID_Abort( MPIR_Comm *comm, int mpi_errno, int exit_code, const char *error_msg );
 
-int MPIR_Open_port(MPIR_Info *, char *);
+int MPID_Open_port(MPIR_Info *, char *);
 int MPID_Close_port(const char *);
 
 /*@
diff --git a/src/mpi/spawn/open_port.c b/src/mpi/spawn/open_port.c
index 79aa456..f7d212a 100644
--- a/src/mpi/spawn/open_port.c
+++ b/src/mpi/spawn/open_port.c
@@ -26,7 +26,7 @@ int MPI_Open_port(MPI_Info info, char *port_name) __attribute__((weak,alias("PMP
 
 int MPIR_Open_port_impl(MPIR_Info *info_ptr, char *port_name)
 {
-    return MPIR_Open_port(info_ptr, port_name);
+    return MPID_Open_port(info_ptr, port_name);
 }
 
 #endif
diff --git a/src/mpid/ch3/src/ch3u_comm_spawn_multiple.c b/src/mpid/ch3/src/ch3u_comm_spawn_multiple.c
index 8346c76..b451ee6 100644
--- a/src/mpid/ch3/src/ch3u_comm_spawn_multiple.c
+++ b/src/mpid/ch3/src/ch3u_comm_spawn_multiple.c
@@ -135,7 +135,7 @@ int MPIDI_Comm_spawn_multiple(int count, char **commands,
 
 	/* Open a port for the spawned processes to connect to */
 	/* FIXME: info may be needed for port name */
-        mpi_errno = MPIR_Open_port(NULL, port_name);
+        mpi_errno = MPID_Open_port(NULL, port_name);
 	/* --BEGIN ERROR HANDLING-- */
         if (mpi_errno) MPIR_ERR_POP(mpi_errno);
 	/* --END ERROR HANDLING-- */
diff --git a/src/mpid/ch3/src/mpid_port.c b/src/mpid/ch3/src/mpid_port.c
index e206634..7940c8d 100644
--- a/src/mpid/ch3/src/mpid_port.c
+++ b/src/mpid/ch3/src/mpid_port.c
@@ -23,7 +23,7 @@ static MPIDI_PortFns portFns = { 0, 0, 0, 0 };
 #endif
 
 /*@
-   MPIR_Open_port - Open an MPI Port
+   MPID_Open_port - Open an MPI Port
 
    Input Arguments:
 .  MPI_Info info - info
@@ -38,10 +38,10 @@ static MPIDI_PortFns portFns = { 0, 0, 0, 0 };
 .N MPI_ERR_OTHER
 @*/
 #undef FUNCNAME
-#define FUNCNAME MPIR_Open_port
+#define FUNCNAME MPID_Open_port
 #undef FCNAME
 #define FCNAME MPL_QUOTE(FUNCNAME)
-int MPIR_Open_port(MPIR_Info *info_ptr, char *port_name)
+int MPID_Open_port(MPIR_Info *info_ptr, char *port_name)
 {
     int mpi_errno=MPI_SUCCESS;
     MPIDI_STATE_DECL(MPID_STATE_MPIR_OPEN_PORT);

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

Summary of changes:
 src/include/mpiimpl.h                       |    2 +-
 src/mpi/spawn/open_port.c                   |    2 +-
 src/mpid/ch3/src/ch3u_comm_spawn_multiple.c |    2 +-
 src/mpid/ch3/src/mpid_port.c                |    6 +++---
 4 files changed, 6 insertions(+), 6 deletions(-)


hooks/post-receive
-- 
MPICH primary repository