regx: move most functions from the fwd component to base

Signed-off-by: Gilles Gouaillardet <[email protected]>
(cherry picked from commit c2a358f)

Author: ggouaillardet

orte/mca/regx/base/Makefile.am

@@ -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
@@ -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

orte/mca/regx/base/base.h

@@ -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