e7ecd56bd2
such, the commit message back to the master SVN repository is fairly
long.
= ORTE Job-Level Output Messages =
Add two new interfaces that should be used for all new code throughout
the ORTE and OMPI layers (we already make the search-and-replace on
the existing ORTE / OMPI layers):
* orte_output(): (and corresponding friends ORTE_OUTPUT,
orte_output_verbose, etc.) This function sends the output directly
to the HNP for processing as part of a job-specific output
channel. It supports all the same outputs as opal_output()
(syslog, file, stdout, stderr), but for stdout/stderr, the output
is sent to the HNP for processing and output. More on this below.
* orte_show_help(): This function is a drop-in-replacement for
opal_show_help(), with two differences in functionality:
1. the rendered text help message output is sent to the HNP for
display (rather than outputting directly into the process' stderr
stream)
1. the HNP detects duplicate help messages and does not display them
(so that you don't see the same error message N times, once from
each of your N MPI processes); instead, it counts "new" instances
of the help message and displays a message every ~5 seconds when
there are new ones ("I got X new copies of the help message...")
opal_show_help and opal_output still exist, but they only output in
the current process. The intent for the new orte_* functions is that
they can apply job-level intelligence to the output. As such, we
recommend that all new ORTE and OMPI code use the new orte_*
functions, not thei opal_* functions.
=== New code ===
For ORTE and OMPI programmers, here's what you need to do differently
in new code:
* Do not include opal/util/show_help.h or opal/util/output.h.
Instead, include orte/util/output.h (this one header file has
declarations for both the orte_output() series of functions and
orte_show_help()).
* Effectively s/opal_output/orte_output/gi throughout your code.
Note that orte_output_open() takes a slightly different argument
list (as a way to pass data to the filtering stream -- see below),
so you if explicitly call opal_output_open(), you'll need to
slightly adapt to the new signature of orte_output_open().
* Literally s/opal_show_help/orte_show_help/. The function signature
is identical.
=== Notes ===
* orte_output'ing to stream 0 will do similar to what
opal_output'ing did, so leaving a hard-coded "0" as the first
argument is safe.
* For systems that do not use ORTE's RML or the HNP, the effect of
orte_output_* and orte_show_help will be identical to their opal
counterparts (the additional information passed to
orte_output_open() will be lost!). Indeed, the orte_* functions
simply become trivial wrappers to their opal_* counterparts. Note
that we have not tested this; the code is simple but it is quite
possible that we mucked something up.
= Filter Framework =
Messages sent view the new orte_* functions described above and
messages output via the IOF on the HNP will now optionally be passed
through a new "filter" framework before being output to
stdout/stderr. The "filter" OPAL MCA framework is intended to allow
preprocessing to messages before they are sent to their final
destinations. The first component that was written in the filter
framework was to create an XML stream, segregating all the messages
into different XML tags, etc. This will allow 3rd party tools to read
the stdout/stderr from the HNP and be able to know exactly what each
text message is (e.g., a help message, another OMPI infrastructure
message, stdout from the user process, stderr from the user process,
etc.).
Filtering is not active by default. Filter components must be
specifically requested, such as:
{{{
$ mpirun --mca filter xml ...
}}}
There can only be one filter component active.
= New MCA Parameters =
The new functionality described above introduces two new MCA
parameters:
* '''orte_base_help_aggregate''': Defaults to 1 (true), meaning that
help messages will be aggregated, as described above. If set to 0,
all help messages will be displayed, even if they are duplicates
(i.e., the original behavior).
* '''orte_base_show_output_recursions''': An MCA parameter to help
debug one of the known issues, described below. It is likely that
this MCA parameter will disappear before v1.3 final.
= Known Issues =
* The XML filter component is not complete. The current output from
this component is preliminary and not real XML. A bit more work
needs to be done to configure.m4 search for an appropriate XML
library/link it in/use it at run time.
* There are possible recursion loops in the orte_output() and
orte_show_help() functions -- e.g., if RML send calls orte_output()
or orte_show_help(). We have some ideas how to fix these, but
figured that it was ok to commit before feature freeze with known
issues. The code currently contains sub-optimal workarounds so
that this will not be a problem, but it would be good to actually
solve the problem rather than have hackish workarounds before v1.3 final.
This commit was SVN r18434.
344 строки
13 KiB
C
344 строки
13 KiB
C
/* -*- Mode: C; c-basic-offset:4 ; -*- */
|
|
/*
|
|
* Copyright (c) 2004-2007 The Trustees of Indiana University and Indiana
|
|
* University Research and Technology
|
|
* Corporation. All rights reserved.
|
|
* Copyright (c) 2004-2007 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$
|
|
*/
|
|
|
|
#include "ompi_config.h"
|
|
|
|
#include "opal/class/opal_list.h"
|
|
#include "orte/util/output.h"
|
|
#include "opal/runtime/opal_progress.h"
|
|
#include "opal/mca/mca.h"
|
|
#include "opal/mca/base/base.h"
|
|
|
|
#include "orte/mca/errmgr/errmgr.h"
|
|
#include "orte/util/name_fns.h"
|
|
#include "orte/runtime/orte_globals.h"
|
|
|
|
#include "ompi/constants.h"
|
|
#include "ompi/mca/pml/pml.h"
|
|
#include "ompi/mca/pml/base/base.h"
|
|
#include "ompi/proc/proc.h"
|
|
#include "ompi/runtime/ompi_module_exchange.h"
|
|
|
|
typedef struct opened_component_t {
|
|
opal_list_item_t super;
|
|
mca_pml_base_component_t *om_component;
|
|
} opened_component_t;
|
|
|
|
/**
|
|
* Function for selecting one component from all those that are
|
|
* available.
|
|
*
|
|
* Call the init function on all available components and get their
|
|
* priorities. Select the component with the highest priority. All
|
|
* other components will be closed and unloaded. The selected component
|
|
* will have all of its function pointers saved and returned to the
|
|
* caller.
|
|
*/
|
|
int mca_pml_base_select(bool enable_progress_threads,
|
|
bool enable_mpi_threads)
|
|
{
|
|
int i, priority = 0, best_priority = 0;
|
|
opal_list_item_t *item = NULL;
|
|
mca_base_component_list_item_t *cli = NULL;
|
|
mca_pml_base_component_t *component = NULL, *best_component = NULL;
|
|
mca_pml_base_module_t *module = NULL, *best_module = NULL;
|
|
opal_list_t opened;
|
|
opened_component_t *om = NULL;
|
|
bool found_pml;
|
|
#if OPAL_ENABLE_FT == 1
|
|
mca_pml_base_component_t *wrapper_component = NULL;
|
|
mca_pml_base_module_t *wrapper_module = NULL;
|
|
int wrapper_priority = -1;
|
|
#endif
|
|
|
|
/* Traverse the list of available components; call their init
|
|
functions. */
|
|
|
|
best_priority = -1;
|
|
best_component = NULL;
|
|
module = NULL;
|
|
OBJ_CONSTRUCT(&opened, opal_list_t);
|
|
for (item = opal_list_get_first(&mca_pml_base_components_available);
|
|
opal_list_get_end(&mca_pml_base_components_available) != item;
|
|
item = opal_list_get_next(item) ) {
|
|
cli = (mca_base_component_list_item_t *) item;
|
|
component = (mca_pml_base_component_t *) cli->cli_component;
|
|
|
|
/* if there is an include list - item must be in the list to be included */
|
|
found_pml = false;
|
|
for( i = 0; i < opal_pointer_array_get_size(&mca_pml_base_pml); i++) {
|
|
char * tmp_val = NULL;
|
|
tmp_val = (char *) opal_pointer_array_get_item(&mca_pml_base_pml, i);
|
|
if( NULL == tmp_val) {
|
|
continue;
|
|
}
|
|
|
|
if(0 == strncmp(component->pmlm_version.mca_component_name,
|
|
tmp_val, strlen(component->pmlm_version.mca_component_name)) ) {
|
|
found_pml = true;
|
|
break;
|
|
}
|
|
}
|
|
|
|
if(!found_pml && opal_pointer_array_get_size(&mca_pml_base_pml)) {
|
|
orte_output_verbose( 10, mca_pml_base_output,
|
|
"select: component %s not in the include list",
|
|
component->pmlm_version.mca_component_name );
|
|
|
|
continue;
|
|
}
|
|
|
|
/* if there is no init function - ignore it */
|
|
if (NULL == component->pmlm_init) {
|
|
orte_output_verbose( 10, mca_pml_base_output,
|
|
"select: no init function; ignoring component %s",
|
|
component->pmlm_version.mca_component_name );
|
|
continue;
|
|
}
|
|
|
|
/* Init component to get its priority */
|
|
orte_output_verbose( 10, mca_pml_base_output,
|
|
"select: initializing %s component %s",
|
|
component->pmlm_version.mca_type_name,
|
|
component->pmlm_version.mca_component_name );
|
|
priority = best_priority;
|
|
module = component->pmlm_init(&priority, enable_progress_threads,
|
|
enable_mpi_threads);
|
|
if (NULL == module) {
|
|
orte_output_verbose( 10, mca_pml_base_output,
|
|
"select: init returned failure for component %s",
|
|
component->pmlm_version.mca_component_name );
|
|
continue;
|
|
}
|
|
|
|
orte_output_verbose( 10, mca_pml_base_output,
|
|
"select: init returned priority %d", priority );
|
|
#if OPAL_ENABLE_FT == 1
|
|
/* Determine if this is the wrapper component */
|
|
if( priority <= PML_SELECT_WRAPPER_PRIORITY) {
|
|
orte_output_verbose( 10, mca_pml_base_output,
|
|
"pml:select: Wrapper Component: Component %s was determined to be a Wrapper PML with priority %d",
|
|
component->pmlm_version.mca_component_name, priority );
|
|
wrapper_priority = priority;
|
|
wrapper_component = component;
|
|
wrapper_module = module;
|
|
continue;
|
|
}
|
|
/* Otherwise determine if this is the best component */
|
|
else
|
|
#endif
|
|
if (priority > best_priority) {
|
|
best_priority = priority;
|
|
best_component = component;
|
|
best_module = module;
|
|
}
|
|
|
|
om = (opened_component_t*)malloc(sizeof(opened_component_t));
|
|
if (NULL == om) {
|
|
return OMPI_ERR_OUT_OF_RESOURCE;
|
|
}
|
|
OBJ_CONSTRUCT(om, opal_list_item_t);
|
|
om->om_component = component;
|
|
opal_list_append(&opened, (opal_list_item_t*) om);
|
|
}
|
|
|
|
/* Finished querying all components. Check for the bozo case. */
|
|
|
|
if( NULL == best_component ) {
|
|
orte_show_help("help-mca-base.txt", "find-available:none-found", true, "pml");
|
|
for( i = 0; i < opal_pointer_array_get_size(&mca_pml_base_pml); i++) {
|
|
char * tmp_val = NULL;
|
|
tmp_val = (char *) opal_pointer_array_get_item(&mca_pml_base_pml, i);
|
|
if( NULL == tmp_val) {
|
|
continue;
|
|
}
|
|
orte_errmgr.abort(1, "PML %s cannot be selected", tmp_val);
|
|
}
|
|
if(0 == i) {
|
|
orte_errmgr.abort(2, "No pml component available. This shouldn't happen.");
|
|
}
|
|
}
|
|
|
|
orte_output_verbose( 10, mca_pml_base_output,
|
|
"selected %s best priority %d\n",
|
|
best_component->pmlm_version.mca_component_name, best_priority);
|
|
|
|
/* Finalize all non-selected components */
|
|
|
|
for (item = opal_list_remove_first(&opened);
|
|
NULL != item;
|
|
item = opal_list_remove_first(&opened)) {
|
|
om = (opened_component_t *) item;
|
|
|
|
if (om->om_component != best_component
|
|
#if OPAL_ENABLE_FT == 1
|
|
&& om->om_component != wrapper_component
|
|
#endif
|
|
) {
|
|
/* Finalize */
|
|
|
|
if (NULL != om->om_component->pmlm_finalize) {
|
|
|
|
/* Blatently ignore the return code (what would we do to
|
|
recover, anyway? This component is going away, so errors
|
|
don't matter anymore) */
|
|
|
|
om->om_component->pmlm_finalize();
|
|
orte_output_verbose(10, mca_pml_base_output,
|
|
"select: component %s not selected / finalized",
|
|
om->om_component->pmlm_version.mca_component_name);
|
|
}
|
|
}
|
|
OBJ_DESTRUCT( om );
|
|
free(om);
|
|
}
|
|
OBJ_DESTRUCT( &opened );
|
|
|
|
#if OPAL_ENABLE_FT == 1
|
|
/* Remove the wrapper component from the mca_pml_base_components_available list
|
|
* so we don't unload it prematurely in the next call
|
|
*/
|
|
if( NULL != wrapper_component ) {
|
|
for (item = opal_list_get_first(&mca_pml_base_components_available);
|
|
item != opal_list_get_end(&mca_pml_base_components_available);
|
|
item = opal_list_get_next(item) ) {
|
|
cli = (mca_base_component_list_item_t *) item;
|
|
component = (mca_pml_base_component_t *) cli->cli_component;
|
|
|
|
if( component == wrapper_component ) {
|
|
opal_list_remove_item(&mca_pml_base_components_available, item);
|
|
}
|
|
}
|
|
}
|
|
#endif
|
|
|
|
/* Save the winner */
|
|
|
|
mca_pml_base_selected_component = *best_component;
|
|
mca_pml = *best_module;
|
|
orte_output_verbose( 10, mca_pml_base_output,
|
|
"select: component %s selected",
|
|
mca_pml_base_selected_component.pmlm_version.mca_component_name );
|
|
|
|
/* This base function closes, unloads, and removes from the
|
|
available list all unselected components. The available list will
|
|
contain only the selected component. */
|
|
|
|
mca_base_components_close(mca_pml_base_output,
|
|
&mca_pml_base_components_available,
|
|
(mca_base_component_t *) best_component);
|
|
|
|
#if OPAL_ENABLE_FT == 1
|
|
/* If we have a wrapper then initalize it */
|
|
if( NULL != wrapper_component ) {
|
|
priority = PML_SELECT_WRAPPER_PRIORITY;
|
|
orte_output_verbose( 10, mca_pml_base_output,
|
|
"pml:select: Wrapping: Component %s [%d] is being wrapped by component %s [%d]",
|
|
mca_pml_base_selected_component.pmlm_version.mca_component_name,
|
|
best_priority,
|
|
wrapper_component->pmlm_version.mca_component_name,
|
|
wrapper_priority );
|
|
|
|
/* Ask the wrapper commponent to wrap around the currently
|
|
* selected component. Indicated by the priority value provided
|
|
* this will cause the wrapper to do something different this time around
|
|
*/
|
|
module = wrapper_component->pmlm_init(&priority,
|
|
enable_progress_threads,
|
|
enable_mpi_threads);
|
|
/* Replace with the wrapper */
|
|
best_component = wrapper_component;
|
|
mca_pml_base_selected_component = *best_component;
|
|
best_module = module;
|
|
mca_pml = *best_module;
|
|
}
|
|
#endif
|
|
|
|
/* register the winner's callback */
|
|
if( NULL != mca_pml.pml_progress ) {
|
|
opal_progress_register(mca_pml.pml_progress);
|
|
}
|
|
|
|
/* register winner in the modex */
|
|
mca_pml_base_pml_selected(best_component->pmlm_version.mca_component_name);
|
|
|
|
/* All done */
|
|
|
|
return OMPI_SUCCESS;
|
|
}
|
|
|
|
/* need a "commonly" named PML structure so everything ends up in the
|
|
same modex field */
|
|
static mca_base_component_t pml_base_component = {
|
|
MCA_BASE_VERSION_1_0_0,
|
|
"pml",
|
|
MCA_BASE_VERSION_1_0_0,
|
|
"base",
|
|
MCA_BASE_VERSION_1_0_0,
|
|
NULL,
|
|
NULL
|
|
};
|
|
|
|
|
|
int
|
|
mca_pml_base_pml_selected(const char *name)
|
|
{
|
|
return ompi_modex_send(&pml_base_component, name, strlen(name) + 1);
|
|
}
|
|
|
|
int
|
|
mca_pml_base_pml_check_selected(const char *my_pml,
|
|
ompi_proc_t **procs,
|
|
size_t nprocs)
|
|
{
|
|
size_t i, size;
|
|
int ret;
|
|
char *remote_pml;
|
|
|
|
for (i = 0 ; i < nprocs ; ++i) {
|
|
if (ompi_proc_local() == procs[i]) continue;
|
|
|
|
ret = ompi_modex_recv(&pml_base_component,
|
|
procs[i],
|
|
(void**) &remote_pml, &size);
|
|
/* if modex isn't implemented, then just assume all is well... */
|
|
if (OMPI_ERR_NOT_IMPLEMENTED == ret) return OMPI_SUCCESS;
|
|
if (OMPI_SUCCESS != ret) return ret;
|
|
if ((size != strlen(my_pml) + 1) ||
|
|
(0 != strcmp(my_pml, remote_pml))) {
|
|
if (procs[i]->proc_hostname) {
|
|
orte_output(0, "%s selected pml %s, but peer %s on %s selected pml %s",
|
|
ORTE_NAME_PRINT(&ompi_proc_local()->proc_name),
|
|
my_pml, ORTE_NAME_PRINT(&procs[i]->proc_name),
|
|
procs[i]->proc_hostname, remote_pml);
|
|
} else {
|
|
orte_output(0, "%s selected pml %s, but peer %s selected pml %s",
|
|
ORTE_NAME_PRINT(&ompi_proc_local()->proc_name),
|
|
my_pml, ORTE_NAME_PRINT(&procs[i]->proc_name),
|
|
remote_pml);
|
|
}
|
|
return OMPI_ERR_UNREACH;
|
|
}
|
|
|
|
free(remote_pml);
|
|
}
|
|
|
|
return OMPI_SUCCESS;
|
|
}
|