1
1

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 <mroz.karol@gmail.com>
Этот коммит содержится в:
Karol Mroz 2016-04-02 16:41:31 +02:00
родитель 9efd7f19f1
Коммит a468c3ba1a
4 изменённых файлов: 6 добавлений и 4 удалений

Просмотреть файл

@ -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")) {

Просмотреть файл

@ -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;

Просмотреть файл

@ -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);

Просмотреть файл

@ -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;
}