Merge pull request #3990 from rhc54/topic/p2

Move handling of OPAL_PREFIX to PMIX_PREFIX down into embedded PMIx integration code

Author: Ralph Castain

opal/mca/pmix/pmix2x/pmix2x_client.c

@@ -29,6 +29,7 @@
 #include "opal/hash_string.h"
 #include "opal/threads/threads.h"
 #include "opal/util/argv.h"
+#include "opal/util/opal_environ.h"
 #include "opal/util/proc.h"
 
 #include "opal/mca/pmix/base/base.h"
@@ -65,6 +66,7 @@ int pmix2x_client_init(opal_list_t *ilist)
     pmix_info_t *pinfo;
     size_t ninfo, n;
     opal_value_t *ival;
+    char *evar;
 
     opal_output_verbose(1, opal_pmix_base_framework.framework_output,
                         "PMIx_client init");
@@ -76,6 +78,9 @@ int pmix2x_client_init(opal_list_t *ilist)
             asprintf(&dbgvalue, "PMIX_DEBUG=%d", dbg);
             putenv(dbgvalue);
         }
+        if (NULL != (evar = getenv("OPAL_PREFIX"))) {
+            opal_setenv("PMIX_PREFIX", evar, false, &environ);
+        }
     }
 
     /* convert the incoming list to info structs */

opal/mca/pmix/pmix2x/pmix2x_server_south.c

@@ -36,6 +36,7 @@
 #include "opal/util/argv.h"
 #include "opal/util/error.h"
 #include "opal/util/output.h"
+#include "opal/util/opal_environ.h"
 #include "opal/util/proc.h"
 #include "opal/util/show_help.h"
 #include "opal/mca/pmix/base/base.h"
@@ -99,6 +100,7 @@ int pmix2x_server_init(opal_pmix_server_module_t *module,
     opal_pmix2x_event_t *event;
     opal_pmix2x_jobid_trkr_t *job;
     opal_pmix_lock_t lk;
+    char *evar;
 
     OPAL_PMIX_ACQUIRE_THREAD(&opal_pmix_base.lock);
 
@@ -107,6 +109,9 @@ int pmix2x_server_init(opal_pmix_server_module_t *module,
             asprintf(&dbgvalue, "PMIX_DEBUG=%d", dbg);
             putenv(dbgvalue);
         }
+        if (NULL != (evar = getenv("OPAL_PREFIX"))) {
+            opal_setenv("PMIX_PREFIX", evar, false, &environ);
+        }
     }
     ++opal_pmix_base.initialized;
 

orte/mca/ess/base/ess_base_std_prolog.c

@@ -9,7 +9,6 @@
  *                         University of Stuttgart.  All rights reserved.
  * Copyright (c) 2004-2005 The Regents of the University of California.
  *                         All rights reserved.
- * Copyright (c) 2017      Intel, Inc.  All rights reserved.
  * $COPYRIGHT$
  *
  * Additional copyrights may follow
@@ -29,7 +28,6 @@
 #include <unistd.h>
 #endif
 
-#include "opal/util/opal_environ.h"
 #include "orte/mca/errmgr/errmgr.h"
 #include "orte/util/show_help.h"
 #include "orte/runtime/orte_wait.h"
@@ -41,7 +39,6 @@ int orte_ess_base_std_prolog(void)
 {
     int ret;
     char *error = NULL;
-    char *evar;
 
     /* Initialize the ORTE data type support */
     if (ORTE_SUCCESS != (ret = orte_dt_init())) {
@@ -59,10 +56,6 @@ int orte_ess_base_std_prolog(void)
             goto error;
         }
     }
-    /* check for OPAL_PREFIX */
-    if (NULL != (evar = getenv("OPAL_PREFIX"))) {
-        opal_setenv("PMIX_PREFIX", evar, false, &environ);
-    }
 
     return ORTE_SUCCESS;