Merge pull request open-mpi#2609 from rhc54/topic/psrv

Bring across some more patches from the debugger work

Author: rhc54

opal/mca/pmix/ext2x/pmix2x.c

@@ -733,6 +733,9 @@ pmix_persistence_t pmix2x_convert_opalpersist(opal_pmix_persistence_t persist)
 void pmix2x_value_load(pmix_value_t *v,
                        opal_value_t *kv)
 {
+    opal_pmix2x_jobid_trkr_t *job;
+    bool found;
+
     switch(kv->type) {
         case OPAL_UNDEF:
             v->type = PMIX_UNDEF;
@@ -829,7 +832,18 @@ void pmix2x_value_load(pmix_value_t *v,
             v->type = PMIX_PROC;
             /* have to stringify the jobid */
             PMIX_PROC_CREATE(v->data.proc, 1);
-            (void)opal_snprintf_jobid(v->data.proc->nspace, PMIX_MAX_NSLEN, kv->data.name.vpid);
+            /* see if this job is in our list of known nspaces */
+            found = false;
+            OPAL_LIST_FOREACH(job, &mca_pmix_ext2x_component.jobids, opal_pmix2x_jobid_trkr_t) {
+                if (job->jobid == kv->data.name.jobid) {
+                    (void)strncpy(v->data.proc->nspace, job->nspace, PMIX_MAX_NSLEN);
+                    found = true;
+                    break;
+                }
+            }
+            if (!found) {
+                (void)opal_snprintf_jobid(v->data.proc->nspace, PMIX_MAX_NSLEN, kv->data.name.vpid);
+            }
             v->data.proc->rank = pmix2x_convert_opalrank(kv->data.name.vpid);
             break;
         case OPAL_BYTE_OBJECT:
@@ -875,7 +889,8 @@ int pmix2x_value_unload(opal_value_t *kv,
                        const pmix_value_t *v)
 {
     int rc=OPAL_SUCCESS;
-
+    bool found;
+    opal_pmix2x_jobid_trkr_t *job;
 
     switch(v->type) {
     case PMIX_UNDEF:
@@ -969,8 +984,19 @@ int pmix2x_value_unload(opal_value_t *kv,
         break;
     case PMIX_PROC:
         kv->type = OPAL_NAME;
-        if (OPAL_SUCCESS != (rc = opal_convert_string_to_jobid(&kv->data.name.jobid, v->data.proc->nspace))) {
-            return pmix2x_convert_opalrc(rc);
+        /* see if this job is in our list of known nspaces */
+        found = false;
+        OPAL_LIST_FOREACH(job, &mca_pmix_ext2x_component.jobids, opal_pmix2x_jobid_trkr_t) {
+            if (0 == strncmp(job->nspace, v->data.proc->nspace, PMIX_MAX_NSLEN)) {
+                kv->data.name.jobid = job->jobid;
+                found = true;
+                break;
+            }
+        }
+        if (!found) {
+            if (OPAL_SUCCESS != (rc = opal_convert_string_to_jobid(&kv->data.name.jobid, v->data.proc->nspace))) {
+                return pmix2x_convert_opalrc(rc);
+            }
         }
         kv->data.name.vpid = pmix2x_convert_rank(v->data.proc->rank);
         break;
@@ -1330,18 +1356,20 @@ static void pmix2x_log(opal_list_t *info,
     pmix2x_opcaddy_t *cd;
     pmix_status_t prc;
 
-    /* setup the operation */
+    /* create the caddy */
     cd = OBJ_NEW(pmix2x_opcaddy_t);
-    cd->opcbfunc = cbfunc;
-    cd->cbdata = cbdata;
-    cd->ninfo = ninfo;
 
     /* bozo check */
     if (NULL == info || 0 == (ninfo = opal_list_get_size(info))) {
         rc = OPAL_ERR_BAD_PARAM;
         goto CLEANUP;
     }
 
+    /* setup the operation */
+    cd->opcbfunc = cbfunc;
+    cd->cbdata = cbdata;
+    cd->ninfo = ninfo;
+
     /* convert the list to an array of info objects */
     PMIX_INFO_CREATE(cd->info, cd->ninfo);
     n=0;
@@ -1358,6 +1386,7 @@ static void pmix2x_log(opal_list_t *info,
         rc = pmix2x_convert_rc(prc);
         goto CLEANUP;
     }
+
     return;
 
   CLEANUP:

opal/mca/pmix/ext2x/pmix2x_client.c

@@ -892,7 +892,6 @@ int pmix2x_spawn(opal_list_t *job_info, opal_list_t *apps, opal_jobid_t *jobid)
     n=0;
     OPAL_LIST_FOREACH(app, apps, opal_pmix_app_t) {
         papps[n].cmd = strdup(app->cmd);
-        papps[n].argc = app->argc;
         papps[n].argv = opal_argv_copy(app->argv);
         papps[n].env = opal_argv_copy(app->env);
         papps[n].maxprocs = app->maxprocs;
@@ -993,7 +992,6 @@ int pmix2x_spawnnb(opal_list_t *job_info, opal_list_t *apps,
     n=0;
     OPAL_LIST_FOREACH(app, apps, opal_pmix_app_t) {
         op->apps[n].cmd = strdup(app->cmd);
-        op->apps[n].argc = app->argc;
         op->apps[n].argv = opal_argv_copy(app->argv);
         op->apps[n].env = opal_argv_copy(app->env);
         op->apps[n].maxprocs = app->maxprocs;

opal/mca/pmix/ext2x/pmix2x_component.c

@@ -27,8 +27,8 @@
 /*
  * Public string showing the pmix external component version number
  */
-const char *opal_pmix_pmix2x_component_version_string =
-    "OPAL pmix2x MCA component version " OPAL_VERSION;
+const char *opal_pmix_ext2x_component_version_string =
+    "OPAL ext2x MCA component version " OPAL_VERSION;
 
 /*
  * Local function

opal/mca/pmix/ext2x/pmix2x_server_north.c

@@ -588,7 +588,6 @@ static pmix_status_t server_spawn_fn(const pmix_proc_t *p,
         if (NULL != apps[n].cmd) {
             app->cmd = strdup(apps[n].cmd);
         }
-        app->argc = apps[n].argc;
         if (NULL != apps[n].argv) {
             app->argv = opal_argv_copy(apps[n].argv);
         }
@@ -785,7 +784,6 @@ static pmix_status_t server_notify_event(pmix_status_t code,
 
     /* convert the source */
     if (OPAL_SUCCESS != (rc = opal_convert_string_to_jobid(&src.jobid, source->nspace))) {
-        opal_output(0, "FILE: %s LINE %d", __FILE__, __LINE__);
         OBJ_RELEASE(opalcaddy);
         return pmix2x_convert_opalrc(rc);
     }
@@ -882,7 +880,6 @@ static pmix_status_t server_query(pmix_proc_t *proct,
 
     /* convert the requestor */
     if (OPAL_SUCCESS != (rc = opal_convert_string_to_jobid(&requestor.jobid, proct->nspace))) {
-        opal_output(0, "FILE: %s LINE %d", __FILE__, __LINE__);
         OBJ_RELEASE(opalcaddy);
         return pmix2x_convert_opalrc(rc);
     }
@@ -923,13 +920,22 @@ static void toolcbfunc(int status,
     pmix2x_opalcaddy_t *opalcaddy = (pmix2x_opalcaddy_t*)cbdata;
     pmix_status_t rc;
     pmix_proc_t p;
+    opal_pmix2x_jobid_trkr_t *job;
 
     /* convert the status */
     rc = pmix2x_convert_opalrc(status);
 
-    /* convert the process name */
-    (void)opal_snprintf_jobid(p.nspace, PMIX_MAX_NSLEN, proc.jobid);
-    p.rank = pmix2x_convert_opalrank(proc.vpid);
+    memset(&p, 0, sizeof(pmix_proc_t));
+    if (OPAL_SUCCESS == status) {
+        /* convert the process name */
+        (void)opal_snprintf_jobid(p.nspace, PMIX_MAX_NSLEN, proc.jobid);
+        p.rank = pmix2x_convert_opalrank(proc.vpid);
+        /* store this job in our list of known nspaces */
+        job = OBJ_NEW(opal_pmix2x_jobid_trkr_t);
+        (void)strncpy(job->nspace, p.nspace, PMIX_MAX_NSLEN);
+        job->jobid = proc.jobid;
+        opal_list_append(&mca_pmix_ext2x_component.jobids, &job->super);
+    }
 
     /* pass it down */
     if (NULL != opalcaddy->toolcbfunc) {
@@ -997,7 +1003,6 @@ static void server_log(const pmix_proc_t *proct,
 
     /* convert the requestor */
     if (OPAL_SUCCESS != (rc = opal_convert_string_to_jobid(&requestor.jobid, proct->nspace))) {
-    opal_output(0, "FILE: %s LINE %d", __FILE__, __LINE__);
     OBJ_RELEASE(opalcaddy);
     ret = pmix2x_convert_opalrc(rc);
         if (NULL != cbfunc) {

opal/mca/pmix/ext2x/pmix2x_server_south.c

@@ -71,6 +71,28 @@ static void errreg_cbfunc (pmix_status_t status,
     *active = false;
 }
 
+static void opcbfunc(pmix_status_t status, void *cbdata)
+{
+    pmix2x_opcaddy_t *op = (pmix2x_opcaddy_t*)cbdata;
+
+    if (NULL != op->opcbfunc) {
+        op->opcbfunc(pmix2x_convert_rc(status), op->cbdata);
+    }
+    if (op->active) {
+        op->status = status;
+        op->active = false;
+    } else {
+        OBJ_RELEASE(op);
+    }
+}
+
+static void op2cbfunc(pmix_status_t status, void *cbdata)
+{
+    volatile bool *active = (volatile bool*)cbdata;
+
+    *active = false;
+}
+
 int pmix2x_server_init(opal_pmix_server_module_t *module,
                       opal_list_t *info)
 {
@@ -123,6 +145,12 @@ int pmix2x_server_init(opal_pmix_server_module_t *module,
     PMIx_Register_event_handler(NULL, 0, NULL, 0, pmix2x_event_hdlr, errreg_cbfunc, (void*)&active);
     PMIX_WAIT_FOR_COMPLETION(active);
 
+    /* as we might want to use some client-side functions, be sure
+     * to register our own nspace */
+    active = true;
+    PMIx_server_register_nspace(job->nspace, 1, NULL, 0, op2cbfunc, (void*)&active);
+    PMIX_WAIT_FOR_COMPLETION(active);
+
     return OPAL_SUCCESS;
 }
 
@@ -163,21 +191,6 @@ int pmix2x_server_gen_ppn(const char *input, char **ppn)
     return pmix2x_convert_rc(rc);
 }
 
-static void opcbfunc(pmix_status_t status, void *cbdata)
-{
-    pmix2x_opcaddy_t *op = (pmix2x_opcaddy_t*)cbdata;
-
-    if (NULL != op->opcbfunc) {
-        op->opcbfunc(pmix2x_convert_rc(status), op->cbdata);
-    }
-    if (op->active) {
-        op->status = status;
-        op->active = false;
-    } else {
-        OBJ_RELEASE(op);
-    }
-}
-
 static void _reg_nspace(int sd, short args, void *cbdata)
 {
     pmix2x_threadshift_t *cd = (pmix2x_threadshift_t*)cbdata;
@@ -486,6 +499,7 @@ int pmix2x_server_notify_event(int status,
         OPAL_LIST_FOREACH(kv, info, opal_value_t) {
             (void)strncpy(pinfo[n].key, kv->key, PMIX_MAX_KEYLEN);
             pmix2x_value_load(&pinfo[n].value, kv);
+            ++n;
         }
     } else {
         sz = 0;

opal/mca/pmix/pmix2x/pmix/Makefile.am

@@ -23,7 +23,7 @@
 # via AC_CONFIG_MACRO_DIR in configure.ac.
 ACLOCAL_AMFLAGS = -I ./config
 
-SUBDIRS = config include src
+SUBDIRS = config contrib include src
 
 
 headers =

opal/mca/pmix/pmix2x/pmix/VERSION

@@ -30,7 +30,7 @@ greek=
 # command, or with the date (if "git describe" fails) in the form of
 # "date<date>".
 
-repo_rev=git9089b99
+repo_rev=gitb9778a7
 
 # If tarball_version is not empty, it is used as the version string in
 # the tarball filename, regardless of all other versions listed in
@@ -44,7 +44,7 @@ tarball_version=
 
 # The date when this release was created
 
-date="Dec 13, 2016"
+date="Dec 19, 2016"
 
 # The shared library version of each of PMIx's public libraries.
 # These versions are maintained in accordance with the "Library

opal/mca/pmix/pmix2x/pmix/configure.ac

@@ -218,7 +218,8 @@ AC_SUBST([CONFIGURE_DEPENDENCIES], ['$(top_srcdir)/VERSION'])
 . $srcdir/VERSION
 AC_SUBST([libpmix_so_version])
 
-AC_CONFIG_FILES(pmix_config_prefix[examples/Makefile]
+AC_CONFIG_FILES(pmix_config_prefix[contrib/Makefile]
+                pmix_config_prefix[examples/Makefile]
                 pmix_config_prefix[man/Makefile]
                 pmix_config_prefix[test/Makefile]
                 pmix_config_prefix[test/simple/Makefile])

opal/mca/pmix/pmix2x/pmix/contrib/Makefile.am

@@ -0,0 +1,39 @@
+#
+# Copyright (c) 2004-2010 The Trustees of Indiana University and Indiana
+#                         University Research and Technology
+#                         Corporation.  All rights reserved.
+# Copyright (c) 2004-2005 The University of Tennessee and The University
+#                         of Tennessee Research Foundation.  All rights
+#                         reserved.
+# Copyright (c) 2004-2009 High Performance Computing Center Stuttgart,
+#                         University of Stuttgart.  All rights reserved.
+# Copyright (c) 2004-2005 The Regents of the University of California.
+#                         All rights reserved.
+# Copyright (c) 2009      Cisco Systems, Inc.  All rights reserved.
+# Copyright (c) 2010      IBM Corporation.  All rights reserved.
+# Copyright (c) 2010-2011 Oak Ridge National Labs.  All rights reserved.
+# Copyright (c) 2013-2016 Los Alamos National Security, Inc.  All rights
+#                         reserved.
+# Copyright (c) 2013-2016 Intel, Inc.  All rights reserved.
+# $COPYRIGHT$
+#
+# Additional copyrights may follow
+#
+# $HEADER$
+#
+
+EXTRA_DIST = \
+	make_dist_tarball \
+	buildrpm.sh \
+	cron-run-all-md2nroff.pl \
+        md2nroff.pl \
+	platform/optimized \
+        pmix_jenkins.sh \
+        pmix-release.sh \
+        pmix.spec \
+        update-my-copyright.pl \
+        whitespace-purge.sh
+
+include perf_tools/Makefile.include
+
+dist_pmixdata_DATA = pmix-valgrind.supp