Merge pull request #4184 from rhc54/topic/pmix

Update to track PMIx master

Author: Ralph Castain

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=git3920e33
+repo_rev=gitaffab34
 
 # 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="Sep 01, 2017"
+date="Sep 06, 2017"
 
 # 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/config/pmix.m4

@@ -34,7 +34,14 @@ AC_DEFUN([PMIX_SETUP_CORE],[
 
     AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS])
     AC_REQUIRE([AC_CANONICAL_TARGET])
-    AC_REQUIRE([AC_PROG_CC])
+
+    # AM_PROG_CC_C_O AC_REQUIREs AC_PROG_CC, so we have to be a little
+    # careful about ordering here, and AC_REQUIRE these things so that
+    # they get stamped out in the right order.
+    AC_REQUIRE([_PMIX_START_SETUP_CC])
+    AC_REQUIRE([_PMIX_PROG_CC])
+    AC_REQUIRE([AM_PROG_CC_C_O])
+
 
     # If no prefix was defined, set a good value
     m4_ifval([$1],

opal/mca/pmix/pmix2x/pmix/config/pmix_setup_cc.m4

@@ -16,7 +16,7 @@ dnl Copyright (c) 2012-2017 Los Alamos National Security, LLC. All rights
 dnl                         reserved.
 dnl Copyright (c) 2015      Research Organization for Information Science
 dnl                         and Technology (RIST). All rights reserved.
-dnl Copyright (c) 2015-2016 Intel, Inc.  All rights reserved.
+dnl Copyright (c) 2015-2017 Intel, Inc. All rights reserved.
 dnl $COPYRIGHT$
 dnl
 dnl Additional copyrights may follow
@@ -29,22 +29,14 @@ dnl
 # Do everything required to setup the C compiler.  Safe to AC_REQUIRE
 # this macro.
 AC_DEFUN([PMIX_SETUP_CC],[
-    # AM_PROG_CC_C_O AC_REQUIREs AC_PROG_CC, so we have to be a little
-    # careful about ordering here, and AC_REQUIRE these things so that
-    # they get stamped out in the right order.
 
-    AC_REQUIRE([_PMIX_START_SETUP_CC])
-    AC_REQUIRE([_PMIX_PROG_CC])
-    AC_REQUIRE([AM_PROG_CC_C_O])
-
-    # We require a C99 compiant compiler
+    # We require a C99 compliant compiler
     # The result of AC_PROG_CC_C99 is stored in ac_cv_prog_cc_c99
     if test "x$ac_cv_prog_cc_c99" = xno ; then
         AC_MSG_WARN([PMIx requires a C99 compiler])
         AC_MSG_ERROR([Aborting.])
     fi
 
-
     PMIX_C_COMPILER_VENDOR([pmix_c_vendor])
 
     # Check for standard headers, needed here because needed before
@@ -309,6 +301,7 @@ AC_DEFUN([PMIX_SETUP_CC],[
 AC_DEFUN([_PMIX_START_SETUP_CC],[
     pmix_show_subtitle "C compiler and preprocessor"
 
+    AC_REQUIRE([AC_PROG_CC])
     # $%@#!@#% AIX!!  This has to be called before anything invokes the C
     # compiler.
     dnl AC_AIX

opal/mca/pmix/pmix2x/pmix/examples/debugger.c

@@ -334,7 +334,9 @@ int main(int argc, char **argv)
             /* setup the executable */
             app[0].cmd = strdup("client");
             PMIX_ARGV_APPEND(rc, app[0].argv, "./client");
-            getcwd(cwd, 1024);  // point us to our current directory
+            if (NULL == getcwd(cwd, 1024)) {  // point us to our current directory
+                goto done;
+            }
             app[0].cwd = strdup(cwd);
             app[0].maxprocs = 2;
             /* provide job-level directives so the apps do what the user requested */

opal/mca/pmix/pmix2x/pmix/src/client/pmix_client.c

@@ -482,15 +482,14 @@ PMIX_EXPORT pmix_status_t PMIx_Init(pmix_proc_t *proc,
     if (NULL != evar) {
         PMIX_INFO_LOAD(&ginfo, PMIX_GDS_MODULE, evar, PMIX_STRING);
         pmix_client_globals.myserver->nptr->compat.gds = pmix_gds_base_assign_module(&ginfo, 1);
+        PMIX_INFO_DESTRUCT(&ginfo);
     } else {
         pmix_client_globals.myserver->nptr->compat.gds = pmix_gds_base_assign_module(NULL, 0);
     }
     if (NULL == pmix_client_globals.myserver->nptr->compat.gds) {
-        PMIX_INFO_DESTRUCT(&ginfo);
         PMIX_RELEASE_THREAD(&pmix_global_lock);
         return PMIX_ERR_INIT;
     }
-    PMIX_INFO_DESTRUCT(&ginfo);
     /* now select a GDS module for our own internal use - the user may
      * have passed down a directive for this purpose. If they did, then
      * use it. Otherwise, we want the "hash" module */

opal/mca/pmix/pmix2x/pmix/src/event/pmix_event_notification.c

@@ -109,7 +109,7 @@ static pmix_status_t notify_server_of_event(pmix_status_t status,
                                             pmix_op_cbfunc_t cbfunc, void *cbdata)
 {
     pmix_status_t rc;
-    pmix_buffer_t *msg;
+    pmix_buffer_t *msg = NULL;
     pmix_cmd_t cmd = PMIX_NOTIFY_CMD;
     pmix_cb_t *cb;
     pmix_event_chain_t *chain;
@@ -231,7 +231,7 @@ static pmix_status_t notify_server_of_event(pmix_status_t status,
         PMIX_RELEASE(rbout);
     }
 
-    if (PMIX_RANGE_PROC_LOCAL != range) {
+    if (PMIX_RANGE_PROC_LOCAL != range && NULL != msg) {
         /* create a callback object as we need to pass it to the
          * recv routine so we know which callback to use when
          * the server acks/nacks the register events request. The
@@ -263,7 +263,9 @@ static pmix_status_t notify_server_of_event(pmix_status_t status,
   cleanup:
     pmix_output_verbose(2, pmix_globals.debug_output,
                         "client: notifying server - unable to send");
-    PMIX_RELEASE(msg);
+    if (NULL != msg) {
+        PMIX_RELEASE(msg);
+    }
     /* we were unable to send anything, so we just return the error */
     return rc;
 }

opal/mca/pmix/pmix2x/pmix/src/event/pmix_event_registration.c

@@ -428,7 +428,7 @@ static void reg_event_hdlr(int sd, short args, void *cbdata)
     void *cbobject = NULL;
     pmix_data_range_t range = PMIX_RANGE_UNDEF;
     pmix_proc_t *parray = NULL;
-    size_t nprocs;
+    size_t nprocs = 0;
 
     /* need to acquire the object from its originating thread */
     PMIX_ACQUIRE_OBJECT(cd);
@@ -527,7 +527,7 @@ static void reg_event_hdlr(int sd, short args, void *cbdata)
         evhdlr->index = index;
         ++pmix_globals.events.nhdlrs;
         evhdlr->rng.range = range;
-        if (NULL != parray) {
+        if (NULL != parray && 0 < nprocs) {
             evhdlr->rng.nprocs = nprocs;
             PMIX_PROC_CREATE(evhdlr->rng.procs, nprocs);
             if (NULL == evhdlr->rng.procs) {
@@ -601,7 +601,7 @@ static void reg_event_hdlr(int sd, short args, void *cbdata)
     evhdlr->precedence = location;
     evhdlr->locator = locator;
     evhdlr->rng.range = range;
-    if (NULL != parray) {
+    if (NULL != parray && 0 < nprocs) {
         evhdlr->rng.nprocs = nprocs;
         PMIX_PROC_CREATE(evhdlr->rng.procs, nprocs);
         if (NULL == evhdlr->rng.procs) {

opal/mca/pmix/pmix2x/pmix/src/mca/base/pmix_mca_base_framework.c

@@ -3,7 +3,7 @@
  * Copyright (c) 2012-2015 Los Alamos National Security, LLC. All rights
  *                         reserved.
  * Copyright (c) 2015      Cisco Systems, Inc.  All rights reserved.
- * Copyright (c) 2016      Intel, Inc. All rights reserved
+ * Copyright (c) 2016-2017 Intel, Inc. All rights reserved.
  * $COPYRIGHT$
  *
  * Additional copyrights may follow
@@ -81,8 +81,12 @@ int pmix_mca_base_framework_register (struct pmix_mca_base_framework_t *framewor
             return ret;
         }
 
-        asprintf (&desc, "Default selection set of components for the %s framework (<none>"
-                  " means use all components that can be found)", framework->framework_name);
+        ret = asprintf (&desc, "Default selection set of components for the %s framework (<none>"
+                        " means use all components that can be found)", framework->framework_name);
+        if (0 > ret) {
+            return PMIX_ERR_OUT_OF_RESOURCE;
+        }
+
         ret = pmix_mca_base_var_register (framework->framework_project, framework->framework_name,
                                      NULL, NULL, desc, PMIX_MCA_BASE_VAR_TYPE_STRING, NULL, 0,
                                      PMIX_MCA_BASE_VAR_FLAG_SETTABLE, PMIX_INFO_LVL_2,

opal/mca/pmix/pmix2x/pmix/src/mca/base/pmix_mca_base_open.c

@@ -69,6 +69,7 @@ int pmix_mca_base_open(void)
     pmix_output_stream_t lds;
     char hostname[64];
     int var_id;
+    int rc;
 
     if (pmix_mca_base_opened++) {
         return PMIX_SUCCESS;
@@ -77,17 +78,24 @@ int pmix_mca_base_open(void)
     /* define the system and user default paths */
 #if PMIX_WANT_HOME_CONFIG_FILES
     pmix_mca_base_system_default_path = strdup(pmix_pinstall_dirs.pmixlibdir);
-    asprintf(&pmix_mca_base_user_default_path, "%s"PMIX_PATH_SEP".pmix"PMIX_PATH_SEP"components", pmix_home_directory());
+    rc = asprintf(&pmix_mca_base_user_default_path, "%s"PMIX_PATH_SEP".pmix"PMIX_PATH_SEP"components", pmix_home_directory());
 #else
-    asprintf(&pmix_mca_base_system_default_path, "%s", pmix_pinstall_dirs.pmixlibdir);
+    rc = asprintf(&pmix_mca_base_system_default_path, "%s", pmix_pinstall_dirs.pmixlibdir);
 #endif
 
+    if (0 > rc) {
+        return PMIX_ERR_OUT_OF_RESOURCE;
+    }
+
     /* see if the user wants to override the defaults */
     if (NULL == pmix_mca_base_user_default_path) {
         value = strdup(pmix_mca_base_system_default_path);
     } else {
-        asprintf(&value, "%s%c%s", pmix_mca_base_system_default_path,
-                 PMIX_ENV_SEP, pmix_mca_base_user_default_path);
+        rc = asprintf(&value, "%s%c%s", pmix_mca_base_system_default_path,
+                      PMIX_ENV_SEP, pmix_mca_base_user_default_path);
+        if (0 > rc) {
+            return PMIX_ERR_OUT_OF_RESOURCE;
+        }
     }
 
     pmix_mca_base_component_path = value;
@@ -139,7 +147,10 @@ int pmix_mca_base_open(void)
         set_defaults(&lds);
     }
     gethostname(hostname, 64);
-    asprintf(&lds.lds_prefix, "[%s:%05d] ", hostname, getpid());
+    rc = asprintf(&lds.lds_prefix, "[%s:%05d] ", hostname, getpid());
+    if (0 > rc) {
+        return PMIX_ERR_OUT_OF_RESOURCE;
+    }
     pmix_output_reopen(0, &lds);
     pmix_output_verbose (PMIX_MCA_BASE_VERBOSE_COMPONENT, 0,
                          "mca: base: opening components at %s", pmix_mca_base_component_path);