pmix/pmix112: Update to release PMIx 1.2.0

Signed-off-by: Joshua Hursey <jhursey@us.ibm.com>

Author: jjhursey

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

@@ -11,7 +11,7 @@
 #                         All rights reserved.
 # Copyright (c) 2006-2015 Cisco Systems, Inc.  All rights reserved.
 # Copyright (c) 2012-2013 Los Alamos National Security, Inc.  All rights reserved.
-# Copyright (c) 2013-2015 Intel, Inc. All rights reserved
+# Copyright (c) 2013-2016 Intel, Inc. All rights reserved
 # $COPYRIGHT$
 #
 # Additional copyrights may follow
@@ -34,6 +34,7 @@ dist_pmixdata_DATA =
 if ! PMIX_EMBEDDED_MODE
 dist_pmixdata_DATA += contrib/pmix-valgrind.supp
 
+
 man_MANS = \
         man/man3/pmix_init.3 \
         man/man3/pmix_finalize.3 \
@@ -59,6 +60,11 @@ include src/server/Makefile.am
 include src/sec/Makefile.am
 include src/common/Makefile.am
 
+if WANT_DSTORE
+include src/sm/Makefile.am
+include src/dstore/Makefile.am
+endif
+
 if PMIX_EMBEDDED_MODE
 noinst_LTLIBRARIES = libpmix.la
 libpmix_la_SOURCES = $(headers) $(sources)

opal/mca/pmix/pmix112/pmix/NEWS

@@ -1,4 +1,5 @@
 Copyright (c) 2015-2016 Intel, Inc.  All rights reserved.
+Copyright (c) 2016      IBM Corporation.  All rights reserved.
 $COPYRIGHT$
 
 Additional copyrights may follow
@@ -20,8 +21,27 @@ 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)
-------------------------------------
+1.2.0
+-----
+- Add shared memory data storage (dstore) option. Default: enabled
+  Configure option: --disable-dstore
+- PMIx_Commit performance improvements
+- Disable errhandler support
+- Keep job info in the shared memory dstore
+- PMIx_Get performance and memory improvements
+
+
+
+1.1.5
+-----
+- Add pmix_version.h to support direct detection of PMIx library version
+- Fix support for Solaris 10 by using abstract version of strnlen
+- Fix native security module for Solaris by using getpeerucred in
+  that environment
+- Ensure man pages don't get installed in embedded builds
+- Pass temporary directory locations in info keys instead of
+  the environment
+
 
 1.1.4
 -----

opal/mca/pmix/pmix112/pmix/VERSION

@@ -4,6 +4,7 @@
 # Copyright (c) 2013      Mellanox Technologies, Inc.
 #                         All rights reserved.
 # Copyright (c) 2014-2016 Intel, Inc. All rights reserved.
+# Copyright (c) 2016      IBM Corporation.  All rights reserved.
 
 # This is the VERSION file for PMIx, describing the precise
 # version of PMIx in this distribution.  The various components of
@@ -14,23 +15,23 @@
 # <major>.<minor>.<release>.
 
 major=1
-minor=1
-release=5
+minor=2
+release=0
 
 # 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
 # numeric.  Common examples include a1 (alpha release 1), b1 or (beta release 1).
 # The only requirement is that it must be entirely printable ASCII
 # characters and have no white space.
 
-greek=a1
+greek=
 
 # 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=git9ae61b8
+repo_rev=git33736edb
 
 # 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 +45,7 @@ tarball_version=
 
 # The date when this release was created
 
-date="Aug 23, 2016"
+date="Dec 14, 2016"
 
 # The shared library version of each of PMIx's public libraries.
 # These versions are maintained in accordance with the "Library

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

@@ -17,8 +17,9 @@ 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) 2015-2016 Research Organization for Information Science
 dnl Copyright (c) 2013-2016 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.
@@ -85,7 +86,6 @@ AC_DEFUN([PMIX_SETUP_CORE],[
     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])
@@ -94,7 +94,6 @@ AC_DEFUN([PMIX_SETUP_CORE],[
     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])
@@ -103,7 +102,12 @@ AC_DEFUN([PMIX_SETUP_CORE],[
     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])
+    pmixmajor=${PMIX_MAJOR_VERSION}L
+    pmixminor=${PMIX_MINOR_VERSION}L
+    AC_SUBST(pmixmajor)
+    AC_SUBST(pmixminor)
+    AC_CONFIG_FILES(pmix_config_prefix[include/pmix_version.h])
+
     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])
@@ -318,7 +322,8 @@ AC_DEFUN([PMIX_SETUP_CORE],[
                       time.h unistd.h \
                       crt_externs.h signal.h \
                       ioLib.h sockLib.h hostLib.h limits.h \
-                      ucred.h])
+                      sys/statfs.h sys/statvfs.h \
+                      netdb.h ucred.h])
 
     # Note that sometimes we have <stdbool.h>, but it doesn't work (e.g.,
     # have both Portland and GNU installed; using pgcc will find GNU's
@@ -495,7 +500,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 getpeereid getpeerucred strnlen])
+    AC_CHECK_FUNCS([asprintf snprintf vasprintf vsnprintf strsignal socketpair strncpy_s usleep statfs statvfs getpeereid getpeerucred strnlen])
 
     # 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
@@ -753,6 +758,26 @@ AC_DEFINE_UNQUOTED([PMIX_WANT_PRETTY_PRINT_STACKTRACE],
                    [$WANT_PRETTY_PRINT_STACKTRACE],
                    [if want pretty-print stack trace feature])
 
+#
+# Do we want the shared memory datastore usage?
+#
+
+AC_MSG_CHECKING([if want shared memory datastore])
+AC_ARG_ENABLE([dstore],
+              [AC_HELP_STRING([--disable-dstore],
+                              [Using shared memory datastore (default: enabled)])])
+if test "$enable_dstore" == "no" ; then
+    AC_MSG_RESULT([no])
+    WANT_DSTORE=0
+else
+    AC_MSG_RESULT([yes])
+    WANT_DSTORE=1
+fi
+AC_DEFINE_UNQUOTED([PMIX_ENABLE_DSTORE],
+                   [$WANT_DSTORE],
+                   [if want shared memory dstore feature])
+AM_CONDITIONAL([WANT_DSTORE],[test "x$enable_dstore" != "xno"])
+
 #
 # Ident string
 #
@@ -810,6 +835,7 @@ AC_DEFUN([PMIX_DO_AM_CONDITIONALS],[
         AM_CONDITIONAL([PMIX_COMPILE_TIMING], [test "$WANT_TIMING" = "1"])
         AM_CONDITIONAL([PMIX_WANT_MUNGE], [test "$pmix_munge_support" = "1"])
         AM_CONDITIONAL([PMIX_WANT_SASL], [test "$pmix_sasl_support" = "1"])
+        AM_CONDITIONAL([WANT_DSTORE],[test "x$enable_dstore" != "xno"])
     ])
     pmix_did_am_conditionals=yes
 ])dnl

opal/mca/pmix/pmix112/pmix/examples/dynamic.c

@@ -30,6 +30,7 @@
 #include <stdlib.h>
 #include <unistd.h>
 #include <time.h>
+#include <sys/param.h>
 
 #include <pmix.h>
 
@@ -45,7 +46,7 @@ int main(int argc, char **argv)
     uint32_t nprocs;
     char nsp2[PMIX_MAX_NSLEN+1];
     pmix_app_t *app;
-    char hostname[PMIX_MAXHOSTNAMELEN], dir[1024];
+    char hostname[MAXHOSTNAMELEN], dir[1024];
     pmix_proc_t *peers;
     size_t npeers, ntmp=0;
     char *nodelist;

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

@@ -17,11 +17,11 @@ include_HEADERS = \
         include/pmix.h \
         include/pmix_server.h \
         include/pmi.h \
-        include/pmi2.h
+        include/pmi2.h \
+        include/pmix_version.h.in
 
 include_pmixdir = $(includedir)/pmix
 include_pmix_HEADERS = \
-    include/pmix/rename.h \
     include/pmix/pmix_common.h
 
 include_pmix_autogendir = $(includedir)/pmix/autogen
@@ -32,4 +32,7 @@ include_pmix_autogen_HEADERS = \
 nodist_include_pmix_autogen_HEADERS = \
         include/pmix/autogen/config.h
 
+nodist_include_HEADERS = \
+    include/pmix_version.h
+
 endif ! PMIX_EMBEDDED_MODE

opal/mca/pmix/pmix112/pmix/include/pmix.h

@@ -46,16 +46,13 @@
 #ifndef PMIx_H
 #define PMIx_H
 
-#include <pmix/autogen/config.h>
-
-/* Symbol transforms */
-#include <pmix/rename.h>
-
 /* Structure and constant definitions */
 #include <pmix/pmix_common.h>
 
 
-BEGIN_C_DECLS
+#if defined(c_plusplus) || defined(__cplusplus)
+extern "C" {
+#endif
 
 /****    PMIX API    ****/
 
@@ -391,5 +388,8 @@ pmix_status_t PMIx_Resolve_peers(const char *nodename, const char *nspace,
  * when done with it */
 pmix_status_t PMIx_Resolve_nodes(const char *nspace, char **nodelist);
 
-END_C_DECLS
+#if defined(c_plusplus) || defined(__cplusplus)
+}
+#endif
+
 #endif

opal/mca/pmix/pmix112/pmix/include/pmix/pmix_common.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013-2015 Intel, Inc. All rights reserved
+ * Copyright (c) 2013-2016 Intel, Inc. All rights reserved
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
@@ -46,18 +46,18 @@
 #ifndef PMIx_COMMON_H
 #define PMIx_COMMON_H
 
-#include <pmix/autogen/config.h>
-#include <pmix/rename.h>
-
 #include <stdbool.h>
 #include <stdlib.h>
 #include <stdint.h>
 #include <string.h>
 #ifdef HAVE_SYS_TIME_H
 #include <sys/time.h> /* for struct timeval */
 #endif
+#include <pmix_version.h>
 
-BEGIN_C_DECLS
+#if defined(c_plusplus) || defined(__cplusplus)
+extern "C" {
+#endif
 
 /****  PMIX CONSTANTS    ****/
 
@@ -92,6 +92,7 @@ BEGIN_C_DECLS
 /* identification attributes */
 #define PMIX_USERID                "pmix.euid"              // (uint32_t) effective user id
 #define PMIX_GRPID                 "pmix.egid"              // (uint32_t) effective group id
+#define PMIX_DSTPATH               "pmix.dstpath"           // (char*) path to dstore files
 
 /* attributes for the rendezvous socket  */
 #define PMIX_SOCKET_MODE           "pmix.sockmode"          // (uint32_t) POSIX mode_t (9 bits valid)
@@ -118,7 +119,7 @@ BEGIN_C_DECLS
 #define PMIX_NPROC_OFFSET          "pmix.offset"            // (uint32_t) starting global rank of this job
 #define PMIX_LOCAL_RANK            "pmix.lrank"             // (uint16_t) rank on this node within this job
 #define PMIX_NODE_RANK             "pmix.nrank"             // (uint16_t) rank on this node spanning all jobs
-#define PMIX_LOCALLDR              "pmix.lldr"              // (uint64_t) opal_identifier of lowest rank on this node within this job
+#define PMIX_LOCALLDR              "pmix.lldr"              // (uint32_t) opal_identifier of lowest rank on this node within this job
 #define PMIX_APPLDR                "pmix.aldr"              // (uint32_t) lowest rank in this app within this job
 
 /* proc location-related info */
@@ -983,5 +984,8 @@ pmix_status_t PMIx_Store_internal(const pmix_proc_t *proc,
 #define PMIX_VAL_FREE(_v) \
      PMIx_free_value_data(_v)
 
-END_C_DECLS
+#if defined(c_plusplus) || defined(__cplusplus)
+}
+#endif
+
 #endif

opal/mca/pmix/pmix112/pmix/include/pmix_server.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013-2015 Intel, Inc. All rights reserved
+ * Copyright (c) 2013-2016 Intel, Inc. All rights reserved
  * Copyright (c) 2015      Artem Y. Polyakov <artpol84@gmail.com>.
  *                         All rights reserved.
  * Copyright (c) 2015      Research Organization for Information Science
@@ -59,15 +59,12 @@
 #ifndef PMIx_SERVER_API_H
 #define PMIx_SERVER_API_H
 
-#include <pmix/autogen/config.h>
-
-/* Symbol transforms */
-#include <pmix/rename.h>
-
 /* Structure and constant definitions */
 #include <pmix/pmix_common.h>
 
-BEGIN_C_DECLS
+#if defined(c_plusplus) || defined(__cplusplus)
+extern "C" {
+#endif
 
 /****    SERVER FUNCTION-SHIPPED APIs    ****/
 /* NOTE: for performance purposes, the host server is required to
@@ -420,6 +417,8 @@ pmix_status_t PMIx_server_dmodex_request(const pmix_proc_t *proc,
                                          pmix_dmodex_response_fn_t cbfunc,
                                          void *cbdata);
 
-END_C_DECLS
+#if defined(c_plusplus) || defined(__cplusplus)
+}
+#endif
 
 #endif

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

@@ -0,0 +1,19 @@
+/*
+ * Copyright (c) 2016      Mellanox Technologies, Inc.
+ *                         All rights reserved.
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ */
+
+
+#ifndef PMIx_VERSION_H
+#define PMIx_VERSION_H
+
+/* define PMIx version */
+#define PMIX_VERSION_MAJOR @pmixmajor@
+#define PMIX_VERSION_MINOR @pmixminor@
+
+#endif