Fix another mpool-related error in ompi_free_list.c. NOTE: I have done my best to correct the mpool compile errors correctly. Somebody else more familiar with that system should check it. In the future, please pay attention to compiler warnings before checking code into the trunk - these were pretty severe as the structures being passed to the functions no longer matched. May or may not have been affecting people.

Add an MCA parameter to orte_init that allows the function to exit with an appropriate code if it cannot attach to an existing universe - needed to support the Eclipse folks.

This commit was SVN r6138.

src/class/ompi_free_list.c

@@ -75,7 +75,7 @@ int ompi_free_list_grow(ompi_free_list_t* flist, size_t num_elements)
     unsigned char* ptr;
     size_t i;
     size_t mod;
-    void* user_out; 
+    struct mca_bmi_base_registration_t* user_out; 
 
     if (flist->fl_max_to_alloc > 0 && flist->fl_num_allocated + num_elements > flist->fl_max_to_alloc)
         return OMPI_ERR_TEMP_OUT_OF_RESOURCE;

src/runtime/orte_init_stage1.c

@@ -55,7 +55,7 @@
 
 int orte_init_stage1(void)
 {
-    int ret;
+    int ret, rc, exit_if_not_exist;
     char *universe;
     char *jobid_str = NULL;
     char *procid_str = NULL;
@@ -187,6 +187,21 @@ int orte_init_stage1(void)
             orte_process_info.ns_replica_uri = strdup(univ.seed_uri);
             orte_process_info.gpr_replica_uri = strdup(univ.seed_uri);
         } else {
+            /* if an existing universe is not detected, check the
+             * relevant MCA parameter to see if the caller wants
+             * us to abort in this situation
+             */
+            if (0 > (rc =  mca_base_param_register_int("orte", "univ", "exist", NULL, 0))) {
+                ORTE_ERROR_LOG(rc);
+                return rc;
+            }
+            if (ORTE_SUCCESS != (rc = mca_base_param_lookup_int(rc, &exit_if_not_exist))) {
+                ORTE_ERROR_LOG(rc);
+                return rc;
+            }
+            if (exit_if_not_exist) {
+                return ORTE_ERR_UNREACH;
+            }
             if (ORTE_ERR_NOT_FOUND != ret) {
                 /* if it exists but no contact could be established,
                  * define unique name based on current one.