Merge pull request #2963 from rhc54/topic/pmixupdate

Update to lastest PMIx master

Author: Ralph Castain

opal/mca/pmix/pmix2x/pmix/VERSION

@@ -23,14 +23,14 @@ release=0
 # 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=git6ed27be
+repo_rev=gitbf86f3a
 
 # 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="Feb 08, 2017"
+date="Feb 13, 2017"
 
 # 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/src/client/pmix_client.c

@@ -1,7 +1,7 @@
 /* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */
 /*
  * Copyright (c) 2014-2017 Intel, Inc.  All rights reserved.
- * Copyright (c) 2014-2016 Research Organization for Information Science
+ * Copyright (c) 2014-2017 Research Organization for Information Science
  *                         and Technology (RIST). All rights reserved.
  * Copyright (c) 2014      Artem Y. Polyakov <[email protected]>.
  *                         All rights reserved.
@@ -236,6 +236,21 @@ static void evhandler_reg_callbk(pmix_status_t status,
     *active = status;
 }
 
+static void _destruct_my_server_fn(int sd, short args, void *cbdata)
+{
+    pmix_cb_t *cb= (pmix_cb_t *)cbdata;
+    PMIX_DESTRUCT(&pmix_client_globals.myserver);
+    cb->active = false;
+}
+
+
+static void pmix_destruct_my_server(void)
+{
+    pmix_cb_t cb;
+    PMIX_THREADSHIFT(&cb, _destruct_my_server_fn);
+    PMIX_WAIT_FOR_COMPLETION(cb.active);
+}
+
 PMIX_EXPORT pmix_status_t PMIx_Init(pmix_proc_t *proc,
                                     pmix_info_t info[], size_t ninfo)
 {
@@ -458,7 +473,15 @@ PMIX_EXPORT pmix_status_t PMIx_Finalize(const pmix_info_t info[], size_t ninfo)
                              "pmix:client finalize sync received");
     }
 
-    PMIX_DESTRUCT(&pmix_client_globals.myserver);
+    pmix_destruct_my_server();
+
+#if defined(PMIX_ENABLE_DSTORE) && (PMIX_ENABLE_DSTORE == 1)
+    if (0 > (rc = pmix_dstore_nspace_del(pmix_globals.myid.nspace))) {
+        PMIX_ERROR_LOG(rc);
+        return rc;
+    }
+#endif
+
     pmix_rte_finalize();
 
     PMIX_LIST_DESTRUCT(&pmix_client_globals.pending_requests);

opal/mca/pmix/pmix2x/pmix/src/client/pmix_client_connect.c

@@ -1,7 +1,7 @@
 /* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */
 /*
- * Copyright (c) 2014-2016 Intel, Inc.  All rights reserved.
- * Copyright (c) 2014-2015 Research Organization for Information Science
+ * Copyright (c) 2014-2017 Intel, Inc. All rights reserved.
+ * Copyright (c) 2014-2017 Research Organization for Information Science
  *                         and Technology (RIST). All rights reserved.
  * Copyright (c) 2014      Artem Y. Polyakov <[email protected]>.
  *                         All rights reserved.
@@ -325,6 +325,7 @@ static void wait_cbfunc(struct pmix_peer_t *pr,
 #if !(defined(PMIX_ENABLE_DSTORE) && (PMIX_ENABLE_DSTORE == 1))
         pmix_job_data_htable_store(nspace, bptr);
 #endif
+        free(nspace);
         PMIX_RELEASE(bptr);
     }
     if (PMIX_ERR_UNPACK_READ_PAST_END_OF_BUFFER != rc) {
@@ -335,6 +336,7 @@ static void wait_cbfunc(struct pmix_peer_t *pr,
     if (NULL != cb->op_cbfunc) {
         cb->op_cbfunc(ret, cb->cbdata);
     }
+    PMIX_RELEASE(cb);
 }
 
 static void op_cbfunc(pmix_status_t status, void *cbdata)

opal/mca/pmix/pmix2x/pmix/src/client/pmix_client_spawn.c

@@ -1,7 +1,7 @@
 /* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */
 /*
- * Copyright (c) 2014-2016 Intel, Inc.  All rights reserved.
- * Copyright (c) 2014-2015 Research Organization for Information Science
+ * Copyright (c) 2014-2017 Intel, Inc. All rights reserved.
+ * Copyright (c) 2014-2017 Research Organization for Information Science
  *                         and Technology (RIST). All rights reserved.
  * Copyright (c) 2014      Artem Y. Polyakov <[email protected]>.
  *                         All rights reserved.
@@ -225,6 +225,8 @@ static void wait_cbfunc(struct pmix_peer_t *pr,
     if (NULL != cb->spawn_cbfunc) {
         cb->spawn_cbfunc(ret, nspace, cb->cbdata);
     }
+    cb->cbdata = NULL;
+    PMIX_RELEASE(cb);
 }
 
 static void spawn_cbfunc(pmix_status_t status, char nspace[], void *cbdata)

opal/mca/pmix/pmix2x/pmix/src/common/pmix_jobdata.c

@@ -1,6 +1,6 @@
 /* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */
 /*
- * Copyright (c) 2016      Mellanox Technologies, Inc.
+ * Copyright (c) 2016-2017 Mellanox Technologies, Inc.
  *                         All rights reserved.
  * Copyright (c) 2016-2017 Intel, Inc.  All rights reserved.
  * $COPYRIGHT$
@@ -381,6 +381,12 @@ static inline pmix_status_t _job_data_store(const char *nspace, void *cbdata)
 exit:
 #if defined(PMIX_ENABLE_DSTORE) && (PMIX_ENABLE_DSTORE == 1)
     if (NULL != cb->bufs) {
+        size_t size = pmix_value_array_get_size(cb->bufs);
+        size_t i;
+        for (i = 0; i < size; i++) {
+            pmix_buffer_t *tmp = &(PMIX_VALUE_ARRAY_GET_ITEM(cb->bufs, pmix_buffer_t, i));
+            PMIX_DESTRUCT(tmp);
+        }
         PMIX_RELEASE(cb->bufs);
     }
 #endif