Update ORTE and PMIx for release

Update PMIx to v2.1.0rc2
Sync changes in ORTE from master for various bug fixes

Signed-off-by: Ralph Castain <[email protected]>

Author: Ralph Castain

.gitignore

@@ -316,15 +316,12 @@ opal/mca/pmix/ext2x/ext2x_client.c
 opal/mca/pmix/ext2x/ext2x_component.c
 opal/mca/pmix/ext2x/ext2x_server_north.c
 opal/mca/pmix/ext2x/ext2x_server_south.c
-opal/mca/pmix/pmix*/pmix/include/pmix/autogen/config.h
-opal/mca/pmix/pmix*/pmix/include/pmix/autogen/config.h.in
-opal/mca/pmix/pmix*/pmix/src/include/private/autogen/config.h.in
-opal/mca/pmix/pmix*/pmix/src/include/private/autogen/config.h
 opal/mca/pmix/pmix2x/pmix/src/include/frameworks.h
 opal/mca/pmix/pmix2x/pmix/src/mca/pinstalldirs/config/pinstall_dirs.h
 opal/mca/pmix/pmix2x/pmix/config/autogen_found_items.m4
 opal/mca/pmix/pmix2x/pmix/src/include/pmix_config.h
 opal/mca/pmix/pmix2x/pmix/src/include/pmix_config.h.in
+opal/mca/pmix/pmix2x/pmix/include/pmix_common.h
 opal/mca/pmix/pmix2x/pmix/include/pmix_rename.h
 opal/mca/pmix/pmix2x/pmix/include/pmix_version.h
 opal/mca/pmix/pmix2x/pmix/src/util/keyval/keyval_lex.c

opal/mca/pmix/base/base.h

@@ -82,10 +82,12 @@ extern opal_pmix_base_t opal_pmix_base;
         OBJ_CONSTRUCT(&(l)->mutex, opal_mutex_t);       \
         pthread_cond_init(&(l)->cond, NULL);            \
         (l)->active = true;                             \
+        OPAL_POST_OBJECT((l));                          \
     } while(0)
 
 #define OPAL_PMIX_DESTRUCT_LOCK(l)          \
     do {                                    \
+        OPAL_ACQUIRE_OBJECT((l));           \
         OBJ_DESTRUCT(&(l)->mutex);          \
         pthread_cond_destroy(&(l)->cond);   \
     } while(0)

opal/mca/pmix/pmix2x/pmix/NEWS

@@ -21,8 +21,40 @@ example, a bug might be fixed in the master, and then moved to the
 current release as well as the "stable" bug fix release branch.
 
 
-Master (not on release branches yet)
-------------------------------------
+2.1.0 -- 26 Oct 2017
+----------------------
+**** NOTE: This release contains the first implementation of cross-version
+**** support. Servers using v2.1.0 are capable of supporting clients using
+**** PMIx versions v1.2 and above. Clients using v2.1.0 are able to interact
+**** with servers based on v1.2 and above.
+- Added cross-version communication support
+- Enable reporting of contact URI to stdout, stderr, or file (PR #538)
+- Enable support for remote tool connections (PR #540, #542)
+- Cleanup libevent configure logi to support default install paths (PR #541)
+- Debounce "unreachable" notifications for tools when they disconnect (PR #544)
+
+
+2.0.2 -- 19 Oct 2017
+----------------------
+- Update RPM spec file (rpmbuild -ta, and --rebuild fixes) (PR #523)
+- Support singletons in PMI-1/PMI-2 (PR #537)
+- Provide missing implementation support for arrays of pmix_value_t's (PR #531)
+- Remove unsupported assembly code for MIPS and ARM processors
+  prior to v6 (PR #547)
+- Fix path separator for PMIx configuration files (PR #547)
+- Add configure option to enable/disable the default value for the
+  show-load-errors MCA param (PR #547)
+
+
+2.0.1 -- 24 Aug. 2017
+----------------------
+- Protect PMIX_INFO_FREE macro from NULL data arrays
+- Added attributes to support HWLOC shared memory regions
+- Fixed several syntax errors in configure code
+- Fixed several visibility errors
+- Correctly return status from PMIx_Fence operation
+- Restore tool connection support and implement search
+  operations to discover rendezvous files
 
 
 2.0.0
@@ -83,6 +115,28 @@ Master (not on release branches yet)
   and to themselves
 
 
+1.2.4 -- 13 Oct. 2017
+----------------------
+- Silence some unnecessary warning messages (PR #487)
+- Coverity fix - TOCTOU (PR #465)
+- automake 1.13 configure fix (PR #486)
+- Update RPM spec file (rpmbuild -ta, and --rebuild fixes) (PR #523)
+- Support singletons in PMI-1/PMI-2 (PR #537)
+
+
+1.2.3 -- 24 Aug. 2017
+----------------------
+- Resolve visibility issues for public APIs (PR #451)
+- Atomics update - remove custom ASM atomics (PR #458)
+- Fix job-fence test (PR #423)
+- Replace stale PMIX_DECLSPEC with PMIX_EXPORT (PR #448)
+- Memory barrier fixes for thread shifting (PR #387)
+- Fix race condition in dmodex (PR #346)
+- Allow disable backward compatability for PMI-1/2 (PR #350)
+- Fix segv in PMIx_server_deregister_nspace (PR #343)
+- Fix possible hang in PMIx_Abort (PR #339)
+
+
 1.2.2 -- 21 March 2017
 ----------------------
 - Compiler fix for Sun/Oracle CC (PR #322)

opal/mca/pmix/pmix2x/pmix/README

@@ -128,6 +128,32 @@ INSTALLATION OPTIONS
   --disable-shared; enabling static libraries and disabling shared
   libraries are two independent options.
 
+ --disable-show-load-errors-by-default
+   Set the default value of the mca_base_component_show_load_errors MCA
+   variable: the --enable form of this option sets the MCA variable to
+   true, the --disable form sets the MCA variable to false.  The MCA
+   mca_base_component_show_load_errors variable can still be overridden
+   at run time via the usual MCA-variable-setting mechanisms; this
+   configure option simply sets the default value.
+
+   The --disable form of this option is intended for PMIx packagers
+   who tend to enable support for many different types of networks and
+   systems in their packages.  For example, consider a packager who
+   includes support for both the FOO and BAR networks in their PMIx
+   package, both of which require support libraries (libFOO.so and
+   libBAR.so).  If an end user only has BAR hardware, they likely only
+   have libBAR.so available on their systems -- not libFOO.so.
+   Disabling load errors by default will prevent the user from seeing
+   potentially confusing warnings about the FOO components failing to
+   load because libFOO.so is not available on their systems.
+
+   Conversely, system administrators tend to build a PMIx that is
+   targeted at their specific environment, and contains few (if any)
+   components that are not needed.  In such cases, they might want
+   their users to be warned that the FOO network components failed to
+   load (e.g., if libFOO.so was mistakenly unavailable), and thus
+   some PMIx calls might unexpectedly return "not supported".
+
 --with-platform=FILE
   Load configure options for the build from FILE.  Options on the
   command line that are not in FILE are also used.  Options on the

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=git9d9df02
+repo_rev=git1617e76
 
 # 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 27, 2017"
+date="Oct 31, 2017"
 
 # The shared library version of each of PMIx's public libraries.
 # These versions are maintained in accordance with the "Library
@@ -75,4 +75,6 @@ date="Sep 27, 2017"
 # Version numbers are described in the Libtool current:revision:age
 # format.
 
-libpmix_so_version=0:0:0
+libpmix_so_version=3:3:1
+libpmi_so_version=1:0:0
+libpmi2_so_version=1:0:0

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

@@ -705,6 +705,32 @@ AC_DEFUN([PMIX_SETUP_CORE],[
 
     pmix_show_title "Modular Component Architecture (MCA) setup"
 
+    #
+    # Do we want to show component load error messages by default?
+    #
+
+    AC_MSG_CHECKING([for default value of mca_base_component_show_load_errors])
+    AC_ARG_ENABLE([show-load-errors-by-default],
+                  [AC_HELP_STRING([--enable-show-load-errors-by-default],
+                                  [Set the default value for the MCA parameter
+                                   mca_base_component_show_load_errors (but can be
+                                   overridden at run time by the usual
+                                   MCA-variable-setting mechansism).  This MCA variable
+                                   controls whether warnings are displayed when an MCA
+                                   component fails to load at run time due to an error.
+                                   (default: enabled, meaning that
+                                   mca_base_component_show_load_errors is enabled
+                                   by default])])
+    if test "$enable_show_load_errors_by_default" = "no" ; then
+        PMIX_SHOW_LOAD_ERRORS_DEFAULT=0
+        AC_MSG_RESULT([disabled by default])
+    else
+        PMIX_SHOW_LOAD_ERRORS_DEFAULT=1
+        AC_MSG_RESULT([enabled by default])
+    fi
+    AC_DEFINE_UNQUOTED(PMIX_SHOW_LOAD_ERRORS_DEFAULT, $PMIX_SHOW_LOAD_ERRORS_DEFAULT,
+                       [Default value for mca_base_component_show_load_errors MCA variable])
+
     AC_MSG_CHECKING([for subdir args])
     PMIX_CONFIG_SUBDIR_ARGS([pmix_subdir_args])
     AC_MSG_RESULT([$pmix_subdir_args])
@@ -760,6 +786,8 @@ AC_DEFUN([PMIX_SETUP_CORE],[
 
     pmix_show_subtitle "Final output"
 
+    AC_CONFIG_HEADERS(pmix_config_prefix[include/pmix_common.h])
+
     AC_CONFIG_FILES(
         pmix_config_prefix[Makefile]
         pmix_config_prefix[config/Makefile]

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

@@ -959,8 +959,8 @@ AC_DEFUN([PMIX_CONFIG_ASM],[
 
         ia64-*)
             pmix_cv_asm_arch="IA64"
-            PMIX_ASM_SUPPORT_64BIT=1
-            PMIX_GCC_INLINE_ASSIGN='"mov %0=r0\n;;\n" : "=&r"(ret)'
+            PMIX_CHECK_SYNC_BUILTINS([pmix_cv_asm_builtin="BUILTIN_SYNC"],
+                          [AC_MSG_ERROR([No atomic primitives available for $host])])
             ;;
 	aarch64*)
             pmix_cv_asm_arch="ARM64"
@@ -993,20 +993,16 @@ AC_DEFUN([PMIX_CONFIG_ASM],[
         armv5*linux*|armv4*linux*|arm-*-linux-gnueabi)
             # uses Linux kernel helpers for some atomic operations
             pmix_cv_asm_arch="ARM"
-            PMIX_ASM_SUPPORT_64BIT=0
-            PMIX_ASM_ARM_VERSION=5
-            CCASFLAGS="$CCASFLAGS -march=armv7-a"
-            AC_DEFINE_UNQUOTED([PMIX_ASM_ARM_VERSION], [$PMIX_ASM_ARM_VERSION],
-                               [What ARM assembly version to use])
-            PMIX_GCC_INLINE_ASSIGN='"mov %0, #0" : "=&r"(ret)'
+            PMIX_CHECK_SYNC_BUILTINS([pmix_cv_asm_builtin="BUILTIN_SYNC"],
+                          [AC_MSG_ERROR([No atomic primitives available for $host])])
             ;;
 
         mips-*|mips64*)
             # Should really find some way to make sure that we are on
             # a MIPS III machine (r4000 and later)
             pmix_cv_asm_arch="MIPS"
-            PMIX_ASM_SUPPORT_64BIT=1
-            PMIX_GCC_INLINE_ASSIGN='"or %0,[$]0,[$]0" : "=&r"(ret)'
+            PMIX_CHECK_SYNC_BUILTINS([pmix_cv_asm_builtin="BUILTIN_SYNC"],
+                          [AC_MSG_ERROR([No atomic primitives available for $host])])
             ;;
 
         powerpc-*|powerpc64-*|powerpcle-*|powerpc64le-*|rs6000-*|ppc-*)

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

@@ -50,7 +50,7 @@ AC_DEFUN([_PMIX_LIBEVENT_EMBEDDED_MODE],[
  ])
 
 AC_DEFUN([_PMIX_LIBEVENT_EXTERNAL],[
-    PMIX_VAR_SCOPE_PUSH([pmix_event_dir pmix_event_libdir])
+    PMIX_VAR_SCOPE_PUSH([pmix_event_dir pmix_event_libdir pmix_event_defaults])
 
     AC_ARG_WITH([libevent],
                 [AC_HELP_STRING([--with-libevent=DIR],
@@ -67,17 +67,32 @@ AC_DEFUN([_PMIX_LIBEVENT_EXTERNAL],[
 
     AC_MSG_CHECKING([for libevent in])
     if test ! -z "$with_libevent" && test "$with_libevent" != "yes"; then
+        pmix_event_defaults=no
         pmix_event_dir=$with_libevent
         if test -d $with_libevent/lib; then
             pmix_event_libdir=$with_libevent/lib
         elif test -d $with_libevent/lib64; then
             pmix_event_libdir=$with_libevent/lib64
+        elif test -d $with_libevent; then
+            pmix_event_libdir=$with_libevent
         else
-            AC_MSG_RESULT([Could not find $with_libevent/lib or $with_libevent/lib64])
+            AC_MSG_RESULT([Could not find $with_libevent/lib, $with_libevent/lib64, or $with_libevent])
             AC_MSG_ERROR([Can not continue])
         fi
         AC_MSG_RESULT([$pmix_event_dir and $pmix_event_libdir])
     else
+        pmix_event_defaults=yes
+        pmix_event_dir=/usr/include
+        if test -d /usr/lib; then
+            pmix_event_libdir=/usr/lib
+        elif test -d /usr/lib64; then
+            pmix_event_libdir=/usr/lib64
+        else
+            AC_MSG_RESULT([not found])
+            AC_MSG_WARN([Could not find /usr/lib or /usr/lib64 - you may])
+            AC_MSG_WARN([to specify --with-libevent-libdir=<path>])
+            AC_MSG_ERROR([Can not continue])
+        fi
         AC_MSG_RESULT([(default search paths)])
     fi
     AS_IF([test ! -z "$with_libevent_libdir" && "$with_libevent_libdir" != "yes"],
@@ -92,11 +107,13 @@ AC_DEFUN([_PMIX_LIBEVENT_EXTERNAL],[
                        [$pmix_event_libdir],
                        [],
                        [AC_MSG_WARN([LIBEVENT SUPPORT NOT FOUND])
-                        AC_MSG_ERROR([CANNOT CONTINE])])
+                        AC_MSG_ERROR([CANNOT CONTINUE])])
+
+    AS_IF([test "$pmix_event_defaults" = "no"],
+          [PMIX_FLAGS_APPEND_UNIQ(CPPFLAGS, $pmix_libevent_CPPFLAGS)
+           PMIX_FLAGS_APPEND_UNIQ(LIBS, $pmix_libevent_LIBS)
+           PMIX_FLAGS_APPEND_UNIQ(LDFLAGS, $pmix_libevent_LDFLAGS)])
 
-    PMIX_FLAGS_APPEND_UNIQ(CPPFLAGS, $pmix_libevent_CPPFLAGS)
-    PMIX_FLAGS_APPEND_UNIQ(LIBS, $pmix_libevent_LIBS)
-    PMIX_FLAGS_APPEND_UNIQ(LDFLAGS, $pmix_libevent_LDFLAGS)
 
     # Ensure that this libevent has the symbol
     # "evthread_set_lock_callbacks", which will only exist if

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

@@ -237,6 +237,8 @@ AC_SUBST([CONFIGURE_DEPENDENCIES], ['$(top_srcdir)/VERSION'])
 
 . $srcdir/VERSION
 AC_SUBST([libpmix_so_version])
+AC_SUBST([libpmi_so_version])
+AC_SUBST([libpmi2_so_version])
 
 AC_CONFIG_FILES(pmix_config_prefix[contrib/Makefile]
                 pmix_config_prefix[examples/Makefile]

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

@@ -13,7 +13,6 @@
 if WANT_PRIMARY_HEADERS
 include_HEADERS = \
         pmix.h \
-        pmix_common.h \
         pmix_server.h \
         pmix_tool.h
 
@@ -24,6 +23,7 @@ include_HEADERS += \
 endif
 
 nodist_include_HEADERS = \
+    pmix_common.h \
     pmix_version.h \
     pmix_rename.h