Skip to content

Commit b12ab2b

Browse files
ggouaillardetggouaillardet
authored
Merge pull request #2857 from ggouaillardet/topic/pmix_ext11
pmix/ext11 fixes, plugs and rename
2 parents 7ab26a4 + b078e57 commit b12ab2b

File tree

9 files changed

+153
-132
lines changed

9 files changed

+153
-132
lines changed

‎opal/mca/pmix/ext11/Makefile.am

Lines changed: 0 additions & 46 deletions
This file was deleted.

‎opal/mca/pmix/ext1x/Makefile.am

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
#
2+
# Copyright (c) 2014-2016 Intel, Inc. All rights reserved.
3+
# Copyright (c) 2015 Cisco Systems, Inc. All rights reserved.
4+
# Copyright (c) 2014-2015 Mellanox Technologies, Inc.
5+
# All rights reserved.
6+
# Copyright (c) 2017 Research Organization for Information Science
7+
# and Technology (RIST). All rights reserved.
8+
# $COPYRIGHT$
9+
#
10+
# Additional copyrights may follow
11+
#
12+
# $HEADER$
13+
#
14+
15+
sources = \
16+
pmix1x.h \
17+
pmix1x_component.c \
18+
pmix1x.c \
19+
pmix1x_client.c \
20+
pmix1x_server_south.c \
21+
pmix1x_server_north.c
22+
23+
# Make the output library in this directory, and name it either
24+
# mca_<type>_<name>.la (for DSO builds) or libmca_<type>_<name>.la
25+
# (for static builds).
26+
27+
if MCA_BUILD_opal_pmix_ext1x_DSO
28+
component_noinst =
29+
component_install = mca_pmix_ext1x.la
30+
else
31+
component_noinst = libmca_pmix_ext1x.la
32+
component_install =
33+
endif
34+
35+
mcacomponentdir = $(opallibdir)
36+
mcacomponent_LTLIBRARIES = $(component_install)
37+
mca_pmix_ext1x_la_SOURCES = $(sources)
38+
mca_pmix_ext1x_la_CFLAGS =
39+
mca_pmix_ext1x_la_CPPFLAGS = $(opal_pmix_ext1x_CPPFLAGS)
40+
mca_pmix_ext1x_la_LDFLAGS = -module -avoid-version $(opal_pmix_ext1x_LDFLAGS)
41+
mca_pmix_ext1x_la_LIBADD = $(opal_pmix_ext1x_LIBS)
42+
43+
noinst_LTLIBRARIES = $(component_noinst)
44+
libmca_pmix_ext1x_la_SOURCES =$(sources)
45+
libmca_pmix_ext1x_la_CFLAGS =
46+
libmca_pmix_ext1x_la_CPPFLAGS = $(opal_pmix_ext1x_CPPFLAGS)
47+
libmca_pmix_ext1x_la_LDFLAGS = -module -avoid-version $(opal_pmix_ext1x_LDFLAGS)
48+
libmca_pmix_ext1x_la_LIBADD = $(opal_pmix_ext1x_LIBS)

‎opal/mca/pmix/ext11/configure.m4 renamed to ‎opal/mca/pmix/ext1x/configure.m4

Lines changed: 18 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
# All rights reserved.
1515
# Copyright (c) 2010-2015 Cisco Systems, Inc. All rights reserved.
1616
# Copyright (c) 2013-2016 Intel, Inc. All rights reserved.
17-
# Copyright (c) 2015 Research Organization for Information Science
17+
# Copyright (c) 2015-2017 Research Organization for Information Science
1818
# and Technology (RIST). All rights reserved.
1919
# Copyright (c) 2014-2015 Mellanox Technologies, Inc.
2020
# All rights reserved.
@@ -25,10 +25,10 @@
2525
# $HEADER$
2626
#
2727

28-
# MCA_pmix_ext11_CONFIG([action-if-found], [action-if-not-found])
28+
# MCA_pmix_ext1x_CONFIG([action-if-found], [action-if-not-found])
2929
# -----------------------------------------------------------
30-
AC_DEFUN([MCA_opal_pmix_ext11_CONFIG],[
31-
AC_CONFIG_FILES([opal/mca/pmix/ext11/Makefile])
30+
AC_DEFUN([MCA_opal_pmix_ext1x_CONFIG],[
31+
AC_CONFIG_FILES([opal/mca/pmix/ext1x/Makefile])
3232

3333
AS_IF([test "$opal_external_pmix_happy" = "yes"],
3434
[AS_IF([test "$opal_event_external_support" != "yes"],
@@ -42,29 +42,30 @@ AC_DEFUN([MCA_opal_pmix_ext11_CONFIG],[
4242
AC_MSG_WARN([TO BUILD PMIX OR ELSE UNPREDICTABLE BEHAVIOR MAY RESULT])
4343
AC_MSG_ERROR([PLEASE CORRECT THE CONFIGURE COMMAND LINE AND REBUILD])])
4444

45-
# check for the 1.1.4 version
46-
AC_MSG_CHECKING([if external component is version 1.1.4])
45+
# check for the 1.x version ( >= 1.1.4 ?)
46+
AC_MSG_CHECKING([if external component is version 1.x])
4747
AS_IF([test "$opal_external_pmix_version" = "11" ||
48+
test "$opal_external_pmix_version" = "12" ||
4849
test "$opal_external_pmix_version" = "1x"],
4950
[AC_MSG_RESULT([yes])
50-
opal_pmix_external_11_happy=yes],
51+
opal_pmix_external_1x_happy=yes],
5152
[AC_MSG_RESULT([no])
52-
opal_pmix_external_11_happy=no])
53+
opal_pmix_external_1x_happy=no])
5354

54-
AS_IF([test "$opal_pmix_external_11_happy" = "yes"],
55+
AS_IF([test "$opal_pmix_external_1x_happy" = "yes"],
5556
[$1
5657
# need to set the wrapper flags for static builds
57-
pmix_ext11_WRAPPER_EXTRA_LDFLAGS=$opal_external_pmix_LDFLAGS
58-
pmix_ext11_WRAPPER_EXTRA_LIBS=$opal_external_pmix_LIBS],
58+
pmix_ext1x_WRAPPER_EXTRA_LDFLAGS=$opal_external_pmix_LDFLAGS
59+
pmix_ext1x_WRAPPER_EXTRA_LIBS=$opal_external_pmix_LIBS],
5960
[$2])],
6061
[$2])
6162

62-
opal_pmix_ext11_CPPFLAGS=$opal_external_pmix_CPPFLAGS
63-
opal_pmix_ext11_LDFLAGS=$opal_external_pmix_LDFLAGS
64-
opal_pmix_ext11_LIBS=$opal_external_pmix_LIBS
63+
opal_pmix_ext1x_CPPFLAGS=$opal_external_pmix_CPPFLAGS
64+
opal_pmix_ext1x_LDFLAGS=$opal_external_pmix_LDFLAGS
65+
opal_pmix_ext1x_LIBS=$opal_external_pmix_LIBS
6566

66-
AC_SUBST([opal_pmix_ext11_CPPFLAGS])
67-
AC_SUBST([opal_pmix_ext11_LDFLAGS])
68-
AC_SUBST([opal_pmix_ext11_LIBS])
67+
AC_SUBST([opal_pmix_ext1x_CPPFLAGS])
68+
AC_SUBST([opal_pmix_ext1x_LDFLAGS])
69+
AC_SUBST([opal_pmix_ext1x_LIBS])
6970

7071
])dnl

‎opal/mca/pmix/ext11/pmix_ext.c renamed to ‎opal/mca/pmix/ext1x/pmix1x.c

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */
22
/*
33
* Copyright (c) 2014-2016 Intel, Inc. All rights reserved.
4-
* Copyright (c) 2014-2016 Research Organization for Information Science
4+
* Copyright (c) 2014-2017 Research Organization for Information Science
55
* and Technology (RIST). All rights reserved.
66
* Copyright (c) 2014-2015 Mellanox Technologies, Inc.
77
* All rights reserved.
@@ -35,7 +35,7 @@
3535
#include "opal/util/proc.h"
3636
#include "opal/util/show_help.h"
3737

38-
#include "pmix_ext.h"
38+
#include "pmix1x.h"
3939
#include "opal/mca/pmix/base/base.h"
4040
#include "opal/mca/pmix/pmix_types.h"
4141

@@ -49,7 +49,7 @@
4949
static const char *pmix1_get_nspace(opal_jobid_t jobid);
5050
static void pmix1_register_jobid(opal_jobid_t jobid, const char *nspace);
5151

52-
const opal_pmix_base_module_t opal_pmix_ext11_module = {
52+
const opal_pmix_base_module_t opal_pmix_ext1x_module = {
5353
/* client APIs */
5454
.init = pmix1_client_init,
5555
.finalize = pmix1_client_finalize,
@@ -100,7 +100,7 @@ static const char *pmix1_get_nspace(opal_jobid_t jobid)
100100
{
101101
opal_pmix1_jobid_trkr_t *jptr;
102102

103-
OPAL_LIST_FOREACH(jptr, &mca_pmix_ext11_component.jobids, opal_pmix1_jobid_trkr_t) {
103+
OPAL_LIST_FOREACH(jptr, &mca_pmix_ext1x_component.jobids, opal_pmix1_jobid_trkr_t) {
104104
if (jptr->jobid == jobid) {
105105
return jptr->nspace;
106106
}
@@ -113,15 +113,15 @@ static void pmix1_register_jobid(opal_jobid_t jobid, const char *nspace)
113113
opal_pmix1_jobid_trkr_t *jptr;
114114

115115
/* if we don't already have it, add this to our jobid tracker */
116-
OPAL_LIST_FOREACH(jptr, &mca_pmix_ext11_component.jobids, opal_pmix1_jobid_trkr_t) {
116+
OPAL_LIST_FOREACH(jptr, &mca_pmix_ext1x_component.jobids, opal_pmix1_jobid_trkr_t) {
117117
if (jptr->jobid == jobid) {
118118
return;
119119
}
120120
}
121121
jptr = OBJ_NEW(opal_pmix1_jobid_trkr_t);
122122
(void)strncpy(jptr->nspace, nspace, PMIX_MAX_NSLEN);
123123
jptr->jobid = jobid;
124-
opal_list_append(&mca_pmix_ext11_component.jobids, &jptr->super);
124+
opal_list_append(&mca_pmix_ext1x_component.jobids, &jptr->super);
125125
}
126126

127127
pmix_status_t pmix1_convert_opalrc(int rc)
@@ -527,6 +527,7 @@ static void opcon(pmix1_opcaddy_t *p)
527527
p->ninfo = 0;
528528
p->apps = NULL;
529529
p->sz = 0;
530+
p->active = false;
530531
p->opcbfunc = NULL;
531532
p->mdxcbfunc = NULL;
532533
p->valcbfunc = NULL;

‎opal/mca/pmix/ext11/pmix_ext.h renamed to ‎opal/mca/pmix/ext1x/pmix1x.h

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
* Copyright (c) 2014-2016 Intel, Inc. All rights reserved.
33
* Copyright (c) 2014-2015 Mellanox Technologies, Inc.
44
* All rights reserved.
5-
* Copyright (c) 2016 Research Organization for Information Science
5+
* Copyright (c) 2016-2017 Research Organization for Information Science
66
* and Technology (RIST). All rights reserved.
77
* $COPYRIGHT$
88
*
@@ -37,11 +37,11 @@ typedef struct {
3737
opal_pmix_base_component_t super;
3838
opal_list_t jobids;
3939
bool native_launch;
40-
} mca_pmix_ext11_component_t;
40+
} mca_pmix_ext1x_component_t;
4141

42-
OPAL_DECLSPEC extern mca_pmix_ext11_component_t mca_pmix_ext11_component;
42+
OPAL_DECLSPEC extern mca_pmix_ext1x_component_t mca_pmix_ext1x_component;
4343

44-
OPAL_DECLSPEC extern const opal_pmix_base_module_t opal_pmix_ext11_module;
44+
OPAL_DECLSPEC extern const opal_pmix_base_module_t opal_pmix_ext1x_module;
4545

4646
/**** INTERNAL OBJECTS ****/
4747
typedef struct {
@@ -62,6 +62,7 @@ typedef struct {
6262
size_t ninfo;
6363
pmix_app_t *apps;
6464
size_t sz;
65+
volatile bool active;
6566
opal_pmix_op_cbfunc_t opcbfunc;
6667
opal_pmix_modex_cbfunc_t mdxcbfunc;
6768
opal_pmix_value_cbfunc_t valcbfunc;

0 commit comments

Comments
 (0)