Merge pull request open-mpi#1741 from rhc54/topic/pmix114

Update to 1.1.4rc3

Author: rhc54

opal/mca/pmix/pmix114/pmix/NEWS

@@ -43,6 +43,9 @@ Master (not on release branches yet)
 - Do not install internal headers unless specifically
   requested to do so
 - Add support for multiple calls to Put/Commit
+- Silence some "return code unchecked" warnings. Thanks
+  to Jim Garlick for pointing them out
+- Resolve a race condition during register_clients
 
 
 1.1.3

opal/mca/pmix/pmix114/pmix/VERSION

@@ -23,14 +23,14 @@ release=4
 # The only requirement is that it must be entirely printable ASCII
 # characters and have no white space.
 
-greek=rc2
+greek=rc3
 
 # If repo_rev is empty, then the repository version number will be
 # obtained during "make dist" via the "git describe --tags --always"
 # command, or with the date (if "git describe" fails) in the form of
 # "date<date>".
 
-repo_rev=git65d985c
+repo_rev=git4695e45
 
 # 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="May 19, 2016"
+date="Jun 01, 2016"
 
 # The shared library version of each of PMIx's public libraries.
 # These versions are maintained in accordance with the "Library

opal/mca/pmix/pmix114/pmix/config/pmix.m4

@@ -456,7 +456,11 @@ AC_DEFUN([PMIX_SETUP_CORE],[
                          #endif
                      ])
 
-    #
+    AC_CHECK_MEMBERS([struct ucred.uid, struct ucred.cr_uid, struct sockpeercred.uid],
+                     [], [],
+                     [#include <sys/types.h>
+                      #include <sys/socket.h> ])
+
     # Check for ptrdiff type.  Yes, there are platforms where
     # sizeof(void*) != sizeof(long) (64 bit Windows, apparently).
     #
@@ -491,7 +495,7 @@ AC_DEFUN([PMIX_SETUP_CORE],[
     # Darwin doesn't need -lm, as it's a symlink to libSystem.dylib
     PMIX_SEARCH_LIBS_CORE([ceil], [m])
 
-    AC_CHECK_FUNCS([asprintf snprintf vasprintf vsnprintf strsignal socketpair strncpy_s usleep])
+    AC_CHECK_FUNCS([asprintf snprintf vasprintf vsnprintf strsignal socketpair strncpy_s usleep getpeereid])
 
     # On some hosts, htonl is a define, so the AC_CHECK_FUNC will get
     # confused.  On others, it's in the standard library, but stubbed with

opal/mca/pmix/pmix114/pmix/config/pmix_check_munge.m4

@@ -1,6 +1,6 @@
 # -*- shell-script -*-
 #
-# Copyright (c) 2015      Intel, Inc. All rights reserved
+# Copyright (c) 2015-2016 Intel, Inc. All rights reserved
 # Copyright (c) 2015      Cisco Systems, Inc.  All rights reserved.
 # $COPYRIGHT$
 #
@@ -24,9 +24,9 @@ AC_DEFUN([PMIX_MUNGE_CONFIG],[
                                 [Search for munge libraries in DIR ])])
 
     pmix_munge_support=0
-    if test "$with_munge" != "no"; then
+    if test ! -z "$with_munge" && test "$with_munge" != "no"; then
         AC_MSG_CHECKING([for munge in])
-        if test ! -z "$with_munge" && test "$with_munge" != "yes"; then
+        if test "$with_munge" != "yes"; then
             if test -d $with_munge/include/munge; then
                 pmix_munge_dir=$with_munge/include/munge
             else
@@ -76,8 +76,8 @@ AC_DEFUN([PMIX_MUNGE_CONFIG],[
         AC_MSG_RESULT([yes])
     fi
 
-    AC_DEFINE_UNQUOTED([PMIX_HAVE_MUNGE], [$pmix_munge_support],
-                       [Whether we have munge support or not])
+    AC_DEFINE_UNQUOTED([PMIX_WANT_MUNGE], [$pmix_munge_support],
+                       [Whether we want munge support or not])
 
     PMIX_VAR_SCOPE_POP
 ])dnl

opal/mca/pmix/pmix114/pmix/config/pmix_check_sasl.m4

@@ -27,9 +27,9 @@ AC_DEFUN([PMIX_SASL_CONFIG],[
                                 [Search for sasl libraries in DIR ])])
 
     pmix_sasl_support=0
-    if test "$with_sasl" != "no"; then
+    if test ! -z "$with_sasl" && test "$with_sasl" != "no"; then
         AC_MSG_CHECKING([for sasl in])
-        if test ! -z "$with_sasl" && test "$with_sasl" != "yes"; then
+        if test "$with_sasl" != "yes"; then
             pmix_sasl_dir=$with_sasl/include/sasl
             if test -d $with_sasl/lib; then
                 pmix_sasl_libdir=$with_sasl/lib

opal/mca/pmix/pmix114/pmix/examples/client.c

@@ -61,7 +61,9 @@ int main(int argc, char **argv)
     fprintf(stderr, "Client %s:%d universe size %d\n", myproc.nspace, myproc.rank, nprocs);
 
     /* put a few values */
-    (void)asprintf(&tmp, "%s-%d-internal", myproc.nspace, myproc.rank);
+    if (0 > asprintf(&tmp, "%s-%d-internal", myproc.nspace, myproc.rank)) {
+        exit(1);
+    }
     value.type = PMIX_UINT32;
     value.data.uint32 = 1234;
     if (PMIX_SUCCESS != (rc = PMIx_Store_internal(&myproc, tmp, &value))) {
@@ -70,7 +72,9 @@ int main(int argc, char **argv)
     }
     free(tmp);
 
-    (void)asprintf(&tmp, "%s-%d-local", myproc.nspace, myproc.rank);
+    if (0 > asprintf(&tmp, "%s-%d-local", myproc.nspace, myproc.rank)) {
+        exit(1);
+    }
     value.type = PMIX_UINT64;
     value.data.uint64 = 1234;
     if (PMIX_SUCCESS != (rc = PMIx_Put(PMIX_LOCAL, tmp, &value))) {
@@ -79,7 +83,9 @@ int main(int argc, char **argv)
     }
     free(tmp);
 
-    (void)asprintf(&tmp, "%s-%d-remote", myproc.nspace, myproc.rank);
+    if (0 > asprintf(&tmp, "%s-%d-remote", myproc.nspace, myproc.rank)) {
+        exit(1);
+    }
     value.type = PMIX_STRING;
     value.data.string = "1234";
     if (PMIX_SUCCESS != (rc = PMIx_Put(PMIX_REMOTE, tmp, &value))) {
@@ -108,7 +114,9 @@ int main(int argc, char **argv)
 
     /* check the returned data */
     for (n=0; n < nprocs; n++) {
-        (void)asprintf(&tmp, "%s-%d-local", myproc.nspace, myproc.rank);
+        if (0 > asprintf(&tmp, "%s-%d-local", myproc.nspace, myproc.rank)) {
+            exit(1);
+        }
         if (PMIX_SUCCESS != (rc = PMIx_Get(&myproc, tmp, NULL, 0, &val))) {
             fprintf(stderr, "Client ns %s rank %d: PMIx_Get %s failed: %d\n", myproc.nspace, myproc.rank, tmp, rc);
             goto done;
@@ -128,7 +136,9 @@ int main(int argc, char **argv)
         fprintf(stderr, "Client ns %s rank %d: PMIx_Get %s returned correct\n", myproc.nspace, myproc.rank, tmp);
         PMIX_VALUE_RELEASE(val);
         free(tmp);
-        (void)asprintf(&tmp, "%s-%d-remote", myproc.nspace, myproc.rank);
+        if (0 > asprintf(&tmp, "%s-%d-remote", myproc.nspace, myproc.rank)) {
+            exit(1);
+        }
         if (PMIX_SUCCESS != (rc = PMIx_Get(&myproc, tmp, NULL, 0, &val))) {
             fprintf(stderr, "Client ns %s rank %d: PMIx_Get %s failed: %d\n", myproc.nspace, myproc.rank, tmp, rc);
             goto done;

opal/mca/pmix/pmix114/pmix/examples/dmodex.c

@@ -117,7 +117,9 @@ int main(int argc, char **argv)
     fprintf(stderr, "Client %s:%d universe size %d\n", myproc.nspace, myproc.rank, nprocs);
 
     /* put a few values */
-    (void)asprintf(&tmp, "%s-%d-internal", myproc.nspace, myproc.rank);
+    if (0 > asprintf(&tmp, "%s-%d-internal", myproc.nspace, myproc.rank)) {
+        exit(1);
+    }
     value.type = PMIX_UINT32;
     value.data.uint32 = 1234;
     if (PMIX_SUCCESS != (rc = PMIx_Store_internal(&myproc, tmp, &value))) {
@@ -126,7 +128,9 @@ int main(int argc, char **argv)
     }
     free(tmp);
 
-    (void)asprintf(&tmp, "%s-%d-local", myproc.nspace, myproc.rank);
+    if (0 > asprintf(&tmp, "%s-%d-local", myproc.nspace, myproc.rank)) {
+        exit(1);
+    }
     value.type = PMIX_UINT64;
     value.data.uint64 = 1234;
     if (PMIX_SUCCESS != (rc = PMIx_Put(PMIX_LOCAL, tmp, &value))) {
@@ -135,7 +139,9 @@ int main(int argc, char **argv)
     }
     free(tmp);
 
-    (void)asprintf(&tmp, "%s-%d-remote", myproc.nspace, myproc.rank);
+    if (0 > asprintf(&tmp, "%s-%d-remote", myproc.nspace, myproc.rank)) {
+        exit(1);
+    }
     value.type = PMIX_STRING;
     value.data.string = "1234";
     if (PMIX_SUCCESS != (rc = PMIx_Put(PMIX_REMOTE, tmp, &value))) {
@@ -170,7 +176,9 @@ int main(int argc, char **argv)
     /* get the committed data - ask for someone who doesn't exist as well */
     num_gets = 0;
     for (n=0; n <= nprocs; n++) {
-        (void)asprintf(&tmp, "%s-%d-local", myproc.nspace, n);
+        if (0 > asprintf(&tmp, "%s-%d-local", myproc.nspace, n)) {
+            exit(1);
+        }
         (void)strncpy(proc.nspace, tmp, PMIX_MAX_NSLEN);
         proc.rank = n;
         if (PMIX_SUCCESS != (rc = PMIx_Get_nb(&proc, tmp,
@@ -179,7 +187,9 @@ int main(int argc, char **argv)
             goto done;
         }
         ++num_gets;
-        (void)asprintf(&tmp, "%s-%d-remote", myproc.nspace, n);
+        if (0 > asprintf(&tmp, "%s-%d-remote", myproc.nspace, n)) {
+            exit(1);
+        }
         (void)strncpy(proc.nspace, tmp, PMIX_MAX_NSLEN);
         if (PMIX_SUCCESS != (rc = PMIx_Get_nb(&proc, tmp,
                                               NULL, 0, valcbfunc, tmp))) {

opal/mca/pmix/pmix114/pmix/examples/dynamic.c

@@ -50,8 +50,12 @@ int main(int argc, char **argv)
     size_t npeers, ntmp=0;
     char *nodelist;
 
-    gethostname(hostname, sizeof(hostname));
-    getcwd(dir, 1024);
+    if (0 > gethostname(hostname, sizeof(hostname))) {
+        exit(1);
+    }
+    if (NULL == getcwd(dir, 1024)) {
+        exit(1);
+    }
 
     /* init us */
     if (PMIX_SUCCESS != (rc = PMIx_Init(&myproc))) {
@@ -81,11 +85,15 @@ int main(int argc, char **argv)
     /* rank=0 calls spawn */
     if (0 == myproc.rank) {
         PMIX_APP_CREATE(app, 1);
-        (void)asprintf(&app->cmd, "%s/client", dir);
+        if (0 > asprintf(&app->cmd, "%s/client", dir)) {
+            exit(1);
+        }
         app->maxprocs = 2;
         app->argc = 1;
         app->argv = (char**)malloc(2 * sizeof(char*));
-        (void)asprintf(&app->argv[0], "%s/client", dir);
+        if (0 > asprintf(&app->argv[0], "%s/client", dir)) {
+            exit(1);
+        }
         app->argv[1] = NULL;
         app->env = (char**)malloc(2 * sizeof(char*));
         app->env[0] = strdup("PMIX_ENV_VALUE=3");

opal/mca/pmix/pmix114/pmix/include/pmix/pmix_common.h

@@ -93,6 +93,9 @@ BEGIN_C_DECLS
 #define PMIX_USERID                "pmix.euid"              // (uint32_t) effective user id
 #define PMIX_GRPID                 "pmix.egid"              // (uint32_t) effective group id
 
+/* attributes for the rendezvous socket  */
+#define PMIX_SOCKET_MODE           "pmix.sockmode"          // (uint32_t) POSIX mode_t (9 bits valid)
+
 /* general proc-level attributes */
 #define PMIX_CPUSET                "pmix.cpuset"            // (char*) hwloc bitmap applied to proc upon launch
 #define PMIX_CREDENTIAL            "pmix.cred"              // (char*) security credential assigned to proc

opal/mca/pmix/pmix114/pmix/src/buffer_ops/pack.c

@@ -332,7 +332,9 @@ pmix_status_t pmix_bfrop_pack_float(pmix_buffer_t *buffer, const void *src,
     char *convert;
 
     for (i = 0; i < num_vals; ++i) {
-        asprintf(&convert, "%f", ssrc[i]);
+        if (0 > asprintf(&convert, "%f", ssrc[i])) {
+            return PMIX_ERR_NOMEM;
+        }
         if (PMIX_SUCCESS != (ret = pmix_bfrop_pack_string(buffer, &convert, 1, PMIX_STRING))) {
             free(convert);
             return ret;
@@ -353,7 +355,9 @@ pmix_status_t pmix_bfrop_pack_double(pmix_buffer_t *buffer, const void *src,
     char *convert;
 
     for (i = 0; i < num_vals; ++i) {
-        asprintf(&convert, "%f", ssrc[i]);
+        if (0 > asprintf(&convert, "%f", ssrc[i])) {
+            return PMIX_ERR_NOMEM;
+        }
         if (PMIX_SUCCESS != (ret = pmix_bfrop_pack_string(buffer, &convert, 1, PMIX_STRING))) {
             free(convert);
             return ret;