Begin setting up for a change to the OOB information passing functionality - this is totally transparent at the moment (need to change computers).

This commit was SVN r14510.

ompi/communicator/comm_dyn.c

@@ -604,6 +604,18 @@ ompi_comm_start_processes(int count, char **array_of_commands,
         return MPI_ERR_SPAWN;
     }
 
+    /* tell the RTE that we want to be cross-connected to the children so we receive
+     * their ORTE-level information - e.g., OOB contact info
+     */
+    if (ORTE_SUCCESS != (rc = orte_rmgr.add_attribute(&attributes, ORTE_RMGR_XCONNECT_AT_SPAWN,
+                                                      ORTE_JOBID, &(orte_process_info.my_name->jobid),
+                                                      ORTE_RMGR_ATTR_OVERRIDE))) {
+        ORTE_ERROR_LOG(rc);
+        OBJ_DESTRUCT(&attributes);
+        opal_progress_event_users_decrement();
+        return MPI_ERR_SPAWN;
+    }
+
     /* check for timing request - get stop time and report elapsed time if so */
     if (timing) {
         if (0 != gettimeofday(&ompistop, NULL)) {

orte/mca/rmgr/rmgr_types.h

@@ -47,6 +47,10 @@ ORTE_DECLSPEC OBJ_CLASS_DECLARATION(orte_attribute_t);
 #define ORTE_RMGR_ATTR_OVERRIDE     true
 
 /* define some useful attributes */
+
+/* Define the parts of the normal spawn "flow" that are to be used.
+ * Takes an uint8_t (based on following flags) as value
+ */
 #define ORTE_RMGR_SPAWN_FLOW    "orte-rmgr-spawn"
 
 /* flags that can be combined to script the RMGR's spawn procedure
@@ -63,10 +67,17 @@ ORTE_DECLSPEC OBJ_CLASS_DECLARATION(orte_attribute_t);
 #define ORTE_RMGR_LAUNCH           0x20
 
 /* direct the RMGR spawn procedure to use the provided jobid
- * instead of getting a new one
+ * instead of getting a new one.
+ * Takes jobid as value.
  */
 #define ORTE_RMGR_USE_GIVEN_JOBID    "orte-rmgr-use-jobid"
 
+/* direct the RMGR spawn procedure to cross-connect ORTE information
+ * between the parent job and the newly spawned child.
+ * Takes parent's jobid as value.
+ */
+#define ORTE_RMGR_XCONNECT_AT_SPAWN "orte-rmgr-xconnect"
+
 
 /* RESOURCE MANAGER DATA TYPES */