Skip to content

Commit ed0b35e

Browse files
jsquyresjsquyres
authored
Merge pull request #4747 from sam6258/regex_cherrypick
Cherry-pick regx framework
2 parents 40eaa56 + e75e4e1 commit ed0b35e

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+2659
-2010
lines changed

‎orte/mca/dfs/orted/dfs_orted.c‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
* Copyright (c) 2012-2013 Los Alamos National Security, LLC.
33
* All rights reserved.
44
* Copyright (c) 2013 Cisco Systems, Inc. All rights reserved.
5-
* Copyright (c) 2015-2017 Intel, Inc. All rights reserved.
5+
* Copyright (c) 2015-2018 Intel, Inc. All rights reserved.
66
* Copyright (c) 2015 Research Organization for Information Science
77
* and Technology (RIST). All rights reserved.
88
* $COPYRIGHT$
@@ -34,7 +34,6 @@
3434
#include "orte/util/proc_info.h"
3535
#include "orte/util/session_dir.h"
3636
#include "orte/util/show_help.h"
37-
#include "orte/util/nidmap.h"
3837
#include "orte/util/threads.h"
3938

4039
#include "orte/mca/errmgr/errmgr.h"

‎orte/mca/errmgr/default_hnp/errmgr_default_hnp.c‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
* Copyright (c) 2011 Oracle and/or all its affiliates. All rights reserved.
1010
* Copyright (c) 2011-2013 Los Alamos National Security, LLC.
1111
* All rights reserved.
12-
* Copyright (c) 2014-2017 Intel, Inc. All rights reserved.
12+
* Copyright (c) 2014-2018 Intel, Inc. All rights reserved.
1313
* Copyright (c) 2017 IBM Corporation. All rights reserved.
1414
* $COPYRIGHT$
1515
*
@@ -49,7 +49,6 @@
4949
#include "orte/util/name_fns.h"
5050
#include "orte/util/proc_info.h"
5151
#include "orte/util/show_help.h"
52-
#include "orte/util/nidmap.h"
5352
#include "orte/util/threads.h"
5453

5554
#include "orte/runtime/orte_globals.h"

‎orte/mca/errmgr/default_orted/errmgr_default_orted.c‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
* reserved.
99
* Copyright (c) 2011-2013 Los Alamos National Security, LLC.
1010
* All rights reserved.
11-
* Copyright (c) 2014-2017 Intel, Inc. All rights reserved.
11+
* Copyright (c) 2014-2018 Intel, Inc. All rights reserved.
1212
* Copyright (c) 2017 IBM Corporation. All rights reserved.
1313
* $COPYRIGHT$
1414
*
@@ -33,7 +33,6 @@
3333
#include "orte/util/proc_info.h"
3434
#include "orte/util/session_dir.h"
3535
#include "orte/util/show_help.h"
36-
#include "orte/util/nidmap.h"
3736
#include "orte/util/threads.h"
3837

3938
#include "orte/mca/iof/base/base.h"

‎orte/mca/errmgr/dvm/errmgr_dvm.c‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
* Copyright (c) 2011 Oracle and/or all its affiliates. All rights reserved.
1010
* Copyright (c) 2011-2013 Los Alamos National Security, LLC.
1111
* All rights reserved.
12-
* Copyright (c) 2014-2017 Intel, Inc. All rights reserved.
12+
* Copyright (c) 2014-2018 Intel, Inc. All rights reserved.
1313
* Copyright (c) 2017 IBM Corporation. All rights reserved.
1414
* $COPYRIGHT$
1515
*
@@ -49,7 +49,6 @@
4949
#include "orte/util/name_fns.h"
5050
#include "orte/util/proc_info.h"
5151
#include "orte/util/show_help.h"
52-
#include "orte/util/nidmap.h"
5352
#include "orte/util/threads.h"
5453

5554
#include "orte/runtime/orte_globals.h"

‎orte/mca/ess/alps/ess_alps_module.c‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
* Copyright (c) 2011 Cisco Systems, Inc. All rights reserved.
1313
* Copyright (c) 2011-2013 Los Alamos National Security, LLC.
1414
* All rights reserved.
15-
* Copyright (c) 2017 Intel, Inc. All rights reserved.
15+
* Copyright (c) 2017-2018 Intel, Inc. All rights reserved.
1616
* $COPYRIGHT$
1717
*
1818
* Additional copyrights may follow
@@ -30,8 +30,6 @@
3030
#include "orte/util/proc_info.h"
3131
#include "orte/mca/errmgr/base/base.h"
3232
#include "orte/util/name_fns.h"
33-
#include "orte/util/nidmap.h"
34-
#include "orte/util/regex.h"
3533
#include "orte/runtime/orte_globals.h"
3634

3735
#include "orte/mca/ess/ess.h"

‎orte/mca/ess/alps/ess_alps_utils.c‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
* Copyright (c) 2011 Cisco Systems, Inc. All rights reserved.
1313
* Copyright (c) 2011-2013 Los Alamos National Security, LLC.
1414
* All rights reserved.
15+
* Copyright (c) 2018 Intel, Inc. All rights reserved.
1516
* $COPYRIGHT$
1617
*
1718
* Additional copyrights may follow
@@ -29,8 +30,6 @@
2930
#include "orte/util/proc_info.h"
3031
#include "orte/mca/errmgr/base/base.h"
3132
#include "orte/util/name_fns.h"
32-
#include "orte/util/nidmap.h"
33-
#include "orte/util/regex.h"
3433
#include "orte/runtime/orte_globals.h"
3534

3635
#include "orte/mca/ess/ess.h"

‎orte/mca/ess/base/ess_base_fns.c‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
* Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved.
1313
* Copyright (c) 2011-2012 Los Alamos National Security, LLC.
1414
* All rights reserved.
15-
* Copyright (c) 2014-2017 Intel, Inc. All rights reserved.
15+
* Copyright (c) 2014-2018 Intel, Inc. All rights reserved.
1616
* Copyright (c) 2014-2017 Research Organization for Information Science
1717
* and Technology (RIST). All rights reserved.
1818
* $COPYRIGHT$
@@ -37,7 +37,6 @@
3737

3838
#include "orte/mca/errmgr/errmgr.h"
3939
#include "orte/util/name_fns.h"
40-
#include "orte/util/nidmap.h"
4140
#include "orte/util/proc_info.h"
4241
#include "orte/util/show_help.h"
4342
#include "orte/runtime/orte_globals.h"

‎orte/mca/ess/base/ess_base_std_orted.c‎

Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* Copyright (c) 2011 Cisco Systems, Inc. All rights reserved.
1515
* Copyright (c) 2011-2013 Los Alamos National Security, LLC. All rights
1616
* reserved.
17-
* Copyright (c) 2013-2017 Intel, Inc. All rights reserved.
17+
* Copyright (c) 2013-2018 Intel, Inc. All rights reserved.
1818
* Copyright (c) 2017 IBM Corporation. All rights reserved.
1919
* $COPYRIGHT$
2020
*
@@ -58,6 +58,7 @@
5858
#include "orte/mca/iof/base/base.h"
5959
#include "orte/mca/plm/base/base.h"
6060
#include "orte/mca/odls/base/base.h"
61+
#include "orte/mca/regx/base/base.h"
6162
#include "orte/mca/errmgr/errmgr.h"
6263
#include "orte/mca/rmaps/base/base.h"
6364
#if OPAL_ENABLE_FT_CR == 1
@@ -68,8 +69,6 @@
6869
#include "orte/util/proc_info.h"
6970
#include "orte/util/session_dir.h"
7071
#include "orte/util/name_fns.h"
71-
#include "orte/util/nidmap.h"
72-
#include "orte/util/regex.h"
7372
#include "orte/util/show_help.h"
7473
#include "orte/mca/errmgr/base/base.h"
7574
#include "orte/mca/state/base/base.h"
@@ -519,9 +518,20 @@ int orte_ess_base_orted_setup(void)
519518
}
520519
if (ORTE_SUCCESS != (ret = orte_rmaps_base_select())) {
521520
ORTE_ERROR_LOG(ret);
522-
error = "orte_rmaps_base_find_available";
521+
error = "orte_rmaps_base_select";
523522
goto error;
524523
}
524+
if (ORTE_SUCCESS != (ret = mca_base_framework_open(&orte_regx_base_framework, 0))) {
525+
ORTE_ERROR_LOG(ret);
526+
error = "orte_regx_base_open";
527+
goto error;
528+
}
529+
if (ORTE_SUCCESS != (ret = orte_regx_base_select())) {
530+
ORTE_ERROR_LOG(ret);
531+
error = "orte_regx_base_select";
532+
goto error;
533+
}
534+
525535

526536
/* if a topology file was given, then the rmaps framework open
527537
* will have reset our topology. Ensure we always get the right
@@ -545,7 +555,7 @@ int orte_ess_base_orted_setup(void)
545555
* own port, which we need in order to construct the nidmap
546556
*/
547557
if (NULL != orte_node_regex) {
548-
if (ORTE_SUCCESS != (ret = orte_util_nidmap_parse(orte_node_regex))) {
558+
if (ORTE_SUCCESS != (ret = orte_regx.nidmap_parse(orte_node_regex))) {
549559
ORTE_ERROR_LOG(ret);
550560
error = "construct nidmap";
551561
goto error;
@@ -565,7 +575,7 @@ int orte_ess_base_orted_setup(void)
565575
* build a nidmap from it - this will update the
566576
* routing plan as well
567577
*/
568-
if (ORTE_SUCCESS != (ret = orte_util_build_daemon_nidmap())) {
578+
if (ORTE_SUCCESS != (ret = orte_regx.build_daemon_nidmap())) {
569579
ORTE_ERROR_LOG(ret);
570580
error = "construct daemon map from static ports";
571581
goto error;

‎orte/mca/ess/env/ess_env_module.c‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
* Copyright (c) 2004-2005 The Regents of the University of California.
1111
* All rights reserved.
1212
* Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved.
13-
* Copyright (c) 2013-2017 Intel, Inc. All rights reserved.
13+
* Copyright (c) 2013-2018 Intel, Inc. All rights reserved.
1414
* $COPYRIGHT$
1515
*
1616
* Additional copyrights may follow
@@ -63,7 +63,6 @@
6363
#include "orte/util/proc_info.h"
6464
#include "orte/util/session_dir.h"
6565
#include "orte/util/name_fns.h"
66-
#include "orte/util/regex.h"
6766

6867
#include "orte/runtime/runtime.h"
6968
#include "orte/runtime/orte_wait.h"

‎orte/mca/ess/hnp/ess_hnp_module.c‎

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* Copyright (c) 2011-2014 Cisco Systems, Inc. All rights reserved.
1515
* Copyright (c) 2011-2017 Los Alamos National Security, LLC. All rights
1616
* reserved.
17-
* Copyright (c) 2013-2017 Intel, Inc. All rights reserved.
17+
* Copyright (c) 2013-2018 Intel, Inc. All rights reserved.
1818
* Copyright (c) 2017 Research Organization for Information Science
1919
* and Technology (RIST). All rights reserved.
2020
* $COPYRIGHT$
@@ -67,6 +67,7 @@
6767
#include "orte/mca/grpcomm/base/base.h"
6868
#include "orte/mca/iof/base/base.h"
6969
#include "orte/mca/ras/base/base.h"
70+
#include "orte/mca/regx/base/base.h"
7071
#include "orte/mca/plm/base/base.h"
7172
#include "orte/mca/plm/plm.h"
7273
#include "orte/mca/odls/base/base.h"
@@ -541,6 +542,16 @@ static int rte_init(void)
541542
error = "orte_rmaps_base_find_available";
542543
goto error;
543544
}
545+
if (ORTE_SUCCESS != (ret = mca_base_framework_open(&orte_regx_base_framework, 0))) {
546+
ORTE_ERROR_LOG(ret);
547+
error = "orte_regx_base_open";
548+
goto error;
549+
}
550+
if (ORTE_SUCCESS != (ret = orte_regx_base_select())) {
551+
ORTE_ERROR_LOG(ret);
552+
error = "orte_regx_base_select";
553+
goto error;
554+
}
544555

545556
/* if a topology file was given, then the rmaps framework open
546557
* will have reset our topology. Ensure we always get the right

0 commit comments

Comments
 (0)