Skip to content

Sync to PMIx master #4294

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 3, 2017
Merged

Sync to PMIx master #4294

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions opal/mca/pmix/pmix2x/pmix/VERSION
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ greek=
# command, or with the date (if "git describe" fails) in the form of
# "date<date>".

repo_rev=git9d9df02
repo_rev=git6ab9c8d

# If tarball_version is not empty, it is used as the version string in
# the tarball filename, regardless of all other versions listed in
Expand All @@ -44,7 +44,7 @@ tarball_version=

# The date when this release was created

date="Sep 27, 2017"
date="Oct 03, 2017"

# The shared library version of each of PMIx's public libraries.
# These versions are maintained in accordance with the "Library
Expand Down
8 changes: 8 additions & 0 deletions opal/mca/pmix/pmix2x/pmix/src/client/pmix_client_connect.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
#include <pmix_rename.h>

#include "src/include/pmix_globals.h"
#include "src/mca/gds/base/base.h"

#ifdef HAVE_STRING_H
#include <string.h>
Expand Down Expand Up @@ -252,6 +253,13 @@ PMIX_EXPORT pmix_status_t PMIx_Disconnect_nb(const pmix_proc_t procs[], size_t n
pmix_output_verbose(2, pmix_globals.debug_output,
"pmix: disconnect called");

size_t cnt;
for (cnt = 0; cnt < nprocs; cnt++) {
if (0 != strcmp(pmix_globals.myid.nspace, procs[cnt].nspace)) {
PMIX_GDS_DEL_NSPACE(rc, procs[cnt].nspace);
}
}

if (pmix_globals.init_cntr <= 0) {
PMIX_RELEASE_THREAD(&pmix_global_lock);
return PMIX_ERR_INIT;
Expand Down
3 changes: 2 additions & 1 deletion opal/mca/pmix/pmix2x/pmix/src/mca/bfrops/v12/pack.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -707,7 +707,7 @@ pmix_status_t pmix12_bfrop_pack_app(pmix_buffer_t *buffer, const void *src,
pmix_app_t *app;
int32_t i, j, nvals;
pmix_status_t ret;
int argc=0;
int argc;

app = (pmix_app_t *) src;

Expand All @@ -716,6 +716,7 @@ pmix_status_t pmix12_bfrop_pack_app(pmix_buffer_t *buffer, const void *src,
return ret;
}
/* argv */
argc = pmix_argv_count(app[i].argv);
if (PMIX_SUCCESS != (ret = pmix12_bfrop_pack_int(buffer, &argc, 1, PMIX_INT))) {
return ret;
}
Expand Down