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.
Этот коммит содержится в:
родитель
24b40860d7
Коммит
91b855c2f4
@ -393,7 +393,10 @@ static int parse_line(parsed_section_values_t *sv)
|
|||||||
/* Have no idea what this parameter is. Not an error -- just
|
/* Have no idea what this parameter is. Not an error -- just
|
||||||
ignore it */
|
ignore it */
|
||||||
if (!showed_unknown_field_warning) {
|
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;
|
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)
|
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,
|
opal_show_help("help-mpi-btl-openib.txt", topic, true,
|
||||||
ini_filename, btl_openib_ini_yynewlines,
|
ini_filename, btl_openib_ini_yynewlines,
|
||||||
btl_openib_ini_yytext);
|
btl_openib_ini_yytext);
|
||||||
|
btl_openib_ini_yytext = save;
|
||||||
}
|
}
|
||||||
|
@ -10,7 +10,7 @@
|
|||||||
# University of Stuttgart. All rights reserved.
|
# University of Stuttgart. All rights reserved.
|
||||||
# Copyright (c) 2004-2006 The Regents of the University of California.
|
# Copyright (c) 2004-2006 The Regents of the University of California.
|
||||||
# All rights reserved.
|
# All rights reserved.
|
||||||
# Copyright (c) 2006 Cisco Systems, Inc. All rights reserved.
|
# Copyright (c) 2006-2007 Cisco Systems, Inc. All rights reserved.
|
||||||
# $COPYRIGHT$
|
# $COPYRIGHT$
|
||||||
#
|
#
|
||||||
# Additional copyrights may follow
|
# Additional copyrights may follow
|
||||||
@ -67,6 +67,17 @@ A newline was expected but was not found. Please re-check this file:
|
|||||||
At line %d, near the following text:
|
At line %d, near the following text:
|
||||||
|
|
||||||
%s
|
%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]
|
[no hca params found]
|
||||||
WARNING: No HCA parameters were found for the HCA that Open MPI
|
WARNING: No HCA parameters were found for the HCA that Open MPI
|
||||||
detected:
|
detected:
|
||||||
|
Загрузка…
x
Ссылка в новой задаче
Block a user