1
1

Do something rational for the disable full support case

This commit was SVN r24844.
Этот коммит содержится в:
Brian Barrett 2011-06-30 14:48:19 +00:00
родитель 8ac35a8496
Коммит e52fef28ca
3 изменённых файлов: 8 добавлений и 5 удалений

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

@ -24,7 +24,7 @@ headers += \
libmca_ess_la_SOURCES += \ libmca_ess_la_SOURCES += \
base/ess_base_close.c \ base/ess_base_close.c \
base/ess_base_open.c \ base/ess_base_open.c \
base/ess_base_select.c base/ess_base_select.c
if !ORTE_DISABLE_FULL_SUPPORT if !ORTE_DISABLE_FULL_SUPPORT

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

@ -57,6 +57,7 @@ ORTE_DECLSPEC extern int orte_ess_base_output;
ORTE_DECLSPEC extern opal_list_t orte_ess_base_components_available; ORTE_DECLSPEC extern opal_list_t orte_ess_base_components_available;
ORTE_DECLSPEC orte_epoch_t orte_ess_base_proc_get_epoch(orte_process_name_t *proc);
#if !ORTE_DISABLE_FULL_SUPPORT #if !ORTE_DISABLE_FULL_SUPPORT
@ -86,8 +87,6 @@ ORTE_DECLSPEC int orte_ess_env_put(orte_std_cntr_t num_procs,
orte_std_cntr_t num_local_procs, orte_std_cntr_t num_local_procs,
char ***env); char ***env);
ORTE_DECLSPEC orte_epoch_t orte_ess_base_proc_get_epoch(orte_process_name_t *proc);
#endif /* ORTE_DISABLE_FULL_SUPPORT */ #endif /* ORTE_DISABLE_FULL_SUPPORT */
END_C_DECLS END_C_DECLS

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

@ -23,8 +23,10 @@
#include "opal/mca/mca.h" #include "opal/mca/mca.h"
#include "opal/mca/base/base.h" #include "opal/mca/base/base.h"
#include "opal/mca/base/mca_base_component_repository.h" #include "opal/mca/base/mca_base_component_repository.h"
#if !ORTE_DISABLE_FULL_SUPPORT
#include "orte/util/nidmap.h" #include "orte/util/nidmap.h"
#endif
#include "orte/runtime/orte_globals.h"
#include "orte/mca/ess/base/base.h" #include "orte/mca/ess/base/base.h"
@ -36,11 +38,13 @@ extern opal_list_t orte_ess_base_components_available;
*/ */
orte_epoch_t orte_ess_base_proc_get_epoch(orte_process_name_t *proc) orte_epoch_t orte_ess_base_proc_get_epoch(orte_process_name_t *proc)
{ {
orte_epoch_t epoch; orte_epoch_t epoch = 0;
#if !ORTE_DISABLE_FULL_SUPPORT
if (ORTE_EPOCH_INVALID == (epoch = orte_util_lookup_epoch(proc))) { if (ORTE_EPOCH_INVALID == (epoch = orte_util_lookup_epoch(proc))) {
return ORTE_NODE_RANK_INVALID; return ORTE_NODE_RANK_INVALID;
} }
#endif
OPAL_OUTPUT_VERBOSE((2, orte_ess_base_output, OPAL_OUTPUT_VERBOSE((2, orte_ess_base_output,
"%s ess:generic: proc %s has epoch %d", "%s ess:generic: proc %s has epoch %d",