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.
247 строки
8.4 KiB
C
247 строки
8.4 KiB
C
/*
|
|
* 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 (c) 2007 Cisco Systems, Inc. All rights reserved.
|
|
* $COPYRIGHT$
|
|
*
|
|
* Additional copyrights may follow
|
|
*
|
|
* $HEADER$
|
|
*/
|
|
|
|
#include "ompi_config.h"
|
|
#include "opal/sys/cache.h"
|
|
#include "opal/event/event.h"
|
|
#include "mpi.h"
|
|
#include "ompi/runtime/params.h"
|
|
#include "ompi/mca/pml/pml.h"
|
|
#include "opal/mca/base/mca_base_param.h"
|
|
#include "ompi/mca/pml/base/pml_base_bsend.h"
|
|
#include "pml_ob1.h"
|
|
#include "pml_ob1_hdr.h"
|
|
#include "pml_ob1_sendreq.h"
|
|
#include "pml_ob1_recvreq.h"
|
|
#include "pml_ob1_rdmafrag.h"
|
|
#include "pml_ob1_recvfrag.h"
|
|
#include "ompi/mca/bml/base/base.h"
|
|
#include "pml_ob1_component.h"
|
|
#include "ompi/mca/allocator/base/base.h"
|
|
|
|
OBJ_CLASS_INSTANCE( mca_pml_ob1_pckt_pending_t,
|
|
ompi_free_list_item_t,
|
|
NULL,
|
|
NULL );
|
|
|
|
static int mca_pml_ob1_component_open(void);
|
|
static int mca_pml_ob1_component_close(void);
|
|
static mca_pml_base_module_t*
|
|
mca_pml_ob1_component_init( int* priority, bool enable_progress_threads,
|
|
bool enable_mpi_threads );
|
|
static int mca_pml_ob1_component_fini(void);
|
|
|
|
mca_pml_base_component_1_0_0_t mca_pml_ob1_component = {
|
|
|
|
/* First, the mca_base_component_t struct containing meta
|
|
information about the component itself */
|
|
|
|
{
|
|
/* Indicate that we are a pml v1.0.0 component (which also implies
|
|
a specific MCA version) */
|
|
|
|
MCA_PML_BASE_VERSION_1_0_0,
|
|
|
|
"ob1", /* 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_ob1_component_open, /* component open */
|
|
mca_pml_ob1_component_close /* component close */
|
|
},
|
|
|
|
/* Next the MCA v1.0.0 component meta data */
|
|
|
|
{
|
|
/* The component is checkpoint ready */
|
|
MCA_BASE_METADATA_PARAM_CHECKPOINT
|
|
},
|
|
|
|
mca_pml_ob1_component_init, /* component init */
|
|
mca_pml_ob1_component_fini /* component finalize */
|
|
|
|
};
|
|
|
|
void *mca_pml_ob1_seg_alloc( struct mca_mpool_base_module_t* mpool,
|
|
size_t* size,
|
|
mca_mpool_base_registration_t** registration);
|
|
|
|
void mca_pml_ob1_seg_free( struct mca_mpool_base_module_t* mpool,
|
|
void* segment );
|
|
|
|
static inline int mca_pml_ob1_param_register_int(
|
|
const char* param_name,
|
|
int default_value)
|
|
{
|
|
int id = mca_base_param_register_int("pml","ob1",param_name,NULL,default_value);
|
|
int param_value = default_value;
|
|
mca_base_param_lookup_int(id,¶m_value);
|
|
return param_value;
|
|
}
|
|
|
|
static int mca_pml_ob1_component_open(void)
|
|
{
|
|
mca_allocator_base_component_t* allocator_component;
|
|
|
|
mca_pml_ob1.free_list_num =
|
|
mca_pml_ob1_param_register_int("free_list_num", 4);
|
|
mca_pml_ob1.free_list_max =
|
|
mca_pml_ob1_param_register_int("free_list_max", -1);
|
|
mca_pml_ob1.free_list_inc =
|
|
mca_pml_ob1_param_register_int("free_list_inc", 64);
|
|
mca_pml_ob1.priority =
|
|
mca_pml_ob1_param_register_int("priority", 20);
|
|
mca_pml_ob1.send_pipeline_depth =
|
|
mca_pml_ob1_param_register_int("send_pipeline_depth", 3);
|
|
mca_pml_ob1.recv_pipeline_depth =
|
|
mca_pml_ob1_param_register_int("recv_pipeline_depth", 4);
|
|
mca_pml_ob1.rdma_put_retries_limit =
|
|
mca_pml_ob1_param_register_int("rdma_put_retries_limit", 5);
|
|
mca_pml_ob1.max_rdma_per_request =
|
|
mca_pml_ob1_param_register_int("max_rdma_per_request", 4);
|
|
mca_pml_ob1.max_send_per_range =
|
|
mca_pml_ob1_param_register_int("max_send_per_range", 4);
|
|
|
|
mca_pml_ob1.unexpected_limit =
|
|
mca_pml_ob1_param_register_int("unexpected_limit", 128);
|
|
|
|
mca_base_param_reg_string(&mca_pml_ob1_component.pmlm_version,
|
|
"allocator",
|
|
"Name of allocator component for unexpected messages",
|
|
false, false,
|
|
"bucket",
|
|
&mca_pml_ob1.allocator_name);
|
|
|
|
allocator_component = mca_allocator_component_lookup( mca_pml_ob1.allocator_name );
|
|
if(NULL == allocator_component) {
|
|
orte_output(0, "mca_pml_ob1_component_open: can't find allocator: %s\n", mca_pml_ob1.allocator_name);
|
|
return OMPI_ERROR;
|
|
}
|
|
mca_pml_ob1.allocator = allocator_component->allocator_init(true,
|
|
mca_pml_ob1_seg_alloc,
|
|
mca_pml_ob1_seg_free, NULL);
|
|
if(NULL == mca_pml_ob1.allocator) {
|
|
orte_output(0, "mca_pml_ob1_component_open: unable to initialize allocator\n");
|
|
return OMPI_ERROR;
|
|
}
|
|
|
|
mca_pml_ob1.leave_pinned = ompi_mpi_leave_pinned;
|
|
mca_pml_ob1.leave_pinned_pipeline = (int) ompi_mpi_leave_pinned_pipeline;
|
|
|
|
mca_pml_ob1.enabled = false;
|
|
return mca_bml_base_open();
|
|
|
|
}
|
|
|
|
|
|
static int mca_pml_ob1_component_close(void)
|
|
{
|
|
int rc;
|
|
|
|
if(OMPI_SUCCESS != (rc = mca_bml_base_close()))
|
|
return rc;
|
|
|
|
return OMPI_SUCCESS;
|
|
}
|
|
|
|
|
|
static mca_pml_base_module_t*
|
|
mca_pml_ob1_component_init( int* priority,
|
|
bool enable_progress_threads,
|
|
bool enable_mpi_threads )
|
|
{
|
|
orte_output_verbose( 10, 0,
|
|
"in ob1, my priority is %d\n", mca_pml_ob1.priority);
|
|
|
|
if((*priority) > mca_pml_ob1.priority) {
|
|
*priority = mca_pml_ob1.priority;
|
|
return NULL;
|
|
}
|
|
*priority = mca_pml_ob1.priority;
|
|
|
|
if(OMPI_SUCCESS != mca_bml_base_init( enable_progress_threads,
|
|
enable_mpi_threads)) {
|
|
return NULL;
|
|
}
|
|
|
|
/* As our own progress function does nothing except calling the BML
|
|
* progress, let's modify the progress function pointer in our structure
|
|
* to avoid useless functions calls. The event library will instead call
|
|
* directly the BML function.
|
|
*/
|
|
mca_pml_ob1.super.pml_progress = mca_bml.bml_progress;
|
|
|
|
return &mca_pml_ob1.super;
|
|
}
|
|
|
|
int mca_pml_ob1_component_fini(void)
|
|
{
|
|
int rc;
|
|
|
|
/* Shutdown BML */
|
|
if(OMPI_SUCCESS != (rc = mca_bml.bml_finalize()))
|
|
return rc;
|
|
|
|
if(!mca_pml_ob1.enabled)
|
|
return OMPI_SUCCESS; /* never selected.. return success.. */
|
|
mca_pml_ob1.enabled = false; /* not anymore */
|
|
|
|
OBJ_DESTRUCT(&mca_pml_ob1.rdma_pending);
|
|
OBJ_DESTRUCT(&mca_pml_ob1.pckt_pending);
|
|
OBJ_DESTRUCT(&mca_pml_ob1.recv_pending);
|
|
OBJ_DESTRUCT(&mca_pml_ob1.send_pending);
|
|
OBJ_DESTRUCT(&mca_pml_ob1.buffers);
|
|
OBJ_DESTRUCT(&mca_pml_ob1.pending_pckts);
|
|
OBJ_DESTRUCT(&mca_pml_ob1.recv_frags);
|
|
OBJ_DESTRUCT(&mca_pml_ob1.rdma_frags);
|
|
OBJ_DESTRUCT(&mca_pml_ob1.lock);
|
|
|
|
if(OMPI_SUCCESS != (rc = mca_pml_ob1.allocator->alc_finalize(mca_pml_ob1.allocator))) {
|
|
return rc;
|
|
}
|
|
|
|
#if 0
|
|
if (mca_pml_base_send_requests.fl_num_allocated !=
|
|
mca_pml_base_send_requests.super.opal_list_length) {
|
|
orte_output(0, "ob1 send requests: %d allocated %d returned\n",
|
|
mca_pml_base_send_requests.fl_num_allocated,
|
|
mca_pml_base_send_requests.super.opal_list_length);
|
|
}
|
|
if (mca_pml_base_recv_requests.fl_num_allocated !=
|
|
mca_pml_base_recv_requests.super.opal_list_length) {
|
|
orte_output(0, "ob1 recv requests: %d allocated %d returned\n",
|
|
mca_pml_base_recv_requests.fl_num_allocated,
|
|
mca_pml_base_recv_requests.super.opal_list_length);
|
|
}
|
|
#endif
|
|
|
|
return OMPI_SUCCESS;
|
|
}
|
|
|
|
void *mca_pml_ob1_seg_alloc( struct mca_mpool_base_module_t* mpool,
|
|
size_t* size,
|
|
mca_mpool_base_registration_t** registration) {
|
|
return malloc(*size);
|
|
}
|
|
|
|
void mca_pml_ob1_seg_free( struct mca_mpool_base_module_t* mpool,
|
|
void* segment ) {
|
|
free(segment);
|
|
}
|