Merge pull request #11513 from wckzhang/string_param

Set default values before mca param registration

Author: wckzhang

ompi/mca/coll/ucc/coll_ucc_component.c

@@ -91,11 +91,13 @@ static int mca_coll_ucc_register(void)
                                     OPAL_INFO_LVL_3, MCA_BASE_VAR_SCOPE_READONLY,
                                     &cm->runtime_version);
 
+    cm->cls = "";
     mca_base_component_var_register(c, "cls",
                                     "Comma separated list of UCC CLS to be used for team creation",
                                     MCA_BASE_VAR_TYPE_STRING, NULL, 0, 0,
                                     OPAL_INFO_LVL_6, MCA_BASE_VAR_SCOPE_READONLY, &cm->cls);
 
+    cm->cts = COLL_UCC_CTS_STR;
     mca_base_component_var_register(c, "cts",
                                     "Comma separated list of UCC coll types to be enabled",
                                     MCA_BASE_VAR_TYPE_STRING, NULL, 0, 0,

ompi/mca/io/romio341/src/io_romio341_component.c

@@ -113,9 +113,9 @@ mca_io_base_component_2_0_0_t mca_io_romio341_component = {
     .io_register_datarep = register_datarep,
 };
 
-static char *ompi_io_romio341_version = ROMIO_VERSION_STRING;
-static char *ompi_io_romio341_user_configure_params = MCA_io_romio341_USER_CONFIGURE_FLAGS;
-static char *ompi_io_romio341_complete_configure_params = MCA_io_romio341_COMPLETE_CONFIGURE_FLAGS;
+static char *ompi_io_romio341_version = NULL;
+static char *ompi_io_romio341_user_configure_params = NULL;
+static char *ompi_io_romio341_complete_configure_params = NULL;
 
 static int register_component(void)
 {
@@ -132,18 +132,21 @@ static int register_component(void)
                                            MCA_BASE_VAR_TYPE_INT, NULL, 0, 0,
                                            OPAL_INFO_LVL_9,
                                            MCA_BASE_VAR_SCOPE_READONLY, &delete_priority_param);
+    ompi_io_romio341_version = ROMIO_VERSION_STRING;
     (void) mca_base_component_var_register(&mca_io_romio341_component.io_version,
                                            "version", "Version of ROMIO", MCA_BASE_VAR_TYPE_STRING,
                                            NULL, 0, MCA_BASE_VAR_FLAG_DEFAULT_ONLY,
                                            OPAL_INFO_LVL_9,
                                            MCA_BASE_VAR_SCOPE_READONLY, &ompi_io_romio341_version);
+    ompi_io_romio341_user_configure_params = MCA_io_romio341_USER_CONFIGURE_FLAGS;
     (void) mca_base_component_var_register(&mca_io_romio341_component.io_version,
                                            "user_configure_params",
                                            "User-specified command line parameters passed to ROMIO's configure script",
                                            MCA_BASE_VAR_TYPE_STRING, NULL, 0,
                                            MCA_BASE_VAR_FLAG_DEFAULT_ONLY,
                                            OPAL_INFO_LVL_9,
                                            MCA_BASE_VAR_SCOPE_READONLY, &ompi_io_romio341_user_configure_params);
+    ompi_io_romio341_complete_configure_params = MCA_io_romio341_COMPLETE_CONFIGURE_FLAGS;
     (void) mca_base_component_var_register(&mca_io_romio341_component.io_version,
                                            "complete_configure_params",
                                            "Complete set of command line parameters passed to ROMIO's configure script",

opal/runtime/opal_params_core.c

@@ -87,10 +87,7 @@ int opal_max_thread_in_progress = 1;
 
 static bool opal_register_util_done = false;
 
-/* Basic color options: 30=black, 31=red, 32=green,
- * 33=yellow, 34=blue, 35=magenta, 36=cyan, 37=white
- * https://en.wikipedia.org/wiki/ANSI_escape_code#Colors */
-static char *opal_var_dump_color_string = "name=34,value=32,valid_values=36";
+static char *opal_var_dump_color_string = NULL;
 
 static char *opal_var_dump_color_keys[OPAL_VAR_DUMP_COLOR_KEY_COUNT] = {
     [OPAL_VAR_DUMP_COLOR_VAR_NAME] = "name",
@@ -258,6 +255,10 @@ int opal_register_util_params(void)
         return OPAL_ERR_OUT_OF_RESOURCE;
     }
 
+    /* Basic color options: 30=black, 31=red, 32=green,
+     * 33=yellow, 34=blue, 35=magenta, 36=cyan, 37=white
+     * https://en.wikipedia.org/wiki/ANSI_escape_code#Colors */
+    opal_var_dump_color_string = "name=34,value=32,valid_values=36";
     ret = mca_base_var_register("opal", "opal", NULL, "var_dump_color", string,
         MCA_BASE_VAR_TYPE_STRING, NULL, 0, 0, OPAL_INFO_LVL_2, MCA_BASE_VAR_SCOPE_READONLY,
         &opal_var_dump_color_string);
@@ -434,13 +435,15 @@ static int parse_color_string(char *color_string, char **key_names,
         values_out[k] = NULL;
     }
 
-    tokens = opal_argv_split(color_string, ',');
-    if (NULL == tokens) {
-        return_code = OPAL_ERR_OUT_OF_RESOURCE;
-        goto end;
+    if (NULL != color_string) {
+        tokens = opal_argv_split(color_string, ',');
+        if (NULL == tokens) {
+            return_code = OPAL_ERR_OUT_OF_RESOURCE;
+            goto end;
+        }
     }
 
-    for (int i = 0; tokens[i] != NULL; i++) {
+    for (int i = 0; tokens && tokens[i] != NULL; i++) {
         kv = opal_argv_split(tokens[i], '=');
         if (NULL == kv) {
             return_code = OPAL_ERR_OUT_OF_RESOURCE;

oshmem/mca/scoll/ucc/scoll_ucc_component.c

@@ -96,12 +96,13 @@ static int ucc_register(void)
                                     OPAL_INFO_LVL_9, MCA_BASE_VAR_SCOPE_READONLY,
                                     &cm->ucc_np);
 
+    cm->cts = "";
     mca_base_component_var_register(c, "cls", 
                                     "Comma separated list of UCC CLS to be used for team creation",
                                     MCA_BASE_VAR_TYPE_STRING, NULL, 0, 0, 
                                     OPAL_INFO_LVL_6, MCA_BASE_VAR_SCOPE_READONLY,
                                     &cm->cls);
-
+    cm->cts = SCOLL_UCC_CTS_STR;
     mca_base_component_var_register(c, "cts", 
                                     "Comma separated list of UCC coll types to be enabled",
                                     MCA_BASE_VAR_TYPE_STRING, NULL, 0, 0,