Skip to content

orte/regx: fix, revamp and enhancement #4704

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 5 commits into from
Jan 12, 2018
Merged

orte/regx: fix, revamp and enhancement #4704

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a056fde
regx/fwd: correctly handle node names with multiple set of digits
ggouaillardet Jan 12, 2018
0c686f0
regx: add the extract_node_names callback
ggouaillardet Jan 12, 2018
c2a358f
regx: move most functions from the fwd component to base
ggouaillardet Jan 12, 2018
4130c93
regx/reverse: add the reverse component
ggouaillardet Jan 12, 2018
c988011
test/util: test the regx framework
ggouaillardet Jan 12, 2018
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
3 changes: 3 additions & 0 deletions orte/mca/regx/base/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
#
# Copyright (c) 2015-2018 Intel, Inc. All rights reserved.
# Copyright (c) 2018 Research Organization for Information Science
# and Technology (RIST). All rights reserved.
# $COPYRIGHT$
#
# Additional copyrights may follow
Expand All @@ -11,5 +13,6 @@ headers += \
base/base.h

libmca_regx_la_SOURCES += \
base/regx_base_default_fns.c \
base/regx_base_frame.c \
base/regx_base_select.c
34 changes: 34 additions & 0 deletions orte/mca/regx/base/base.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,40 @@ ORTE_DECLSPEC extern mca_base_framework_t orte_regx_base_framework;
/* select all components */
ORTE_DECLSPEC int orte_regx_base_select(void);

/*
* common stuff
*/
typedef struct {
opal_list_item_t super;
int vpid;
int cnt;
int slots;
orte_topology_t *t;
} orte_regex_range_t;

OBJ_CLASS_DECLARATION(orte_regex_range_t);

typedef struct {
/* list object */
opal_list_item_t super;
char *prefix;
char *suffix;
int num_digits;
opal_list_t ranges;
} orte_regex_node_t;
END_C_DECLS

OBJ_CLASS_DECLARATION(orte_regex_node_t);

ORTE_DECLSPEC extern int orte_regx_base_nidmap_parse(char *regex);

ORTE_DECLSPEC extern int orte_regx_base_encode_nodemap(opal_buffer_t *buffer);

ORTE_DECLSPEC int orte_regx_base_decode_daemon_nodemap(opal_buffer_t *buffer);

ORTE_DECLSPEC int orte_regx_base_generate_ppn(orte_job_t *jdata, char **ppn);

ORTE_DECLSPEC int orte_regx_base_parse_ppn(orte_job_t *jdata, char *regex);

ORTE_DECLSPEC int orte_regx_base_extract_node_names(char *regexp, char ***names);
#endif
Loading