2007-03-17 02:11:45 +03:00
|
|
|
/*
|
2009-04-30 20:41:50 +04:00
|
|
|
* Copyright (c) 2004-2009 The Trustees of Indiana University and Indiana
|
2007-03-17 02:11:45 +03:00
|
|
|
* University Research and Technology
|
|
|
|
|
* Corporation. All rights reserved.
|
|
|
|
|
* Copyright (c) 2004-2006 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-2006 The Regents of the University of California.
|
|
|
|
|
* All rights reserved.
|
2010-07-06 18:33:36 +04:00
|
|
|
* Copyright (c) 2010 Cisco Systems, Inc. All rights reserved.
|
2007-03-17 02:11:45 +03:00
|
|
|
* $COPYRIGHT$
|
|
|
|
|
*
|
|
|
|
|
* Additional copyrights may follow
|
|
|
|
|
*
|
|
|
|
|
* $HEADER$
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
#include "ompi_config.h"
|
2010-07-06 18:33:36 +04:00
|
|
|
#include "opal/runtime/opal.h"
|
2009-02-14 05:26:12 +03:00
|
|
|
#include "opal/util/output.h"
|
Update libevent to the 2.0 series, currently at 2.0.7rc. We will update to their final release when it becomes available. Currently known errors exist in unused portions of the libevent code. This revision passes the IBM test suite on a Linux machine and on a standalone Mac.
This is a fairly intrusive change, but outside of the moving of opal/event to opal/mca/event, the only changes involved (a) changing all calls to opal_event functions to reflect the new framework instead, and (b) ensuring that all opal_event_t objects are properly constructed since they are now true opal_objects.
Note: Shiqing has just returned from vacation and has not yet had a chance to complete the Windows integration. Thus, this commit almost certainly breaks Windows support on the trunk. However, I want this to have a chance to soak for as long as possible before I become less available a week from today (going to be at a class for 5 days, and thus will only be sparingly available) so we can find and fix any problems.
Biggest change is moving the libevent code from opal/event to a new opal/mca/event framework. This was done to make it much easier to update libevent in the future. New versions can be inserted as a new component and tested in parallel with the current version until validated, then we can remove the earlier version if we so choose. This is a statically built framework ala installdirs, so only one component will build at a time. There is no selection logic - the sole compiled component simply loads its function pointers into the opal_event struct.
I have gone thru the code base and converted all the libevent calls I could find. However, I cannot compile nor test every environment. It is therefore quite likely that errors remain in the system. Please keep an eye open for two things:
1. compile-time errors: these will be obvious as calls to the old functions (e.g., opal_evtimer_new) must be replaced by the new framework APIs (e.g., opal_event.evtimer_new)
2. run-time errors: these will likely show up as segfaults due to missing constructors on opal_event_t objects. It appears that it became a typical practice for people to "init" an opal_event_t by simply using memset to zero it out. This will no longer work - you must either OBJ_NEW or OBJ_CONSTRUCT an opal_event_t. I tried to catch these cases, but may have missed some. Believe me, you'll know when you hit it.
There is also the issue of the new libevent "no recursion" behavior. As I described on a recent email, we will have to discuss this and figure out what, if anything, we need to do.
This commit was SVN r23925.
2010-10-24 22:35:54 +04:00
|
|
|
#include "opal/mca/event/event.h"
|
George did the work and deserves all the credit for it. Ralph did the merge, and deserves whatever blame results from errors in it :-)
WHAT: Open our low-level communication infrastructure by moving all necessary components (btl/rcache/allocator/mpool) down in OPAL
All the components required for inter-process communications are currently deeply integrated in the OMPI layer. Several groups/institutions have express interest in having a more generic communication infrastructure, without all the OMPI layer dependencies. This communication layer should be made available at a different software level, available to all layers in the Open MPI software stack. As an example, our ORTE layer could replace the current OOB and instead use the BTL directly, gaining access to more reactive network interfaces than TCP. Similarly, external software libraries could take advantage of our highly optimized AM (active message) communication layer for their own purpose. UTK with support from Sandia, developped a version of Open MPI where the entire communication infrastucture has been moved down to OPAL (btl/rcache/allocator/mpool). Most of the moved components have been updated to match the new schema, with few exceptions (mainly BTLs where I have no way of compiling/testing them). Thus, the completion of this RFC is tied to being able to completing this move for all BTLs. For this we need help from the rest of the Open MPI community, especially those supporting some of the BTLs. A non-exhaustive list of BTLs that qualify here is: mx, portals4, scif, udapl, ugni, usnic.
This commit was SVN r32317.
2014-07-26 04:47:28 +04:00
|
|
|
#include "opal/mca/btl/base/base.h"
|
This commit represents a bunch of work on a Mercurial side branch. As
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.
2008-05-14 00:00:55 +04:00
|
|
|
|
2007-03-17 02:11:45 +03:00
|
|
|
#include "mpi.h"
|
|
|
|
|
#include "ompi/mca/pml/pml.h"
|
|
|
|
|
#include "ompi/mca/pml/base/pml_base_bsend.h"
|
|
|
|
|
#include "ompi/mca/pml/crcpw/pml_crcpw.h"
|
|
|
|
|
#include "ompi/mca/bml/base/base.h"
|
|
|
|
|
|
2013-03-28 01:09:41 +04:00
|
|
|
static int mca_pml_crcpw_component_register(void);
|
2007-03-17 02:11:45 +03:00
|
|
|
|
|
|
|
|
mca_pml_crcpw_component_t mca_pml_crcpw_component = {
|
|
|
|
|
{
|
|
|
|
|
/* First, the mca_base_component_t struct containing meta
|
|
|
|
|
information about the component itself */
|
|
|
|
|
|
|
|
|
|
{
|
2008-07-29 02:40:57 +04:00
|
|
|
MCA_PML_BASE_VERSION_2_0_0,
|
2007-03-17 02:11:45 +03:00
|
|
|
|
|
|
|
|
"crcpw", /* MCA component name */
|
|
|
|
|
OMPI_MAJOR_VERSION, /* MCA component major version */
|
|
|
|
|
OMPI_MINOR_VERSION, /* MCA component minor version */
|
|
|
|
|
OMPI_RELEASE_VERSION, /* MCA component release version */
|
|
|
|
|
mca_pml_crcpw_component_open, /* component open */
|
2013-03-28 01:09:41 +04:00
|
|
|
mca_pml_crcpw_component_close, /* component close */
|
|
|
|
|
NULL,
|
|
|
|
|
mca_pml_crcpw_component_register
|
2007-03-17 02:11:45 +03:00
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
/* The component is checkpoint ready */
|
|
|
|
|
MCA_BASE_METADATA_PARAM_CHECKPOINT
|
|
|
|
|
},
|
|
|
|
|
|
|
|
|
|
mca_pml_crcpw_component_init, /* component init */
|
|
|
|
|
mca_pml_crcpw_component_finalize /* component finalize */
|
|
|
|
|
},
|
|
|
|
|
/* Verbosity */
|
|
|
|
|
0,
|
|
|
|
|
/* Priority */
|
|
|
|
|
PML_SELECT_WRAPPER_PRIORITY,
|
|
|
|
|
/* Are we being used as a wrapper? */
|
|
|
|
|
false
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
ompi_free_list_t pml_state_list;
|
2009-04-30 20:36:50 +04:00
|
|
|
bool pml_crcpw_is_finalized = false;
|
2007-03-17 02:11:45 +03:00
|
|
|
|
2013-03-28 01:09:41 +04:00
|
|
|
static int mca_pml_crcpw_component_register(void)
|
2007-03-17 02:11:45 +03:00
|
|
|
{
|
|
|
|
|
/*
|
|
|
|
|
* Register some MCA parameters
|
|
|
|
|
*/
|
2013-03-28 01:09:41 +04:00
|
|
|
mca_pml_crcpw_component.priority = PML_SELECT_WRAPPER_PRIORITY;
|
|
|
|
|
(void) mca_base_component_var_register(&mca_pml_crcpw_component.super.pmlm_version, "priority",
|
|
|
|
|
"Priority of the PML crcpw component",
|
|
|
|
|
MCA_BASE_VAR_TYPE_INT, NULL, 0, 0,
|
|
|
|
|
OPAL_INFO_LVL_9,
|
|
|
|
|
MCA_BASE_VAR_SCOPE_READONLY,
|
|
|
|
|
&mca_pml_crcpw_component.priority);
|
2007-03-17 02:11:45 +03:00
|
|
|
|
2013-03-28 01:09:41 +04:00
|
|
|
mca_pml_crcpw_component.verbose = 0;
|
|
|
|
|
(void) mca_base_component_var_register(&mca_pml_crcpw_component.super.pmlm_version, "verbose",
|
|
|
|
|
"Verbose level for the PML crcpw component",
|
|
|
|
|
MCA_BASE_VAR_TYPE_INT, NULL, 0, 0,
|
|
|
|
|
OPAL_INFO_LVL_9,
|
|
|
|
|
MCA_BASE_VAR_SCOPE_READONLY,
|
|
|
|
|
&mca_pml_crcpw_component.verbose);
|
|
|
|
|
|
|
|
|
|
return OMPI_SUCCESS;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
int mca_pml_crcpw_component_open(void)
|
|
|
|
|
{
|
|
|
|
|
opal_output_verbose( 10, mca_pml_crcpw_component.output_handle,
|
|
|
|
|
"pml:crcpw: component_open: Open");
|
2007-03-17 02:11:45 +03:00
|
|
|
|
2008-06-09 18:53:58 +04:00
|
|
|
mca_pml_crcpw_component.output_handle = opal_output_open(NULL);
|
2007-03-17 02:11:45 +03:00
|
|
|
if ( 0 != mca_pml_crcpw_component.verbose) {
|
2008-06-09 18:53:58 +04:00
|
|
|
opal_output_set_verbosity(mca_pml_crcpw_component.output_handle,
|
2007-03-17 02:11:45 +03:00
|
|
|
mca_pml_crcpw_component.verbose);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* Debug Output
|
|
|
|
|
*/
|
2008-06-09 18:53:58 +04:00
|
|
|
opal_output_verbose(10, mca_pml_crcpw_component.output_handle,
|
2007-03-17 02:11:45 +03:00
|
|
|
"pml:crcpw: open()");
|
2008-06-09 18:53:58 +04:00
|
|
|
opal_output_verbose(20, mca_pml_crcpw_component.output_handle,
|
2007-03-17 02:11:45 +03:00
|
|
|
"pml:crcpw: open: priority = %d",
|
|
|
|
|
mca_pml_crcpw_component.priority);
|
2008-06-09 18:53:58 +04:00
|
|
|
opal_output_verbose(20, mca_pml_crcpw_component.output_handle,
|
2007-03-17 02:11:45 +03:00
|
|
|
"pml:crcpw: open: verbosity = %d",
|
|
|
|
|
mca_pml_crcpw_component.verbose);
|
|
|
|
|
|
|
|
|
|
return OMPI_SUCCESS;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
int mca_pml_crcpw_component_close(void)
|
|
|
|
|
{
|
2008-06-09 18:53:58 +04:00
|
|
|
opal_output_verbose( 20, mca_pml_crcpw_component.output_handle,
|
2007-03-17 02:11:45 +03:00
|
|
|
"pml:crcpw: component_close: Close");
|
|
|
|
|
|
|
|
|
|
return OMPI_SUCCESS;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
mca_pml_base_module_t* mca_pml_crcpw_component_init(int* priority,
|
|
|
|
|
bool enable_progress_threads,
|
|
|
|
|
bool enable_mpi_threads)
|
|
|
|
|
{
|
|
|
|
|
/* We use the PML_SELECT_WRAPPER_PRIORITY to indicate when this
|
|
|
|
|
* component should wrap around what is already selected
|
|
|
|
|
* If it is not set to this seminal value, then we are doing a
|
|
|
|
|
* normal selection operation
|
|
|
|
|
*/
|
|
|
|
|
if(*priority == PML_SELECT_WRAPPER_PRIORITY ) {
|
2008-06-09 18:53:58 +04:00
|
|
|
opal_output_verbose( 20, mca_pml_crcpw_component.output_handle,
|
2007-03-17 02:11:45 +03:00
|
|
|
"pml:crcpw: component_init: Wrap the selected component %s",
|
|
|
|
|
mca_pml_base_selected_component.pmlm_version.mca_component_name);
|
|
|
|
|
|
|
|
|
|
mca_pml_crcpw_module.wrapped_pml_component = mca_pml_base_selected_component;
|
|
|
|
|
mca_pml_crcpw_module.wrapped_pml_module = mca_pml;
|
|
|
|
|
mca_pml_crcpw_component.pml_crcp_wrapped = true;
|
|
|
|
|
|
2008-06-09 18:53:58 +04:00
|
|
|
opal_output_verbose( 20, mca_pml_crcpw_component.output_handle,
|
2007-03-17 02:11:45 +03:00
|
|
|
"pml:crcpw: component_init: Initalize Wrapper");
|
|
|
|
|
|
|
|
|
|
OBJ_CONSTRUCT(&pml_state_list, ompi_free_list_t);
|
2007-11-02 02:38:50 +03:00
|
|
|
ompi_free_list_init_new( &pml_state_list,
|
2007-03-17 02:11:45 +03:00
|
|
|
sizeof(ompi_crcp_base_pml_state_t),
|
2010-07-06 18:33:36 +04:00
|
|
|
opal_cache_line_size,
|
2007-03-17 02:11:45 +03:00
|
|
|
OBJ_CLASS(ompi_crcp_base_pml_state_t),
|
2010-07-06 18:33:36 +04:00
|
|
|
0,opal_cache_line_size,
|
2007-03-17 02:11:45 +03:00
|
|
|
5, /* Initial number */
|
|
|
|
|
-1, /* Max = Unlimited */
|
|
|
|
|
64, /* Increment by */
|
|
|
|
|
NULL);
|
|
|
|
|
}
|
|
|
|
|
else {
|
2008-06-09 18:53:58 +04:00
|
|
|
opal_output_verbose( 20, mca_pml_crcpw_component.output_handle,
|
2007-03-17 02:11:45 +03:00
|
|
|
"pml:crcpw: component_init: Priority %d",
|
|
|
|
|
mca_pml_crcpw_component.priority);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
*priority = mca_pml_crcpw_component.priority;
|
|
|
|
|
|
2009-04-30 20:36:50 +04:00
|
|
|
pml_crcpw_is_finalized = false;
|
|
|
|
|
|
2007-03-17 02:11:45 +03:00
|
|
|
return &mca_pml_crcpw_module.super;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
int mca_pml_crcpw_component_finalize(void)
|
|
|
|
|
{
|
2008-06-09 18:53:58 +04:00
|
|
|
opal_output_verbose( 20, mca_pml_crcpw_component.output_handle,
|
2007-03-17 02:11:45 +03:00
|
|
|
"pml:crcpw: component_finalize: Finalize");
|
|
|
|
|
|
|
|
|
|
OBJ_DESTRUCT(&pml_state_list);
|
|
|
|
|
|
2009-04-30 20:36:50 +04:00
|
|
|
pml_crcpw_is_finalized = true;
|
|
|
|
|
|
2007-03-17 02:11:45 +03:00
|
|
|
if(mca_pml_crcpw_component.pml_crcp_wrapped) {
|
|
|
|
|
return mca_pml_crcpw_module.wrapped_pml_component.pmlm_finalize();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return OMPI_SUCCESS;
|
|
|
|
|
}
|
|
|
|
|
|