Merge pull request #7236 from raffenet/4.3.x-fixes

[4.3.x] misc: backport fixes and update version

Approved-by: Hui Zhou <[email protected]>

Author: raffenet

maint/version.m4

@@ -14,7 +14,7 @@
 # changing this by playing with diversions, but then we would probably be
 # playing with autotools-fire.
 
-m4_define([MPICH_VERSION_m4],[4.3.0b1])dnl
+m4_define([MPICH_VERSION_m4],[4.3.0rc1])dnl
 m4_define([MPICH_RELEASE_DATE_m4],[unreleased development copy])dnl
 
 # For libtool ABI versioning rules see:

src/mpi/romio/test/aggregation1.c

@@ -6,7 +6,7 @@
 /* Test case from John Bent (ROMIO req #835)
  * Aggregation code was not handling certain access patterns when collective
  * buffering forced */
-#define _XOPEN_SOURCE 500       /* strdup not in string.h otherwise */
+#define _XOPEN_SOURCE 600       /* strdup not in string.h otherwise */
 #include <unistd.h>
 #include <stdlib.h>
 #include <mpi.h>

src/mpid/ch4/src/ch4_spawn.c

@@ -40,7 +40,6 @@ int MPID_Comm_spawn_multiple(int count, char *commands[], char **argvs[], const
     memset(port_name, 0, sizeof(port_name));
 
     int total_num_processes = 0;
-    int spawn_error = 0;
     int *pmi_errcodes = NULL;
 
     if (comm_ptr->rank == root) {
@@ -63,29 +62,30 @@ int MPID_Comm_spawn_multiple(int count, char *commands[], char **argvs[], const
             mpi_errno = MPIR_pmi_spawn_multiple(count, commands, argvs, maxprocs, info_ptrs,
                                                 1, &preput_keyval_vector, pmi_errcodes);
             MPID_THREAD_CS_EXIT(VCI, MPIR_THREAD_VCI_PMI_MUTEX);
-            if (mpi_errno != MPI_SUCCESS) {
-                spawn_error = 1;
-            }
-        } else {
-            spawn_error = 1;
         }
     }
 
     int bcast_ints[2];
     if (comm_ptr->rank == root) {
         bcast_ints[0] = total_num_processes;
-        bcast_ints[1] = spawn_error;
+        bcast_ints[1] = mpi_errno;
     }
     mpi_errno = MPIR_Bcast(bcast_ints, 2, MPI_INT, root, comm_ptr, MPIR_ERR_NONE);
     MPIR_ERR_CHECK(mpi_errno);
     if (comm_ptr->rank != root) {
         total_num_processes = bcast_ints[0];
-        spawn_error = bcast_ints[1];
+        if (bcast_ints[1]) {
+            /* root spawn encountered error */
+            MPIR_ERR_SET(mpi_errno, MPI_ERR_OTHER, "**spawn");
+        }
         pmi_errcodes = (int *) MPL_calloc(total_num_processes, sizeof(int), MPL_MEM_OTHER);
         MPIR_Assert(pmi_errcodes);
+    } else {
+        /* restore the potential mpi_errno from MPID_Open_port and MPIR_pmi_spawn_multiple */
+        mpi_errno = bcast_ints[1];
     }
 
-    MPIR_ERR_CHKANDJUMP(spawn_error, mpi_errno, MPI_ERR_OTHER, "**spawn");
+    MPIR_ERR_CHECK(mpi_errno);
 
     int should_accept = 1;
     if (errcodes != MPI_ERRCODES_IGNORE) {

src/mpid/common/bc/mpidu_bc.h

@@ -11,8 +11,7 @@
 #define MPID_MAX_BC_SIZE 4096
 
 /* Internally we may use a larger port name size than MPI_MAX_PORT_NAME */
-/* FIXME: MPID_MAX_PORT_NAME should be larger than MPID_MAX_BC_SIZE */
-#define MPID_MAX_PORT_NAME 1024
+#define MPID_MAX_PORT_NAME MPID_MAX_BC_SIZE
 
 int MPIDU_bc_table_create(int rank, int size, int *nodemap, void *bc, int bc_len, int same_len,
                           int roots_only, void **bc_table, int *ret_bc_len);