Merge pull request #2267 from rhc54/topic/pmixup

Update to latest PMIx master

Author: rhc54

opal/mca/pmix/pmix3x/pmix/VERSION

@@ -30,7 +30,7 @@ greek=
 # command, or with the date (if "git describe" fails) in the form of
 # "date<date>".
 
-repo_rev=gitd2aa31f
+repo_rev=git967f3e3
 
 # 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="Oct 13, 2016"
+date="Oct 20, 2016"
 
 # The shared library version of each of PMIx's public libraries.
 # These versions are maintained in accordance with the "Library

opal/mca/pmix/pmix3x/pmix/config/pmix.m4

@@ -17,7 +17,7 @@ dnl Copyright (c) 2009      Los Alamos National Security, LLC.  All rights
 dnl                         reserved.
 dnl Copyright (c) 2009-2011 Oak Ridge National Labs.  All rights reserved.
 dnl Copyright (c) 2011-2013 NVIDIA Corporation.  All rights reserved.
-dnl Copyright (c) 2013-2016 Intel, Inc. All rights reserved.
+dnl Copyright (c) 2013-2016 Intel, Inc.  All rights reserved.
 dnl Copyright (c) 2015-2016 Research Organization for Information Science
 dnl                         and Technology (RIST). All rights reserved.
 dnl Copyright (c) 2016      Mellanox Technologies, Inc.
@@ -312,14 +312,14 @@ AC_DEFUN([PMIX_SETUP_CORE],[
     pmix_show_title "Header file tests"
 
     AC_CHECK_HEADERS([arpa/inet.h \
-                      fcntl.h inttypes.h libgen.h \
-                      netinet/in.h \
+                      fcntl.h ifaddrs.h inttypes.h libgen.h \
+                      net/if.h net/uio.h netinet/in.h \
                       stdint.h stddef.h \
                       stdlib.h string.h strings.h \
-                      sys/param.h \
-                      sys/select.h sys/socket.h \
+                      sys/ioctl.h sys/param.h \
+                      sys/select.h sys/socket.h sys/sockio.h \
                       stdarg.h sys/stat.h sys/time.h \
-                      sys/types.h sys/un.h sys/uio.h net/uio.h \
+                      sys/types.h sys/un.h sys/uio.h \
                       sys/wait.h syslog.h \
                       time.h unistd.h dirent.h \
                       crt_externs.h signal.h \

opal/mca/pmix/pmix3x/pmix/config/pmix_check_os_flavors.m4

@@ -0,0 +1,69 @@
+dnl -*- shell-script -*-
+dnl
+dnl Copyright (c) 2010      Cisco Systems, Inc.  All rights reserved.
+dnl Copyright (c) 2014-2016 Intel, Inc. All rights reserved.
+dnl Copyright (c) 2014      Research Organization for Information Science
+dnl                         and Technology (RIST). All rights reserved.
+dnl
+dnl $COPYRIGHT$
+dnl
+dnl Additional copyrights may follow
+dnl
+dnl $HEADER$
+dnl
+
+# PMIX_CHECK_OS_FLAVOR_SPECIFIC()
+# ----------------------------------------------------
+# Helper macro from PMIX-CHECK-OS-FLAVORS(), below.
+# $1 = macro to look for
+# $2 = suffix of env variable to set with results
+AC_DEFUN([PMIX_CHECK_OS_FLAVOR_SPECIFIC],
+[
+    AC_MSG_CHECKING([$1])
+    AC_COMPILE_IFELSE([AC_LANG_PROGRAM(
+     [[#ifndef $1
+      error: this isnt $1
+      #endif
+     ]])],
+                      [pmix_found_$2=yes],
+                      [pmix_found_$2=no])
+    AC_MSG_RESULT([$pmix_found_$2])
+])dnl
+
+# PMIX_CHECK_OS_FLAVORS()
+# ----------------------------------------------------
+# Try to figure out the various OS flavors out there.
+#
+AC_DEFUN([PMIX_CHECK_OS_FLAVORS],
+[
+    PMIX_CHECK_OS_FLAVOR_SPECIFIC([__NetBSD__], [netbsd])
+    PMIX_CHECK_OS_FLAVOR_SPECIFIC([__FreeBSD__], [freebsd])
+    PMIX_CHECK_OS_FLAVOR_SPECIFIC([__OpenBSD__], [openbsd])
+    PMIX_CHECK_OS_FLAVOR_SPECIFIC([__DragonFly__], [dragonfly])
+    PMIX_CHECK_OS_FLAVOR_SPECIFIC([__386BSD__], [386bsd])
+    PMIX_CHECK_OS_FLAVOR_SPECIFIC([__bsdi__], [bsdi])
+    PMIX_CHECK_OS_FLAVOR_SPECIFIC([__APPLE__], [apple])
+    PMIX_CHECK_OS_FLAVOR_SPECIFIC([__linux__], [linux])
+    PMIX_CHECK_OS_FLAVOR_SPECIFIC([__sun__], [sun])
+    AS_IF([test "$pmix_found_sun" = "no"],
+          PMIX_CHECK_OS_FLAVOR_SPECIFIC([__sun], [sun]))
+
+    AS_IF([test "$pmix_found_sun" = "yes"],
+          [pmix_have_solaris=1
+           CFLAGS="$CFLAGS -D_REENTRANT"
+           CPPFLAGS="$CPPFLAGS -D_REENTRANT"],
+          [pmix_have_solaris=0])
+    AC_DEFINE_UNQUOTED([PMIX_HAVE_SOLARIS],
+                       [$pmix_have_solaris],
+                       [Whether or not we have solaris])
+
+    # check for sockaddr_in (a good sign we have TCP)
+    AC_CHECK_HEADERS([netdb.h netinet/in.h netinet/tcp.h])
+    AC_CHECK_TYPES([struct sockaddr_in],
+                   [pmix_found_sockaddr=yes],
+                   [pmix_found_sockaddr=no],
+                   [AC_INCLUDES_DEFAULT
+#ifdef HAVE_NETINET_IN_H
+#include <netinet/in.h>
+#endif])
+])dnl

opal/mca/pmix/pmix3x/pmix/config/pmix_setup_libevent.m4

@@ -116,10 +116,6 @@ AC_DEFUN([_PMIX_LIBEVENT_EXTERNAL],[
                   AC_MSG_WARN([PMIx requires libevent to be compiled with])
                   AC_MSG_WARN([thread support enabled])
                   AC_MSG_ERROR([Cannot continue])])
-    # Chck if this libevent has the symbol
-    # "libevent_global_shutdown", which will only exist in
-    # libevent version 2.1.1+
-    AC_CHECK_FUNCS([libevent_global_shutdown],[], [])
 
     # Set output variables
     PMIX_EVENT_HEADER="<event.h>"

opal/mca/pmix/pmix3x/pmix/examples/fault.c

@@ -49,15 +49,15 @@ static void notification_fn(size_t evhdlr_registration_id,
 static void op_callbk(pmix_status_t status,
                       void *cbdata)
 {
-    fprintf(stderr, "client: OP CALLBACK CALLED WITH STATUS %d", status);
+    fprintf(stderr, "Client %s:%d OP CALLBACK CALLED WITH STATUS %d\n", myproc.nspace, myproc.rank, status);
 }
 
 static void errhandler_reg_callbk(pmix_status_t status,
                                   size_t errhandler_ref,
                                   void *cbdata)
 {
-    fprintf(stderr, "client: ERRHANDLER REGISTRATION CALLBACK CALLED WITH STATUS %d, ref=%lu",
-                status, (unsigned long)errhandler_ref);
+    fprintf(stderr, "Client %s:%d ERRHANDLER REGISTRATION CALLBACK CALLED WITH STATUS %d, ref=%lu\n",
+               myproc.nspace, myproc.rank, status, (unsigned long)errhandler_ref);
 }
 
 int main(int argc, char **argv)
@@ -76,7 +76,9 @@ int main(int argc, char **argv)
     fprintf(stderr, "Client ns %s rank %d: Running\n", myproc.nspace, myproc.rank);
 
     /* get our universe size */
-    if (PMIX_SUCCESS != (rc = PMIx_Get(&myproc, PMIX_UNIV_SIZE, NULL, 0, &val))) {
+    memcpy(proc.nspace, myproc.nspace, PMIX_MAX_NSLEN);
+    proc.rank = PMIX_RANK_WILDCARD;
+    if (PMIX_SUCCESS != (rc = PMIx_Get(&proc, PMIX_UNIV_SIZE, NULL, 0, &val))) {
         fprintf(stderr, "Client ns %s rank %d: PMIx_Get universe size failed: %d\n", myproc.nspace, myproc.rank, rc);
         goto done;
     }
@@ -100,9 +102,9 @@ int main(int argc, char **argv)
 
     /* rank=0 calls abort */
     if (0 == myproc.rank) {
-        PMIx_Abort(PMIX_ERR_OUT_OF_RESOURCE, "Eat rocks",
-                   &proc, 1);
-        fprintf(stderr, "Client ns %s rank %d: Abort called\n", myproc.nspace, myproc.rank);
+        sleep(2);
+        fprintf(stderr, "Client ns %s rank %d: exiting with error\n", myproc.nspace, myproc.rank);
+        exit(1);
     }
     /* everyone simply waits */
     while (!completed) {

opal/mca/pmix/pmix3x/pmix/include/pmix_version.h.in

@@ -1,7 +1,7 @@
 /*
  * Copyright (c) 2016      Mellanox Technologies, Inc.
  *                         All rights reserved.
- * Copyright (c) 2016      Intel, Inc. All rights reserved.
+ * Copyright (c) 2016      Intel, Inc.  All rights reserved.
  * $COPYRIGHT$
  *
  * Additional copyrights may follow

opal/mca/pmix/pmix3x/pmix/src/client/pmix_client_get.c

@@ -571,10 +571,12 @@ static void _getnbfn(int fd, short flags, void *cbdata)
 
     /* otherwise, the data must be something they "put" */
 #if defined(PMIX_ENABLE_DSTORE) && (PMIX_ENABLE_DSTORE == 1)
-    if (PMIX_SUCCESS == (rc = pmix_dstore_fetch(nptr->nspace, cb->rank, cb->key, &val))) {
+    rc = pmix_dstore_fetch(nptr->nspace, cb->rank, cb->key, &val);
 #else
-    if (PMIX_SUCCESS == (rc = pmix_hash_fetch(&nptr->modex, cb->rank, cb->key, &val))) {
+    rc = pmix_hash_fetch(&nptr->modex, cb->rank, cb->key, &val);
 #endif /* PMIX_ENABLE_DSTORE */
+
+    if ( PMIX_SUCCESS == rc ) {
         pmix_output_verbose(2, pmix_globals.debug_output,
                             "pmix_get[%d]: value retrieved from dstore", __LINE__);
         /* found it - we are in an event, so we can
@@ -607,6 +609,15 @@ static void _getnbfn(int fd, short flags, void *cbdata)
                             "Unable to locally satisfy request for key=%s for rank = %d, namespace = %s",
                             cb->key, cb->rank, cb->nspace);
         cb->checked = true; // flag that we are going to check this again
+    } else if (PMIX_ERR_PROC_ENTRY_NOT_FOUND != rc) {
+        /* errors are fatal */
+        cb->value_cbfunc(rc, NULL, cb->cbdata);
+        /* protect the data */
+        cb->procs = NULL;
+        cb->key = NULL;
+        cb->info = NULL;
+        PMIX_RELEASE(cb);
+        return;
     }
 
   request:

opal/mca/pmix/pmix3x/pmix/src/dstore/pmix_dstore.c

@@ -1,7 +1,7 @@
 /*
  * Copyright (c) 2016      Mellanox Technologies, Inc.
  *                         All rights reserved.
- * Copyright (c) 2016      Intel, Inc. All rights reserved.
+ * Copyright (c) 2016      Intel, Inc.  All rights reserved.
  * $COPYRIGHT$
  *
  * Additional copyrights may follow

opal/mca/pmix/pmix3x/pmix/src/dstore/pmix_dstore.h

@@ -25,6 +25,16 @@ BEGIN_C_DECLS
 int pmix_dstore_init(pmix_info_t info[], size_t ninfo);
 void pmix_dstore_finalize(void);
 int pmix_dstore_store(const char *nspace, pmix_rank_t rank, pmix_kval_t *kv);
+
+/*
+ * Return codes:
+ * - PMIX_ERR_BAD_PARAM - bad parameters - can't proceed.
+ * - PMIX_ERR_FATAL - fatal error
+ * - PMIX_ERR_NOT_FOUND - we have the BLOB for the process but the
+ *   requested key wasn't found there
+ * - PMIX_ERR_PROC_ENTRY_NOT_FOUND - the BLOB for the process wasn't
+ *   found - need to request it from the server.
+ */
 int pmix_dstore_fetch(const char *nspace, pmix_rank_t rank,
                       const char *key, pmix_value_t **kvs);
 int pmix_dstore_patch_env(const char *nspace, char ***env);