Merge pull request #1277 from rhc54/cmr20/pmixupdate

Update PMIx support to the 1.1.5 release

Author: jsquyres

opal/mca/pmix/pmix112/pmix/Makefile.am

@@ -31,9 +31,9 @@ EXTRA_DIST =
 # Only install the valgrind suppressions file if we're building in
 # standalone mode
 dist_pmixdata_DATA =
+
 if ! PMIX_EMBEDDED_MODE
 dist_pmixdata_DATA += contrib/pmix-valgrind.supp
-endif
 
 man_MANS = \
         man/man3/pmix_init.3 \
@@ -42,9 +42,13 @@ man_MANS = \
         man/man3/pmix_abort.3 \
         man/man3/pmix_put.3 \
         man/man3/pmix_commit.3 \
+        man/man3/pmix_fence.3 \
+        man/man3/pmix_get.3 \
         man/man7/pmix.7 \
         man/man7/pmix_constants.7
 
+endif
+
 include config/Makefile.am
 include include/Makefile.am
 include src/class/Makefile.am
@@ -61,17 +65,22 @@ if PMIX_EMBEDDED_MODE
 noinst_LTLIBRARIES = libpmix.la
 libpmix_la_SOURCES = $(headers) $(sources)
 libpmix_la_LDFLAGS =
+
 else
+
 lib_LTLIBRARIES = libpmix.la
 libpmix_la_SOURCES = $(headers) $(sources)
 libpmix_la_LDFLAGS = -version-info $(libpmix_so_version)
+SUBDIRS = . test examples
 endif
 
-
-if ! PMIX_EMBEDDED_MODE
-SUBDIRS = . test
+if WANT_INSTALL_HEADERS
 pmixdir = $(pmixincludedir)/$(subdir)
 nobase_pmix_HEADERS = $(headers)
+
+else
+
+noinst_HEADERS = $(headers)
 endif
 
 nroff:
@@ -82,14 +91,15 @@ nroff:
 
 EXTRA_DIST += README INSTALL VERSION LICENSE autogen.sh \
              config/pmix_get_version.sh $(man_MANS) \
-             contrib/platform/optimized \
-             test/test_common.h test/cli_stages.h \
-             test/server_callbacks.h test/test_fence.h \
-             test/test_publish.h test/test_resolve_peers.h \
-             test/test_spawn.h test/utils.h test/test_cd.h \
-             examples/client.c examples/dmodex.c examples/dynamic.c \
-             examples/fault.c examples/pub.c
+             contrib/platform/optimized
 
+if ! PMIX_EMBEDDED_MODE
+
+EXTRA_DIST += test/test_common.h test/cli_stages.h \
+              test/server_callbacks.h test/test_fence.h \
+              test/test_publish.h test/test_resolve_peers.h \
+              test/test_spawn.h test/utils.h test/test_cd.h
+endif
 
 dist-hook:
 	env LS_COLORS= sh "$(top_srcdir)/config/distscript.sh" "$(top_srcdir)" "$(distdir)" "$(PMIX_VERSION)" "$(PMIX_REPO_REV)"

opal/mca/pmix/pmix112/pmix/NEWS

@@ -1,4 +1,4 @@
-Copyright (c) 2015      Intel, Inc.  All rights reserved.
+Copyright (c) 2015-2016 Intel, Inc.  All rights reserved.
 $COPYRIGHT$
 
 Additional copyrights may follow
@@ -23,6 +23,39 @@ current release as well as the "stable" bug fix release branch.
 Master (not on release branches yet)
 ------------------------------------
 
+1.1.4
+-----
+- Properly increment the reference count for PMIx_Init
+- Fix examples so all run properly
+- Fix/complete PMI2 backward compatibility support to handle
+  keys that are not associated with a specific rank
+- Do a better job of hiding non-API symbols
+- Correct handling of semi-colon terminations on macros.
+  Thanks to Ashley Pittman for the patch
+- Add more man pages
+- Improve error checking and messages for connection
+  attempts from client to server
+- If the tmpdir name is too long, provide an appropriate
+  help message to the user (particularly relevant on
+  Mac OSX). Thanks to Rainer Keller for the patch.
+- Fix some C++ compatibility issues
+- Fix/complete PMI-1 backward compatibility support
+- 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
+-----
+- Update the symbol hiding file to cover all symbols
+- Fix examples and test directory Makefile.am's so
+  the Makefiles are automatically built and the
+  code compiled, but not installed
+- Do not install the pmix library in embedded use-cases
+
 
 1.1.2
 -----

opal/mca/pmix/pmix112/pmix/VERSION

@@ -3,7 +3,7 @@
 # Copyright (c) 2011      NVIDIA Corporation.  All rights reserved.
 # Copyright (c) 2013      Mellanox Technologies, Inc.
 #                         All rights reserved.
-# Copyright (c) 2014-2015 Intel, Inc. All rights reserved.
+# Copyright (c) 2014-2016 Intel, Inc. All rights reserved.
 
 # This is the VERSION file for PMIx, describing the precise
 # version of PMIx in this distribution.  The various components of
@@ -15,7 +15,7 @@
 
 major=1
 minor=1
-release=2
+release=4
 
 # greek is used for alpha or beta release tags.  If it is non-empty,
 # it will be appended to the version number.  It does not have to be
@@ -30,7 +30,7 @@ greek=
 # command, or with the date (if "git describe" fails) in the form of
 # "date<date>".
 
-repo_rev=git17ae5a4
+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="Dec 12, 2015"
+date="Jun 01, 2016"
 
 # The shared library version of each of PMIx's public libraries.
 # These versions are maintained in accordance with the "Library
@@ -75,4 +75,4 @@ date="Dec 12, 2015"
 # Version numbers are described in the Libtool current:revision:age
 # format.
 
-libpmix_so_version=2:1:0
+libpmix_so_version=2:3:0

opal/mca/pmix/pmix112/pmix/config/pmix.m4

@@ -20,6 +20,9 @@ dnl Copyright (c) 2011-2013 NVIDIA Corporation.  All rights reserved.
 dnl Copyright (c) 2013-2015 Intel, Inc. All rights reserved
 dnl Copyright (c) 2015      Research Organization for Information Science
 dnl                         and Technology (RIST). All rights reserved.
+dnl Copyright (c) 2016      Mellanox Technologies, Inc.
+dnl                         All rights reserved.
+dnl Copyright (c) 2016      IBM Corporation.  All rights reserved.
 dnl
 dnl $COPYRIGHT$
 dnl
@@ -82,6 +85,34 @@ AC_DEFUN([PMIX_SETUP_CORE],[
     AC_SUBST(PMIX_RELEASE_DATE)
     AC_MSG_RESULT([$PMIX_VERSION])
 
+    # Save the breakdown the version information
+    AC_MSG_CHECKING([for pmix major version])
+    PMIX_MAJOR_VERSION="`$PMIX_top_srcdir/config/pmix_get_version.sh $PMIX_top_srcdir/VERSION --major`"
+    if test "$?" != "0"; then
+        AC_MSG_ERROR([Cannot continue])
+    fi
+    AC_SUBST(PMIX_MAJOR_VERSION)
+    AC_DEFINE_UNQUOTED([PMIX_MAJOR_VERSION], ["$PMIX_MAJOR_VERSION"],
+                       [The library major version is always available, contrary to VERSION])
+
+    AC_MSG_CHECKING([for pmix minor version])
+    PMIX_MINOR_VERSION="`$PMIX_top_srcdir/config/pmix_get_version.sh $PMIX_top_srcdir/VERSION --minor`"
+    if test "$?" != "0"; then
+        AC_MSG_ERROR([Cannot continue])
+    fi
+    AC_SUBST(PMIX_MINOR_VERSION)
+    AC_DEFINE_UNQUOTED([PMIX_MINOR_VERSION], ["$PMIX_MINOR_VERSION"],
+                       [The library minor version is always available, contrary to VERSION])
+
+    AC_MSG_CHECKING([for pmix release version])
+    PMIX_RELEASE_VERSION="`$PMIX_top_srcdir/config/pmix_get_version.sh $PMIX_top_srcdir/VERSION --release`"
+    if test "$?" != "0"; then
+        AC_MSG_ERROR([Cannot continue])
+    fi
+    AC_SUBST(PMIX_RELEASE_VERSION)
+    AC_DEFINE_UNQUOTED([PMIX_RELEASE_VERSION], ["$PMIX_RELEASE_VERSION"],
+                       [The library release version is always available, contrary to VERSION])
+
     # Debug mode?
     AC_MSG_CHECKING([if want pmix maintainer support])
     pmix_debug=
@@ -99,11 +130,6 @@ AC_DEFUN([PMIX_SETUP_CORE],[
     AC_MSG_CHECKING([for pmix directory prefix])
     AC_MSG_RESULT(m4_ifval([$1], pmix_config_prefix, [(none)]))
 
-    # Note that private/config.h *MUST* be listed first so that it
-    # becomes the "main" config header file.  Any AC-CONFIG-HEADERS
-    # after that (pmix/config.h) will only have selective #defines
-    # replaced, not the entire file.
-    AC_CONFIG_HEADERS(pmix_config_prefix[include/private/autogen/config.h])
     AC_CONFIG_HEADERS(pmix_config_prefix[include/pmix/autogen/config.h])
 
     # What prefix are we using?
@@ -430,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).
     #
@@ -465,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
@@ -580,7 +610,7 @@ AC_DEFUN([PMIX_SETUP_CORE],[
         # rather than have successive assignments to these shell
         # variables, lest the $(foo) names try to get evaluated here.
         # Yuck!
-        CPPFLAGS='-I$(PMIX_top_srcdir) -I$(PMIX_top_builddir) -I$(PMIX_top_srcdir)/src -I$(PMIX_top_srcdir)/include -I$(PMIX_top_builddir)/include'" $CPPFLAGS"
+        CPPFLAGS='-I$(PMIX_top_builddir) -I$(PMIX_top_srcdir) -I$(PMIX_top_srcdir)/src -I$(PMIX_top_builddir)/include -I$(PMIX_top_srcdir)/include'" $CPPFLAGS"
     else
         CPPFLAGS='-I$(PMIX_top_srcdir) -I$(PMIX_top_srcdir)/src -I$(PMIX_top_srcdir)/include'" $CPPFLAGS"
     fi
@@ -608,12 +638,15 @@ AC_DEFUN([PMIX_SETUP_CORE],[
 
 AC_DEFUN([PMIX_DEFINE_ARGS],[
     # Embedded mode, or standalone?
+    AC_MSG_CHECKING([if embedded mode is enabled])
     AC_ARG_ENABLE([embedded-mode],
         [AC_HELP_STRING([--enable-embedded-mode],
                 [Using --enable-embedded-mode causes PMIx to skip a few configure checks and install nothing.  It should only be used when building PMIx within the scope of a larger package.])])
     AS_IF([test ! -z "$enable_embedded_mode" && test "$enable_embedded_mode" = "yes"],
-          [pmix_mode=embedded],
-          [pmix_mode=standalone])
+          [pmix_mode=embedded
+           AC_MSG_RESULT([yes])],
+          [pmix_mode=standalone
+           AC_MSG_RESULT([no])])
 
     # Change the symbol prefix?
     AC_ARG_WITH([pmix-symbol-prefix],
@@ -685,6 +718,22 @@ AC_ARG_ENABLE(debug-symbols,
               AC_HELP_STRING([--disable-debug-symbols],
                              [Disable adding compiler flags to enable debugging symbols if --enable-debug is specified.  For non-debugging builds, this flag has no effect.]))
 
+#
+# Do we want to install the internal devel headers?
+#
+AC_MSG_CHECKING([if want to install project-internal header files])
+AC_ARG_WITH(devel-headers,
+    AC_HELP_STRING([--with-devel-headers],
+                   [normal PMIx users/applications do not need this (pmix.h and friends are ALWAYS installed).  Developer headers are only necessary for authors doing deeper integration (default: disabled).]))
+if test "$with_devel_headers" = "yes"; then
+    AC_MSG_RESULT([yes])
+    WANT_INSTALL_HEADERS=1
+else
+    AC_MSG_RESULT([no])
+    WANT_INSTALL_HEADERS=0
+fi
+AM_CONDITIONAL(WANT_INSTALL_HEADERS, test "$WANT_INSTALL_HEADERS" = 1)
+
 #
 # Do we want the pretty-print stack trace feature?
 #

opal/mca/pmix/pmix112/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/pmix112/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/pmix112/pmix/config/pmix_check_visibility.m4

@@ -30,7 +30,7 @@ AC_DEFUN([PMIX_CHECK_VISIBILITY],[
         AC_HELP_STRING([--enable-visibility],
             [enable visibility feature of certain compilers/linkers (default: enabled)]))
 
-    pmix_visibility_define=0
+    WANT_VISIBILITY=0
     pmix_msg="whether to enable symbol visibility"
 
     if test "$enable_visibility" = "no"; then
@@ -73,7 +73,8 @@ AC_DEFUN([PMIX_CHECK_VISIBILITY],[
         PMIX_VISIBILITY_CFLAGS=$pmix_add
 
         if test "$pmix_add" != "" ; then
-            pmix_visibility_define=1
+            WANT_VISIBILITY=1
+            CFLAGS="$CFLAGS $PMIX_VISIBILITY_CFLAGS"
             AC_MSG_CHECKING([$pmix_msg])
             AC_MSG_RESULT([yes (via $pmix_add)])
         elif test "$enable_visibility" = "yes"; then
@@ -85,6 +86,7 @@ AC_DEFUN([PMIX_CHECK_VISIBILITY],[
         unset pmix_add
     fi
 
-    AC_DEFINE_UNQUOTED([PMIX_C_HAVE_VISIBILITY], [$pmix_visibility_define],
+    AC_DEFINE_UNQUOTED([PMIX_C_HAVE_VISIBILITY], [$WANT_VISIBILITY],
             [Whether C compiler supports symbol visibility or not])
+    AM_CONDITIONAL([WANT_HIDDEN],[test "$WANT_VISIBILITY" = "1"])
 ])

opal/mca/pmix/pmix112/pmix/configure.ac

@@ -20,6 +20,7 @@
 # Copyright (c) 2013      Mellanox Technologies, Inc.
 #                         All rights reserved.
 # Copyright (c) 2014-2015 Intel, Inc. All rights reserved
+# Copyright (c) 2016      IBM Corporation.  All rights reserved.
 # $COPYRIGHT$
 #
 # Additional copyrights may follow
@@ -88,6 +89,7 @@ AH_TOP([/* -*- c -*-
  * Copyright (c) 2004-2005 The Regents of the University of California.
  *                         All rights reserved.
  * Copyright (c) 2013-2015 Intel, Inc. All rights reserved
+ * Copyright (c) 2016      IBM Corporation.  All rights reserved.
  * $COPYRIGHT$
  *
  * Additional copyrights may follow
@@ -206,7 +208,8 @@ AC_SUBST([CONFIGURE_DEPENDENCIES], ['$(top_srcdir)/VERSION'])
 . $srcdir/VERSION
 AC_SUBST([libpmix_so_version])
 
-AC_CONFIG_FILES(pmix_config_prefix[test/Makefile]
+AC_CONFIG_FILES(pmix_config_prefix[examples/Makefile]
+                pmix_config_prefix[test/Makefile]
                 pmix_config_prefix[test/simple/Makefile])
 
 pmix_show_title "Configuration complete"