Skip to content

Commit a548232

Browse files
author
rhc54
committed
Merge pull request #1518 from kmroz/wip-ompi-info-param-output-1
opal_info_support: add component to param pretty output
2 parents d724d8a + e1eb23e commit a548232

File tree

1 file changed

+16
-1
lines changed

1 file changed

+16
-1
lines changed

opal/runtime/opal_info_support.c

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -646,6 +646,8 @@ static void opal_info_show_mca_group_params(const mca_base_var_group_t *group, m
646646
}
647647
}
648648

649+
const mca_base_var_group_t *curr_group = NULL;
650+
char *component_msg = NULL;
649651
for (i = 0 ; i < count ; ++i) {
650652
ret = mca_base_var_get(variables[i], &var);
651653
if (OPAL_SUCCESS != ret || ((var->mbv_flags & MCA_BASE_VAR_FLAG_INTERNAL) &&
@@ -654,14 +656,27 @@ static void opal_info_show_mca_group_params(const mca_base_var_group_t *group, m
654656
continue;
655657
}
656658

659+
if (opal_info_pretty && curr_group != group) {
660+
free(component_msg);
661+
asprintf(&component_msg, " %s", group_component);
662+
asprintf(&message, "MCA%s %s%s", requested ? "" : " (disabled)",
663+
group->group_framework,
664+
component_msg ? component_msg : "");
665+
opal_info_out(message, message, "---------------------------------------------------");
666+
free(message);
667+
curr_group = group;
668+
}
669+
657670
ret = mca_base_var_dump(variables[i], &strings, !opal_info_pretty ? MCA_BASE_VAR_DUMP_PARSABLE : MCA_BASE_VAR_DUMP_READABLE);
658671
if (OPAL_SUCCESS != ret) {
659672
continue;
660673
}
661674

662675
for (j = 0 ; strings[j] ; ++j) {
663676
if (0 == j && opal_info_pretty) {
664-
asprintf (&message, "MCA%s %s", requested ? "" : " (disabled)", group->group_framework);
677+
asprintf (&message, "MCA%s %s%s", requested ? "" : " (disabled)",
678+
group->group_framework,
679+
component_msg ? component_msg : "");
665680
opal_info_out(message, message, strings[j]);
666681
free(message);
667682
} else {

0 commit comments

Comments
 (0)