Fixes trac:1289: ensure that if we haven't initialized the orte_output
system, we don't try to use it (e.g., if orte_output or orte_show_help is called before orte_init). This commit was SVN r18442. The following Trac tickets were found above: Ticket 1289 --> https://svn.open-mpi.org/trac/ompi/ticket/1289
Этот коммит содержится в:
родитель
517abf9b09
Коммит
28d5f762ca
@ -523,7 +523,7 @@ static int show_help(const char *filename, const char *topic,
|
|||||||
|
|
||||||
/* If we're aggregating, check for duplicates. Otherwise, don't
|
/* If we're aggregating, check for duplicates. Otherwise, don't
|
||||||
track duplicates at all and always display the message. */
|
track duplicates at all and always display the message. */
|
||||||
if (want_aggregate) {
|
if (orte_output_ready && want_aggregate) {
|
||||||
rc = get_tli(filename, topic, &tli);
|
rc = get_tli(filename, topic, &tli);
|
||||||
} else {
|
} else {
|
||||||
rc = ORTE_ERR_NOT_FOUND;
|
rc = ORTE_ERR_NOT_FOUND;
|
||||||
@ -580,7 +580,7 @@ static int show_help(const char *filename, const char *topic,
|
|||||||
}
|
}
|
||||||
|
|
||||||
/* If we're aggregating, add this process name to the list */
|
/* If we're aggregating, add this process name to the list */
|
||||||
if (want_aggregate) {
|
if (orte_output_ready && want_aggregate) {
|
||||||
pnli = OBJ_NEW(process_name_list_item_t);
|
pnli = OBJ_NEW(process_name_list_item_t);
|
||||||
if (NULL == pnli) {
|
if (NULL == pnli) {
|
||||||
rc = ORTE_ERR_OUT_OF_RESOURCE;
|
rc = ORTE_ERR_OUT_OF_RESOURCE;
|
||||||
|
Загрузка…
x
Ссылка в новой задаче
Block a user