Merge pull request #5386 from rhc54/cmr31/pmix212

v3.1.x: Update to PMIx v2.1.2

Author: bwbarrett

ompi/errhandler/errcode-internal.h

@@ -14,6 +14,7 @@
  * Copyright (c) 2010      Oracle and/or its affiliates.  All rights reserved.
  * Copyright (c) 2012      Los Alamos National Security, LLC.  All rights
  *                         reserved.
+ * Copyright (c) 2018      Intel, Inc. All rights reserved.
  * $COPYRIGHT$
  *
  * Additional copyrights may follow
@@ -69,7 +70,7 @@ static inline int ompi_errcode_get_mpi_code(int errcode)
        it */
     for (i = 0; i < ompi_errcode_intern_lastused; i++) {
         errc = (ompi_errcode_intern_t *)opal_pointer_array_get_item(&ompi_errcodes_intern, i);
-        if (errc->code == errcode) {
+        if (NULL != errc && errc->code == errcode) {
             ret = errc->mpi_code;
             break;
         }

ompi/runtime/ompi_mpi_init.c

@@ -17,7 +17,7 @@
  * Copyright (c) 2008-2009 Sun Microsystems, Inc.  All rights reserved.
  * Copyright (c) 2011      Sandia National Laboratories. All rights reserved.
  * Copyright (c) 2012-2013 Inria.  All rights reserved.
- * Copyright (c) 2014-2017 Intel, Inc.  All rights reserved.
+ * Copyright (c) 2014-2018 Intel, Inc. All rights reserved.
  * Copyright (c) 2014-2016 Research Organization for Information Science
  *                         and Technology (RIST). All rights reserved.
  * Copyright (c) 2016      Mellanox Technologies Ltd. All rights reserved.

opal/mca/btl/usnic/btl_usnic_hwloc.c

@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2013-2016 Cisco Systems, Inc.  All rights reserved.
- * Copyright (c) 2016-2017 Intel, Inc. All rights reserved.
+ * Copyright (c) 2016-2018 Intel, Inc. All rights reserved.
  * $COPYRIGHT$
  *
  * Additional copyrights may follow
@@ -41,8 +41,8 @@ static int get_distance_matrix(void)
      * responsible for freeing it. */
 
     if (NULL == matrix) {
-        matrix = hwloc_get_whole_distance_matrix_by_type(opal_hwloc_topology,
-                                                         HWLOC_OBJ_NODE);
+        matrix = (struct hwloc_distances_s*)hwloc_get_whole_distance_matrix_by_type(opal_hwloc_topology,
+                                                                                    HWLOC_OBJ_NODE);
     }
 
     return (NULL == matrix) ? OPAL_ERROR : OPAL_SUCCESS;

opal/mca/hwloc/base/hwloc_base_util.c

@@ -13,7 +13,7 @@
  * Copyright (c) 2011-2017 Cisco Systems, Inc.  All rights reserved
  * Copyright (c) 2012-2017 Los Alamos National Security, LLC.
  *                         All rights reserved.
- * Copyright (c) 2013-2017 Intel, Inc.  All rights reserved.
+ * Copyright (c) 2013-2018 Intel, Inc. All rights reserved.
  * Copyright (c) 2015-2017 Research Organization for Information Science
  *                         and Technology (RIST). All rights reserved.
  * $COPYRIGHT$
@@ -2047,8 +2047,9 @@ static void sort_by_dist(hwloc_topology_t topo, char* device_name, opal_list_t *
     hwloc_obj_t root = NULL;
     int depth;
     unsigned i;
-#endif
+#else
     unsigned distances_nr = 0;
+#endif
 
     for (device_obj = hwloc_get_obj_by_type(topo, HWLOC_OBJ_OS_DEVICE, 0); device_obj; device_obj = hwloc_get_next_osdev(topo, device_obj)) {
         if (device_obj->attr->osdev.type == HWLOC_OBJ_OSDEV_OPENFABRICS
@@ -2070,7 +2071,7 @@ static void sort_by_dist(hwloc_topology_t topo, char* device_name, opal_list_t *
 
                 /* find distance matrix for all numa nodes */
 #if HWLOC_API_VERSION < 0x20000
-                distances = hwloc_get_whole_distance_matrix_by_type(topo, HWLOC_OBJ_NODE);
+                distances = (struct hwloc_distances_s*)hwloc_get_whole_distance_matrix_by_type(topo, HWLOC_OBJ_NODE);
                 if (NULL ==  distances) {
                     /* we can try to find distances under group object. This info can be there. */
                     depth = hwloc_get_type_depth(topo, HWLOC_OBJ_NODE);

opal/mca/pmix/pmix2x/pmix/LICENSE

@@ -26,7 +26,7 @@ Copyright (c) 2006-2010 Sun Microsystems, Inc.  All rights reserved.
 Copyright (c) 2006-2010 The University of Houston. All rights reserved.
 Copyright (c) 2006-2009 Myricom, Inc.  All rights reserved.
 Copyright (c) 2007-2008 UT-Battelle, LLC. All rights reserved.
-Copyright (c) 2007-2010 IBM Corporation.  All rights reserved.
+Copyright (c) 2007-2018 IBM Corporation.  All rights reserved.
 Copyright (c) 1998-2005 Forschungszentrum Juelich, Juelich Supercomputing
                         Centre, Federal Republic of Germany
 Copyright (c) 2005-2008 ZIH, TU Dresden, Federal Republic of Germany
@@ -36,7 +36,7 @@ Copyright (c) 2008-2009 Institut National de Recherche en
                         Informatique.  All rights reserved.
 Copyright (c) 2007      Lawrence Livermore National Security, LLC.
                         All rights reserved.
-Copyright (c) 2007-2009 Mellanox Technologies.  All rights reserved.
+Copyright (c) 2007-2018 Mellanox Technologies.  All rights reserved.
 Copyright (c) 2006-2010 QLogic Corporation.  All rights reserved.
 Copyright (c) 2008-2010 Oak Ridge National Labs.  All rights reserved.
 Copyright (c) 2006-2010 Oracle and/or its affiliates.  All rights reserved.
@@ -45,7 +45,7 @@ Copyright (c) 2010      ARM ltd.  All rights reserved.
 Copyright (c) 2010-2011 Alex Brick <[email protected]>.  All rights reserved.
 Copyright (c) 2012      The University of Wisconsin-La Crosse. All rights
                         reserved.
-Copyright (c) 2013-2014 Intel, Inc. All rights reserved.
+Copyright (c) 2013-2018 Intel, Inc. All rights reserved.
 Copyright (c) 2011-2014 NVIDIA Corporation.  All rights reserved.
 
 $COPYRIGHT$

opal/mca/pmix/pmix2x/pmix/NEWS

@@ -21,7 +21,7 @@ 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.
 
 
-2.1.2 -- TBD
+2.1.2 -- 6 July 2018
 ----------------------
 - Added PMIX_VERSION_RELEASE string to pmix_version.h
 - Added PMIX_SPAWNED and PMIX_PARENT_ID keys to all procs
@@ -32,6 +32,7 @@ current release as well as the "stable" bug fix release branch.
   shared memory region upon first connection
 - Fix potential deadlock in PMIx_server_init in an error case
 - Fix uninitialized variable
+- Fix several memory and file descriptor leaks
 
 
 2.1.1 -- 5 Mar 2018

opal/mca/pmix/pmix2x/pmix/README

@@ -15,7 +15,7 @@ Copyright (c) 2007      Myricom, Inc.  All rights reserved.
 Copyright (c) 2008      IBM Corporation.  All rights reserved.
 Copyright (c) 2010      Oak Ridge National Labs.  All rights reserved.
 Copyright (c) 2011      University of Houston. All rights reserved.
-Copyright (c) 2013-2017 Intel, Inc. All rights reserved.
+Copyright (c) 2013-2018 Intel, Inc. All rights reserved.
 $COPYRIGHT$
 
 Additional copyrights may follow
@@ -25,13 +25,14 @@ $HEADER$
 ===========================================================================
 
 When submitting questions and problems, be sure to include as much
-extra information as possible.  This web page details all the
-information that we request in order to provide assistance:
+extra information as possible.  The issues template on the
+GitHub repo provides directions:
 
-     http://pmix.github.io/pmix/community/help/
+     http://github.com/pmix/pmix/issues
 
 The best way to report bugs, send comments, or ask questions is to
-sign up on the PMIx mailing list, which is hosted by GoogleGroups:
+open an issue on the repo. Alternatively, you are welcome to sign
+up for the developer/user mailing list:
 
         [email protected]
 
@@ -48,7 +49,7 @@ Thanks for your time.
 
 More information is available in the PMIx FAQ:
 
-    http://pmix.github.io/pmix/faq/
+    https://pmix.org/support
 
 We are in early days, so please be patient - info will grow as questions
 are addressed.
@@ -63,7 +64,7 @@ General notes
 
 - The majority of PMIx's documentation is here in this file, the
   included man pages, and on the web site FAQ
-  (http://pmix.github.io/pmix/faq).  This will eventually be
+  (https://pmix.org/support).  This will eventually be
   supplemented with cohesive installation and user documentation files.
 
 - Systems that have been tested are:
@@ -312,7 +313,7 @@ Common Questions
 Many common questions about building and using PMIx are answered
 on the FAQ:
 
-    http://pmix.github.io/pmix/faq/
+    https://pmix.org/support
 
 ===========================================================================
 
@@ -323,10 +324,10 @@ Found a bug?  Got a question?  Want to make a suggestion?  Want to
 contribute to PMIx?  Please let us know!
 
 When submitting questions and problems, be sure to include as much
-extra information as possible.  This web page details all the
-information that we request in order to provide assistance:
+extra information as possible. Again, the issues template is your
+friend in this regard!
 
-     http://pmix.github.io/pmix/community/help/
+     https://github.com/pmix/pmix/issues
 
 Questions and comments should generally be sent to the PMIx mailing
 list ([email protected]).  Because of spam, only
@@ -338,4 +339,4 @@ user's list:
 
      https://groups.google.com/d/forum/pmix
 
-Make today an PMIx day!
+Make today a PMIx day!

opal/mca/pmix/pmix2x/pmix/VERSION

@@ -23,14 +23,14 @@ release=2
 # The only requirement is that it must be entirely printable ASCII
 # characters and have no white space.
 
-greek=rc1
+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=gitc9312a8
+repo_rev=git8b0bc1f
 
 # 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="Jun 18, 2018"
+date="Jul 06, 2018"
 
 # The shared library version of each of PMIx's public libraries.
 # These versions are maintained in accordance with the "Library

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

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

opal/mca/pmix/pmix2x/pmix/src/mca/gds/ds12/gds_dstore.c

@@ -2879,6 +2879,8 @@ static pmix_status_t dstore_del_nspace(const char* nspace)
     ns_map_t *ns_map;
     session_t *session_tbl = NULL;
     ns_track_elem_t *trk = NULL;
+    int dstor_track_idx;
+    size_t session_tbl_idx;
 
     PMIX_OUTPUT_VERBOSE((10, pmix_gds_base_framework.framework_output,
         "%s:%d:%s delete nspace `%s`", __FILE__, __LINE__, __func__, nspace));
@@ -2887,7 +2889,8 @@ static pmix_status_t dstore_del_nspace(const char* nspace)
         rc = PMIX_ERR_NOT_AVAILABLE;
         return rc;
     }
-
+    dstor_track_idx = ns_map_data->track_idx;
+    session_tbl_idx = ns_map_data->tbl_idx;
     size = pmix_value_array_get_size(_ns_map_array);
     ns_map = PMIX_VALUE_ARRAY_GET_BASE(_ns_map_array, ns_map_t);
 
@@ -2899,30 +2902,29 @@ static pmix_status_t dstore_del_nspace(const char* nspace)
                 continue;
             }
             in_use++;
-            break;
-        }
-    }
-
-    if(ns_map_data->track_idx >= 0) {
-        trk = pmix_value_array_get_item(_ns_track_array, ns_map_data->track_idx);
-        if((ns_map_data->track_idx + 1) > (int)pmix_value_array_get_size(_ns_track_array)) {
-            rc = PMIX_ERR_VALUE_OUT_OF_BOUNDS;
-            PMIX_ERROR_LOG(rc);
-            goto exit;
-        }
-        if (true == trk->in_use) {
-            PMIX_DESTRUCT(trk);
         }
     }
 
     /* A lot of nspaces may be using same session info
      * session record can only be deleted once all references are gone */
     if (!in_use) {
         session_tbl = PMIX_VALUE_ARRAY_GET_BASE(_session_array, session_t);
-
         PMIX_OUTPUT_VERBOSE((10, pmix_gds_base_framework.framework_output,
-            "%s:%d:%s delete session for jobuid: %d", __FILE__, __LINE__, __func__, session_tbl[ns_map_data->tbl_idx].jobuid));
-        _esh_session_release(&session_tbl[ns_map_data->tbl_idx]);
+                             "%s:%d:%s delete session for jobuid: %d",
+                             __FILE__, __LINE__, __func__, session_tbl[session_tbl_idx].jobuid));
+        size = pmix_value_array_get_size(_ns_track_array);
+        if (size && (dstor_track_idx >= 0)) {
+            if((dstor_track_idx + 1) > size) {
+                rc = PMIX_ERR_VALUE_OUT_OF_BOUNDS;
+                PMIX_ERROR_LOG(rc);
+                goto exit;
+            }
+            trk = pmix_value_array_get_item(_ns_track_array, dstor_track_idx);
+            if (true == trk->in_use) {
+                PMIX_DESTRUCT(trk);
+            }
+        }
+        _esh_session_release(&session_tbl[session_tbl_idx]);
      }
 exit:
     return rc;