1
1

Add a friendly help message if no pls components are found to be

available.

This commit was SVN r8594.
Этот коммит содержится в:
Jeff Squyres 2005-12-22 14:29:45 +00:00
родитель 0c57e2d091
Коммит 93b4d12d14
3 изменённых файлов: 39 добавлений и 6 удалений

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

@ -16,6 +16,8 @@
# $HEADER$ # $HEADER$
# #
dist_pkgdata_DATA += base/help-pls-base.txt
headers += \ headers += \
base/base.h base/base.h

24
orte/mca/pls/base/help-pls-base.txt Обычный файл
Просмотреть файл

@ -0,0 +1,24 @@
# -*- text -*-
#
# Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
# University Research and Technology
# Corporation. All rights reserved.
# Copyright (c) 2004-2005 The University of Tennessee and The University
# of Tennessee Research Foundation. All rights
# reserved.
# Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
# University of Stuttgart. All rights reserved.
# Copyright (c) 2004-2005 The Regents of the University of California.
# All rights reserved.
# $COPYRIGHT$
#
# Additional copyrights may follow
#
# $HEADER$
#
[no-available-pls]
No available launching agents were found.
This is an unusual error; it means that Open RTE was unable to find
any mechanism to launch proceses, and therefore is unable start the
process(es) in your application.

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

@ -18,12 +18,13 @@
#include "orte_config.h" #include "orte_config.h"
#include "include/orte_constants.h" #include "orte/include/orte_constants.h"
#include "opal/class/opal_list.h" #include "opal/class/opal_list.h"
#include "opal/util/output.h" #include "opal/util/output.h"
#include "mca/mca.h" #include "opal/util/show_help.h"
#include "mca/base/base.h" #include "opal/mca/mca.h"
#include "mca/pls/base/base.h" #include "opal/mca/base/base.h"
#include "orte/mca/pls/base/base.h"
/* /*
@ -52,6 +53,8 @@ OBJ_CLASS_INSTANCE(orte_pls_base_cmp_t, opal_list_item_t,
*/ */
orte_pls_base_module_t* orte_pls_base_select(char *preferred) orte_pls_base_module_t* orte_pls_base_select(char *preferred)
{ {
orte_pls_base_module_t *ret;
/* Construct the empty list */ /* Construct the empty list */
OBJ_CONSTRUCT(&orte_pls_base.pls_available, opal_list_t); OBJ_CONSTRUCT(&orte_pls_base.pls_available, opal_list_t);
@ -60,10 +63,14 @@ orte_pls_base_module_t* orte_pls_base_select(char *preferred)
/* Now - did we want a specific one? */ /* Now - did we want a specific one? */
if (NULL != preferred) { if (NULL != preferred) {
return select_preferred(preferred); ret = select_preferred(preferred);
} else { } else {
return select_any(); ret = select_any();
} }
if (NULL == ret) {
opal_show_help("help-pls-base.txt", "no-available-pls", true);
}
return ret;
} }