Skip to content

Commit 87ddfdd

Browse files
author
Ralph Castain
committed
Update to PMIx v2.1.3
Signed-off-by: Ralph Castain <[email protected]> (cherry picked from commit 6bee6c0)
1 parent 8c4b0ec commit 87ddfdd

File tree

5 files changed

+20
-10
lines changed

5 files changed

+20
-10
lines changed

opal/mca/pmix/pmix2x/pmix/NEWS

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,14 @@ example, a bug might be fixed in the master, and then moved to the
2121
current release as well as the "stable" bug fix release branch.
2222

2323

24-
2.1.2 -- TBD
24+
2.1.3 -- TBD
25+
----------------------
26+
- Fixed memory corruption bug in event notification
27+
system due to uninitialized variable
28+
- Add numeric version definition
29+
30+
31+
2.1.2 -- 6 July 2018
2532
----------------------
2633
- Added PMIX_VERSION_RELEASE string to pmix_version.h
2734
- Added PMIX_SPAWNED and PMIX_PARENT_ID keys to all procs

opal/mca/pmix/pmix2x/pmix/VERSION

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,15 @@
1515

1616
major=2
1717
minor=1
18-
release=2
18+
release=3
1919

2020
# greek is used for alpha or beta release tags. If it is non-empty,
2121
# it will be appended to the version number. It does not have to be
2222
# numeric. Common examples include a1 (alpha release 1), b1 or (beta release 1).
2323
# The only requirement is that it must be entirely printable ASCII
2424
# characters and have no white space.
2525

26-
greek=
26+
greek=rc1
2727

2828
# If repo_rev is empty, then the repository version number will be
2929
# obtained during "make dist" via the "git describe --tags --always"
@@ -44,7 +44,7 @@ tarball_version=
4444

4545
# The date when this release was created
4646

47-
date="Jul 01, 2018"
47+
date="Jul 19, 2018"
4848

4949
# The shared library version of each of PMIx's public libraries.
5050
# These versions are maintained in accordance with the "Library
@@ -75,6 +75,6 @@ date="Jul 01, 2018"
7575
# Version numbers are described in the Libtool current:revision:age
7676
# format.
7777

78-
libpmix_so_version=3:12:1
78+
libpmix_so_version=3:13:1
7979
libpmi_so_version=1:0:0
8080
libpmi2_so_version=1:0:0

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,7 @@
192192

193193
Summary: An extended/exascale implementation of PMI
194194
Name: %{?_name:%{_name}}%{!?_name:pmix}
195-
Version: 2.1.2
195+
Version: 2.1.3rc1
196196
Release: 1%{?dist}
197197
License: BSD
198198
Group: Development/Libraries

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,7 @@
1818
#define PMIX_VERSION_MAJOR @pmixmajor@
1919
#define PMIX_VERSION_MINOR @pmixminor@
2020
#define PMIX_VERSION_RELEASE @pmixrelease@
21+
22+
#define PMIX_NUMERIC_VERSION 0x00020103
23+
2124
#endif

opal/mca/pmix/pmix2x/pmix/src/event/pmix_event_registration.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -391,11 +391,11 @@ static void check_cached_events(pmix_rshift_caddy_t *cd)
391391
chain->status = ncd->status;
392392
(void)strncpy(chain->source.nspace, pmix_globals.myid.nspace, PMIX_MAX_NSLEN);
393393
chain->source.rank = pmix_globals.myid.rank;
394-
/* we already left space for evhandler name plus
395-
* a callback object when we cached the notification */
396-
chain->ninfo = ncd->ninfo;
397-
PMIX_INFO_CREATE(chain->info, chain->ninfo);
394+
/* we always leave space for event hdlr name and a callback object */
395+
chain->nallocated = ncd->ninfo + 2;
396+
PMIX_INFO_CREATE(chain->info, chain->nallocated);
398397
if (0 < cd->ninfo) {
398+
chain->ninfo = ncd->ninfo;
399399
/* need to copy the info */
400400
for (n=0; n < ncd->ninfo; n++) {
401401
PMIX_INFO_XFER(&chain->info[n], &ncd->info[n]);

0 commit comments

Comments
 (0)