From a468c3ba1ad7e23590a853a0471f05a1f35bd138 Mon Sep 17 00:00:00 2001 From: Karol Mroz Date: Sat, 2 Apr 2016 16:41:31 +0200 Subject: [PATCH 1/2] opal_info_support: pass component map when handling params Pass component_map to opal_info_do_params(). It will be needed to output component versions. Signed-off-by: Karol Mroz --- ompi/tools/ompi_info/ompi_info.c | 4 ++-- opal/runtime/opal_info_support.c | 1 + opal/runtime/opal_info_support.h | 1 + oshmem/tools/oshmem_info/oshmem_info.c | 4 ++-- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/ompi/tools/ompi_info/ompi_info.c b/ompi/tools/ompi_info/ompi_info.c index 4cd449d6c32..547e6264af5 100644 --- a/ompi/tools/ompi_info/ompi_info.c +++ b/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")) { diff --git a/opal/runtime/opal_info_support.c b/opal/runtime/opal_info_support.c index 189fc9a314f..02615d8ab32 100644 --- a/opal/runtime/opal_info_support.c +++ b/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; diff --git a/opal/runtime/opal_info_support.h b/opal/runtime/opal_info_support.h index 686c4463300..61283971436 100644 --- a/opal/runtime/opal_info_support.h +++ b/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); diff --git a/oshmem/tools/oshmem_info/oshmem_info.c b/oshmem/tools/oshmem_info/oshmem_info.c index 38be24d4eb6..d51658db4d3 100644 --- a/oshmem/tools/oshmem_info/oshmem_info.c +++ b/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; } From 20e448c7d818143a8736ad40174c0c56bdf5fca6 Mon Sep 17 00:00:00 2001 From: Karol Mroz Date: Sat, 2 Apr 2016 16:44:21 +0200 Subject: [PATCH 2/2] opal_info_support: output component versions When invoking, for example, `ompi_info` with: -a --params foo all --params foo bar it's useful to have the appropriate components and their versions be displayed, regardless of whether they have registered any parameters. Signed-off-by: Karol Mroz --- opal/runtime/opal_info_support.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/opal/runtime/opal_info_support.c b/opal/runtime/opal_info_support.c index 02615d8ab32..661a49b702a 100644 --- a/opal/runtime/opal_info_support.c +++ b/opal/runtime/opal_info_support.c @@ -483,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; @@ -511,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); } }