Merge pull request #1522 from kmroz/wip-ompi-info-params-fix

opal_info_support: fix memory leak and refactor for pvars

Author: rhc54

opal/runtime/opal_info_support.c

@@ -648,6 +648,8 @@ static void opal_info_show_mca_group_params(const mca_base_var_group_t *group, m
 
     const mca_base_var_group_t *curr_group = NULL;
     char *component_msg = NULL;
+    asprintf(&component_msg, " %s", group_component);
+
     for (i = 0 ; i < count ; ++i) {
         ret = mca_base_var_get(variables[i], &var);
         if (OPAL_SUCCESS != ret || ((var->mbv_flags & MCA_BASE_VAR_FLAG_INTERNAL) &&
@@ -657,8 +659,6 @@ static void opal_info_show_mca_group_params(const mca_base_var_group_t *group, m
         }
 
         if (opal_info_pretty && curr_group != group) {
-            free(component_msg);
-            asprintf(&component_msg, " %s", group_component);
             asprintf(&message, "MCA%s %s%s", requested ? "" : " (disabled)",
                      group->group_framework,
                      component_msg ? component_msg : "");
@@ -704,14 +704,25 @@ static void opal_info_show_mca_group_params(const mca_base_var_group_t *group, m
             continue;
         }
 
+        if (opal_info_pretty && curr_group != group) {
+            asprintf(&message, "MCA%s %s%s", requested ? "" : " (disabled)",
+                     group->group_framework,
+                     component_msg ? component_msg : "");
+            opal_info_out(message, message, "---------------------------------------------------");
+            free(message);
+            curr_group = group;
+        }
+
         ret = mca_base_pvar_dump (variables[i], &strings, !opal_info_pretty ? MCA_BASE_VAR_DUMP_PARSABLE : MCA_BASE_VAR_DUMP_READABLE);
         if (OPAL_SUCCESS != ret) {
             continue;
         }
 
         for (j = 0 ; strings[j] ; ++j) {
             if (0 == j && opal_info_pretty) {
-                asprintf (&message, "MCA%s %s", requested ? "" : " (disabled)", group->group_framework);
+                asprintf (&message, "MCA%s %s%s", requested ? "" : " (disabled)",
+                          group->group_framework,
+                          component_msg ? component_msg : "");
                 opal_info_out(message, message, strings[j]);
                 free(message);
             } else {
@@ -740,6 +751,7 @@ static void opal_info_show_mca_group_params(const mca_base_var_group_t *group, m
         }
         opal_info_show_mca_group_params(group, max_level, want_internal);
     }
+    free(component_msg);
 }
 
 void opal_info_show_mca_params(const char *type, const char *component,