Merge pull request #6885 from rhc54/cmr40/pmix314

Update PMIx to official v3.1.4 release

Author: gpaulsen

opal/mca/pmix/pmix3x/pmix/NEWS

@@ -21,6 +21,28 @@ example, a bug might be fixed in the master, and then moved to
 multiple release branches.
 
 
+3.1.4 -- 9 Aug 2019
+----------------------
+- 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 #1368: Backport support for libev
+- 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 #1376: Fix problems in the Log code path, updates to simple test suite
+- 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
+
+
 3.1.3 -- 2 July 2019
 ----------------------
 - PR #1096: Restore PMIX_NUM_SLOTS for backward compatibility
@@ -120,6 +142,45 @@ multiple release branches.
  - Fix a bug when registering default event handlers
 
 
+3.1.0 -- 17 Jan 2019
+----------------------
+**** THIS RELEASE MARKS THE STARTING POINT FOR FULL COMPLIANCE
+**** WITH THE PMIX v3 STANDARD. ALL API BEHAVIORS AND ATTRIBUTE
+**** DEFINITIONS MEET THE v3 STANDARD SPECIFICATIONS.
+ - Add a new, faster dstore GDS component 'ds21'
+ - Performance optimizations for the dstore GDS components.
+ - Plug miscellaneous memory leaks
+ - Silence an unnecessary warning message when checking connection
+   to a non-supporting server
+ - Ensure lost-connection events get delivered to default event
+   handlers
+ - Correctly handle cache refresh for queries
+ - Protect against race conditions between host and internal library
+   when dealing with async requests
+ - Cleanup tool operations and add support for connections to
+   remote servers. Initial support for debugger direct/indirect
+   launch verified with PRRTE. Cleanup setting of tmpdir options.
+   Drop rendezvous files when acting as a launcher
+ - Automatically store the server URI for easy access by client
+ - Provide MCA parameter to control TCP connect retry/timeout
+ - Update event notification system to properly evict oldest events
+   when more space is needed
+ - Fix a number of error paths
+ - Update IOF cache code to properly drop oldest message. Provide
+   MCA parameter for setting cache size.
+ - Handle setsockopt(SO_RCVTIMEO) not being supported
+ - Ensure that epilogs get run even when connections unexpectedly
+   terminate. Properly split epilog strings to process multiple
+   paths
+ - Pass the tool's command line to the server so it can be returned
+   in queries
+ - Add support for C11 atomics
+ - Support collection and forwarding of fabric-specific envars
+ - Improve handling of hwloc configure option
+ - Fix PMIx_server_generate_regex to preserve node ordering
+ - Fix a bug when registering default event handlers
+
+
 3.0.2 -- 18 Sept 2018
 ----------------------
 - Ensure we cleanup any active sensors when a peer departs. Allow the

opal/mca/pmix/pmix3x/pmix/VERSION

@@ -15,7 +15,7 @@
 
 major=3
 minor=1
-release=3
+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=gitc10fd1d4
+repo_rev=gite6837057
 
 # 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="Jul 02, 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
@@ -75,13 +75,13 @@ date="Jul 02, 2019"
 # Version numbers are described in the Libtool current:revision:age
 # format.
 
-libpmix_so_version=4:23:2
-libpmi_so_version=1:0:0
+libpmix_so_version=4:24:2
+libpmi_so_version=1:1:0
 libpmi2_so_version=1:0:0
 
 # "Common" components install standalone libraries that are run-time
 # # linked by one or more components.  So they need to be versioned as
 # # well.  Yuck; this somewhat breaks the
 # # components-don't-affect-the-build-system abstraction.
 #
-libmca_common_dstore_so_version=1:0:0
+libmca_common_dstore_so_version=1:1:0

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

@@ -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
@@ -754,8 +754,22 @@ AC_DEFUN([PMIX_SETUP_CORE],[
     ##################################
     pmix_show_title "Libevent"
 
+    PMIX_LIBEV_CONFIG
     PMIX_LIBEVENT_CONFIG
 
+    AS_IF([test $pmix_libevent_support -eq 1 && test $pmix_libev_support -eq 1],
+      [AC_MSG_WARN([Both libevent and libev support have been specified.])
+       AC_MSG_WARN([Only one can be configured against at a time. Please])
+       AC_MSG_WARN([remove one from the configure command line.])
+       AC_MSG_ERROR([Cannot continue])])
+
+    AS_IF([test $pmix_libevent_support -eq 0 && test $pmix_libev_support -eq 0],
+          [AC_MSG_WARN([Either libevent or libev support is required, but neither])
+           AC_MSG_WARN([was found. Please use the configure options to point us])
+           AC_MSG_WARN([to where we can find one or the other library])
+           AC_MSG_ERROR([Cannot continue])])
+
+
     ##################################
     # HWLOC
     ##################################

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

@@ -1,7 +1,9 @@
 dnl -*- shell-script -*-
 dnl
 dnl Copyright (c) 2009      Oak Ridge National Labs.  All rights reserved.
-dnl Copyright (c) 2013-2017 Intel, Inc.  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/pmix3x/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/pmix3x/pmix/config/pmix_setup_libev.m4

@@ -0,0 +1,96 @@
+# -*- shell-script -*-
+#
+# Copyright (c) 2009-2015 Cisco Systems, Inc.  All rights reserved.
+# Copyright (c) 2013      Los Alamos National Security, LLC.  All rights reserved.
+# Copyright (c) 2013-2019 Intel, Inc.  All rights reserved.
+# Copyright (c) 2017-2019 Research Organization for Information Science
+#                         and Technology (RIST).  All rights reserved.
+# $COPYRIGHT$
+#
+# Additional copyrights may follow
+#
+# $HEADER$
+#
+
+# MCA_libev_CONFIG([action-if-found], [action-if-not-found])
+# --------------------------------------------------------------------
+AC_DEFUN([PMIX_LIBEV_CONFIG],[
+    PMIX_VAR_SCOPE_PUSH([pmix_libev_dir pmix_libev_libdir pmix_libev_standard_header_location pmix_libev_standard_lib_location])
+
+    AC_ARG_WITH([libev],
+                [AC_HELP_STRING([--with-libev=DIR],
+                                [Search for libev headers and libraries in DIR ])])
+    PMIX_CHECK_WITHDIR([libev], [$with_libev], [include/event.h])
+
+    AC_ARG_WITH([libev-libdir],
+                [AC_HELP_STRING([--with-libev-libdir=DIR],
+                                [Search for libev libraries in DIR ])])
+    PMIX_CHECK_WITHDIR([libev-libdir], [$with_livev_libdir], [libev.*])
+
+    pmix_libev_support=0
+
+    AS_IF([test -n "$with_libev" && test "$with_libev" != "no"],
+          [AC_MSG_CHECKING([for libev in])
+           pmix_check_libev_save_CPPFLAGS="$CPPFLAGS"
+           pmix_check_libeve_save_LDFLAGS="$LDFLAGS"
+           pmix_check_libev_save_LIBS="$LIBS"
+           if test "$with_libev" != "yes"; then
+               pmix_libev_dir=$with_libev/include
+               pmix_libev_standard_header_location=no
+               pmix_libev_standard_lib_location=no
+               AS_IF([test -z "$with_libev_libdir" || test "$with_libev_libdir" = "yes"],
+                     [if test -d $with_libev/lib; then
+                          pmix_libev_libdir=$with_libev/lib
+                      elif test -d $with_libev/lib64; then
+                          pmix_libev_libdir=$with_libev/lib64
+                      else
+                          AC_MSG_RESULT([Could not find $with_libev/lib or $with_libev/lib64])
+                          AC_MSG_ERROR([Can not continue])
+                      fi
+                      AC_MSG_RESULT([$pmix_libev_dir and $pmix_libev_libdir])],
+                     [AC_MSG_RESULT([$with_libev_libdir])])
+           else
+               AC_MSG_RESULT([(default search paths)])
+               pmix_libev_standard_header_location=yes
+               pmix_libev_standard_lib_location=yes
+           fi
+           AS_IF([test ! -z "$with_libev_libdir" && test "$with_libev_libdir" != "yes"],
+                 [pmix_libev_libdir="$with_libev_libdir"
+                  pmix_libev_standard_lib_location=no])
+
+           PMIX_CHECK_PACKAGE([pmix_libev],
+                              [event.h],
+                              [ev],
+                              [event_base_new],
+                              [],
+                              [$pmix_libev_dir],
+                              [$pmix_libev_libdir],
+                              [pmix_libev_support=1],
+                              [pmix_libev_support=0])
+           CPPFLAGS="$pmix_check_libev_save_CPPFLAGS"
+           LDFLAGS="$pmix_check_libev_save_LDFLAGS"
+           LIBS="$pmix_check_libev_save_LIBS"])
+
+    AS_IF([test $pmix_libev_support -eq 1],
+          [LIBS="$LIBS $pmix_libev_LIBS"
+
+           AS_IF([test "$pmix_libev_standard_header_location" != "yes"],
+                 [CPPFLAGS="$CPPFLAGS $pmix_libev_CPPFLAGS"])
+           AS_IF([test "$pmix_libev_standard_lib_location" != "yes"],
+                 [LDFLAGS="$LDFLAGS $pmix_libev_LDFLAGS"])])
+
+    AC_MSG_CHECKING([will libev support be built])
+    if test $pmix_libev_support -eq 1; then
+        AC_MSG_RESULT([yes])
+        PMIX_EVENT_HEADER="<event.h>"
+        AC_DEFINE_UNQUOTED([PMIX_EVENT_HEADER], [$PMIX_EVENT_HEADER],
+                           [Location of event.h])
+        PMIX_SUMMARY_ADD([[External Packages]],[[libev]],[libev],[$pmix_libev_dir])
+    else
+        AC_MSG_RESULT([no])
+    fi
+
+    AC_DEFINE_UNQUOTED([PMIX_HAVE_LIBEV], [$pmix_libev_support], [Whether we are building against libev])
+
+    PMIX_VAR_SCOPE_POP
+])dnl