Merge pull request #1515 from kmroz/wip-ompi-info-all-2

opal_info_support: output component versions

ompi/tools/ompi_info/ompi_info.c

@@ -131,7 +131,7 @@ int main(int argc, char *argv[])
         if (OMPI_ERR_BAD_PARAM == ret) {
             /* output what we got */
             opal_info_do_params(true, opal_cmd_line_is_taken(ompi_info_cmd_line, "internal"),
-                                &mca_types, NULL);
+                                &mca_types, &component_map, NULL);
         }
         exit(1);
     }
@@ -161,7 +161,7 @@ int main(int argc, char *argv[])
     if (want_all || opal_cmd_line_is_taken(ompi_info_cmd_line, "param") ||
         opal_cmd_line_is_taken(ompi_info_cmd_line, "params")) {
         opal_info_do_params(want_all, opal_cmd_line_is_taken(ompi_info_cmd_line, "internal"),
-                            &mca_types, ompi_info_cmd_line);
+                            &mca_types, &component_map, ompi_info_cmd_line);
         acted = true;
     }
     if (opal_cmd_line_is_taken(ompi_info_cmd_line, "type")) {

opal/runtime/opal_info_support.c

@@ -429,6 +429,7 @@ void opal_info_do_path(bool want_all, opal_cmd_line_t *cmd_line)
 
 void opal_info_do_params(bool want_all_in, bool want_internal,
                          opal_pointer_array_t *mca_types,
+                         opal_pointer_array_t *component_map,
                          opal_cmd_line_t *opal_info_cmd_line)
 {
     mca_base_var_info_lvl_t max_level = OPAL_INFO_LVL_1;
@@ -482,6 +483,9 @@ void opal_info_do_params(bool want_all_in, bool want_internal,
     /* Show the params */
 
     if (want_all) {
+        opal_info_show_component_version(mca_types, component_map, opal_info_type_all,
+                                         opal_info_component_all, opal_info_ver_full,
+                                         opal_info_ver_all);
         for (i = 0; i < mca_types->size; ++i) {
             if (NULL == (type = (char *)opal_pointer_array_get_item(mca_types, i))) {
                 continue;
@@ -510,6 +514,9 @@ void opal_info_do_params(bool want_all_in, bool want_internal,
                 exit(1);
             }
 
+            opal_info_show_component_version(mca_types, component_map, type,
+                                             component, opal_info_ver_full,
+                                             opal_info_ver_all);
             opal_info_show_mca_params(type, component, max_level, want_internal);
         }
     }

opal/runtime/opal_info_support.h

@@ -68,6 +68,7 @@ OPAL_DECLSPEC void opal_info_err_params(opal_pointer_array_t *component_map);
 
 OPAL_DECLSPEC void opal_info_do_params(bool want_all_in, bool want_internal,
                                        opal_pointer_array_t *mca_type,
+                                       opal_pointer_array_t *component_map,
                                        opal_cmd_line_t *opal_info_cmd_line);
 
 OPAL_DECLSPEC void opal_info_show_path(const char *type, const char *value);

oshmem/tools/oshmem_info/oshmem_info.c

@@ -125,7 +125,7 @@ int main(int argc, char *argv[])
         if (OSHMEM_ERR_BAD_PARAM == ret) {
             /* output what we got */
             opal_info_do_params(true, opal_cmd_line_is_taken(info_cmd_line, "internal"),
-                                &mca_types, NULL);
+                                &mca_types, &component_map, NULL);
         }
         exit(1);
     }
@@ -151,7 +151,7 @@ int main(int argc, char *argv[])
     if (want_all || opal_cmd_line_is_taken(info_cmd_line, "param") ||
         opal_cmd_line_is_taken(info_cmd_line, "params")) {
         opal_info_do_params(want_all, opal_cmd_line_is_taken(info_cmd_line, "internal"),
-                            &mca_types, info_cmd_line);
+                            &mca_types, &component_map, info_cmd_line);
         acted = true;
     }