ports/openmpi
ports/openmpi
1
1
Форкнуть 0
Код Релизы Активность

Minor fixes in the help messages

Просмотр исходного кода 
* If the text to cite where the problem occurred is "\n", prettyprint
   somethign a little nicer so that it's clear that we're talking
   about the end of line
 * Add a missing help message ("ini file:unknown field"), and display
   it a little better (i.e., show the erroneous field, not a
   misleading "end of line" marker)
 * It's "OpenIB", not "Open IB"

This commit was SVN r13241.
Этот коммит содержится в:
Jeff Squyres 2007-01-22 18:45:43 +00:00
родитель 24b40860d7
Коммит 91b855c2f4
2 изменённых файлов: 25 добавлений и 6 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

10
ompi/mca/btl/openib/btl_openib_ini.c
Просмотреть файл

@ -393,7 +393,10 @@ static int parse_line(parsed_section_values_t *sv)
/* Have no idea what this parameter is. Not an error -- just
ignore it */
if (!showed_unknown_field_warning) {
show_help("ini file:unknown field");
opal_show_help("help-mpi-btl-openib.txt",
"ini file:unknown field", true,
ini_filename, btl_openib_ini_yynewlines,
key_buffer);
showed_unknown_field_warning = true;
}
}
@ -611,7 +614,12 @@ static int intify_list(char *value, uint32_t **values, int *len)
*/
static inline void show_help(const char *topic)
{
char *save = btl_openib_ini_yytext;
if (0 == strcmp("\n", btl_openib_ini_yytext)) {
btl_openib_ini_yytext = "<end of line>";
}
opal_show_help("help-mpi-btl-openib.txt", topic, true,
ini_filename, btl_openib_ini_yynewlines,
btl_openib_ini_yytext);
btl_openib_ini_yytext = save;
}

21
ompi/mca/btl/openib/help-mpi-btl-openib.txt
Просмотреть файл

@ -10,7 +10,7 @@
# University of Stuttgart. All rights reserved.
# Copyright (c) 2004-2006 The Regents of the University of California.
# All rights reserved.
# Copyright (c) 2006 Cisco Systems, Inc. All rights reserved.
# Copyright (c) 2006-2007 Cisco Systems, Inc. All rights reserved.
# $COPYRIGHT$
#
# Additional copyrights may follow
@ -27,7 +27,7 @@ btl_openib_hca_param_files MCA parameter:
%s
[ini file:not in a section]
In parsing Open IB BTL parameter file, values were found that were not
In parsing OpenIB BTL parameter file, values were found that were not
in a valid INI section. These values will be ignored. Please
re-check this file:
@ -37,7 +37,7 @@ At line %d, near the following text:
%s
[ini file:unexpected token]
In parsing Open IB BTL parameter file, unexpected tokens were found
In parsing OpenIB BTL parameter file, unexpected tokens were found
(this may cause significant portions of the INI file to be ignored).
Please re-check this file:
@ -47,7 +47,7 @@ At line %d, near the following text:
%s
[ini file:expected equals]
In parsing Open IB BTL parameter file, unexpected tokens were found
In parsing OpenIB BTL parameter file, unexpected tokens were found
(this may cause significant portions of the INI file to be ignored).
An equals sign ("=") was expected but was not found. Please re-check
this file:
@ -58,7 +58,7 @@ At line %d, near the following text:
%s
[ini file:expected newline]
In parsing Open IB BTL parameter file, unexpected tokens were found
In parsing OpenIB BTL parameter file, unexpected tokens were found
(this may cause significant portions of the INI file to be ignored).
A newline was expected but was not found. Please re-check this file:
@ -67,6 +67,17 @@ A newline was expected but was not found. Please re-check this file:
At line %d, near the following text:
%s
[ini file:unknown field]
In parsing OpenIB BTL parameter file, an unrecognized field name was
found. Please re-check this file:
%s
At line %d, the field named:
%s
This field, and any other unrecognized fields, will be skipped.
[no hca params found]
WARNING: No HCA parameters were found for the HCA that Open MPI
detected: