Minor cleanup - add jobid <-> nspace in one more place

(cherry picked from commit f713e71)

Author: Ralph Castain

opal/mca/pmix/pmix1xx/pmix1_client.c

@@ -103,7 +103,7 @@ int pmix1_client_init(void)
     }
 
     /* store our jobid and rank */
-    if (NULL != getenv(OPAL_MCA_PREFIX"orte_launch")) {
+   if (NULL != getenv(OPAL_MCA_PREFIX"orte_launch")) {
         /* if we were launched by the OMPI RTE, then
          * the jobid is in a special format - so get it */
         native_launch = true;
@@ -196,6 +196,44 @@ int pmix1_abort(int flag, const char *msg,
     return pmix1_convert_rc(rc);
 }
 
+int pmix1_store_local(const opal_process_name_t *proc, opal_value_t *val)
+{
+    pmix_value_t kv;
+    pmix_status_t rc;
+    pmix_proc_t p;
+    opal_pmix1_jobid_trkr_t *job;
+
+    if (NULL != proc) {
+        /* if the jobid is my own, then we can just use
+         * my namespace */
+        if (OPAL_PROC_MY_NAME.jobid == proc->jobid) {
+            (void)strncpy(p.nspace, my_proc.nspace, PMIX_MAX_NSLEN);
+        } else {
+            /* look thru our list of jobids and find the
+             * corresponding nspace */
+            OPAL_LIST_FOREACH(job, &jobids, opal_pmix1_jobid_trkr_t) {
+                if (job->jobid == proc->jobid) {
+                    (void)strncpy(p.nspace, job->nspace, PMIX_MAX_NSLEN);
+                    break;
+                }
+            }
+        }
+        p.rank = proc->vpid;
+    } else {
+        /* use our name */
+        (void)strncpy(p.nspace, my_proc.nspace, PMIX_MAX_NSLEN);
+        p.rank = OPAL_PROC_MY_NAME.vpid;
+    }
+
+    PMIX_VALUE_CONSTRUCT(&kv);
+    pmix1_value_load(&kv, val);
+
+    rc = PMIx_Store_internal(&p, val->key, &kv);
+    PMIX_VALUE_DESTRUCT(&kv);
+
+    return pmix1_convert_rc(rc);
+}
+
 int pmix1_commit(void)
 {
     pmix_status_t rc;

opal/mca/pmix/pmix1xx/pmix_pmix1.c

@@ -88,31 +88,6 @@ const opal_pmix_base_module_t opal_pmix_pmix1xx_module = {
     pmix1_store_local
 };
 
-int pmix1_store_local(const opal_process_name_t *proc, opal_value_t *val)
-{
-    pmix_value_t kv;
-    pmix_status_t rc;
-    pmix_proc_t p;
-
-    if (NULL != proc) {
-        /* convert the process jobid */
-        (void)strncpy(p.nspace, opal_convert_jobid_to_string(proc->jobid), PMIX_MAX_NSLEN);
-        p.rank = proc->vpid;
-    } else {
-        /* use our name */
-        (void)strncpy(p.nspace, opal_convert_jobid_to_string(OPAL_PROC_MY_NAME.jobid), PMIX_MAX_NSLEN);
-        p.rank = OPAL_PROC_MY_NAME.vpid;
-    }
-
-    PMIX_VALUE_CONSTRUCT(&kv);
-    pmix1_value_load(&kv, val);
-
-    rc = PMIx_Store_internal(&p, val->key, &kv);
-    PMIX_VALUE_DESTRUCT(&kv);
-
-    return pmix1_convert_rc(rc);
-}
-
 pmix_status_t pmix1_convert_opalrc(int rc)
 {
     switch (rc) {