Merge pull request #6886 from rhc54/cmr31/pmix223

v3.1.x: Update PMIx to v2.2.3rc2

Author: jsquyres

opal/mca/pmix/pmix2x/pmix/NEWS

@@ -53,6 +53,24 @@ current release as well as the "stable" bug fix release branch.
 - PR #1311: Work around memory bug in older gcc compilers
 - PR #1329: Add -fPIC to static builds
 - PR #1334: Cache only -W CFLAG entries to fix 32-bit builds
+- PR #1341: Do not use '==' in m4 test statements
+- PR #1342: Fix if_linux_ipv6_open interface filter
+- PR #1344: Remove unnecessary libtool init for c++
+- PR #1346: Fix incorrect pointer casts/deref
+- PR #1347/#1348: Fix use of gethostname
+- PR #1353/#1357: util/environ: use setenv() if available
+- PR #1354: Plug a misc memory leak in the pmix_query_caddy_t destructor
+- PR #1356: Fix another pointer cast/deref in test suite
+- PR #1358: Implement support for class-based info arrays
+- PR #1359: Plug misc minor memory leaks
+- PR #1369: Fix legacy support for PMI-1
+- PR #1370: Cleanup handling of data requests for different nspaces
+- PR #1193: Resolve get of proc-specific job-level info from another nspace
+- PR #1377: Skip fastpath/dstore for NULL keys
+- PR #1379: Change IF_NAMESIZE to PMIX_IF_NAMESIZE and set to safe size
+- PR #1385: Check for EINVAL return from posix_fallocate
+- PR #1389: Plug misc memory leaks in configure
+
 
 
 2.2.2 -- 24 Jan 2019

opal/mca/pmix/pmix2x/pmix/VERSION

@@ -24,14 +24,14 @@ release=3
 # The only requirement is that it must be entirely printable ASCII
 # characters and have no white space.
 
-greek=rc1
+greek=rc2
 
 # 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=git8aac6645
+repo_rev=git9a14c877
 
 # If tarball_version is not empty, it is used as the version string in
 # the tarball filename, regardless of all other versions listed in
@@ -45,7 +45,7 @@ tarball_version=
 
 # The date when this release was created
 
-date="Jun 26, 2019"
+date="Aug 09, 2019"
 
 # The shared library version of each of PMIx's public libraries.
 # These versions are maintained in accordance with the "Library
@@ -76,8 +76,8 @@ date="Jun 26, 2019"
 # Version numbers are described in the Libtool current:revision:age
 # format.
 
-libpmix_so_version=3:22:1
-libpmi_so_version=1:0:0
+libpmix_so_version=3:23:1
+libpmi_so_version=1:1:0
 libpmi2_so_version=1:0:0
 
 # "Common" components install standalone libraries that are run-time

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

@@ -11,9 +11,9 @@ dnl                         University of Stuttgart.  All rights reserved.
 dnl Copyright (c) 2004-2005 The Regents of the University of California.
 dnl                         All rights reserved.
 dnl Copyright (c) 2009      Sun Microsystems, Inc.  All rights reserved.
-dnl Copyright (c) 2014-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) 2014-2019 Intel, Inc.  All rights reserved.
+dnl Copyright (c) 2015-2019 Research Organization for Information Science
+dnl                         and Technology (RIST).  All rights reserved.
 dnl $COPYRIGHT$
 dnl
 dnl Additional copyrights may follow
@@ -44,7 +44,9 @@ AC_DEFUN([PMIX_C_GET_ALIGNMENT],[
     FILE *f=fopen("conftestval", "w");
     if (!f) exit(1);
     diff = ((char *)&p->x) - ((char *)&p->c);
+    free(p);
     fprintf(f, "%d\n", (diff >= 0) ? diff : -diff);
+    fclose(f);
 ]])],                         [AS_TR_SH([pmix_cv_c_align_$1])=`cat conftestval`],
                                [AC_MSG_WARN([*** Problem running configure test!])
                                 AC_MSG_WARN([*** See config.log for details.])

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

@@ -191,7 +191,7 @@ AC_DEFUN([PMIX_SETUP_CORE],[
                                [Link the output PMIx library to this extra lib (used in embedded mode)]))
     AC_MSG_CHECKING([for extra lib])
     AS_IF([test ! -z "$with_pmix_extra_lib"],
-          [AS_IF([test "$with_pmix_extra_lib" == "yes" || test "$with_pmix_extra_lib" == "no"],
+          [AS_IF([test "$with_pmix_extra_lib" = "yes" || test "$with_pmix_extra_lib" = "no"],
                  [AC_MSG_RESULT([ERROR])
                   AC_MSG_WARN([Invalid value for --with-extra-pmix-lib:])
                   AC_MSG_WARN([    $with_pmix_extra_lib])
@@ -209,7 +209,7 @@ AC_DEFUN([PMIX_SETUP_CORE],[
                                [Link any embedded components/tools that require it to the provided libtool lib (used in embedded mode)]))
     AC_MSG_CHECKING([for extra ltlib])
     AS_IF([test ! -z "$with_pmix_extra_ltlib"],
-          [AS_IF([test "$with_pmix_extra_ltlib" == "yes" || test "$with_pmix_extra_ltlib" == "no"],
+          [AS_IF([test "$with_pmix_extra_ltlib" = "yes" || test "$with_pmix_extra_ltlib" = "no"],
                  [AC_MSG_RESULT([ERROR])
                   AC_MSG_WARN([Invalid value for --with-pmix-extra-ltlib:])
                   AC_MSG_WARN([    $with_pmix_extra_ltlib])
@@ -663,7 +663,7 @@ AC_DEFUN([PMIX_SETUP_CORE],[
     # -lrt might be needed for clock_gettime
     PMIX_SEARCH_LIBS_CORE([clock_gettime], [rt])
 
-    AC_CHECK_FUNCS([asprintf snprintf vasprintf vsnprintf strsignal socketpair strncpy_s usleep statfs statvfs getpeereid getpeerucred strnlen posix_fallocate tcgetpgrp])
+    AC_CHECK_FUNCS([asprintf snprintf vasprintf vsnprintf strsignal socketpair strncpy_s usleep statfs statvfs getpeereid getpeerucred strnlen posix_fallocate tcgetpgrp setpgid ptsname openpty setenv])
 
     # 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
@@ -1162,7 +1162,7 @@ AC_MSG_CHECKING([if want to support dlopen of non-global namespaces])
 AC_ARG_ENABLE([nonglobal-dlopen],
               AC_HELP_STRING([--enable-nonglobal-dlopen],
                              [enable non-global dlopen (default: enabled)]))
-if test "$enable_nonglobal_dlopen" == "no"; then
+if test "$enable_nonglobal_dlopen" = "no"; then
     AC_MSG_RESULT([no])
     pmix_need_libpmix=0
 else

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

@@ -2,6 +2,8 @@ dnl -*- shell-script -*-
 dnl
 dnl Copyright (c) 2009      Oak Ridge National Labs.  All rights reserved.
 dnl Copyright (c) 2013-2019 Intel, Inc.  All rights reserved.
+dnl Copyright (c) 2019      Research Organization for Information Science
+dnl                         and Technology (RIST).  All rights reserved.
 dnl
 dnl $COPYRIGHT$
 dnl
@@ -43,6 +45,7 @@ int main (int argc, char * argv[])
     f=fopen("conftestval", "w");
     if (!f) exit(1);
     fprintf (f, "%d", PLATFORM_COMPILER_$1);
+    fclose(f);
     return 0;
 }
             ], [
@@ -75,6 +78,7 @@ int main (int argc, char * argv[])
     f=fopen("conftestval", "w");
     if (!f) exit(1);
     fprintf (f, "%s", PLATFORM_COMPILER_$1);
+    fclose(f);
     return 0;
 }
             ], [
@@ -110,6 +114,7 @@ int main (int argc, char * argv[])
     f=fopen("conftestval", "w");
     if (!f) exit(1);
     fprintf (f, "%s", _STRINGIFY(PLATFORM_COMPILER_$1));
+    fclose(f);
     return 0;
 }
             ], [

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

@@ -10,9 +10,9 @@ dnl Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
 dnl                         University of Stuttgart.  All rights reserved.
 dnl Copyright (c) 2004-2005 The Regents of the University of California.
 dnl                         All rights reserved.
-dnl Copyright (c) 2014      Intel, Inc. All rights reserved.
-dnl Copyright (c) 2016      Research Organization for Information Science
-dnl                         and Technology (RIST). All rights reserved.
+dnl Copyright (c) 2014-2019 Intel, Inc.  All rights reserved.
+dnl Copyright (c) 2016-2019 Research Organization for Information Science
+dnl                         and Technology (RIST).  All rights reserved.
 dnl $COPYRIGHT$
 dnl
 dnl Additional copyrights may follow
@@ -45,6 +45,7 @@ int main ()
   func (4711, "Help %d [%s]\n", 10, "ten");
   f=fopen ("conftestval", "w");
   if (!f) exit (1);
+  fclose(f);
   return 0;
 }
 

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

@@ -171,7 +171,7 @@ LT_PREREQ([2.2.6])
 
 pmix_enable_shared="$enable_shared"
 pmix_enable_static="$enable_static"
-AS_IF([test ! -z "$enable_static" && test "$enable_static" == "yes"],
+AS_IF([test ! -z "$enable_static" && test "$enable_static" = "yes"],
       [CFLAGS="$CFLAGS -fPIC"])
 
 AM_ENABLE_SHARED
@@ -201,7 +201,6 @@ AS_IF([test "$pmix_debug" = "1"],
 
 LT_INIT()
 LT_LANG([C])
-LT_LANG([C++])
 
 ############################################################################
 # Setup the core

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

@@ -192,7 +192,7 @@
 
 Summary: An extended/exascale implementation of PMI
 Name: %{?_name:%{_name}}%{!?_name:pmix}
-Version: 2.2.3rc1
+Version: 2.2.3rc2
 Release: 1%{?dist}
 License: BSD
 Group: Development/Libraries

opal/mca/pmix/pmix2x/pmix/contrib/pmix.spec

@@ -1,6 +1,6 @@
 #!/bin/bash
 #
-# Copyright (c) 2015      Intel, Inc. All rights reserved.
+# Copyright (c) 2015-2019 Intel, Inc.  All rights reserved.
 # Copyright (c) 2015      Los Alamos National Security, LLC. All rights
 #                         reserved
 # Copyright (c) 2015 Cisco Systems, Inc.
@@ -18,7 +18,7 @@ for file in $(git ls-files) ; do
     # skip sym links, pdfs, etc. If any other file types should be
     # skipped add the check here.
     type=$(file -b --mime-type -h $file)
-    if test ${type::4} == "text" ; then
+    if test ${type::4} = "text" ; then
         # Eliminate whitespace at the end of lines
         perl -pi -e 's/\s*$/\n/' $file
     fi

opal/mca/pmix/pmix2x/pmix/contrib/whitespace-purge.sh

@@ -254,6 +254,9 @@ int main(int argc, char **argv)
         fprintf(stderr, "Client ns %s rank %d: PMIx_Commit failed: %d\n", myproc.nspace, myproc.rank, rc);
         goto done;
     }
+    if (0 == myproc.rank) {
+        sleep(2);
+    }
 
     /* call fence to synchronize with our peers - instruct
      * the fence operation to collect and return all "put"