ports/openmpi
ports/openmpi
1
1
Форкнуть 0
Код Релизы Активность

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.
Этот коммит содержится в:
Jeff Squyres 2008-05-13 20:00:55 +00:00
родитель 125eb5a2ed
Коммит e7ecd56bd2
454 изменённых файлов: 5859 добавлений и 3432 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

4
ompi/class/ompi_free_list.c
Просмотреть файл

@ -22,7 +22,7 @@
#include "ompi/class/ompi_free_list.h"
#include "opal/include/opal/align.h"
#include "opal/sys/cache.h"
#include "opal/util/output.h"
#include "orte/util/output.h"
#include "ompi/mca/mpool/mpool.h"
static void ompi_free_list_construct(ompi_free_list_t* fl);
@ -62,7 +62,7 @@ static void ompi_free_list_destruct(ompi_free_list_t* fl)
#if 0 && OMPI_ENABLE_DEBUG
if(opal_list_get_size(&fl->super) != fl->fl_num_allocated) {
opal_output(0, "ompi_free_list: %d allocated %d returned: %s:%d\n",
orte_output(0, "ompi_free_list: %d allocated %d returned: %s:%d\n",
fl->fl_num_allocated, opal_list_get_size(&fl->super),
fl->super.super.cls_init_file_name, fl->super.super.cls_init_lineno);
}

2
ompi/class/ompi_seq_tracker.c
Просмотреть файл

@ -20,7 +20,7 @@
#include "ompi/class/ompi_seq_tracker.h"
#include "opal/sys/cache.h"
#include "opal/util/output.h"
#include "orte/util/output.h"

22
ompi/communicator/comm.c
Просмотреть файл

@ -30,7 +30,7 @@
#include "ompi/proc/proc.h"
#include "opal/threads/mutex.h"
#include "opal/util/bit_ops.h"
#include "opal/util/output.h"
#include "orte/util/output.h"
#include "opal/util/convert.h"
#include "ompi/mca/topo/topo.h"
#include "ompi/mca/topo/base/base.h"
@ -1154,7 +1154,7 @@ ompi_proc_t **ompi_comm_get_rprocs ( ompi_communicator_t *local_comm,
/* rprocs isn't freed unless we have an error,
since it is used in the communicator */
if ( OMPI_SUCCESS !=rc ) {
opal_output(0, "%d: Error in ompi_get_rprocs\n", local_rank);
orte_output(0, "%d: Error in ompi_get_rprocs\n", local_rank);
if ( NULL != rprocs ) {
free ( rprocs );
rprocs=NULL;
@ -1269,25 +1269,25 @@ int ompi_comm_determine_first ( ompi_communicator_t *intercomm, int high )
/********************************************************************************/
int ompi_comm_dump ( ompi_communicator_t *comm )
{
opal_output(0, "Dumping information for comm_cid %d\n", comm->c_contextid);
opal_output(0," f2c index:%d cube_dim: %d\n", comm->c_f_to_c_index,
orte_output(0, "Dumping information for comm_cid %d\n", comm->c_contextid);
orte_output(0," f2c index:%d cube_dim: %d\n", comm->c_f_to_c_index,
comm->c_cube_dim);
opal_output(0," Local group: size = %d my_rank = %d\n",
orte_output(0," Local group: size = %d my_rank = %d\n",
comm->c_local_group->grp_proc_count,
comm->c_local_group->grp_my_rank );
opal_output(0," Communicator is:");
orte_output(0," Communicator is:");
/* Display flags */
if ( OMPI_COMM_IS_INTER(comm) )
opal_output(0," inter-comm,");
orte_output(0," inter-comm,");
if ( OMPI_COMM_IS_CART(comm))
opal_output(0," topo-cart,");
orte_output(0," topo-cart,");
if ( OMPI_COMM_IS_GRAPH(comm))
opal_output(0," topo-graph");
opal_output(0,"\n");
orte_output(0," topo-graph");
orte_output(0,"\n");
if (OMPI_COMM_IS_INTER(comm)) {
opal_output(0," Remote group size:%d\n", comm->c_remote_group->grp_proc_count);
orte_output(0," Remote group size:%d\n", comm->c_remote_group->grp_proc_count);
}
return OMPI_SUCCESS;
}

2
ompi/communicator/comm_init.c
Просмотреть файл

@ -258,7 +258,7 @@ int ompi_comm_finalize(void)
if ( NULL != comm ) {
/* Still here ? */
if ( ompi_debug_show_handle_leaks && !(OMPI_COMM_IS_FREED(comm)) ){
opal_output(0,"WARNING: MPI_Comm still allocated in MPI_Finalize\n");
orte_output(0,"WARNING: MPI_Comm still allocated in MPI_Finalize\n");
ompi_comm_dump ( comm);
OBJ_RELEASE(comm);
}

2
ompi/communicator/communicator.h
Просмотреть файл

@ -238,7 +238,7 @@ struct ompi_communicator_t {
{
#if OMPI_ENABLE_DEBUG
if(peer_id >= comm->c_remote_group->grp_proc_count) {
opal_output(0, "ompi_comm_lookup_peer: invalid peer index (%d)", peer_id);
orte_output(0, "ompi_comm_lookup_peer: invalid peer index (%d)", peer_id);
return (struct ompi_proc_t *) NULL;
}
#endif

14
ompi/datatype/convertor.c
Просмотреть файл

@ -130,7 +130,7 @@ ompi_convertor_find_or_create_master( uint32_t remote_arch )
} else if( opal_arch_checkmask( &master->remote_arch, OPAL_ARCH_BOOLIS32 ) ) {
remote_sizes[DT_CXX_BOOL] = 4;
} else {
opal_output( 0, "Unknown sizeof(bool) for the remote architecture\n" );
orte_output( 0, "Unknown sizeof(bool) for the remote architecture\n" );
}
/* check the length of the long */
@ -151,7 +151,7 @@ ompi_convertor_find_or_create_master( uint32_t remote_arch )
} else if( opal_arch_checkmask( &master->remote_arch, OPAL_ARCH_LOGICALIS32 ) ) {
remote_sizes[DT_LOGIC] = 4;
} else {
opal_output( 0, "Unknown sizeof(fortran logical) for the remote architecture\n" );
orte_output( 0, "Unknown sizeof(fortran logical) for the remote architecture\n" );
}
/**
@ -637,17 +637,17 @@ void ompi_convertor_dump( ompi_convertor_t* convertor )
void ompi_ddt_dump_stack( const dt_stack_t* pStack, int stack_pos,
const union dt_elem_desc* pDesc, const char* name )
{
opal_output( 0, "\nStack %p stack_pos %d name %s\n", (void*)pStack, stack_pos, name );
orte_output( 0, "\nStack %p stack_pos %d name %s\n", (void*)pStack, stack_pos, name );
for( ; stack_pos >= 0; stack_pos-- ) {
opal_output( 0, "%d: pos %d count %d disp %ld ", stack_pos, pStack[stack_pos].index,
orte_output( 0, "%d: pos %d count %d disp %ld ", stack_pos, pStack[stack_pos].index,
(int)pStack[stack_pos].count, (long)pStack[stack_pos].disp );
if( pStack->index != -1 )
opal_output( 0, "\t[desc count %d disp %ld extent %ld]\n",
orte_output( 0, "\t[desc count %d disp %ld extent %ld]\n",
pDesc[pStack[stack_pos].index].elem.count,
(long)pDesc[pStack[stack_pos].index].elem.disp,
(long)pDesc[pStack[stack_pos].index].elem.extent );
else
opal_output( 0, "\n" );
orte_output( 0, "\n" );
}
opal_output( 0, "\n" );
orte_output( 0, "\n" );
}

2
ompi/datatype/copy_functions_heterogeneous.c
Просмотреть файл

@ -12,7 +12,7 @@
#include "ompi_config.h"
#include "opal/util/output.h"
#include "orte/util/output.h"
#include "opal/util/arch.h"
#include "opal/types.h"

10
ompi/datatype/datatype_internal.h
Просмотреть файл

@ -23,7 +23,7 @@
#ifdef HAVE_STRING_H
#include <string.h>
#endif /* HAVE_STRING_H */
#include "opal/util/output.h"
#include "orte/util/output.h"
extern int ompi_ddt_dfd;
@ -31,17 +31,17 @@ extern int ompi_ddt_dfd;
# define DDT_DUMP_STACK( PSTACK, STACK_POS, PDESC, NAME ) \
ompi_ddt_dump_stack( (PSTACK), (STACK_POS), (PDESC), (NAME) )
# if defined(ACCEPT_C99)
# define DUMP( ARGS... ) opal_output(ompi_ddt_dfd, __VA_ARGS__)
# define DUMP( ARGS... ) orte_output(ompi_ddt_dfd, __VA_ARGS__)
# else
# if defined(__GNUC__) && !defined(__STDC__)
# define DUMP(ARGS...) opal_output( ompi_ddt_dfd, ARGS)
# define DUMP(ARGS...) orte_output( ompi_ddt_dfd, ARGS)
# else
static inline void DUMP( char* fmt, ... )
{
va_list list;
va_start( list, fmt );
opal_output( ompi_ddt_dfd, fmt, list );
orte_output( ompi_ddt_dfd, fmt, list );
va_end( list );
}
# define DUMP printf
@ -265,7 +265,7 @@ OMPI_DECLSPEC int ompi_ddt_safeguard_pointer_debug_breakpoint( const void* actua
((PDATA)->ub - (PDATA)->lb) * ((COUNT) - 1); \
if( ((ACTPTR) < __lower_bound) || ((ACTPTR) >= __upper_bound) ) { \
ompi_ddt_safeguard_pointer_debug_breakpoint( (ACTPTR), (LENGTH), (INITPTR), (PDATA), (COUNT) ); \
opal_output( 0, "%s:%d\n\tPointer %p size %lu is outside [%p,%p] for\n\tbase ptr %p count %d and data \n", \
orte_output( 0, "%s:%d\n\tPointer %p size %lu is outside [%p,%p] for\n\tbase ptr %p count %d and data \n", \
__FILE__, __LINE__, (ACTPTR), (unsigned long)(LENGTH), __lower_bound, __upper_bound, \
(INITPTR), (COUNT) ); \
ompi_ddt_dump( (PDATA) ); \

10
ompi/datatype/datatype_pack.c
Просмотреть файл

@ -257,7 +257,7 @@ ompi_generic_simple_pack_function( ompi_convertor_t* pConvertor,
size_t iov_len_local;
uint32_t iov_count;
DO_DEBUG( opal_output( 0, "ompi_convertor_generic_simple_pack( %p, {%p, %lu}, %d )\n", (void*)pConvertor,
DO_DEBUG( orte_output( 0, "ompi_convertor_generic_simple_pack( %p, {%p, %lu}, %d )\n", (void*)pConvertor,
iov[0].iov_base, (unsigned long)iov[0].iov_len, *out_size ); );
description = pConvertor->use_desc->desc;
@ -275,7 +275,7 @@ ompi_generic_simple_pack_function( ompi_convertor_t* pConvertor,
pElem = &(description[pos_desc]);
source_base += pStack->disp;
DO_DEBUG( opal_output( 0, "unpack start pos_desc %d count_desc %d disp %ld\n"
DO_DEBUG( orte_output( 0, "unpack start pos_desc %d count_desc %d disp %ld\n"
"stack_pos %d pos_desc %d count_desc %d disp %ld\n",
pos_desc, count_desc, (long)(source_base - pConvertor->pBaseBuf),
pConvertor->stack_pos, pStack->index, (int)pStack->count, (long)pStack->disp ); );
@ -297,7 +297,7 @@ ompi_generic_simple_pack_function( ompi_convertor_t* pConvertor,
goto complete_loop;
}
if( DT_END_LOOP == pElem->elem.common.type ) { /* end of the current loop */
DO_DEBUG( opal_output( 0, "pack end_loop count %d stack_pos %d pos_desc %d disp %ld space %lu\n",
DO_DEBUG( orte_output( 0, "pack end_loop count %d stack_pos %d pos_desc %d disp %ld space %lu\n",
(int)pStack->count, pConvertor->stack_pos, pos_desc, (long)pStack->disp, (unsigned long)iov_len_local ); );
if( --(pStack->count) == 0 ) { /* end of loop */
if( pConvertor->stack_pos == 0 ) {
@ -321,7 +321,7 @@ ompi_generic_simple_pack_function( ompi_convertor_t* pConvertor,
}
source_base = pConvertor->pBaseBuf + pStack->disp;
UPDATE_INTERNAL_COUNTERS( description, pos_desc, pElem, count_desc );
DO_DEBUG( opal_output( 0, "pack new_loop count %d stack_pos %d pos_desc %d disp %ld space %lu\n",
DO_DEBUG( orte_output( 0, "pack new_loop count %d stack_pos %d pos_desc %d disp %ld space %lu\n",
(int)pStack->count, pConvertor->stack_pos, pos_desc, (long)pStack->disp, (unsigned long)iov_len_local ); );
}
if( DT_LOOP == pElem->elem.common.type ) {
@ -361,7 +361,7 @@ ompi_generic_simple_pack_function( ompi_convertor_t* pConvertor,
/* I complete an element, next step I should go to the next one */
PUSH_STACK( pStack, pConvertor->stack_pos, pos_desc, DT_BYTE, count_desc,
source_base - pStack->disp - pConvertor->pBaseBuf );
DO_DEBUG( opal_output( 0, "pack save stack stack_pos %d pos_desc %d count_desc %d disp %ld\n",
DO_DEBUG( orte_output( 0, "pack save stack stack_pos %d pos_desc %d count_desc %d disp %ld\n",
pConvertor->stack_pos, pStack->index, (int)pStack->count, (long)pStack->disp ); );
return 0;
}

6
ompi/datatype/datatype_pack.h
Просмотреть файл

@ -36,7 +36,7 @@ static inline void pack_predefined_data( ompi_convertor_t* CONVERTOR,
/* the extent and the size of the basic datatype are equals */
OMPI_DDT_SAFEGUARD_POINTER( _source, _copy_blength, (CONVERTOR)->pBaseBuf,
(CONVERTOR)->pDesc, (CONVERTOR)->count );
DO_DEBUG( opal_output( 0, "pack 1. memcpy( %p, %p, %lu ) => space %lu\n",
DO_DEBUG( orte_output( 0, "pack 1. memcpy( %p, %p, %lu ) => space %lu\n",
*(DESTINATION), _source, (unsigned long)_copy_blength, (unsigned long)(*(SPACE)) ); );
MEMCPY_CSUM( *(DESTINATION), _source, _copy_blength, (CONVERTOR) );
_source += _copy_blength;
@ -46,7 +46,7 @@ static inline void pack_predefined_data( ompi_convertor_t* CONVERTOR,
for( _i = 0; _i < _copy_count; _i++ ) {
OMPI_DDT_SAFEGUARD_POINTER( _source, _copy_blength, (CONVERTOR)->pBaseBuf,
(CONVERTOR)->pDesc, (CONVERTOR)->count );
DO_DEBUG( opal_output( 0, "pack 2. memcpy( %p, %p, %lu ) => space %lu\n",
DO_DEBUG( orte_output( 0, "pack 2. memcpy( %p, %p, %lu ) => space %lu\n",
*(DESTINATION), _source, (unsigned long)_copy_blength, (unsigned long)(*(SPACE) - (_i * _copy_blength)) ); );
MEMCPY_CSUM( *(DESTINATION), _source, _copy_blength, (CONVERTOR) );
*(DESTINATION) += _copy_blength;
@ -77,7 +77,7 @@ static inline void pack_contiguous_loop( ompi_convertor_t* CONVERTOR,
for( _i = 0; _i < _copy_loops; _i++ ) {
OMPI_DDT_SAFEGUARD_POINTER( _source, _end_loop->size, (CONVERTOR)->pBaseBuf,
(CONVERTOR)->pDesc, (CONVERTOR)->count );
DO_DEBUG( opal_output( 0, "pack 3. memcpy( %p, %p, %lu ) => space %lu\n",
DO_DEBUG( orte_output( 0, "pack 3. memcpy( %p, %p, %lu ) => space %lu\n",
*(DESTINATION), _source, (unsigned long)_end_loop->size, (unsigned long)(*(SPACE) - _i * _end_loop->size) ); );
MEMCPY_CSUM( *(DESTINATION), _source, _end_loop->size, (CONVERTOR) );
*(DESTINATION) += _end_loop->size;

26
ompi/datatype/datatype_unpack.c
Просмотреть файл

@ -198,7 +198,7 @@ ompi_unpack_homogeneous_contig_function( ompi_convertor_t* pConv,
ptrdiff_t extent = pData->ub - pData->lb;
ptrdiff_t initial_displ = pConv->use_desc->desc[pConv->use_desc->used].end_loop.first_elem_disp;
DO_DEBUG( opal_output( 0, "unpack_homogeneous_contig( pBaseBuf %p, iov_count %d )\n",
DO_DEBUG( orte_output( 0, "unpack_homogeneous_contig( pBaseBuf %p, iov_count %d )\n",
pConv->pBaseBuf, *out_size ); );
for( iov_count = 0; iov_count < (*out_size); iov_count++ ) {
packed_buffer = (unsigned char*)iov[iov_count].iov_base;
@ -210,19 +210,19 @@ ompi_unpack_homogeneous_contig_function( ompi_convertor_t* pConv,
if( (ptrdiff_t)pData->size == extent ) {
user_memory += pConv->bConverted;
DO_DEBUG( opal_output( 0, "unpack_homogeneous_contig( user_memory %p, packed_buffer %p length %lu\n",
DO_DEBUG( orte_output( 0, "unpack_homogeneous_contig( user_memory %p, packed_buffer %p length %lu\n",
user_memory, packed_buffer, (unsigned long)remaining ); );
/* contiguous data or basic datatype with count */
OMPI_DDT_SAFEGUARD_POINTER( user_memory, remaining,
pConv->pBaseBuf, pData, pConv->count );
DO_DEBUG( opal_output( 0, "1. unpack contig dest %p src %p length %lu\n",
DO_DEBUG( orte_output( 0, "1. unpack contig dest %p src %p length %lu\n",
user_memory, packed_buffer, (unsigned long)remaining ); );
MEMCPY_CSUM( user_memory, packed_buffer, remaining, pConv );
} else {
user_memory += stack[0].disp + stack[1].disp;
DO_DEBUG( opal_output( 0, "unpack_homogeneous_contig( user_memory %p, packed_buffer %p length %lu\n",
DO_DEBUG( orte_output( 0, "unpack_homogeneous_contig( user_memory %p, packed_buffer %p length %lu\n",
user_memory, packed_buffer, (unsigned long)remaining ); );
length = pConv->bConverted / pData->size; /* already done */
@ -234,7 +234,7 @@ ompi_unpack_homogeneous_contig_function( ompi_convertor_t* pConv,
if( length <= remaining ) {
OMPI_DDT_SAFEGUARD_POINTER( user_memory, length, pConv->pBaseBuf,
pData, pConv->count );
DO_DEBUG( opal_output( 0, "2. unpack dest %p src %p length %lu\n",
DO_DEBUG( orte_output( 0, "2. unpack dest %p src %p length %lu\n",
user_memory, packed_buffer, (unsigned long)length ); );
MEMCPY_CSUM( user_memory, packed_buffer, length, pConv );
packed_buffer += length;
@ -245,7 +245,7 @@ ompi_unpack_homogeneous_contig_function( ompi_convertor_t* pConv,
for( i = 0; pData->size <= remaining; i++ ) {
OMPI_DDT_SAFEGUARD_POINTER( user_memory, pData->size, pConv->pBaseBuf,
pData, pConv->count );
DO_DEBUG( opal_output( 0, "3. unpack dest %p src %p length %lu\n",
DO_DEBUG( orte_output( 0, "3. unpack dest %p src %p length %lu\n",
user_memory, packed_buffer, (unsigned long)pData->size ); );
MEMCPY_CSUM( user_memory, packed_buffer, pData->size, pConv );
packed_buffer += pData->size;
@ -258,7 +258,7 @@ ompi_unpack_homogeneous_contig_function( ompi_convertor_t* pConv,
if( remaining != 0 ) {
OMPI_DDT_SAFEGUARD_POINTER( user_memory, remaining, pConv->pBaseBuf,
pData, pConv->count );
DO_DEBUG( opal_output( 0, "4. unpack dest %p src %p length %lu\n",
DO_DEBUG( orte_output( 0, "4. unpack dest %p src %p length %lu\n",
user_memory, packed_buffer, (unsigned long)remaining ); );
MEMCPY_CSUM( user_memory, packed_buffer, remaining, pConv );
user_memory += remaining;
@ -299,7 +299,7 @@ ompi_unpack_partial_datatype( ompi_convertor_t* pConvertor, dt_elem_desc_t* pEle
uint32_t i, length, count_desc = 1;
size_t data_length = ompi_ddt_basicDatatypes[pElem->elem.common.type]->size;
DO_DEBUG( opal_output( 0, "unpack partial data start %lu end %lu data_length %lu user %p\n"
DO_DEBUG( orte_output( 0, "unpack partial data start %lu end %lu data_length %lu user %p\n"
"\tbConverted %lu total_length %lu count %d\n",
(unsigned long)start_position, (unsigned long)end_position, (unsigned long)data_length, *user_buffer,
(unsigned long)pConvertor->bConverted, (unsigned long)pConvertor->local_size, pConvertor->count ); );
@ -365,7 +365,7 @@ ompi_generic_simple_unpack_function( ompi_convertor_t* pConvertor,
size_t iov_len_local;
uint32_t iov_count;
DO_DEBUG( opal_output( 0, "ompi_convertor_generic_simple_unpack( %p, {%p, %lu}, %u )\n",
DO_DEBUG( orte_output( 0, "ompi_convertor_generic_simple_unpack( %p, {%p, %lu}, %u )\n",
(void*)pConvertor, iov[0].iov_base, (unsigned long)iov[0].iov_len, *out_size ); );
description = pConvertor->use_desc->desc;
@ -383,7 +383,7 @@ ompi_generic_simple_unpack_function( ompi_convertor_t* pConvertor,
pElem = &(description[pos_desc]);
user_memory_base += pStack->disp;
DO_DEBUG( opal_output( 0, "unpack start pos_desc %d count_desc %d disp %ld\n"
DO_DEBUG( orte_output( 0, "unpack start pos_desc %d count_desc %d disp %ld\n"
"stack_pos %d pos_desc %d count_desc %d disp %ld\n",
pos_desc, count_desc, (long)(user_memory_base - pConvertor->pBaseBuf),
pConvertor->stack_pos, pStack->index, (int)pStack->count, (long)(pStack->disp) ); );
@ -443,7 +443,7 @@ ompi_generic_simple_unpack_function( ompi_convertor_t* pConvertor,
goto complete_loop;
}
if( DT_END_LOOP == pElem->elem.common.type ) { /* end of the current loop */
DO_DEBUG( opal_output( 0, "unpack end_loop count %d stack_pos %d pos_desc %d disp %ld space %lu\n",
DO_DEBUG( orte_output( 0, "unpack end_loop count %d stack_pos %d pos_desc %d disp %ld space %lu\n",
(int)pStack->count, pConvertor->stack_pos, pos_desc,
(long)pStack->disp, (unsigned long)iov_len_local ); );
if( --(pStack->count) == 0 ) { /* end of loop */
@ -466,7 +466,7 @@ ompi_generic_simple_unpack_function( ompi_convertor_t* pConvertor,
}
user_memory_base = pConvertor->pBaseBuf + pStack->disp;
UPDATE_INTERNAL_COUNTERS( description, pos_desc, pElem, count_desc );
DO_DEBUG( opal_output( 0, "unpack new_loop count %d stack_pos %d pos_desc %d disp %ld space %lu\n",
DO_DEBUG( orte_output( 0, "unpack new_loop count %d stack_pos %d pos_desc %d disp %ld space %lu\n",
(int)pStack->count, pConvertor->stack_pos, pos_desc,
(long)pStack->disp, (unsigned long)iov_len_local ); );
}
@ -506,7 +506,7 @@ ompi_generic_simple_unpack_function( ompi_convertor_t* pConvertor,
/* I complete an element, next step I should go to the next one */
PUSH_STACK( pStack, pConvertor->stack_pos, pos_desc, DT_BYTE, count_desc,
user_memory_base - pStack->disp - pConvertor->pBaseBuf );
DO_DEBUG( opal_output( 0, "unpack save stack stack_pos %d pos_desc %d count_desc %d disp %ld\n",
DO_DEBUG( orte_output( 0, "unpack save stack stack_pos %d pos_desc %d count_desc %d disp %ld\n",
pConvertor->stack_pos, pStack->index, (int)pStack->count, (long)pStack->disp ); );
return 0;
}

6
ompi/datatype/datatype_unpack.h
Просмотреть файл

@ -36,7 +36,7 @@ static inline void unpack_predefined_data( ompi_convertor_t* CONVERTOR, /* the c
/* the extent and the size of the basic datatype are equals */
OMPI_DDT_SAFEGUARD_POINTER( _destination, _copy_blength, (CONVERTOR)->pBaseBuf,
(CONVERTOR)->pDesc, (CONVERTOR)->count );
DO_DEBUG( opal_output( 0, "unpack 1. memcpy( %p, %p, %lu ) => space %lu\n",
DO_DEBUG( orte_output( 0, "unpack 1. memcpy( %p, %p, %lu ) => space %lu\n",
_destination, *(SOURCE), (unsigned long)_copy_blength, (unsigned long)(*(SPACE)) ); );
MEMCPY_CSUM( _destination, *(SOURCE), _copy_blength, (CONVERTOR) );
*(SOURCE) += _copy_blength;
@ -46,7 +46,7 @@ static inline void unpack_predefined_data( ompi_convertor_t* CONVERTOR, /* the c
for( _i = 0; _i < _copy_count; _i++ ) {
OMPI_DDT_SAFEGUARD_POINTER( _destination, _copy_blength, (CONVERTOR)->pBaseBuf,
(CONVERTOR)->pDesc, (CONVERTOR)->count );
DO_DEBUG( opal_output( 0, "unpack 2. memcpy( %p, %p, %lu ) => space %lu\n",
DO_DEBUG( orte_output( 0, "unpack 2. memcpy( %p, %p, %lu ) => space %lu\n",
_destination, *(SOURCE), (unsigned long)_copy_blength, (unsigned long)(*(SPACE) - (_i * _copy_blength)) ); );
MEMCPY_CSUM( _destination, *(SOURCE), _copy_blength, (CONVERTOR) );
*(SOURCE) += _copy_blength;
@ -77,7 +77,7 @@ static inline void unpack_contiguous_loop( ompi_convertor_t* CONVERTOR,
for( _i = 0; _i < _copy_loops; _i++ ) {
OMPI_DDT_SAFEGUARD_POINTER( _destination, _end_loop->size, (CONVERTOR)->pBaseBuf,
(CONVERTOR)->pDesc, (CONVERTOR)->count );
DO_DEBUG( opal_output( 0, "unpack 3. memcpy( %p, %p, %lu ) => space %lu\n",
DO_DEBUG( orte_output( 0, "unpack 3. memcpy( %p, %p, %lu ) => space %lu\n",
_destination, *(SOURCE), (unsigned long)_end_loop->size, (unsigned long)(*(SPACE) - _i * _end_loop->size) ); );
MEMCPY_CSUM( _destination, *(SOURCE), _end_loop->size, (CONVERTOR) );
*(SOURCE) += _end_loop->size;

2
ompi/datatype/dt_add.c
Просмотреть файл

@ -125,7 +125,7 @@ int32_t ompi_ddt_add( ompi_datatype_t* pdtBase, const ompi_datatype_t* pdtAdd,
/* The data-type contain too many elements. We will be unable
* to handle it, so let's just complain by now.
*/
opal_output( 0, "Too many elements in the datatype. The limit is %ud\n",
orte_output( 0, "Too many elements in the datatype. The limit is %ud\n",
MAX_DT_COMPONENT_COUNT );
return OMPI_ERROR;
}

16
ompi/datatype/dt_copy.c
Просмотреть файл

@ -60,7 +60,7 @@ static inline void copy_predefined_data( const dt_elem_desc_t* ELEM,
OMPI_DDT_SAFEGUARD_POINTER( _source, _copy_blength, (SOURCE_BASE),
(DATATYPE), (TOTAL_COUNT) );
/* the extent and the size of the basic datatype are equals */
DO_DEBUG( opal_output( 0, "copy 1. memcpy( %p, %p, %lu ) => space %lu\n",
DO_DEBUG( orte_output( 0, "copy 1. memcpy( %p, %p, %lu ) => space %lu\n",
_destination, _source, (unsigned long)_copy_blength, (unsigned long)(*(SPACE)) ); );
MEMCPY( _destination, _source, _copy_blength );
_source += _copy_blength;
@ -70,7 +70,7 @@ static inline void copy_predefined_data( const dt_elem_desc_t* ELEM,
for( _i = 0; _i < _copy_count; _i++ ) {
OMPI_DDT_SAFEGUARD_POINTER( _source, _copy_blength, (SOURCE_BASE),
(DATATYPE), (TOTAL_COUNT) );
DO_DEBUG( opal_output( 0, "copy 2. memcpy( %p, %p, %lu ) => space %lu\n",
DO_DEBUG( orte_output( 0, "copy 2. memcpy( %p, %p, %lu ) => space %lu\n",
_destination, _source, (unsigned long)_copy_blength, (unsigned long)(*(SPACE) - (_i * _copy_blength)) ); );
MEMCPY( _destination, _source, _copy_blength );
_source += _elem->extent;
@ -106,7 +106,7 @@ static inline void copy_contiguous_loop( const dt_elem_desc_t* ELEM,
for( _i = 0; _i < _copy_loops; _i++ ) {
OMPI_DDT_SAFEGUARD_POINTER( _source, _end_loop->size, (SOURCE_BASE),
(DATATYPE), (TOTAL_COUNT) );
DO_DEBUG( opal_output( 0, "copy 3. memcpy( %p, %p, %lu ) => space %lu\n",
DO_DEBUG( orte_output( 0, "copy 3. memcpy( %p, %p, %lu ) => space %lu\n",
_destination, _source, (unsigned long)_end_loop->size, (unsigned long)(*(SPACE) - _i * _end_loop->size) ); );
MEMCPY( _destination, _source, _end_loop->size );
_source += _loop->extent;
@ -138,7 +138,7 @@ int32_t ompi_ddt_copy_content_same_ddt( const ompi_datatype_t* datatype, int32_t
unsigned char *source = (unsigned char*)source_base,
*destination = (unsigned char*)destination_base;
DO_DEBUG( opal_output( 0, "ompi_ddt_copy_content_same_ddt( %p, %d, dst %p, src %p )\n",
DO_DEBUG( orte_output( 0, "ompi_ddt_copy_content_same_ddt( %p, %d, dst %p, src %p )\n",
(void*)datatype, count, destination_base, source_base ); );
/* empty data ? then do nothing. This should normally be trapped
* at a higher level.
@ -166,7 +166,7 @@ int32_t ompi_ddt_copy_content_same_ddt( const ompi_datatype_t* datatype, int32_t
(unsigned char*)destination_base, datatype, count );
OMPI_DDT_SAFEGUARD_POINTER( source, memcpy_chunk,
(unsigned char*)source_base, datatype, count );
DO_DEBUG( opal_output( 0, "copy c1. memcpy( %p, %p, %lu ) => space %lu\n",
DO_DEBUG( orte_output( 0, "copy c1. memcpy( %p, %p, %lu ) => space %lu\n",
destination, source, (unsigned long)memcpy_chunk, (unsigned long)total_length ); );
MEMCPY( destination, source, memcpy_chunk );
destination += memcpy_chunk;
@ -180,7 +180,7 @@ int32_t ompi_ddt_copy_content_same_ddt( const ompi_datatype_t* datatype, int32_t
(unsigned char*)destination_base, datatype, count );
OMPI_DDT_SAFEGUARD_POINTER( source, datatype->size,
(unsigned char*)source_base, datatype, count );
DO_DEBUG( opal_output( 0, "copy c2. memcpy( %p, %p, %lu ) => space %lu\n",
DO_DEBUG( orte_output( 0, "copy c2. memcpy( %p, %p, %lu ) => space %lu\n",
destination, source, (unsigned long)datatype->size,
(unsigned long)(iov_len_local - (pos_desc * datatype->size)) ); );
MEMCPY( destination, source, datatype->size );
@ -218,7 +218,7 @@ int32_t ompi_ddt_copy_content_same_ddt( const ompi_datatype_t* datatype, int32_t
UPDATE_INTERNAL_COUNTERS( description, pos_desc, pElem, count_desc );
}
if( DT_END_LOOP == pElem->elem.common.type ) { /* end of the current loop */
DO_DEBUG( opal_output( 0, "copy end_loop count %d stack_pos %d pos_desc %d disp %ld space %lu\n",
DO_DEBUG( orte_output( 0, "copy end_loop count %d stack_pos %d pos_desc %d disp %ld space %lu\n",
(int)pStack->count, stack_pos, pos_desc, (long)pStack->disp, (unsigned long)iov_len_local ); );
if( --(pStack->count) == 0 ) { /* end of loop */
if( stack_pos == 0 ) {
@ -240,7 +240,7 @@ int32_t ompi_ddt_copy_content_same_ddt( const ompi_datatype_t* datatype, int32_t
source = (unsigned char*)source_base + pStack->disp;
destination = (unsigned char*)destination_base + pStack->disp;
UPDATE_INTERNAL_COUNTERS( description, pos_desc, pElem, count_desc );
DO_DEBUG( opal_output( 0, "copy new_loop count %d stack_pos %d pos_desc %d disp %ld space %lu\n",
DO_DEBUG( orte_output( 0, "copy new_loop count %d stack_pos %d pos_desc %d disp %ld space %lu\n",
(int)pStack->count, stack_pos, pos_desc, (long)pStack->disp, (unsigned long)iov_len_local ); );
}
if( DT_LOOP == pElem->elem.common.type ) {

4
ompi/datatype/dt_module.c
Просмотреть файл

@ -837,7 +837,7 @@ int32_t ompi_ddt_finalize( void )
#if defined(VERBOSE)
if( ompi_ddt_dfd != -1 )
opal_output_close( ompi_ddt_dfd );
orte_output_close( ompi_ddt_dfd );
ompi_ddt_dfd = -1;
#endif /* VERBOSE */
@ -999,7 +999,7 @@ void ompi_ddt_dump( const ompi_datatype_t* pData )
index += snprintf( buffer + index, length - index, "No optimized description\n" );
}
buffer[index] = '\0'; /* make sure we end the string with 0 */
opal_output( 0, "%s\n", buffer );
orte_output( 0, "%s\n", buffer );
ompi_ddt_print_args( pData );

2
ompi/datatype/fake_stack.c
Просмотреть файл

@ -60,7 +60,7 @@ int ompi_convertor_create_stack_with_pos_general( ompi_convertor_t* pConvertor,
assert( pConvertor->bConverted != starting_point );
assert( starting_point <=(pConvertor->count * pData->size) );
/*opal_output( 0, "Data extent %d size %d count %d total_size %d starting_point %d\n",
/*orte_output( 0, "Data extent %d size %d count %d total_size %d starting_point %d\n",
pData->ub - pData->lb, pData->size, pConvertor->count,
pConvertor->local_size, starting_point );*/
pConvertor->stack_pos = 0;

16
ompi/datatype/position.c
Просмотреть файл

@ -120,7 +120,7 @@ int ompi_convertor_generic_simple_position( ompi_convertor_t* pConvertor,
if( iov_len_local > pConvertor->pDesc->size ) {
pStack = pConvertor->pStack; /* we're working with the full stack */
count_desc = (uint32_t)(iov_len_local / pConvertor->pDesc->size);
DO_DEBUG( opal_output( 0, "position before %lu asked %lu data size %lu"
DO_DEBUG( orte_output( 0, "position before %lu asked %lu data size %lu"
" iov_len_local %lu count_desc %d\n",
(unsigned long)pConvertor->bConverted, (unsigned long)*position, (unsigned long)pConvertor->pDesc->size,
(unsigned long)iov_len_local, count_desc ); );
@ -133,7 +133,7 @@ int ompi_convertor_generic_simple_position( ompi_convertor_t* pConvertor,
pConvertor->bConverted += count_desc * pConvertor->pDesc->size;
iov_len_local = *position - pConvertor->bConverted;
pStack[0].count -= count_desc;
DO_DEBUG( opal_output( 0, "after bConverted %lu remaining count %lu iov_len_local %lu\n",
DO_DEBUG( orte_output( 0, "after bConverted %lu remaining count %lu iov_len_local %lu\n",
(unsigned long)pConvertor->bConverted, (unsigned long)pStack[0].count, (unsigned long)iov_len_local ); );
}
@ -146,14 +146,14 @@ int ompi_convertor_generic_simple_position( ompi_convertor_t* pConvertor,
pElem = &(description[pos_desc]);
base_pointer += pStack->disp;
DO_DEBUG( opal_output( 0, "position start pos_desc %d count_desc %d disp %llx\n"
DO_DEBUG( orte_output( 0, "position start pos_desc %d count_desc %d disp %llx\n"
"stack_pos %d pos_desc %d count_desc %d disp %llx\n",
pos_desc, count_desc, (unsigned long long)(base_pointer - pConvertor->pBaseBuf),
pConvertor->stack_pos, pStack->index, (int)pStack->count, (unsigned long long)pStack->disp ); );
while( 1 ) {
if( DT_END_LOOP == pElem->elem.common.type ) { /* end of the current loop */
DO_DEBUG( opal_output( 0, "position end_loop count %d stack_pos %d pos_desc %d disp %llx space %lu\n",
DO_DEBUG( orte_output( 0, "position end_loop count %d stack_pos %d pos_desc %d disp %llx space %lu\n",
(int)pStack->count, pConvertor->stack_pos, pos_desc,
(unsigned long long)pStack->disp, (unsigned long)iov_len_local ); );
if( --(pStack->count) == 0 ) { /* end of loop */
@ -176,7 +176,7 @@ int ompi_convertor_generic_simple_position( ompi_convertor_t* pConvertor,
}
base_pointer = pConvertor->pBaseBuf + pStack->disp;
UPDATE_INTERNAL_COUNTERS( description, pos_desc, pElem, count_desc );
DO_DEBUG( opal_output( 0, "position new_loop count %d stack_pos %d pos_desc %d disp %llx space %lu\n",
DO_DEBUG( orte_output( 0, "position new_loop count %d stack_pos %d pos_desc %d disp %llx space %lu\n",
(int)pStack->count, pConvertor->stack_pos, pos_desc,
(unsigned long long)pStack->disp, (unsigned long)iov_len_local ); );
}
@ -199,7 +199,7 @@ int ompi_convertor_generic_simple_position( ompi_convertor_t* pConvertor,
base_pointer = pConvertor->pBaseBuf + pStack->disp;
UPDATE_INTERNAL_COUNTERS( description, pos_desc, pElem, count_desc );
DDT_DUMP_STACK( pConvertor->pStack, pConvertor->stack_pos, pElem, "advance loop" );
DO_DEBUG( opal_output( 0, "position set loop count %d stack_pos %d pos_desc %d disp %llx space %lu\n",
DO_DEBUG( orte_output( 0, "position set loop count %d stack_pos %d pos_desc %d disp %llx space %lu\n",
(int)pStack->count, pConvertor->stack_pos, pos_desc,
(unsigned long long)pStack->disp, (unsigned long)iov_len_local ); );
continue;
@ -216,7 +216,7 @@ int ompi_convertor_generic_simple_position( ompi_convertor_t* pConvertor,
base_pointer = pConvertor->pBaseBuf + pStack->disp;
pos_desc++; /* advance to the next data */
UPDATE_INTERNAL_COUNTERS( description, pos_desc, pElem, count_desc );
DO_DEBUG( opal_output( 0, "position set loop count %d stack_pos %d pos_desc %d disp %llx space %lu\n",
DO_DEBUG( orte_output( 0, "position set loop count %d stack_pos %d pos_desc %d disp %llx space %lu\n",
(int)pStack->count, pConvertor->stack_pos, pos_desc,
(unsigned long long)pStack->disp, (unsigned long)iov_len_local ); );
}
@ -228,7 +228,7 @@ int ompi_convertor_generic_simple_position( ompi_convertor_t* pConvertor,
/* I complete an element, next step I should go to the next one */
PUSH_STACK( pStack, pConvertor->stack_pos, pos_desc, DT_BYTE, count_desc,
base_pointer - pStack->disp - pConvertor->pBaseBuf );
DO_DEBUG( opal_output( 0, "position save stack stack_pos %d pos_desc %d count_desc %d disp %llx\n",
DO_DEBUG( orte_output( 0, "position save stack stack_pos %d pos_desc %d count_desc %d disp %llx\n",
pConvertor->stack_pos, pStack->index, (int)pStack->count, (unsigned long long)pStack->disp ); );
return 0;
}

6
ompi/errhandler/errhandler_predefined.c
Просмотреть файл

@ -21,7 +21,7 @@
#include <stdlib.h>
#include <stdarg.h>
#include "opal/util/output.h"
#include "orte/util/output.h"
#include "ompi/errhandler/errhandler.h"
#include "ompi/errhandler/errhandler_predefined.h"
#include "ompi/errhandler/errcode.h"
@ -139,9 +139,9 @@ static void out(char *str, char *arg)
{
if (ompi_mpi_initialized && !ompi_mpi_finalized) {
if (NULL != arg) {
opal_output(0, str, arg);
orte_output(0, str, arg);
} else {
opal_output(0, str);
orte_output(0, str);
}
} else {
if (NULL != arg) {

4
ompi/file/file.c
Просмотреть файл

@ -24,7 +24,7 @@
#include "ompi/runtime/params.h"
#include "ompi/mca/io/base/base.h"
#include "ompi/info/info.h"
#include "opal/util/output.h"
#include "orte/util/output.h"
/*
* Table for Fortran <-> C file handle conversion
@ -200,7 +200,7 @@ int ompi_file_finalize(void)
we're destroying everything, it isn't worth it */
}
if (num_unnamed > 0) {
opal_output(0, "WARNING: %lu unnamed MPI_File handles still allocated at MPI_FINALIZE", (unsigned long)num_unnamed);
orte_output(0, "WARNING: %lu unnamed MPI_File handles still allocated at MPI_FINALIZE", (unsigned long)num_unnamed);
}
OBJ_DESTRUCT(&ompi_file_f_to_c_table);

4
ompi/group/group.h
Просмотреть файл

@ -28,7 +28,7 @@
#ifndef OMPI_GROUP_H
#define OMPI_GROUP_H
#include "opal/util/output.h"
#include "orte/util/output.h"
#include "mpi.h"
#include "opal/class/opal_pointer_array.h"
#if defined(c_plusplus) || defined(__cplusplus)
@ -310,7 +310,7 @@ static inline struct ompi_proc_t* ompi_group_peer_lookup(ompi_group_t *group, in
{
#if OMPI_ENABLE_DEBUG
if (peer_id >= group->grp_proc_count) {
opal_output(0, "ompi_group_lookup_peer: invalid peer index (%d)", peer_id);
orte_output(0, "ompi_group_lookup_peer: invalid peer index (%d)", peer_id);
return (struct ompi_proc_t *) NULL;
}
#endif

8
ompi/info/info.c
Просмотреть файл

@ -33,7 +33,7 @@
#include "ompi/constants.h"
#include "ompi/info/info.h"
#include "ompi/runtime/params.h"
#include "opal/util/output.h"
#include "orte/util/output.h"
/*
@ -378,12 +378,12 @@ int ompi_info_finalize(void)
if (!info->i_freed && ompi_debug_show_handle_leaks) {
if (ompi_debug_show_handle_leaks) {
opal_output(0, "WARNING: MPI_Info still allocated at MPI_FINALIZE");
orte_output(0, "WARNING: MPI_Info still allocated at MPI_FINALIZE");
for (item = opal_list_get_first(&(info->super));
opal_list_get_end(&(info->super)) != item;
item = opal_list_get_next(item)) {
entry = (ompi_info_entry_t *) item;
opal_output(0, "WARNING: key=\"%s\", value=\"%s\"",
orte_output(0, "WARNING: key=\"%s\", value=\"%s\"",
entry->ie_key,
NULL != entry->ie_value ? entry->ie_value : "(null)");
found = true;
@ -397,7 +397,7 @@ int ompi_info_finalize(void)
since we're destroying everything, it isn't worth it */
if (!found && ompi_debug_show_handle_leaks) {
opal_output(0, "WARNING: (no keys)");
orte_output(0, "WARNING: (no keys)");
}
}
}

2
ompi/mca/allocator/basic/allocator_basic.c
Просмотреть файл

@ -18,7 +18,7 @@
*/
#include "ompi_config.h"
#include "opal/util/output.h"
#include "orte/util/output.h"
#include "allocator_basic.h"
#include "ompi/constants.h"

4
ompi/mca/bml/base/bml_base_btl.c
Просмотреть файл

@ -108,7 +108,7 @@ int mca_bml_base_send( mca_bml_base_btl_t* bml_btl,
}
if(mca_bml_base_error_count % 2) {
/* local completion - network "drops" packet */
opal_output(0, "%s:%d: dropping data, with local completion\n", __FILE__, __LINE__);
orte_output(0, "%s:%d: dropping data, with local completion\n", __FILE__, __LINE__);
des->des_cbfunc(bml_btl->btl, bml_btl->btl_endpoint, des, OMPI_SUCCESS);
return OMPI_SUCCESS;
} else {
@ -116,7 +116,7 @@ int mca_bml_base_send( mca_bml_base_btl_t* bml_btl,
mca_bml_base_context_t* ctx = (mca_bml_base_context_t*)
malloc(sizeof(mca_bml_base_context_t));
if(NULL != ctx) {
opal_output(0, "%s:%d: corrupting data\n", __FILE__, __LINE__);
orte_output(0, "%s:%d: corrupting data\n", __FILE__, __LINE__);
ctx->index = (size_t) ((des->des_src[0].seg_len * rand() * 1.0) / (RAND_MAX + 1.0));
ctx->cbfunc = des->des_cbfunc;
ctx->cbdata = des->des_cbdata;

2
ompi/mca/bml/base/bml_base_btl.h
Просмотреть файл

@ -24,7 +24,7 @@
#include "opal/mca/mca.h"
#include "ompi/mca/bml/bml.h"
#include "opal/util/output.h"
#include "orte/util/output.h"
/*
* Global functions for the BML

2
ompi/mca/bml/base/bml_base_endpoint.h
Просмотреть файл

@ -24,7 +24,7 @@
#include "opal/mca/mca.h"
#include "ompi/mca/bml/bml.h"
#include "opal/util/output.h"
#include "orte/util/output.h"
#include "opal/threads/mutex.h"
#include "bml_base_btl.h"

2
ompi/mca/bml/base/bml_base_init.c
Просмотреть файл

@ -67,7 +67,7 @@ int mca_bml_base_init( bool enable_progress_threads,
cli = (mca_base_component_list_item_t*) item;
component = (mca_bml_base_component_t*) cli->cli_component;
if(NULL == component->bml_init) {
opal_output_verbose( 10, mca_bml_base_output,
orte_output_verbose( 10, mca_bml_base_output,
"select: no init function; ignoring component %s",
component->bml_version.mca_component_name );
continue;

6
ompi/mca/bml/bml.h
Просмотреть файл

@ -133,7 +133,7 @@ static inline mca_bml_base_btl_t* mca_bml_base_btl_array_insert(mca_bml_base_btl
{
#if OMPI_ENABLE_DEBUG
if(array->arr_size >= array->arr_reserve) {
opal_output(0, "mca_bml_base_btl_array_insert: invalid array index %lu >= %lu",
orte_output(0, "mca_bml_base_btl_array_insert: invalid array index %lu >= %lu",
(unsigned long)array->arr_size, (unsigned long)array->arr_reserve);
return 0;
}
@ -179,7 +179,7 @@ static inline mca_bml_base_btl_t* mca_bml_base_btl_array_get_index(mca_bml_base_
{
#if OMPI_ENABLE_DEBUG
if(item_index >= array->arr_size) {
opal_output(0, "mca_bml_base_btl_array_get_index: invalid array index %lu >= %lu",
orte_output(0, "mca_bml_base_btl_array_get_index: invalid array index %lu >= %lu",
(unsigned long)item_index, (unsigned long)array->arr_size);
return 0;
}
@ -198,7 +198,7 @@ static inline mca_bml_base_btl_t* mca_bml_base_btl_array_get_next(mca_bml_base_b
{
#if OMPI_ENABLE_DEBUG
if(array->arr_size == 0) {
opal_output(0, "mca_bml_base_btl_array_get_next: invalid array size");
orte_output(0, "mca_bml_base_btl_array_get_next: invalid array size");
return 0;
}
#endif

12
ompi/mca/bml/r2/bml_r2.c
Просмотреть файл

@ -23,7 +23,7 @@
#include <stdlib.h>
#include <string.h>
#include "opal/util/show_help.h"
#include "orte/util/output.h"
#include "ompi/class/ompi_bitmap.h"
#include "ompi/mca/bml/bml.h"
#include "ompi/mca/bml/base/base.h"
@ -244,7 +244,7 @@ int mca_bml_r2_add_procs(
/* allocate bml specific proc data */
bml_endpoint = OBJ_NEW(mca_bml_base_endpoint_t);
if (NULL == bml_endpoint) {
opal_output(0, "mca_bml_r2_add_procs: unable to allocate resources");
orte_output(0, "mca_bml_r2_add_procs: unable to allocate resources");
free(btl_endpoints);
return OMPI_ERR_OUT_OF_RESOURCE;
}
@ -299,14 +299,14 @@ int mca_bml_r2_add_procs(
bml_btl->btl_flags = btl->btl_flags;
bml_btl->btl_put = btl->btl_put;
if( (bml_btl->btl_flags & MCA_BTL_FLAGS_PUT) && (NULL == bml_btl->btl_put) ) {
opal_output(0, "mca_bml_r2_add_procs: The PUT flag is specified for"
orte_output(0, "mca_bml_r2_add_procs: The PUT flag is specified for"
" the %s BTL without any PUT function attached. Disard the flag !",
bml_btl->btl->btl_component->btl_version.mca_component_name);
bml_btl->btl_flags ^= MCA_BTL_FLAGS_PUT;
}
bml_btl->btl_get = btl->btl_get;
if( (bml_btl->btl_flags & MCA_BTL_FLAGS_GET) && (NULL == bml_btl->btl_get) ) {
opal_output(0, "mca_bml_r2_add_procs: The GET flag is specified for"
orte_output(0, "mca_bml_r2_add_procs: The GET flag is specified for"
" the %s BTL without any GET function attached. Disard the flag !",
bml_btl->btl->btl_component->btl_version.mca_component_name);
bml_btl->btl_flags ^= MCA_BTL_FLAGS_GET;
@ -460,7 +460,7 @@ int mca_bml_r2_add_procs(
remote = strdup("Unknown");
}
opal_show_help("help-mca-bml-r2",
orte_show_help("help-mca-bml-r2",
"unreachable proc",
true, local, remote, NULL);
@ -607,7 +607,7 @@ int mca_bml_r2_del_btl(mca_btl_base_module_t* btl)
return OMPI_SUCCESS;
if(opal_list_get_size(&mca_btl_base_modules_initialized) == 2){
opal_output(0, "only one BTL left, can't failover");
orte_output(0, "only one BTL left, can't failover");
goto CLEANUP;
}

18
ompi/mca/bml/r2/bml_r2_ft.c
Просмотреть файл

@ -23,7 +23,7 @@
#include <stdlib.h>
#include <string.h>
#include "opal/util/show_help.h"
#include "orte/util/output.h"
#include "ompi/runtime/ompi_cr.h"
#include "ompi/class/ompi_bitmap.h"
#include "ompi/mca/bml/bml.h"
@ -99,7 +99,7 @@ int mca_bml_r2_ft_event(int state)
*/
if( NULL != (mca_bml_r2.btl_modules[btl_idx])->btl_mpool &&
NULL != (mca_bml_r2.btl_modules[btl_idx])->btl_mpool->mpool_ft_event ) {
opal_output_verbose(10, ompi_cr_output,
orte_output_verbose(10, ompi_cr_output,
"bml:r2: ft_event: Notify the %s MPool.\n",
(mca_bml_r2.btl_modules[btl_idx])->btl_mpool->mpool_component->mpool_version.mca_component_name);
if(OMPI_SUCCESS != (ret = (mca_bml_r2.btl_modules[btl_idx])->btl_mpool->mpool_ft_event(loc_state) ) ) {
@ -111,7 +111,7 @@ int mca_bml_r2_ft_event(int state)
* Notify BTL
*/
if( NULL != (mca_bml_r2.btl_modules[btl_idx])->btl_ft_event) {
opal_output_verbose(10, ompi_cr_output,
orte_output_verbose(10, ompi_cr_output,
"bml:r2: ft_event: Notify the %s BTL.\n",
(mca_bml_r2.btl_modules[btl_idx])->btl_component->btl_version.mca_component_name);
if(OMPI_SUCCESS != (ret = (mca_bml_r2.btl_modules[btl_idx])->btl_ft_event(loc_state) ) ) {
@ -140,7 +140,7 @@ int mca_bml_r2_ft_event(int state)
mca_bml_r2.btl_progress = NULL;
}
opal_output_verbose(10, ompi_cr_output,
orte_output_verbose(10, ompi_cr_output,
"bml:r2: ft_event(Restart): Reselect BTLs\n");
/*
@ -152,7 +152,7 @@ int mca_bml_r2_ft_event(int state)
* are not available now.
*/
if( OMPI_SUCCESS != (ret = mca_btl_base_close())) {
opal_output(0, "bml:r2: ft_event(Restart): Failed to close BTL framework\n");
orte_output(0, "bml:r2: ft_event(Restart): Failed to close BTL framework\n");
return ret;
}
@ -164,11 +164,11 @@ int mca_bml_r2_ft_event(int state)
* we try to remove some restart only files.
*/
if (OMPI_SUCCESS != (ret = orte_grpcomm.barrier())) {
opal_output(0, "bml:r2: ft_event(Restart): Failed in orte_grpcomm.barrier (%d)", ret);
orte_output(0, "bml:r2: ft_event(Restart): Failed in orte_grpcomm.barrier (%d)", ret);
return ret;
}
opal_output_verbose(10, ompi_cr_output,
orte_output_verbose(10, ompi_cr_output,
"bml:r2: ft_event(Restart): Cleanup restart files\n");
opal_crs_base_cleanup_flush();
@ -176,7 +176,7 @@ int mca_bml_r2_ft_event(int state)
* Re-open the BTL framework to get the full list of components.
*/
if( OMPI_SUCCESS != (ret = mca_btl_base_open()) ) {
opal_output(0, "bml:r2: ft_event(Restart): Failed to open BTL framework\n");
orte_output(0, "bml:r2: ft_event(Restart): Failed to open BTL framework\n");
return ret;
}
@ -187,7 +187,7 @@ int mca_bml_r2_ft_event(int state)
*/
if( OMPI_SUCCESS != (ret = mca_btl_base_select(OMPI_ENABLE_PROGRESS_THREADS,
OMPI_ENABLE_MPI_THREADS) ) ) {
opal_output(0, "bml:r2: ft_event(Restart): Failed to select in BTL framework\n");
orte_output(0, "bml:r2: ft_event(Restart): Failed to select in BTL framework\n");
return ret;
}

2
ompi/mca/bml/r2/bml_r2_ft.h
Просмотреть файл

@ -21,7 +21,7 @@
#ifndef MCA_BML_R2_FT_H
#define MCA_BML_R2_FT_H
#include "opal/util/output.h"
#include "orte/util/output.h"
#include "ompi/mca/btl/btl.h"
#if defined(c_plusplus) || defined(__cplusplus)

4
ompi/mca/btl/base/btl_base_error.c
Просмотреть файл

@ -24,8 +24,8 @@
#include "base.h"
#include "btl_base_error.h"
#include "opal/util/show_help.h"
#include "orte/util/output.h"
#include "orte/util/proc_info.h"
#include "orte/types.h"
#include "orte/util/name_fns.h"
@ -65,7 +65,7 @@ void mca_btl_base_error_no_nics(const char* transport,
/* print out no-nic warning if user told us to */
asprintf(&procid, "%s", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME));
opal_show_help("help-mpi-btl-base.txt", "btl:no-nics",
orte_show_help("help-mpi-btl-base.txt", "btl:no-nics",
true, procid, transport, orte_process_info.nodename,
nic_name);
free(procid);

3
ompi/mca/btl/base/btl_base_error.h
Просмотреть файл

@ -9,7 +9,7 @@
* 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 (c) 2007-2008 Cisco Systems, Inc. All rights reserved.
* Copyright (c) 2007 Sun Microsystems, Inc. All rights reserved.
* $COPYRIGHT$
*
@ -28,6 +28,7 @@
#include "orte/util/proc_info.h"
#include "orte/util/name_fns.h"
#include "orte/util/output.h"
#include "orte/runtime/orte_globals.h"
OMPI_DECLSPEC extern int mca_btl_base_verbose;

7
ompi/mca/btl/base/btl_base_mca.c
Просмотреть файл

@ -24,6 +24,9 @@
#include <stdio.h>
#include "opal/mca/base/mca_base_param.h"
#include "orte/util/output.h"
#include "ompi/mca/btl/btl.h"
#include "ompi/mca/btl/base/base.h"
@ -72,7 +75,7 @@ int mca_btl_base_param_register(mca_base_component_t *version,
mca_base_param_reg_int(version, "min_rdma_size", "", true, false,
0, &value);
if(value != 0) {
opal_output(0, "min_rdma_size BTL parameter is deprecated. Please "
orte_output(0, "min_rdma_size BTL parameter is deprecated. Please "
"use the rdma_pipeline_send_length BTL parameter instead\n");
module->btl_rdma_pipeline_send_length = (size_t)value;
}
@ -85,7 +88,7 @@ int mca_btl_base_param_register(mca_base_component_t *version,
mca_base_param_reg_int(version, "max_rdma_size", "", true, false,
0, &value);
if (0 != value) {
opal_output(0, "The max_rdma_size BTL parameter is deprecated. Please use the rdma_pipeline_frag_size BTL parameter instead");
orte_output(0, "The max_rdma_size BTL parameter is deprecated. Please use the rdma_pipeline_frag_size BTL parameter instead");
module->btl_rdma_pipeline_frag_size = (size_t)value;
}

9
ompi/mca/btl/base/btl_base_open.c
Просмотреть файл

@ -23,7 +23,10 @@
#include "opal/mca/mca.h"
#include "opal/mca/base/base.h"
#include "opal/util/output.h"
#include "orte/util/output.h"
#include "orte/util/output.h"
#include "opal/mca/base/mca_base_param.h"
#include "ompi/mca/pml/pml.h"
#include "ompi/mca/btl/btl.h"
@ -94,8 +97,8 @@ int mca_btl_base_open(void)
0,
&mca_btl_base_verbose);
mca_btl_base_output = opal_output_open(NULL);
opal_output_set_verbosity(mca_btl_base_output, mca_btl_base_verbose);
mca_btl_base_output = orte_output_open(NULL, "BTL", "DEBUG", NULL);
orte_output_set_verbosity(mca_btl_base_output, mca_btl_base_verbose);
/* Open up all available components */

15
ompi/mca/btl/base/btl_base_select.c
Просмотреть файл

@ -20,8 +20,7 @@
#include "ompi_config.h"
#include "opal/util/argv.h"
#include "opal/util/show_help.h"
#include "opal/util/output.h"
#include "orte/util/output.h"
#include "opal/mca/mca.h"
#include "opal/mca/base/base.h"
#include "opal/mca/base/mca_base_component_repository.h"
@ -99,12 +98,12 @@ int mca_btl_base_select(bool enable_progress_threads,
}
}
opal_output_verbose(10, mca_btl_base_output,
orte_output_verbose(10, mca_btl_base_output,
"select: initializing %s component %s",
component->btl_version.mca_type_name,
component->btl_version.mca_component_name);
if (NULL == component->btl_init) {
opal_output_verbose(10, mca_btl_base_output,
orte_output_verbose(10, mca_btl_base_output,
"select: no init function; ignoring component %s",
component->btl_version.mca_component_name);
} else {
@ -115,10 +114,10 @@ int mca_btl_base_select(bool enable_progress_threads,
list and remove it from the component repository */
if (NULL == modules) {
opal_output_verbose(10, mca_btl_base_output,
orte_output_verbose(10, mca_btl_base_output,
"select: init of component %s returned failure",
component->btl_version.mca_component_name);
opal_output_verbose(10, mca_btl_base_output,
orte_output_verbose(10, mca_btl_base_output,
"select: module %s unloaded",
component->btl_version.mca_component_name);
@ -129,7 +128,7 @@ int mca_btl_base_select(bool enable_progress_threads,
/* Otherwise, it initialized properly. Save it. */
else {
opal_output_verbose(10, mca_btl_base_output,
orte_output_verbose(10, mca_btl_base_output,
"select: init of component %s returned success",
component->btl_version.mca_component_name);
@ -152,7 +151,7 @@ int mca_btl_base_select(bool enable_progress_threads,
/* Finished querying all components. Check for the bozo case. */
if (0 == opal_list_get_size(&mca_btl_base_modules_initialized)) {
opal_show_help("help-mca-base.txt", "find-available:none-found", true,
orte_show_help("help-mca-base.txt", "find-available:none-found", true,
"btl");
orte_errmgr.abort(1, NULL);
}

8
ompi/mca/btl/elan/btl_elan.c
Просмотреть файл

@ -10,7 +10,7 @@
*/
#include "ompi_config.h"
#include "opal/util/output.h"
#include "orte/util/output.h"
#include "opal/util/if.h"
#include "ompi/mca/pml/pml.h"
#include "ompi/mca/btl/btl.h"
@ -471,7 +471,7 @@ static int mca_btl_elan_send( struct mca_btl_base_module_t* btl,
(void*)elan_hdr,
send_len, ELAN_RAIL_ALL );
if( OPAL_UNLIKELY(NULL == frag->elan_event) ) {
opal_output( 0, "elan_queueTx failed for destination %d\n", endpoint->elan_vp );
orte_output( 0, "elan_queueTx failed for destination %d\n", endpoint->elan_vp );
return OMPI_ERROR;
}
} else {
@ -479,7 +479,7 @@ static int mca_btl_elan_send( struct mca_btl_base_module_t* btl,
elan_btl->elan_vp, frag->tag,
(void*)elan_hdr, frag->segment.seg_len );
if( OPAL_UNLIKELY(NULL == frag->elan_event) ) {
opal_output( 0, "elan_tportTxStart failed for destination %d\n", endpoint->elan_vp );
orte_output( 0, "elan_tportTxStart failed for destination %d\n", endpoint->elan_vp );
return OMPI_ERROR;
}
}
@ -554,7 +554,7 @@ static int mca_btl_elan_get( mca_btl_base_module_t* btl,
frag->endpoint = endpoint;
frag->btl = elan_btl;
frag->type = MCA_BTL_ELAN_HDR_TYPE_GET;
opal_output( 0, "elan_get( remote %p, local %p, length %d, peer %d )\n",
orte_output( 0, "elan_get( remote %p, local %p, length %d, peer %d )\n",
(void*)src_addr, (void*)dst_addr, (int)src_len, peer );
frag->elan_event = elan_get(elan_btl->base->state, src_addr, dst_addr, src_len, peer);
/* Add the fragment to the pending RDMA list */

2
ompi/mca/btl/elan/btl_elan.h
Просмотреть файл

@ -23,7 +23,7 @@
#include "opal/event/event.h"
#include "ompi/mca/pml/pml.h"
#include "ompi/mca/btl/btl.h"
#include "opal/util/output.h"
#include "orte/util/output.h"
#include "ompi/mca/btl/base/btl_base_error.h"
#include "ompi/mca/btl/btl.h"

6
ompi/mca/btl/elan/btl_elan_component.c
Просмотреть файл

@ -15,7 +15,7 @@
#include "opal/event/event.h"
#include "opal/util/if.h"
#include "opal/util/argv.h"
#include "opal/util/output.h"
#include "orte/util/output.h"
#include "ompi/mca/pml/pml.h"
#include "ompi/mca/btl/btl.h"
@ -231,13 +231,13 @@ mca_btl_elan_component_init( int *num_btl_modules,
}
}
if( 0 == fscanf( position, "%s%i", file_line, &positions[count] ) ) {
opal_output( 0, "Unable to read the network position" );
orte_output( 0, "Unable to read the network position" );
continue;
}
fclose(position);
btl = (mca_btl_elan_module_t*)malloc (sizeof (mca_btl_elan_module_t));
if(NULL == btl) {
opal_output( 0, "No enough memory to allocate the Elan internal structures" );
orte_output( 0, "No enough memory to allocate the Elan internal structures" );
return NULL;
}
memcpy( btl, &mca_btl_elan_module, sizeof(mca_btl_elan_module_t) );

8
ompi/mca/btl/gm/btl_gm.c
Просмотреть файл

@ -19,7 +19,7 @@
#include "ompi_config.h"
#include <string.h>
#include "opal/util/output.h"
#include "orte/util/output.h"
#include "opal/util/if.h"
#include "ompi/mca/pml/pml.h"
#include "ompi/mca/btl/btl.h"
@ -484,7 +484,7 @@ static void mca_btl_gm_send_callback( struct gm_port* port, void* context, gm_st
default:
/* error condition can't deal with */
opal_output(0, "[%s:%d] send completed with unhandled gm error %d\n", __FILE__,__LINE__,status);
orte_output(0, "[%s:%d] send completed with unhandled gm error %d\n", __FILE__,__LINE__,status);
/* release the send token */
OPAL_THREAD_ADD32( &btl->gm_num_send_tokens, 1 );
@ -678,7 +678,7 @@ static void mca_btl_gm_put_callback( struct gm_port* port, void* context, gm_sta
break;
default:
/* error condition can't deal with */
opal_output(0, "[%s:%d] gm_put operation failed with status %d\n", __FILE__, __LINE__, status);
orte_output(0, "[%s:%d] gm_put operation failed with status %d\n", __FILE__, __LINE__, status);
/* release the send token */
OPAL_THREAD_ADD32( &btl->gm_num_send_tokens, 1 );
@ -832,7 +832,7 @@ static void mca_btl_gm_get_callback( struct gm_port* port, void* context, gm_sta
break;
default:
/* error condition can't deal with */
opal_output(0, "[%s:%d] gm_get operation failed with status %d\n", __FILE__, __LINE__, status);
orte_output(0, "[%s:%d] gm_get operation failed with status %d\n", __FILE__, __LINE__, status);
/* release the send token */
OPAL_THREAD_ADD32( &btl->gm_num_send_tokens, 1 );

2
ompi/mca/btl/gm/btl_gm.h
Просмотреть файл

@ -34,7 +34,7 @@
#include "ompi/mca/pml/pml.h"
#include "ompi/mca/btl/btl.h"
#include "ompi/mca/btl/base/base.h"
#include "opal/util/output.h"
#include "orte/util/output.h"
#include "ompi/mca/mpool/mpool.h"
#include "ompi/mca/btl/btl.h"
#include "btl_gm_endpoint.h"

26
ompi/mca/btl/gm/btl_gm_component.c
Просмотреть файл

@ -23,7 +23,7 @@
#include "opal/event/event.h"
#include "opal/util/if.h"
#include "opal/util/argv.h"
#include "opal/util/output.h"
#include "orte/util/output.h"
#include "ompi/mca/pml/pml.h"
#include "ompi/mca/btl/btl.h"
#include "ompi/request/request.h"
@ -220,7 +220,7 @@ static int gm_dereg_mr(void *reg_data, mca_mpool_base_registration_t *reg)
rc = gm_deregister_memory(port, reg->base, reg->bound - reg->base + 1);
if(rc != GM_SUCCESS) {
opal_output(0, "%s: error unpinning gm memory errno says %s\n",
orte_output(0, "%s: error unpinning gm memory errno says %s\n",
__func__, strerror(errno));
return OMPI_ERROR;
}
@ -278,7 +278,7 @@ mca_btl_gm_module_init (mca_btl_gm_module_t * btl)
&btl->super,
&resources);
if(NULL == btl->super.btl_mpool) {
opal_output (0, "[%s:%d] unable to initialize mpool", __FILE__, __LINE__);
orte_output (0, "[%s:%d] unable to initialize mpool", __FILE__, __LINE__);
return OMPI_ERROR;
}
@ -349,7 +349,7 @@ mca_btl_gm_module_init (mca_btl_gm_module_t * btl)
/* enable rdma */
if( GM_SUCCESS != gm_allow_remote_memory_access (btl->port) ) {
opal_output (0, "[%s:%d] unable to allow remote memory access", __FILE__, __LINE__);
orte_output (0, "[%s:%d] unable to allow remote memory access", __FILE__, __LINE__);
return OMPI_ERROR;
}
@ -359,7 +359,7 @@ mca_btl_gm_module_init (mca_btl_gm_module_t * btl)
btl->gm_thread.t_run = mca_btl_gm_progress_thread;
btl->gm_thread.t_arg = btl;
if(OPAL_SUCCESS != (rc = opal_thread_start(&btl->gm_thread))) {
opal_output (0, "[%s:%d] unable to create progress thread, retval=%d", __FILE__, __LINE__, rc);
orte_output (0, "[%s:%d] unable to create progress thread, retval=%d", __FILE__, __LINE__, rc);
return rc;
}
#endif
@ -402,18 +402,18 @@ static int mca_btl_gm_discover( void )
/* Get node local Id */
if( GM_SUCCESS != gm_get_node_id( port, &node_id) ) {
opal_output (0, " failure to get node_id \n");
orte_output (0, " failure to get node_id \n");
continue;
}
/* Gather an unique id for the node */
#if GM_API_VERSION > 0x200
if (GM_SUCCESS != gm_node_id_to_global_id( port, node_id, &global_id) ) {
opal_output (0, "[%s:%d] Unable to get my GM global unique id", __FILE__, __LINE__);
orte_output (0, "[%s:%d] Unable to get my GM global unique id", __FILE__, __LINE__);
continue;
}
#else
if( GM_SUCCESS != gm_get_host_name( port, global_id ) ) {
opal_output( 0, "[%s:%d] Unable to get the GM host name\n", __FILE__, __LINE__);
orte_output( 0, "[%s:%d] Unable to get the GM host name\n", __FILE__, __LINE__);
continue;
}
#endif /* GM_API_VERSION > 0x200 */
@ -421,7 +421,7 @@ static int mca_btl_gm_discover( void )
/* create the btl module */
btl = (mca_btl_gm_module_t *)malloc( sizeof(mca_btl_gm_module_t) );
if (NULL == btl) {
opal_output( 0, "[%s:%d] out of resources", __FILE__, __LINE__);
orte_output( 0, "[%s:%d] out of resources", __FILE__, __LINE__);
return OMPI_ERR_OUT_OF_RESOURCE;
}
/* copy the basic informations into the new BTL */
@ -438,7 +438,7 @@ static int mca_btl_gm_discover( void )
#endif /* GM_API_VERSION > 0x200 */
if(mca_btl_gm_component.gm_debug > 0) {
opal_output(0,
orte_output(0,
"%s gm_port %08lX, "
"board %" PRIu32 ", global %" PRIu32 " "
"node %" PRIu32 "port %" PRIu32 "\n",
@ -447,7 +447,7 @@ static int mca_btl_gm_discover( void )
}
if((rc = mca_btl_gm_module_init(btl)) != OMPI_SUCCESS) {
opal_output(0, "[%s:%d] unable to initialze gm port", __FILE__, __LINE__);
orte_output(0, "[%s:%d] unable to initialze gm port", __FILE__, __LINE__);
return rc;
}
@ -511,7 +511,7 @@ mca_btl_gm_component_init (int *num_btl_modules,
/* try to initialize GM */
if( GM_SUCCESS != gm_init() ) {
opal_output( 0, "[%s:%d] error in initializing the gm library\n", __FILE__, __LINE__ );
orte_output( 0, "[%s:%d] error in initializing the gm library\n", __FILE__, __LINE__ );
mca_btl_gm_component.gm_num_btls = 0;
mca_btl_gm_modex_send();
OPAL_THREAD_UNLOCK(&mca_btl_gm_component.gm_lock);
@ -521,7 +521,7 @@ mca_btl_gm_component_init (int *num_btl_modules,
/* First discover all available boards. For each board we create a unique BTL */
mca_btl_gm_component.gm_btls = malloc( mca_btl_gm_component.gm_max_btls * sizeof (mca_btl_gm_module_t *));
if (NULL == mca_btl_gm_component.gm_btls) {
opal_output( 0, "[%s:%d] out of resources.", __FILE__, __LINE__ );
orte_output( 0, "[%s:%d] out of resources.", __FILE__, __LINE__ );
OPAL_THREAD_UNLOCK(&mca_btl_gm_component.gm_lock);
return NULL;
}

10
ompi/mca/btl/gm/btl_gm_proc.c
Просмотреть файл

@ -131,14 +131,14 @@ mca_btl_gm_proc_t* mca_btl_gm_proc_create(ompi_proc_t* ompi_proc)
(void*)&gm_proc->proc_addrs,
&size);
if(OMPI_SUCCESS != rc) {
opal_output(0, "[%s:%d] ompi_modex_recv failed for peer %s",
orte_output(0, "[%s:%d] ompi_modex_recv failed for peer %s",
__FILE__,__LINE__,ORTE_NAME_PRINT(&ompi_proc->proc_name));
OBJ_RELEASE(gm_proc);
return NULL;
}
if((size % sizeof(mca_btl_gm_addr_t)) != 0) {
opal_output(0, "[%s:%d] invalid gm address for peer %s",
orte_output(0, "[%s:%d] invalid gm address for peer %s",
__FILE__,__LINE__,ORTE_NAME_PRINT(&ompi_proc->proc_name));
OBJ_RELEASE(gm_proc);
return NULL;
@ -187,12 +187,12 @@ int mca_btl_gm_proc_insert(
gm_btl->port,
gm_endpoint->endpoint_addr.global_id,
&gm_endpoint->endpoint_addr.node_id)) {
opal_output( 0, "[%s:%d] error in converting global to local id \n",
orte_output( 0, "[%s:%d] error in converting global to local id \n",
__FILE__, __LINE__ );
return OMPI_ERROR;
}
if(mca_btl_gm_component.gm_debug > 0) {
opal_output(0, "%s mapped global id %" PRIu32
orte_output(0, "%s mapped global id %" PRIu32
" to node id %" PRIu32 "\n",
ORTE_NAME_PRINT(ORTE_PROC_MY_NAME),
gm_endpoint->endpoint_addr.global_id,
@ -202,7 +202,7 @@ int mca_btl_gm_proc_insert(
gm_endpoint->endpoint_addr.node_id = gm_host_name_to_node_id( gm_btl->port,
gm_endpoint->endpoint_addr.global_id);
if( GM_NO_SUCH_NODE_ID == gm_endpoint->endpoint_addr.node_id ) {
opal_output( 0, "[%s:%d] unable to convert the remote host name (%s) to a host id",
orte_output( 0, "[%s:%d] unable to convert the remote host name (%s) to a host id",
__FILE__, __LINE__, gm_endpoint->endpoint_addr.global_id);
return OMPI_ERROR;
}

18
ompi/mca/btl/mx/btl_mx.c
Просмотреть файл

@ -95,7 +95,7 @@ int mca_btl_mx_del_procs( struct mca_btl_base_module_t* btl,
struct ompi_proc_t** procs,
struct mca_btl_base_endpoint_t** peers )
{
opal_output( 0, "MX BTL delete procs\n" );
orte_output( 0, "MX BTL delete procs\n" );
/* TODO */
return OMPI_SUCCESS;
}
@ -121,7 +121,7 @@ int mca_btl_mx_register( struct mca_btl_base_module_t* btl,
for( i = 0; i < mca_btl_mx_component.mx_max_posted_recv; i++ ) {
MCA_BTL_MX_FRAG_ALLOC_EAGER( mx_btl, frag, rc );
if( NULL == frag ) {
opal_output( 0, "mca_btl_mx_register: unable to allocate more eager fragments\n" );
orte_output( 0, "mca_btl_mx_register: unable to allocate more eager fragments\n" );
if( 0 == i ) {
return OMPI_ERROR;
}
@ -140,7 +140,7 @@ int mca_btl_mx_register( struct mca_btl_base_module_t* btl,
0x01ULL, BTL_MX_RECV_MASK,
frag, &(frag->mx_request) );
if( MX_SUCCESS != mx_return ) {
opal_output( 0, "mca_btl_mx_register: mx_irecv failed with status %d (%s)\n",
orte_output( 0, "mca_btl_mx_register: mx_irecv failed with status %d (%s)\n",
mx_return, mx_strerror(mx_return) );
MCA_BTL_MX_FRAG_RETURN( mx_btl, frag );
return OMPI_ERROR;
@ -323,7 +323,7 @@ mca_btl_base_descriptor_t* mca_btl_mx_prepare_dst( struct mca_btl_base_module_t*
frag->segment[0].seg_key.key64,
BTL_MX_PUT_MASK, NULL, &(frag->mx_request) );
if( OPAL_UNLIKELY(MX_SUCCESS != mx_return) ) {
opal_output( 0, "Fail to re-register a fragment with the MX NIC ...\n" );
orte_output( 0, "Fail to re-register a fragment with the MX NIC ...\n" );
MCA_BTL_MX_FRAG_RETURN( btl, frag );
return NULL;
}
@ -332,7 +332,7 @@ mca_btl_base_descriptor_t* mca_btl_mx_prepare_dst( struct mca_btl_base_module_t*
{
mx_return = mx_forget( mx_btl->mx_endpoint, &(frag->mx_request) );
if( OPAL_UNLIKELY(MX_SUCCESS != mx_return) ) {
opal_output( 0, "mx_forget failed in mca_btl_mx_prepare_dst with error %d (%s)\n",
orte_output( 0, "mx_forget failed in mca_btl_mx_prepare_dst with error %d (%s)\n",
mx_return, mx_strerror(mx_return) );
return NULL;
}
@ -389,7 +389,7 @@ static int mca_btl_mx_put( struct mca_btl_base_module_t* btl,
descriptor->des_dst[0].seg_key.key64, frag,
&frag->mx_request );
if( OPAL_UNLIKELY(MX_SUCCESS != mx_return) ) {
opal_output( 0, "mx_isend fails with error %s\n", mx_strerror(mx_return) );
orte_output( 0, "mx_isend fails with error %s\n", mx_strerror(mx_return) );
return OMPI_ERROR;
}
return OMPI_SUCCESS;
@ -442,7 +442,7 @@ int mca_btl_mx_send( struct mca_btl_base_module_t* btl,
endpoint->mx_peer_addr,
tag64, frag, &frag->mx_request );
if( OPAL_UNLIKELY(MX_SUCCESS != mx_return) ) {
opal_output( 0, "mx_isend fails with error %s\n", mx_strerror(mx_return) );
orte_output( 0, "mx_isend fails with error %s\n", mx_strerror(mx_return) );
return OMPI_ERROR;
}
@ -451,7 +451,7 @@ int mca_btl_mx_send( struct mca_btl_base_module_t* btl,
uint32_t mx_result;
mx_return = mx_ibuffered( mx_btl->mx_endpoint, &(frag->mx_request), &mx_result );
if( OPAL_UNLIKELY(MX_SUCCESS != mx_return) ) {
opal_output( 0, "mx_ibuffered failed with error %d (%s)\n",
orte_output( 0, "mx_ibuffered failed with error %d (%s)\n",
mx_return, mx_strerror(mx_return) );
return OMPI_ERROR;
}
@ -462,7 +462,7 @@ int mca_btl_mx_send( struct mca_btl_base_module_t* btl,
MCA_BTL_MX_FRAG_RETURN( mx_btl, frag );
}
if( OPAL_UNLIKELY(MX_SUCCESS != mx_return) ) {
opal_output( 0, "mx_forget failed with error %d (%s)\n",
orte_output( 0, "mx_forget failed with error %d (%s)\n",
mx_return, mx_strerror(mx_return) );
return OMPI_ERROR;
}

2
ompi/mca/btl/mx/btl_mx.h
Просмотреть файл

@ -29,7 +29,7 @@
/* Open MPI includes */
#include "ompi/class/ompi_free_list.h"
#include "ompi/class/ompi_bitmap.h"
#include "opal/util/output.h"
#include "orte/util/output.h"
#include "opal/event/event.h"
#include "ompi/mca/pml/pml.h"
#include "ompi/mca/btl/btl.h"

44
ompi/mca/btl/mx/btl_mx_component.c
Просмотреть файл

@ -203,7 +203,7 @@ mca_btl_mx_unexpected_handler( void *context, mx_endpoint_addr_t source,
mca_btl_base_descriptor_t descriptor;
mca_btl_base_segment_t segment;
/*opal_output( 0, "Get unexpected handler context %p source %lld match_value %lld\n"
/*orte_output( 0, "Get unexpected handler context %p source %lld match_value %lld\n"
"\tlength %d data %p\n", context, source.stuff[0], match_value, length,
data_if_available );*/
if( !(0x01 & match_value) )
@ -246,7 +246,7 @@ static mca_btl_mx_module_t* mca_btl_mx_create(uint64_t addr)
ret = mx_open_board( nic_id, &endp_handle );
if( MX_SUCCESS != ret ) {
opal_output( 0, "Unable to open board %d: %s\n", nic_id, mx_strerror(ret) );
orte_output( 0, "Unable to open board %d: %s\n", nic_id, mx_strerror(ret) );
return NULL;
}
@ -254,7 +254,7 @@ static mca_btl_mx_module_t* mca_btl_mx_create(uint64_t addr)
ms.iport = 0;
ret = mx__get_mapper_state( endp_handle, &ms );
if( MX_SUCCESS != ret ) {
opal_output( 0, "get_mapper_state failed for board %d: %s\n",
orte_output( 0, "get_mapper_state failed for board %d: %s\n",
nic_id, mx_strerror(ret) );
return NULL;
}
@ -271,13 +271,13 @@ static mca_btl_mx_module_t* mca_btl_mx_create(uint64_t addr)
if( (NULL != mca_btl_mx_component.mx_if_exclude) &&
(NULL != (where = strstr(mca_btl_mx_component.mx_if_exclude, mapper_mac))) ) {
/*opal_output( 0, "MX network %d connected to the mapper %s has been excluded\n",
/*orte_output( 0, "MX network %d connected to the mapper %s has been excluded\n",
nic_id, mapper_mac );*/
return NULL;
}
else if( (NULL != mca_btl_mx_component.mx_if_include) &&
(NULL == (where = strstr(mca_btl_mx_component.mx_if_include, mapper_mac))) ) {
/*opal_output( 0, "MX network %d connected to the mapper %s has not been included\n",
/*orte_output( 0, "MX network %d connected to the mapper %s has not been included\n",
nic_id, mapper_mac );*/
return NULL;
}
@ -294,7 +294,7 @@ static mca_btl_mx_module_t* mca_btl_mx_create(uint64_t addr)
mca_btl_mx_component.mx_filter,
NULL, 0, &mx_btl->mx_endpoint);
if(status != MX_SUCCESS) {
opal_output( 0, "mca_btl_mx_init: mx_open_endpoint() failed with status %d (%s)\n",
orte_output( 0, "mca_btl_mx_init: mx_open_endpoint() failed with status %d (%s)\n",
status, mx_strerror(status) );
mx_btl->mx_endpoint = NULL;
mca_btl_mx_finalize( &mx_btl->super );
@ -309,7 +309,7 @@ static mca_btl_mx_module_t* mca_btl_mx_create(uint64_t addr)
if( (status = mx_get_info( mx_btl->mx_endpoint, MX_LINE_SPEED,
&nic_id, sizeof(nic_id),
&value, sizeof(int))) != MX_SUCCESS ) {
opal_output( 0, "mx_get_info(MX_LINE_SPEED) failed with status %d (%s)\n",
orte_output( 0, "mx_get_info(MX_LINE_SPEED) failed with status %d (%s)\n",
status, mx_strerror(status) );
} else {
if( MX_SPEED_2G == value ) {
@ -334,13 +334,13 @@ static mca_btl_mx_module_t* mca_btl_mx_create(uint64_t addr)
char *counters_name;
if( (status = mx_get_info( mx_btl->mx_endpoint, MX_PIO_SEND_MAX, NULL, 0,
&value, sizeof(int))) != MX_SUCCESS ) {
opal_output( 0, "mx_get_info(MX_PIO_SEND_MAX) failed with status %d (%s)\n",
orte_output( 0, "mx_get_info(MX_PIO_SEND_MAX) failed with status %d (%s)\n",
status, mx_strerror(status) );
}
printf( "MX_PIO_SEND_MAX = %d\n", value );
if( (status = mx_get_info( mx_btl->mx_endpoint, MX_COPY_SEND_MAX, NULL, 0,
&value, sizeof(int))) != MX_SUCCESS ) {
opal_output( 0, "mx_get_info(MX_COPY_SEND_MAX) failed with status %d (%s)\n",
orte_output( 0, "mx_get_info(MX_COPY_SEND_MAX) failed with status %d (%s)\n",
status, mx_strerror(status) );
}
printf( "MX_COPY_SEND_MAX = %d\n", value );
@ -348,27 +348,27 @@ static mca_btl_mx_module_t* mca_btl_mx_create(uint64_t addr)
board = 0;
if( (status = mx_get_info( mx_btl->mx_endpoint, MX_PRODUCT_CODE, &board, sizeof(int),
text, MX_MAX_STR_LEN)) != MX_SUCCESS ) {
opal_output( 0, "mx_get_info(MX_PRODUCT_CODE) failed with status %d (%s)\n",
orte_output( 0, "mx_get_info(MX_PRODUCT_CODE) failed with status %d (%s)\n",
status, mx_strerror(status) );
}
printf( "product code %s\n", text );
if( (status = mx_get_info( mx_btl->mx_endpoint, MX_COUNTERS_COUNT, &board, sizeof(int),
&counters, sizeof(int))) != MX_SUCCESS ) {
opal_output( 0, "mx_get_info(MX_COUNTERS_COUNT) failed with status %d (%s)\n",
orte_output( 0, "mx_get_info(MX_COUNTERS_COUNT) failed with status %d (%s)\n",
status, mx_strerror(status) );
}
printf( "counters = %d\n", counters );
counters_name = (char*)malloc( counters * MX_MAX_STR_LEN );
if( (status = mx_get_info( mx_btl->mx_endpoint, MX_COUNTERS_LABELS, &board, sizeof(int),
counters_name, counters * MX_MAX_STR_LEN)) != MX_SUCCESS ) {
opal_output( 0, "mx_get_info(MX_COUNTERS_LABELS) failed with status %d (%s)\n",
orte_output( 0, "mx_get_info(MX_COUNTERS_LABELS) failed with status %d (%s)\n",
status, mx_strerror(status) );
}
counters_value = (int*)malloc( counters * sizeof(int) );
if( (status = mx_get_info( mx_btl->mx_endpoint, MX_COUNTERS_VALUES, &board, sizeof(int),
counters_value, counters * sizeof(int))) != MX_SUCCESS ) {
opal_output( 0, "mx_get_info(MX_COUNTERS_VALUES) failed with status %d (%s)\n",
orte_output( 0, "mx_get_info(MX_COUNTERS_VALUES) failed with status %d (%s)\n",
status, mx_strerror(status) );
}
for( i = 0; i < counters; i++ )
@ -381,7 +381,7 @@ static mca_btl_mx_module_t* mca_btl_mx_create(uint64_t addr)
/* query the endpoint address */
if((status = mx_get_endpoint_addr( mx_btl->mx_endpoint,
&mx_btl->mx_endpoint_addr)) != MX_SUCCESS) {
opal_output( 0, "mca_btl_mx_init: mx_get_endpoint_addr() failed with status %d (%s)\n",
orte_output( 0, "mca_btl_mx_init: mx_get_endpoint_addr() failed with status %d (%s)\n",
status, mx_strerror(status) );
mca_btl_mx_finalize( &mx_btl->super );
return NULL;
@ -391,7 +391,7 @@ static mca_btl_mx_module_t* mca_btl_mx_create(uint64_t addr)
status = mx_register_unexp_handler( mx_btl->mx_endpoint, mca_btl_mx_unexpected_handler,
(void*)mx_btl );
if( MX_SUCCESS != status ) {
opal_output( 0, "mca_btl_mx_init: mx_register_unexp_handler() failed with status %d (%s)\n",
orte_output( 0, "mca_btl_mx_init: mx_register_unexp_handler() failed with status %d (%s)\n",
status, mx_strerror(status) );
mca_btl_mx_finalize( &mx_btl->super );
return NULL;
@ -421,7 +421,7 @@ mca_btl_base_module_t** mca_btl_mx_component_init(int *num_btl_modules,
*num_btl_modules = 0;
if (enable_progress_threads) {
opal_output( 0, "mca_btl_mx_component_init: progress threads requested but not supported");
orte_output( 0, "mca_btl_mx_component_init: progress threads requested but not supported");
ompi_modex_send(&mca_btl_mx_component.super.btl_version,
NULL, 0);
return NULL;
@ -487,7 +487,7 @@ mca_btl_base_module_t** mca_btl_mx_component_init(int *num_btl_modules,
/* get the number of card available on the system */
if( (status = mx_get_info( NULL, MX_NIC_COUNT, NULL, 0,
&mca_btl_mx_component.mx_num_btls, sizeof(uint32_t))) != MX_SUCCESS ) {
opal_output( 0, "mca_btl_mx_component_init: mx_get_info(MX_NIC_COUNT) failed with status %d(%s)\n",
orte_output( 0, "mca_btl_mx_component_init: mx_get_info(MX_NIC_COUNT) failed with status %d(%s)\n",
status, mx_strerror(status) );
ompi_modex_send(&mca_btl_mx_component.super.btl_version,
NULL, 0);
@ -511,7 +511,7 @@ mca_btl_base_module_t** mca_btl_mx_component_init(int *num_btl_modules,
*/
mca_btl_mx_component.mx_btls = malloc( mca_btl_mx_component.mx_num_btls * sizeof(mca_btl_base_module_t*) );
if( NULL == mca_btl_mx_component.mx_btls ) {
opal_output( 0, "MX BTL no memory\n" );
orte_output( 0, "MX BTL no memory\n" );
return NULL;
}
@ -521,7 +521,7 @@ mca_btl_base_module_t** mca_btl_mx_component_init(int *num_btl_modules,
return NULL;
if( (status = mx_get_info( NULL, MX_NIC_IDS, NULL, 0,
nic_addrs, size)) != MX_SUCCESS) {
opal_output(0, "MX BTL error (mx_get_info failed) size = %ld [%s] #cards %d\n",
orte_output(0, "MX BTL error (mx_get_info failed) size = %ld [%s] #cards %d\n",
(unsigned long)size, mx_strerror(status), mca_btl_mx_component.mx_num_btls );
free(nic_addrs);
return NULL;
@ -596,7 +596,7 @@ int mca_btl_mx_component_progress(void)
mx_return = mx_ipeek( mx_btl->mx_endpoint, &mx_request, &mx_result );
if( OPAL_UNLIKELY(mx_return != MX_SUCCESS) ) {
opal_output( 0, "mca_btl_mx_component_progress: mx_ipeek() failed with status %d (%s)\n",
orte_output( 0, "mca_btl_mx_component_progress: mx_ipeek() failed with status %d (%s)\n",
mx_return, mx_strerror(mx_return) );
continue;
}
@ -606,7 +606,7 @@ int mca_btl_mx_component_progress(void)
mx_return = mx_test( mx_btl->mx_endpoint, &mx_request, &mx_status, &mx_result);
if( OPAL_UNLIKELY(mx_return != MX_SUCCESS) ) {
opal_output(0, "mca_btl_mx_progress: mx_test() failed with status %d (%s)\n",
orte_output(0, "mca_btl_mx_progress: mx_test() failed with status %d (%s)\n",
mx_return, mx_strerror(mx_return));
continue;
}
@ -644,7 +644,7 @@ int mca_btl_mx_component_progress(void)
0x01ULL, BTL_MX_RECV_MASK,
frag, &(frag->mx_request) );
if( MX_SUCCESS != mx_return ) {
opal_output( 0, "Fail to re-register a fragment with the MX NIC ... (%s)\n",
orte_output( 0, "Fail to re-register a fragment with the MX NIC ... (%s)\n",
mx_strerror(mx_return) );
}
}

6
ompi/mca/btl/mx/btl_mx_proc.c
Просмотреть файл

@ -122,7 +122,7 @@ mca_btl_mx_proc_t* mca_btl_mx_proc_create(ompi_proc_t* ompi_proc)
rc = ompi_modex_recv( &mca_btl_mx_component.super.btl_version,
ompi_proc, (void*)&mx_peers, &size );
if( OMPI_SUCCESS != rc ) {
opal_output( 0, "mca_pml_base_modex_recv failed for peer %s",
orte_output( 0, "mca_pml_base_modex_recv failed for peer %s",
ORTE_NAME_PRINT(&ompi_proc->proc_name) );
return NULL;
}
@ -131,7 +131,7 @@ mca_btl_mx_proc_t* mca_btl_mx_proc_create(ompi_proc_t* ompi_proc)
return NULL;
}
if( (size % sizeof(mca_btl_mx_addr_t)) != 0 ) {
opal_output( 0, "invalid mx address for peer %s",
orte_output( 0, "invalid mx address for peer %s",
ORTE_NAME_PRINT(&ompi_proc->proc_name) );
return NULL;
}
@ -228,7 +228,7 @@ int mca_btl_mx_proc_connect( mca_btl_mx_endpoint_t* module_endpoint )
if( MX_SUCCESS != mx_nic_id_to_hostname( module_endpoint->mx_peer.nic_id, peer_name ) )
sprintf( peer_name, "unknown %lx nic_id", (long)module_endpoint->mx_peer.nic_id );
opal_output( 0, "mx_connect fail for %s with key %x (error %s)\n\tUnique ID (local %x remote %x)\n",
orte_output( 0, "mx_connect fail for %s with key %x (error %s)\n\tUnique ID (local %x remote %x)\n",
peer_name, mca_btl_mx_component.mx_filter, mx_strerror(mx_status),
module_endpoint->endpoint_btl->mx_unique_network_id,
module_endpoint->mx_peer.unique_network_id );

4
ompi/mca/btl/ofud/btl_ofud.c
Просмотреть файл

@ -23,7 +23,7 @@
#include "ompi_config.h"
#include "opal/prefetch.h"
#include "opal/util/output.h"
#include "orte/util/output.h"
#include "ompi/datatype/convertor.h"
#include "ompi/datatype/datatype.h"
#include "ompi/mca/btl/btl.h"
@ -435,7 +435,7 @@ static int mca_btl_ud_dereg_mr(void* reg_data,
if(ud_reg->mr != NULL) {
if(ibv_dereg_mr(ud_reg->mr)) {
opal_output(0, "%s: error unpinning UD memory: %s\n",
orte_output(0, "%s: error unpinning UD memory: %s\n",
__func__, strerror(errno));
return OMPI_ERROR;
}

4
ompi/mca/btl/ofud/btl_ofud.h
Просмотреть файл

@ -34,7 +34,7 @@
/* Open MPI includes */
#include "opal/class/opal_hash_table.h"
#include "opal/util/output.h"
#include "orte/util/output.h"
#include "opal/sys/timer.h"
#include "ompi/class/ompi_free_list.h"
#include "ompi/class/ompi_bitmap.h"
@ -345,7 +345,7 @@ do { \
} while(0)
#define MCA_BTL_UD_SHOW_TIME(var) \
OPAL_OUTPUT((0, " " #var " avg %lu cnt %lu", \
ORTE_OUTPUT((0, " " #var " avg %lu cnt %lu", \
(mca_btl_ud_profile.avg_ ## var) / (mca_btl_ud_profile.cnt_ ## var), \
mca_btl_ud_profile.cnt_ ## var));

2
ompi/mca/btl/ofud/btl_ofud_component.c
Просмотреть файл

@ -25,7 +25,7 @@
#include "ompi_config.h"
#include "ompi/constants.h"
#include "opal/prefetch.h"
#include "opal/util/output.h"
#include "orte/util/output.h"
#include "ompi/mca/btl/btl.h"
#include "opal/sys/timer.h"
#include "opal/mca/base/mca_base_param.h"

2
ompi/mca/btl/ofud/btl_ofud_endpoint.c
Просмотреть файл

@ -97,7 +97,7 @@ int mca_btl_ud_endpoint_post_send(mca_btl_ud_module_t* ud_btl,
MCA_BTL_UD_START_TIME(ibv_post_send);
if(OPAL_UNLIKELY((ret = ibv_post_send(ib_qp, wr, &bad_wr)))) {
#if 0
opal_output(0, "ep->sd_wqe %d btl->sd_wqe %d len %d ib_qp_next %d",
orte_output(0, "ep->sd_wqe %d btl->sd_wqe %d len %d ib_qp_next %d",
endpoint->sd_wqe, ud_btl->sd_wqe,
frag->sg_entry.length, ud_btl->ib_qp_next);
#endif

4
ompi/mca/btl/ofud/btl_ofud_proc.c
Просмотреть файл

@ -126,7 +126,7 @@ mca_btl_ud_proc_t* mca_btl_ud_proc_create(ompi_proc_t* ompi_proc)
&size);
if(OMPI_SUCCESS != rc) {
opal_output(0,
orte_output(0,
"[%s:%d] ompi_modex_recv failed for peer %s",
__FILE__,__LINE__,ORTE_NAME_PRINT(&ompi_proc->proc_name));
OBJ_RELEASE(module_proc);
@ -134,7 +134,7 @@ mca_btl_ud_proc_t* mca_btl_ud_proc_create(ompi_proc_t* ompi_proc)
}
if((size % sizeof(mca_btl_ud_addr_t)) != 0) {
opal_output(0, "[%s:%d] invalid module address for peer %s",
orte_output(0, "[%s:%d] invalid module address for peer %s",
__FILE__,__LINE__,ORTE_NAME_PRINT(&ompi_proc->proc_name));
OBJ_RELEASE(module_proc);
return NULL;

9
ompi/mca/btl/openib/btl_openib.c
Просмотреть файл

@ -25,9 +25,8 @@
#include "ompi_config.h"
#include <string.h>
#include <inttypes.h>
#include "opal/util/output.h"
#include "orte/util/output.h"
#include "opal/util/if.h"
#include "opal/util/show_help.h"
#include "opal/util/arch.h"
#include "ompi/mca/pml/pml.h"
@ -109,13 +108,13 @@ static void show_init_error(const char *file, int line,
asprintf(&str_limit, "%ld", (long)limit.rlim_cur);
}
opal_show_help("help-mpi-btl-openib.txt", "init-fail-no-mem",
orte_show_help("help-mpi-btl-openib.txt", "init-fail-no-mem",
true, orte_process_info.nodename,
file, line, func, dev, str_limit);
if (NULL != str_limit) free(str_limit);
} else {
opal_show_help("help-mpi-btl-openib.txt", "init-fail-create-q",
orte_show_help("help-mpi-btl-openib.txt", "init-fail-create-q",
true, orte_process_info.nodename,
file, line, func, strerror(errno), errno, dev);
}
@ -318,7 +317,7 @@ int mca_btl_openib_add_procs(
mca_btl_openib_proc_t* ib_proc;
int remote_matching_port;
opal_output(-1, "add procs: adding proc %d", i);
orte_output(-1, "add procs: adding proc %d", i);
if(NULL == (ib_proc = mca_btl_openib_proc_create(ompi_proc))) {
return OMPI_ERR_OUT_OF_RESOURCE;
}

4
ompi/mca/btl/openib/btl_openib.h
Просмотреть файл

@ -39,7 +39,7 @@
#include "opal/event/event.h"
#include "ompi/mca/pml/pml.h"
#include "ompi/mca/btl/btl.h"
#include "opal/util/output.h"
#include "orte/util/output.h"
#include "ompi/mca/mpool/mpool.h"
#include "ompi/mca/btl/base/btl_base_error.h"
@ -61,7 +61,7 @@ BEGIN_C_DECLS
#if OMPI_ENABLE_DEBUG
#define ATTACH() do { \
int i = 0; \
opal_output(0, "WAITING TO DEBUG ATTACH"); \
orte_output(0, "WAITING TO DEBUG ATTACH"); \
while (i == 0) sleep(5); \
} while(0);
#else

7
ompi/mca/btl/openib/btl_openib_async.c
Просмотреть файл

@ -19,8 +19,7 @@
#include <unistd.h>
#include <errno.h>
#include "opal/util/output.h"
#include "opal/util/show_help.h"
#include "orte/util/output.h"
#include "ompi/mca/btl/btl.h"
#include "ompi/mca/btl/base/base.h"
@ -276,7 +275,7 @@ static int btl_openib_async_hcah(struct mca_btl_openib_async_poll *hcas_poll, in
case IBV_EVENT_PATH_MIG_ERR:
case IBV_EVENT_SRQ_ERR:
case IBV_EVENT_PORT_ERR:
opal_show_help("help-mpi-btl-openib.txt", "of error event",
orte_show_help("help-mpi-btl-openib.txt", "of error event",
true,orte_process_info.nodename, orte_process_info.pid,
event.event_type, openib_event_to_str(event.event_type),
xrc_event ? "true" : "false");
@ -294,7 +293,7 @@ static int btl_openib_async_hcah(struct mca_btl_openib_async_poll *hcas_poll, in
case IBV_EVENT_SRQ_LIMIT_REACHED:
break;
default:
opal_show_help("help-mpi-btl-openib.txt", "of unknown event",
orte_show_help("help-mpi-btl-openib.txt", "of unknown event",
true,orte_process_info.nodename, orte_process_info.pid,
event.event_type, xrc_event ? "true" : "false");
}

51
ompi/mca/btl/openib/btl_openib_component.c
Просмотреть файл

@ -34,8 +34,7 @@
#include "opal/include/opal/align.h"
#include "opal/util/if.h"
#include "opal/util/argv.h"
#include "opal/util/output.h"
#include "opal/util/show_help.h"
#include "orte/util/output.h"
#include "opal/sys/timer.h"
#include "opal/sys/atomic.h"
#include "opal/util/argv.h"
@ -174,7 +173,7 @@ static int btl_openib_modex_send(void)
size_t size, msg_size;
ompi_btl_openib_connect_base_module_t *cpc;
opal_output(-1, "Starting to modex send");
orte_output(-1, "Starting to modex send");
if (0 == mca_btl_openib_component.ib_num_btls) {
return 0;
}
@ -228,7 +227,7 @@ static int btl_openib_modex_send(void)
/* Pack the number of modules */
offset = message;
pack8(&offset, mca_btl_openib_component.ib_num_btls);
opal_output(-1, "modex sending %d btls (packed: %d, offset now at %d)", mca_btl_openib_component.ib_num_btls, *((uint8_t*) message), (int) (offset - message));
orte_output(-1, "modex sending %d btls (packed: %d, offset now at %d)", mca_btl_openib_component.ib_num_btls, *((uint8_t*) message), (int) (offset - message));
/* Pack each of the modules */
for (i = 0; i < mca_btl_openib_component.ib_num_btls; i++) {
@ -238,7 +237,7 @@ static int btl_openib_modex_send(void)
memcpy(offset,
&(mca_btl_openib_component.openib_btls[i]->port_info),
size);
opal_output(-1, "modex packed btl port modex message: %lx, %d, %d (size: %d)",
orte_output(-1, "modex packed btl port modex message: %lx, %d, %d (size: %d)",
mca_btl_openib_component.openib_btls[i]->port_info.subnet_id,
mca_btl_openib_component.openib_btls[i]->port_info.mtu,
mca_btl_openib_component.openib_btls[i]->port_info.lid,
@ -248,13 +247,13 @@ static int btl_openib_modex_send(void)
MCA_BTL_OPENIB_MODEX_MSG_HTON(*(mca_btl_openib_modex_message_t *)offset);
#endif
offset += size;
opal_output(-1, "modex packed btl %d: modex message, offset now %d",
orte_output(-1, "modex packed btl %d: modex message, offset now %d",
i, (int) (offset -message));
/* Pack the number of CPCs that follow */
pack8(&offset,
mca_btl_openib_component.openib_btls[i]->num_cpcs);
opal_output(-1, "modex packed btl %d: to pack %d cpcs (packed: %d, offset now %d)",
orte_output(-1, "modex packed btl %d: to pack %d cpcs (packed: %d, offset now %d)",
i, mca_btl_openib_component.openib_btls[i]->num_cpcs,
*((uint8_t*) (offset - 1)), (int) (offset-message));
@ -265,27 +264,27 @@ static int btl_openib_modex_send(void)
uint8_t u8;
cpc = mca_btl_openib_component.openib_btls[i]->cpcs[j];
opal_output(-1, "modex packed btl %d: packing cpc %s",
orte_output(-1, "modex packed btl %d: packing cpc %s",
i, cpc->data.cbm_component->cbc_name);
/* Pack the CPC index */
u8 = ompi_btl_openib_connect_base_get_cpc_index(cpc->data.cbm_component);
pack8(&offset, u8);
opal_output(-1, "packing btl %d: cpc %d: index %d (packed %d, offset now %d)",
orte_output(-1, "packing btl %d: cpc %d: index %d (packed %d, offset now %d)",
i, j, u8, *((uint8_t*) (offset-1)), (int)(offset-message));
/* Pack the CPC priority */
pack8(&offset, cpc->data.cbm_priority);
opal_output(-1, "packing btl %d: cpc %d: priority %d (packed %d, offset now %d)",
orte_output(-1, "packing btl %d: cpc %d: priority %d (packed %d, offset now %d)",
i, j, cpc->data.cbm_priority, *((uint8_t*) (offset-1)), (int)(offset-message));
/* Pack the blob length */
u8 = cpc->data.cbm_modex_message_len;
pack8(&offset, u8);
opal_output(-1, "packing btl %d: cpc %d: message len %d (packed %d, offset now %d)",
orte_output(-1, "packing btl %d: cpc %d: message len %d (packed %d, offset now %d)",
i, j, u8, *((uint8_t*) (offset-1)), (int)(offset-message));
/* If the blob length is > 0, pack the blob */
if (u8 > 0) {
memcpy(offset, cpc->data.cbm_modex_message, u8);
offset += u8;
opal_output(-1, "packing btl %d: cpc %d: blob packed %d %x (offset now %d)",
orte_output(-1, "packing btl %d: cpc %d: blob packed %d %x (offset now %d)",
i, j,
((uint32_t*)cpc->data.cbm_modex_message)[0],
((uint32_t*)cpc->data.cbm_modex_message)[1],
@ -301,7 +300,7 @@ static int btl_openib_modex_send(void)
rc = ompi_modex_send(&mca_btl_openib_component.super.btl_version,
message, msg_size);
free(message);
opal_output(-1, "Modex sent! %d calculated, %d actual\n", (int) msg_size, (int) (offset - message));
orte_output(-1, "Modex sent! %d calculated, %d actual\n", (int) msg_size, (int) (offset - message));
return rc;
}
@ -480,7 +479,7 @@ static int init_one_port(opal_list_t *btl_list, mca_btl_openib_hca_t *hca,
if(mca_btl_openib_component.ib_num_btls > 0 &&
IB_DEFAULT_GID_PREFIX == subnet_id &&
mca_btl_openib_component.warn_default_gid_prefix) {
opal_show_help("help-mpi-btl-openib.txt", "default subnet prefix",
orte_show_help("help-mpi-btl-openib.txt", "default subnet prefix",
true, orte_process_info.nodename);
}
@ -504,7 +503,7 @@ static int init_one_port(opal_list_t *btl_list, mca_btl_openib_hca_t *hca,
} else if (0 == lmc % (mca_btl_openib_component.apm_lmc + 1)) {
lmc_step = mca_btl_openib_component.apm_lmc + 1;
} else {
opal_show_help("help-mpi-btl-openib.txt", "apm with wrong lmc",true,
orte_show_help("help-mpi-btl-openib.txt", "apm with wrong lmc",true,
mca_btl_openib_component.apm_lmc, lmc);
return OMPI_ERROR;
}
@ -512,7 +511,7 @@ static int init_one_port(opal_list_t *btl_list, mca_btl_openib_hca_t *hca,
if (mca_btl_openib_component.apm_lmc) {
/* Disable apm and report warning */
mca_btl_openib_component.apm_lmc = 0;
opal_show_help("help-mpi-btl-openib.txt", "apm without lmc",true);
orte_show_help("help-mpi-btl-openib.txt", "apm without lmc",true);
}
}
#endif
@ -1034,7 +1033,7 @@ static int init_one_hca(opal_list_t *btl_list, struct ibv_device* ib_dev)
*/
if (!(hca->ib_dev_attr.device_cap_flags & IBV_DEVICE_XRC) &&
mca_btl_openib_component.num_xrc_qps > 0) {
opal_show_help("help-mpi-btl-openib.txt",
orte_show_help("help-mpi-btl-openib.txt",
"XRC on device without XRC support", true,
mca_btl_openib_component.num_xrc_qps,
ibv_get_device_name(ib_dev),
@ -1058,7 +1057,7 @@ static int init_one_hca(opal_list_t *btl_list, struct ibv_device* ib_dev)
warning that we're using default values (unless overridden
that we don't want to see these warnings) */
if (mca_btl_openib_component.warn_no_hca_params_found) {
opal_show_help("help-mpi-btl-openib.txt",
orte_show_help("help-mpi-btl-openib.txt",
"no hca params found", true,
orte_process_info.nodename,
hca->ib_dev_attr.vendor_id,
@ -1193,7 +1192,7 @@ static int init_one_hca(opal_list_t *btl_list, struct ibv_device* ib_dev)
if (hca->btls > 0) {
/* if apm was enabled it should be > 1 */
if (1 == mca_btl_openib_component.apm_ports) {
opal_show_help("help-mpi-btl-openib.txt", "apm not enough ports", true);
orte_show_help("help-mpi-btl-openib.txt", "apm not enough ports", true);
mca_btl_openib_component.apm_ports = 0;
}
ret = prepare_hca_for_use(hca);
@ -1516,7 +1515,7 @@ btl_openib_component_init(int *num_btl_modules,
couldn't provide it. So print an error and deactivate
this BTL. */
if (mca_btl_openib_component.want_fork_support > 0) {
opal_show_help("help-mpi-btl-openib.txt",
orte_show_help("help-mpi-btl-openib.txt",
"ibv_fork_init fail", true,
orte_process_info.nodename);
goto no_btls;
@ -1531,7 +1530,7 @@ btl_openib_component_init(int *num_btl_modules,
mca_btl_openib_component.if_list = NULL;
if (NULL != mca_btl_openib_component.if_include &&
NULL != mca_btl_openib_component.if_exclude) {
opal_show_help("help-mpi-btl-openib.txt",
orte_show_help("help-mpi-btl-openib.txt",
"specified include and exclude", true,
mca_btl_openib_component.if_include,
mca_btl_openib_component.if_exclude, NULL);
@ -1580,7 +1579,7 @@ btl_openib_component_init(int *num_btl_modules,
}
if(ret != OMPI_SUCCESS) {
opal_show_help("help-mpi-btl-openib.txt",
orte_show_help("help-mpi-btl-openib.txt",
"error in hca init", true, orte_process_info.nodename);
}
@ -1594,7 +1593,7 @@ btl_openib_component_init(int *num_btl_modules,
if (0 != opal_argv_count(mca_btl_openib_component.if_list) &&
mca_btl_openib_component.warn_nonexistent_if) {
char *str = opal_argv_join(mca_btl_openib_component.if_list, ',');
opal_show_help("help-mpi-btl-openib.txt", "nonexistent port",
orte_show_help("help-mpi-btl-openib.txt", "nonexistent port",
true, orte_process_info.nodename,
((NULL != mca_btl_openib_component.if_include) ?
"in" : "ex"), str);
@ -1602,7 +1601,7 @@ btl_openib_component_init(int *num_btl_modules,
}
if(0 == mca_btl_openib_component.ib_num_btls) {
opal_show_help("help-mpi-btl-openib.txt",
orte_show_help("help-mpi-btl-openib.txt",
"no active ports found", true, orte_process_info.nodename);
return NULL;
}
@ -2087,7 +2086,7 @@ error:
}
if(IBV_WC_RETRY_EXC_ERR == wc->status)
opal_show_help("help-mpi-btl-openib.txt", "btl_openib:retry-exceeded", true);
orte_show_help("help-mpi-btl-openib.txt", "btl_openib:retry-exceeded", true);
if(openib_btl)
openib_btl->error_cb(&openib_btl->super, MCA_BTL_ERROR_FLAGS_FATAL);
@ -2146,7 +2145,7 @@ void* mca_btl_openib_progress_thread(opal_object_t* arg)
pthread_setcancelstate( PTHREAD_CANCEL_ENABLE, NULL );
pthread_setcanceltype( PTHREAD_CANCEL_ASYNCHRONOUS, NULL );
opal_output(-1, "WARNING: the openib btl progress thread code *does not yet work*. Your run is likely to hang, crash, break the kitchen sink, and/or eat your cat. You have been warned.");
orte_output(-1, "WARNING: the openib btl progress thread code *does not yet work*. Your run is likely to hang, crash, break the kitchen sink, and/or eat your cat. You have been warned.");
while (hca->progress) {
while(opal_progress_threads()) {

2
ompi/mca/btl/openib/btl_openib_endpoint.c
Просмотреть файл

@ -380,7 +380,7 @@ void mca_btl_openib_endpoint_init(mca_btl_openib_module_t *btl,
ep->rem_info.rem_lid = remote_proc_info->pm_port_info.lid;
ep->rem_info.rem_subnet_id = remote_proc_info->pm_port_info.subnet_id;
ep->rem_info.rem_mtu = remote_proc_info->pm_port_info.mtu;
opal_output(-1, "Got remote LID, subnet, MTU: %d, %lx, %d",
orte_output(-1, "Got remote LID, subnet, MTU: %d, %lx, %d",
ep->rem_info.rem_lid,
ep->rem_info.rem_subnet_id,
ep->rem_info.rem_mtu);

18
ompi/mca/btl/openib/btl_openib_fd.c
Просмотреть файл

@ -17,7 +17,7 @@
#include "opal/class/opal_list.h"
#include "opal/event/event.h"
#include "opal/util/output.h"
#include "orte/util/output.h"
#include "ompi/constants.h"
@ -252,12 +252,12 @@ static bool local_pipe_cmd(void)
break;
case CMD_TIME_TO_QUIT:
opal_output(-1, "fd listener thread: time to quit");
orte_output(-1, "fd listener thread: time to quit");
ret = true;
break;
default:
opal_output(-1, "fd listener thread: unknown pipe command!");
orte_output(-1, "fd listener thread: unknown pipe command!");
break;
}
@ -281,24 +281,24 @@ static void *thread_main(void *context)
FD_SET(pipe_fd[0], &read_fds);
max_fd = pipe_fd[0] + 1;
opal_output(-1, "fd listener thread running");
orte_output(-1, "fd listener thread running");
/* Main loop waiting for commands over the fd's */
while (1) {
memcpy(&read_fds_copy, &read_fds, sizeof(read_fds));
memcpy(&write_fds_copy, &write_fds, sizeof(write_fds));
opal_output(-1, "fd listener thread blocking on select...");
orte_output(-1, "fd listener thread blocking on select...");
rc = select(max_fd, &read_fds_copy, &write_fds_copy, NULL, NULL);
if (0 != rc && EAGAIN == errno) {
continue;
}
opal_output(-1, "fd listener thread woke up!");
orte_output(-1, "fd listener thread woke up!");
if (rc > 0) {
if (FD_ISSET(pipe_fd[0], &read_fds_copy)) {
opal_output(-1, "fd listener thread: pipe command");
orte_output(-1, "fd listener thread: pipe command");
if (local_pipe_cmd()) {
opal_output(-1, "fd listener thread: exiting");
orte_output(-1, "fd listener thread: exiting");
break;
}
}
@ -324,7 +324,7 @@ static void *thread_main(void *context)
/* If either was ready, invoke the callback */
if (0 != flags) {
opal_output(-1, "fd listener thread: invoking callback for registered fd %d", ri->ri_fd);
orte_output(-1, "fd listener thread: invoking callback for registered fd %d", ri->ri_fd);
ri->ri_callback.fd(ri->ri_fd, flags,
ri->ri_context);
}

9
ompi/mca/btl/openib/btl_openib_ini.c
Просмотреть файл

@ -23,8 +23,7 @@
#include <ctype.h>
#include <stdlib.h>
#include "opal/util/output.h"
#include "opal/util/show_help.h"
#include "orte/util/output.h"
#include "opal/mca/base/mca_base_param.h"
#include "btl_openib.h"
@ -235,7 +234,7 @@ static int parse_file(char *filename)
ini_filename = filename;
btl_openib_ini_yyin = fopen(filename, "r");
if (NULL == btl_openib_ini_yyin) {
opal_show_help("help-mpi-btl-openib.txt", "ini file:file not found",
orte_show_help("help-mpi-btl-openib.txt", "ini file:file not found",
true, filename);
ret = OMPI_ERR_NOT_FOUND;
goto cleanup;
@ -393,7 +392,7 @@ static int parse_line(parsed_section_values_t *sv)
/* Have no idea what this parameter is. Not an error -- just
ignore it */
if (!showed_unknown_field_warning) {
opal_show_help("help-mpi-btl-openib.txt",
orte_show_help("help-mpi-btl-openib.txt",
"ini file:unknown field", true,
ini_filename, btl_openib_ini_yynewlines,
key_buffer);
@ -618,7 +617,7 @@ static inline void show_help(const char *topic)
if (0 == strcmp("\n", btl_openib_ini_yytext)) {
btl_openib_ini_yytext = "<end of line>";
}
opal_show_help("help-mpi-btl-openib.txt", topic, true,
orte_show_help("help-mpi-btl-openib.txt", topic, true,
ini_filename, btl_openib_ini_yynewlines,
btl_openib_ini_yytext);
btl_openib_ini_yytext = save;

63
ompi/mca/btl/openib/btl_openib_mca.c
Просмотреть файл

@ -26,9 +26,8 @@
#include <string.h>
#include "opal/mca/installdirs/installdirs.h"
#include "opal/util/output.h"
#include "orte/util/output.h"
#include "opal/util/argv.h"
#include "opal/util/show_help.h"
#include "opal/mca/base/mca_base_param.h"
#include "btl_openib.h"
#include "btl_openib_mca.h"
@ -69,7 +68,7 @@ static inline int reg_string(const char* param_name, const char* param_desc,
default_value, &value);
if (0 != (flags & REGSTR_EMPTY_OK) && 0 == strlen(value)) {
opal_output(0, "Bad parameter value for parameter \"%s\"",
orte_output(0, "Bad parameter value for parameter \"%s\"",
param_name);
return OMPI_ERR_BAD_PARAM;
}
@ -96,7 +95,7 @@ static inline int reg_int(const char* param_name, const char* param_desc,
if ((0 != (flags & REGINT_GE_ZERO) && value < 0) ||
(0 != (flags & REGINT_GE_ONE) && value < 1) ||
(0 != (flags & REGINT_NONZERO) && 0 == value)) {
opal_output(0, "Bad parameter value for parameter \"%s\"",
orte_output(0, "Bad parameter value for parameter \"%s\"",
param_name);
return OMPI_ERR_BAD_PARAM;
}
@ -150,7 +149,7 @@ int btl_openib_register_mca_params(void)
mca_btl_openib_component.want_fork_support = ival;
#else
if (0 != ival) {
opal_show_help("help-mpi-btl-openib.txt",
orte_show_help("help-mpi-btl-openib.txt",
"ibv_fork requested but not supported", true,
orte_process_info.nodename);
return OMPI_ERROR;
@ -175,7 +174,7 @@ int btl_openib_register_mca_params(void)
mca_btl_openib_component.want_fork_support = ival;
#else
if (0 != ival) {
opal_show_help("help-mpi-btl-openib.txt",
orte_show_help("help-mpi-btl-openib.txt",
"ibv_fork requested but not supported", true,
orte_process_info.nodename);
return OMPI_ERROR;
@ -236,7 +235,7 @@ int btl_openib_register_mca_params(void)
"(must be > 0 and < 0xffff)",
0, &ival, REGINT_GE_ZERO));
if (ival > 0xffff) {
opal_show_help("help-mpi-btl-openib.txt", "invalid mca param value",
orte_show_help("help-mpi-btl-openib.txt", "invalid mca param value",
true, "invalid value for btl_openib_ib_pkey_val",
"btl_openib_ib_pkey_val ignored");
} else {
@ -266,7 +265,7 @@ int btl_openib_register_mca_params(void)
CHECK(reg_int("ib_mtu", msg, IBV_MTU_1024, &ival, 0));
free(msg);
if (ival < IBV_MTU_1024 || ival > IBV_MTU_4096) {
opal_show_help("help-mpi-btl-openib.txt", "invalid mca param value",
orte_show_help("help-mpi-btl-openib.txt", "invalid mca param value",
true, "invalid value for btl_openib_ib_mtu",
"btl_openib_ib_mtu reset to 1024");
mca_btl_openib_component.ib_mtu = IBV_MTU_1024;
@ -279,12 +278,12 @@ int btl_openib_register_mca_params(void)
"(must be >= 0 and <= 31)",
5, &ival, 0));
if (ival > 31) {
opal_show_help("help-mpi-btl-openib.txt", "invalid mca param value",
orte_show_help("help-mpi-btl-openib.txt", "invalid mca param value",
true, "btl_openib_ib_min_rnr_timer > 31",
"btl_openib_ib_min_rnr_timer reset to 31");
ival = 31;
} else if (ival < 0){
opal_show_help("help-mpi-btl-openib.txt", "invalid mca param value",
orte_show_help("help-mpi-btl-openib.txt", "invalid mca param value",
true, "btl_openib_ib_min_rnr_timer < 0",
"btl_openib_ib_min_rnr_timer reset to 0");
ival = 0;
@ -295,12 +294,12 @@ int btl_openib_register_mca_params(void)
"(must be >= 0 and <= 31)",
10, &ival, 0));
if (ival > 31) {
opal_show_help("help-mpi-btl-openib.txt", "invalid mca param value",
orte_show_help("help-mpi-btl-openib.txt", "invalid mca param value",
true, "btl_openib_ib_timeout > 31",
"btl_openib_ib_timeout reset to 31");
ival = 31;
} else if (ival < 0) {
opal_show_help("help-mpi-btl-openib.txt", "invalid mca param value",
orte_show_help("help-mpi-btl-openib.txt", "invalid mca param value",
true, "btl_openib_ib_timeout < 0",
"btl_openib_ib_timeout reset to 0");
ival = 0;
@ -311,12 +310,12 @@ int btl_openib_register_mca_params(void)
"(must be >= 0 and <= 7)",
7, &ival, 0));
if (ival > 7) {
opal_show_help("help-mpi-btl-openib.txt", "invalid mca param value",
orte_show_help("help-mpi-btl-openib.txt", "invalid mca param value",
true, "btl_openib_ib_retry_count > 7",
"btl_openib_ib_retry_count reset to 7");
ival = 7;
} else if (ival < 0) {
opal_show_help("help-mpi-btl-openib.txt", "invalid mca param value",
orte_show_help("help-mpi-btl-openib.txt", "invalid mca param value",
true, "btl_openib_ib_retry_count < 0",
"btl_openib_ib_retry_count reset to 0");
ival = 0;
@ -328,12 +327,12 @@ int btl_openib_register_mca_params(void)
"(must be >= 0 and <= 7)",
7, &ival, 0));
if (ival > 7) {
opal_show_help("help-mpi-btl-openib.txt", "invalid mca param value",
orte_show_help("help-mpi-btl-openib.txt", "invalid mca param value",
true, "btl_openib_ib_rnr_retry > 7",
"btl_openib_ib_rnr_retry reset to 7");
ival = 7;
} else if (ival < 0) {
opal_show_help("help-mpi-btl-openib.txt", "invalid mca param value",
orte_show_help("help-mpi-btl-openib.txt", "invalid mca param value",
true, "btl_openib_ib_rnr_retry < 0",
"btl_openib_ib_rnr_retry reset to 0");
ival = 0;
@ -350,12 +349,12 @@ int btl_openib_register_mca_params(void)
"(must be >= 0 and <= 15)",
0, &ival, 0));
if (ival > 15) {
opal_show_help("help-mpi-btl-openib.txt", "invalid mca param value",
orte_show_help("help-mpi-btl-openib.txt", "invalid mca param value",
true, "btl_openib_ib_service_level > 15",
"btl_openib_ib_service_level reset to 15");
ival = 15;
} else if (ival < 0) {
opal_show_help("help-mpi-btl-openib.txt", "invalid mca param value",
orte_show_help("help-mpi-btl-openib.txt", "invalid mca param value",
true, "btl_openib_ib_service_level < 0",
"btl_openib_ib_service_level reset to 0");
ival = 0;
@ -432,7 +431,7 @@ int btl_openib_register_mca_params(void)
"(must be > 0 and power of two)",
64, &ival, REGINT_GE_ZERO));
if(ival <= 1 || (ival & (ival - 1))) {
opal_show_help("help-mpi-btl-openib.txt", "wrong buffer alignment",
orte_show_help("help-mpi-btl-openib.txt", "wrong buffer alignment",
true, ival, orte_process_info.nodename, 64);
mca_btl_openib_component.buffer_alignment = 64;
} else {
@ -544,7 +543,7 @@ static int mca_btl_openib_mca_setup_qps(void)
queues = opal_argv_split(str, ':');
if (0 == opal_argv_count(queues)) {
opal_show_help("help-mpi-btl-openib.txt",
orte_show_help("help-mpi-btl-openib.txt",
"no qps in receive_queues", true,
orte_process_info.nodename, str);
return OMPI_ERROR;
@ -561,12 +560,12 @@ static int mca_btl_openib_mca_setup_qps(void)
#if HAVE_XRC
num_xrc_qps++;
#else
opal_show_help("help-mpi-btl-openib.txt", "No XRC support", true,
orte_show_help("help-mpi-btl-openib.txt", "No XRC support", true,
orte_process_info.nodename, str);
goto error;
#endif
} else {
opal_show_help("help-mpi-btl-openib.txt",
orte_show_help("help-mpi-btl-openib.txt",
"invalid qp type in receive_queues", true,
orte_process_info.nodename, str, queues[qp]);
goto error;
@ -575,14 +574,14 @@ static int mca_btl_openib_mca_setup_qps(void)
}
/* Current XRC implementation can't used with other QP types - PP and SRQ */
if (num_xrc_qps > 0 && (num_pp_qps > 0 || num_srq_qps > 0)) {
opal_show_help("help-mpi-btl-openib.txt", "XRC with PP or SRQ", true,
orte_show_help("help-mpi-btl-openib.txt", "XRC with PP or SRQ", true,
orte_process_info.nodename, str);
goto error;
}
/* Current XRC implementation can't used with btls_per_lid > 1 */
if (num_xrc_qps > 0 && mca_btl_openib_component.btls_per_lid > 1) {
opal_show_help("help-mpi-btl-openib.txt", "XRC with BTLs per LID", true,
orte_show_help("help-mpi-btl-openib.txt", "XRC with BTLs per LID", true,
orte_process_info.nodename, str, num_xrc_qps);
goto error;
}
@ -606,7 +605,7 @@ static int mca_btl_openib_mca_setup_qps(void)
if ('P' == params[0][0]) {
int32_t rd_win, rd_rsv;
if (count < 3 || count > 6) {
opal_show_help("help-mpi-btl-openib.txt",
orte_show_help("help-mpi-btl-openib.txt",
"invalid pp qp specification", true,
orte_process_info.nodename, queues[qp]);
goto error;
@ -629,12 +628,12 @@ static int mca_btl_openib_mca_setup_qps(void)
mca_btl_openib_component.qp_infos[qp].u.pp_qp.rd_win = rd_win;
mca_btl_openib_component.qp_infos[qp].u.pp_qp.rd_rsv = rd_rsv;
if((rd_num - rd_low) > rd_win)
opal_show_help("help-mpi-btl-openib.txt", "non optimal rd_win",
orte_show_help("help-mpi-btl-openib.txt", "non optimal rd_win",
true, rd_win, rd_num - rd_low);
} else {
int32_t sd_max;
if(count < 3 || count > 5) {
opal_show_help("help-mpi-btl-openib.txt",
orte_show_help("help-mpi-btl-openib.txt",
"invalid srq specification", true,
orte_process_info.nodename, queues[qp]);
goto error;
@ -657,7 +656,7 @@ static int mca_btl_openib_mca_setup_qps(void)
}
if (rd_num <= rd_low) {
opal_show_help("help-mpi-btl-openib.txt", "rd_num must be > rd_low",
orte_show_help("help-mpi-btl-openib.txt", "rd_num must be > rd_low",
true, orte_process_info.nodename, queues[qp]);
goto error;
}
@ -679,24 +678,24 @@ static int mca_btl_openib_mca_setup_qps(void)
mca_btl_openib_module.super.btl_eager_limit :
mca_btl_openib_module.super.btl_max_send_size;
if (max_qp_size < max_size_needed) {
opal_show_help("help-mpi-btl-openib.txt",
orte_show_help("help-mpi-btl-openib.txt",
"biggest qp size is too small", true,
orte_process_info.nodename, max_qp_size,
max_size_needed);
ret = OMPI_ERROR;
goto error;
} else if (max_qp_size > max_size_needed) {
opal_show_help("help-mpi-btl-openib.txt",
orte_show_help("help-mpi-btl-openib.txt",
"biggest qp size is too big", true,
orte_process_info.nodename, max_qp_size,
max_size_needed);
opal_output(0, "The biggest QP size is bigger than maximum send size. "
orte_output(0, "The biggest QP size is bigger than maximum send size. "
"This is not optimal configuration as memory will be wasted.");
}
if (mca_btl_openib_component.ib_free_list_max > 0 &&
min_freelist_size > mca_btl_openib_component.ib_free_list_max) {
opal_show_help("help-mpi-btl-openib.txt", "freelist too small", true,
orte_show_help("help-mpi-btl-openib.txt", "freelist too small", true,
orte_process_info.nodename,
mca_btl_openib_component.ib_free_list_max,
min_freelist_size);

16
ompi/mca/btl/openib/btl_openib_proc.c
Просмотреть файл

@ -173,7 +173,7 @@ mca_btl_openib_proc_t* mca_btl_openib_proc_create(ompi_proc_t* ompi_proc)
/* Unpack the number of modules in the message */
offset = message;
unpack8(&offset, &(module_proc->proc_port_count));
opal_output(-1, "unpack: %d btls", module_proc->proc_port_count);
orte_output(-1, "unpack: %d btls", module_proc->proc_port_count);
if (module_proc->proc_port_count > 0) {
module_proc->proc_ports = (mca_btl_openib_proc_modex_t *)
malloc(sizeof(mca_btl_openib_proc_modex_t) *
@ -192,12 +192,12 @@ mca_btl_openib_proc_t* mca_btl_openib_proc_create(ompi_proc_t* ompi_proc)
MCA_BTL_OPENIB_MODEX_MSG_NTOH(module_proc->proc_ports[i].pm_port_info);
#endif
offset += size;
opal_output(-1, "unpacked btl %d: modex message, offset now %d",
orte_output(-1, "unpacked btl %d: modex message, offset now %d",
i, (int)(offset-((char*)message)));
/* Unpack the number of CPCs that follow */
unpack8(&offset, &(module_proc->proc_ports[i].pm_cpc_data_count));
opal_output(-1, "unpacked btl %d: number of cpcs to follow %d (offset now %d)",
orte_output(-1, "unpacked btl %d: number of cpcs to follow %d (offset now %d)",
i, module_proc->proc_ports[i].pm_cpc_data_count, (int)(offset-((char*)message)));
module_proc->proc_ports[i].pm_cpc_data =
calloc(module_proc->proc_ports[i].pm_cpc_data_count,
@ -212,16 +212,16 @@ mca_btl_openib_proc_t* mca_btl_openib_proc_create(ompi_proc_t* ompi_proc)
ompi_btl_openib_connect_base_module_data_t *cpcd;
cpcd = module_proc->proc_ports[i].pm_cpc_data + j;
unpack8(&offset, &u8);
opal_output(-1, "unpacked btl %d: cpc %d: index %d (offset now %d)",
orte_output(-1, "unpacked btl %d: cpc %d: index %d (offset now %d)",
i, j, u8, (int)(offset-(char*)message));
cpcd->cbm_component =
ompi_btl_openib_connect_base_get_cpc_byindex(u8);
opal_output(-1, "unpacked btl %d: cpc %d: component %s",
orte_output(-1, "unpacked btl %d: cpc %d: component %s",
i, j, cpcd->cbm_component->cbc_name);
unpack8(&offset, &cpcd->cbm_priority);
unpack8(&offset, &cpcd->cbm_modex_message_len);
opal_output(-1, "unpacked btl %d: cpc %d: priority %d, msg len %d (offset now %d)",
orte_output(-1, "unpacked btl %d: cpc %d: priority %d, msg len %d (offset now %d)",
i, j, cpcd->cbm_priority, cpcd->cbm_modex_message_len, (int)(offset-(char*)message));
if (cpcd->cbm_modex_message_len > 0) {
cpcd->cbm_modex_message = malloc(cpcd->cbm_modex_message_len);
@ -232,7 +232,7 @@ mca_btl_openib_proc_t* mca_btl_openib_proc_create(ompi_proc_t* ompi_proc)
memcpy(cpcd->cbm_modex_message, offset,
cpcd->cbm_modex_message_len);
offset += cpcd->cbm_modex_message_len;
opal_output(-1, "unpacked btl %d: cpc %d: blob unpacked %d %x (offset now %d)",
orte_output(-1, "unpacked btl %d: cpc %d: blob unpacked %d %x (offset now %d)",
i, j,
((uint32_t*)cpcd->cbm_modex_message)[0],
((uint32_t*)cpcd->cbm_modex_message)[1],
@ -253,7 +253,7 @@ mca_btl_openib_proc_t* mca_btl_openib_proc_create(ompi_proc_t* ompi_proc)
return NULL;
}
opal_output(-1, "unpacking done!");
orte_output(-1, "unpacking done!");
return module_proc;
}

2
ompi/mca/btl/openib/btl_openib_xrc.c
Просмотреть файл

@ -16,7 +16,7 @@
#include <errno.h>
#include <unistd.h>
#include "opal/util/output.h"
#include "orte/util/output.h"
#include "ompi/mca/btl/btl.h"
#include "ompi/mca/btl/base/base.h"
#include "btl_openib_xrc.h"

24
ompi/mca/btl/openib/connect/btl_openib_connect_base.c
Просмотреть файл

@ -25,8 +25,8 @@
#include "connect/btl_openib_connect_ibcm.h"
#endif
#include "orte/util/output.h"
#include "opal/util/argv.h"
#include "opal/util/show_help.h"
/*
* Array of all possible connection functions
@ -107,14 +107,14 @@ int ompi_btl_openib_connect_base_register(void)
for (save = j = 0; NULL != temp[j]; ++j) {
for (i = 0; NULL != all[i]; ++i) {
if (0 == strcmp(temp[j], all[i]->cbc_name)) {
opal_output(-1, "include: saving %s", all[i]->cbc_name);
orte_output(-1, "include: saving %s", all[i]->cbc_name);
available[save++] = all[i];
++num_available;
break;
}
}
if (NULL == all[i]) {
opal_show_help("help-mpi-btl-openib-cpc-base.txt",
orte_show_help("help-mpi-btl-openib-cpc-base.txt",
"cpc name not found", true,
"include", orte_process_info.nodename,
"include", cpc_include, temp[j],
@ -139,7 +139,7 @@ int ompi_btl_openib_connect_base_register(void)
}
}
if (NULL == all[i]) {
opal_show_help("help-mpi-btl-openib-cpc-base.txt",
orte_show_help("help-mpi-btl-openib-cpc-base.txt",
"cpc name not found", true,
"exclude", orte_process_info.nodename,
"exclude", cpc_exclude, temp[j],
@ -158,7 +158,7 @@ int ompi_btl_openib_connect_base_register(void)
}
}
if (NULL == temp[j]) {
opal_output(-1, "exclude: saving %s", all[i]->cbc_name);
orte_output(-1, "exclude: saving %s", all[i]->cbc_name);
available[save++] = all[i];
++num_available;
}
@ -168,7 +168,7 @@ int ompi_btl_openib_connect_base_register(void)
/* If there's no include/exclude list, copy all[] into available[] */
else {
opal_output(-1, "no include or exclude: saving all");
orte_output(-1, "no include or exclude: saving all");
memcpy(available, all, sizeof(all));
num_available = (sizeof(all) /
sizeof(ompi_btl_openib_connect_base_module_t *)) - 1;
@ -201,7 +201,7 @@ int ompi_btl_openib_connect_base_init(void)
for (i = num_available = 0; NULL != available[i]; ++i) {
if (NULL == available[i]->cbc_init) {
available[num_available++] = available[i];
opal_output(-1, "found available cpc (NULL init): %s",
orte_output(-1, "found available cpc (NULL init): %s",
all[i]->cbc_name);
continue;
}
@ -209,7 +209,7 @@ int ompi_btl_openib_connect_base_init(void)
rc = available[i]->cbc_init();
if (OMPI_SUCCESS == rc) {
available[num_available++] = available[i];
opal_output(-1, "found available cpc (SUCCESS init): %s",
orte_output(-1, "found available cpc (SUCCESS init): %s",
all[i]->cbc_name);
continue;
} else if (OMPI_ERR_NOT_SUPPORTED == rc) {
@ -265,7 +265,7 @@ int ompi_btl_openib_connect_base_select_for_local_port(mca_btl_openib_module_t *
free(msg);
return rc;
}
opal_output(-1, "match cpc for local port: %s",
orte_output(-1, "match cpc for local port: %s",
available[i]->cbc_name);
/* This CPC has indicated that it wants to run on this openib
@ -275,7 +275,7 @@ int ompi_btl_openib_connect_base_select_for_local_port(mca_btl_openib_module_t *
/* If we got an empty array, then no CPCs were eligible. Doh! */
if (0 == cpc_index) {
opal_show_help("help-mpi-btl-openib-cpc-base.txt",
orte_show_help("help-mpi-btl-openib-cpc-base.txt",
"no cpcs for port", true,
orte_process_info.nodename,
ibv_get_device_name(btl->hca->ib_dev),
@ -350,10 +350,10 @@ ompi_btl_openib_connect_base_find_match(mca_btl_openib_module_t *btl,
if (NULL != local_selected) {
*ret_local_cpc = local_selected;
*ret_remote_cpc_data = remote_selected;
opal_output(-1, "find_match: found match!");
orte_output(-1, "find_match: found match!");
return OMPI_SUCCESS;
} else {
opal_output(-1, "find_match: did NOT find match!");
orte_output(-1, "find_match: did NOT find match!");
return OMPI_ERR_NOT_FOUND;
}
}

235
ompi/mca/btl/openib/connect/btl_openib_connect_ibcm.c
Просмотреть файл

@ -259,7 +259,7 @@
#include "opal/util/if.h"
#include "opal/util/error.h"
#include "opal/util/output.h"
#include "orte/util/output.h"
#include "opal/event/event.h"
#include "opal/class/opal_pointer_array.h"
@ -267,7 +267,6 @@
#include "btl_openib_proc.h"
#include "btl_openib_fd.h"
#include "connect/connect.h"
#include "opal/util/show_help.h"
/* JMS to be removed: see #1264 */
#undef event
@ -576,7 +575,7 @@ static int ibcm_component_query(mca_btl_openib_module_t *btl,
iWarp), so we can safely assume that we can use this CPC. */
#if defined(HAVE_STRUCT_IBV_DEVICE_TRANSPORT_TYPE)
if (IBV_TRANSPORT_IB != btl->hca->ib_dev->transport_type) {
opal_output_verbose(5, mca_btl_base_output,
orte_output_verbose(5, mca_btl_base_output,
"openib BTL: ibcm CPC only supported on InfiniBand");
rc = OMPI_ERR_NOT_SUPPORTED;
goto error;
@ -585,7 +584,7 @@ static int ibcm_component_query(mca_btl_openib_module_t *btl,
/* IBCM is not supported if we have any XRC QPs */
if (mca_btl_openib_component.num_xrc_qps > 0) {
opal_output_verbose(5, mca_btl_base_output,
orte_output_verbose(5, mca_btl_base_output,
"openib BTL: ibcm CPC not supported with XRC receive queues");
rc = OMPI_ERR_NOT_SUPPORTED;
goto error;
@ -609,7 +608,7 @@ static int ibcm_component_query(mca_btl_openib_module_t *btl,
goto error;
}
msg = (modex_msg_t*) (m + 1);
opal_output(-1, "ibcm: created cpc module %p for btl %p",
orte_output(-1, "ibcm: created cpc module %p for btl %p",
(void*)m, (void*)btl);
/* See if we've already for an IB CM listener for this device */
@ -630,7 +629,7 @@ static int ibcm_component_query(mca_btl_openib_module_t *btl,
cmh = OBJ_NEW(ibcm_listen_cm_id_t);
if (NULL == cmh) {
rc = OMPI_ERR_OUT_OF_RESOURCE;
opal_output_verbose(5, mca_btl_base_output,
orte_output_verbose(5, mca_btl_base_output,
"openib BTL: ibcm CPC system error (malloc failed)");
goto error;
}
@ -647,7 +646,7 @@ static int ibcm_component_query(mca_btl_openib_module_t *btl,
/* We can't open the device for some reason (can't read,
can't write, doesn't exist, ...etc.); IBCM is not setup
on this node. */
opal_output_verbose(5, mca_btl_base_output,
orte_output_verbose(5, mca_btl_base_output,
"openib BTL: ibcm CPC failed to open IB CM device: %s", filename);
free(filename);
rc = OMPI_ERR_NOT_SUPPORTED;
@ -664,7 +663,7 @@ static int ibcm_component_query(mca_btl_openib_module_t *btl,
platform. So print an optional message and return
ERR_NOT_SUPPORTED (i.e., gracefully fail). */
OBJ_RELEASE(cmh);
opal_output_verbose(5, mca_btl_base_output,
orte_output_verbose(5, mca_btl_base_output,
"openib BTL: ibcm CPC failed to open IB CM device");
rc = OMPI_ERR_NOT_SUPPORTED;
goto error;
@ -675,7 +674,7 @@ static int ibcm_component_query(mca_btl_openib_module_t *btl,
0 != ib_cm_listen(cmh->listen_cm_id, ibcm_pid, 0)) {
/* Same rationale as above */
OBJ_RELEASE(cmh);
opal_output_verbose(5, mca_btl_base_output,
orte_output_verbose(5, mca_btl_base_output,
"openib BTL: ibcm CPC failed to initialize IB CM handles");
rc = OMPI_ERR_NOT_SUPPORTED;
goto error;
@ -708,7 +707,7 @@ static int ibcm_component_query(mca_btl_openib_module_t *btl,
different formula). Query for the Nth GID (N = MCA param) on
the port. */
if (ibcm_gid_table_index > btl->ib_port_attr.gid_tbl_len) {
opal_output_verbose(5, mca_btl_base_output,
orte_output_verbose(5, mca_btl_base_output,
"openib BTL: ibcm CPC desired GID table index (%d) is larger than the actual table size (%d) on device %s",
ibcm_gid_table_index,
btl->ib_port_attr.gid_tbl_len,
@ -719,7 +718,7 @@ static int ibcm_component_query(mca_btl_openib_module_t *btl,
rc = ibv_query_gid(btl->hca->ib_dev_context, btl->port_num, ibcm_gid_table_index,
&gid);
if (0 != rc) {
opal_output_verbose(5, mca_btl_base_output,
orte_output_verbose(5, mca_btl_base_output,
"openib BTL: ibcm CPC system error (ibv_query_gid failed)");
rc = OMPI_ERR_UNREACH;
goto error;
@ -740,7 +739,7 @@ static int ibcm_component_query(mca_btl_openib_module_t *btl,
/* All done */
*cpc = (ompi_btl_openib_connect_base_module_t *) m;
opal_output_verbose(5, mca_btl_base_output,
orte_output_verbose(5, mca_btl_base_output,
"openib BTL: ibcm CPC available for use on %s",
ibv_get_device_name(btl->hca->ib_dev));
return OMPI_SUCCESS;
@ -748,11 +747,11 @@ static int ibcm_component_query(mca_btl_openib_module_t *btl,
error:
ibcm_module_finalize(btl, (ompi_btl_openib_connect_base_module_t *) m);
if (OMPI_ERR_NOT_SUPPORTED == rc) {
opal_output_verbose(5, mca_btl_base_output,
orte_output_verbose(5, mca_btl_base_output,
"openib BTL: ibcm CPC unavailable for use on %s; skipped",
ibv_get_device_name(btl->hca->ib_dev));
} else {
opal_output_verbose(5, mca_btl_base_output,
orte_output_verbose(5, mca_btl_base_output,
"openib BTL: ibcm CPC unavailable for use on %s; fatal error %d (%s)",
ibv_get_device_name(btl->hca->ib_dev), rc,
opal_strerror(rc));
@ -881,7 +880,7 @@ static int fill_path_record(ibcm_module_t *m,
modex_msg_t *local_msg =
(modex_msg_t*) m->cpc.data.cbm_modex_message;
opal_output(-1, "filling path record");
orte_output(-1, "filling path record");
/* Global attributes */
path_rec->dgid.global.subnet_prefix =
path_rec->sgid.global.subnet_prefix =
@ -958,31 +957,31 @@ static int fill_path_record(ibcm_module_t *m,
path_rec->rate = IBV_RATE_MAX; break;
}
opal_output(-1, "Got src/dest subnet id: 0x%lx / 0x%lx",
orte_output(-1, "Got src/dest subnet id: 0x%lx / 0x%lx",
path_rec->sgid.global.subnet_prefix,
path_rec->dgid.global.subnet_prefix);
opal_output(-1, "Got src/dest interface id: 0x%lx / 0x%lx",
orte_output(-1, "Got src/dest interface id: 0x%lx / 0x%lx",
path_rec->sgid.global.interface_id,
path_rec->dgid.global.interface_id);
opal_output(-1, "Got src/dest lid: 0x%x / 0x%x",
orte_output(-1, "Got src/dest lid: 0x%x / 0x%x",
path_rec->slid, path_rec->dlid);
opal_output(-1, "Got raw_traffic: %d\n", path_rec->raw_traffic);
orte_output(-1, "Got raw_traffic: %d\n", path_rec->raw_traffic);
opal_output(-1, "Got flow_label: %d\n", path_rec->flow_label);
opal_output(-1, "Got hop_limit: %d\n", path_rec->hop_limit);
opal_output(-1, "Got traffic_class: %d\n", path_rec->traffic_class);
opal_output(-1, "Got reversible: 0x%x\n", path_rec->reversible);
opal_output(-1, "Got numb_path: %d\n", path_rec->numb_path);
opal_output(-1, "Got pkey: 0x%x\n", path_rec->pkey);
orte_output(-1, "Got flow_label: %d\n", path_rec->flow_label);
orte_output(-1, "Got hop_limit: %d\n", path_rec->hop_limit);
orte_output(-1, "Got traffic_class: %d\n", path_rec->traffic_class);
orte_output(-1, "Got reversible: 0x%x\n", path_rec->reversible);
orte_output(-1, "Got numb_path: %d\n", path_rec->numb_path);
orte_output(-1, "Got pkey: 0x%x\n", path_rec->pkey);
opal_output(-1, "Got sl: %d\n", path_rec->sl);
opal_output(-1, "Got mtu_selector: %d\n", path_rec->mtu_selector);
opal_output(-1, "Got mtu: %d\n", path_rec->mtu);
opal_output(-1, "Got rate_selector: %d\n", path_rec->rate_selector);
opal_output(-1, "Got rate: %d\n", path_rec->rate);
opal_output(-1, "Got packet_life_time_selector: %d\n", path_rec->packet_life_time_selector);
opal_output(-1, "Got packet lifetime: 0x%x\n", path_rec->packet_life_time);
opal_output(-1, "Got preference: %d\n", path_rec->preference);
orte_output(-1, "Got sl: %d\n", path_rec->sl);
orte_output(-1, "Got mtu_selector: %d\n", path_rec->mtu_selector);
orte_output(-1, "Got mtu: %d\n", path_rec->mtu);
orte_output(-1, "Got rate_selector: %d\n", path_rec->rate_selector);
orte_output(-1, "Got rate: %d\n", path_rec->rate);
orte_output(-1, "Got packet_life_time_selector: %d\n", path_rec->packet_life_time_selector);
orte_output(-1, "Got packet lifetime: 0x%x\n", path_rec->packet_life_time);
orte_output(-1, "Got preference: %d\n", path_rec->preference);
return OMPI_SUCCESS;
}
@ -995,7 +994,7 @@ static int ibcm_endpoint_init(struct mca_btl_base_endpoint_t *endpoint)
return OMPI_ERR_OUT_OF_RESOURCE;
}
opal_output(-1, "ibcm endpoint init for endpoint %p / %p",
orte_output(-1, "ibcm endpoint init for endpoint %p / %p",
(void*)endpoint, (void*)ie);
ie->ie_cpc = endpoint->endpoint_local_cpc;
ie->ie_endpoint = endpoint;
@ -1022,9 +1021,9 @@ static bool i_initiate(ibcm_module_t *m,
uint64_t my_port_guid = ntoh64(m->btl->hca->ib_dev_attr.node_guid) +
m->btl->port_num;
opal_output(-1, "i_initiate: my guid (%0lx), msg guid (%0lx)",
orte_output(-1, "i_initiate: my guid (%0lx), msg guid (%0lx)",
my_port_guid, msg->mm_port_guid);
opal_output(-1, "i_initiate: my pid (%d), msg pid (%d)",
orte_output(-1, "i_initiate: my pid (%d), msg pid (%d)",
ibcm_pid, msg->mm_service_id);
return
@ -1043,7 +1042,7 @@ static ibcm_request_t *alloc_request(ibcm_module_t *m, modex_msg_t *msg,
{
struct ib_cm_req_param *cm_req;
ibcm_request_t *req = OBJ_NEW(ibcm_request_t);
opal_output(-1, "allocated cached req id: %p", (void*)req);
orte_output(-1, "allocated cached req id: %p", (void*)req);
if (NULL == req) {
return NULL;
@ -1053,7 +1052,7 @@ static ibcm_request_t *alloc_request(ibcm_module_t *m, modex_msg_t *msg,
if (0 != ib_cm_create_id(m->cmh->cm_device,
&(req->super.cm_id),
NULL)) {
opal_output(-1, "ib cm: failed to create active device id");
orte_output(-1, "ib cm: failed to create active device id");
OBJ_RELEASE(req);
return NULL;
}
@ -1095,7 +1094,7 @@ static int ibcm_module_start_connect(ompi_btl_openib_connect_base_module_t *cpc,
struct ibv_sa_path_rec path_rec;
bool do_initiate;
opal_output(-1,"ibcm start connect on endpoint %p", (void*)endpoint);
orte_output(-1,"ibcm start connect on endpoint %p", (void*)endpoint);
/* Has an incoming request already initiated the connect sequence
on this endpoint? If so, just exit successfully -- the
@ -1116,7 +1115,7 @@ static int ibcm_module_start_connect(ompi_btl_openib_connect_base_module_t *cpc,
/* Fill in the path record for this peer */
if (OMPI_SUCCESS != fill_path_record(m, endpoint, &path_rec)) {
opal_output(-1, "================ start connect failed!!!");
orte_output(-1, "================ start connect failed!!!");
rc = OMPI_ERR_NOT_FOUND;
goto err;
}
@ -1160,7 +1159,7 @@ static int ibcm_module_start_connect(ompi_btl_openib_connect_base_module_t *cpc,
ie->ie_cm_id_cache = calloc(ie->ie_cm_id_cache_size,
sizeof(ibcm_base_cm_id_t*));
if (NULL == ie->ie_cm_id_cache) {
opal_output(-1, "ib cm: failed to malloc %d active device ids",
orte_output(-1, "ib cm: failed to malloc %d active device ids",
num_ids);
rc = OMPI_ERR_OUT_OF_RESOURCE;
goto err;
@ -1193,14 +1192,14 @@ static int ibcm_module_start_connect(ompi_btl_openib_connect_base_module_t *cpc,
cm_req->srq = BTL_OPENIB_QP_TYPE_SRQ(i);
cm_req->qp_num = endpoint->qps[i].qp->lcl_qp->qp_num;
cm_req->starting_psn = endpoint->qps[i].qp->lcl_psn;
opal_output(-1, "ibcm: sending my qpn %d, psn %d\n",
orte_output(-1, "ibcm: sending my qpn %d, psn %d\n",
cm_req->qp_num, cm_req->starting_psn);
req->private_data.ireqd_request = req;
req->private_data.ireqd_qp_index = i;
/* Send the request */
opal_output(-1, "ibcm sending connect request %d of %d (id %p)",
orte_output(-1, "ibcm sending connect request %d of %d (id %p)",
i, mca_btl_openib_component.num_qps,
(void*)req->super.cm_id);
if (0 != ib_cm_send_req(req->super.cm_id, cm_req)) {
@ -1232,7 +1231,7 @@ static int ibcm_module_start_connect(ompi_btl_openib_connect_base_module_t *cpc,
cm_req->srq = 0;
cm_req->qp_num = ie->ie_bogus_qp->qp_num;
cm_req->starting_psn = 0;
opal_output(-1, "ibcm: sending BOGUS qpn %d, psn %d (id %p)",
orte_output(-1, "ibcm: sending BOGUS qpn %d, psn %d (id %p)",
cm_req->qp_num, cm_req->starting_psn,
(void*)req->super.cm_id);
@ -1355,14 +1354,14 @@ static int ibcm_endpoint_finalize(struct mca_btl_base_endpoint_t *endpoint)
{
ibcm_endpoint_t *ie =
(ibcm_endpoint_t *) endpoint->endpoint_local_cpc_data;
opal_output(-1, "ibcm endpoint finalize: %p", (void*)endpoint);
orte_output(-1, "ibcm endpoint finalize: %p", (void*)endpoint);
/* Free the stuff we allocated in ibcm_module_init */
if (NULL != ie) {
int i;
for (i = 0; i < ie->ie_cm_id_cache_size; ++i) {
if (NULL != ie->ie_cm_id_cache[i]) {
opal_output(-1, "Endpoint %p (%p), destroying ID %d (%p)\n",
orte_output(-1, "Endpoint %p (%p), destroying ID %d (%p)\n",
(void*)endpoint,
(void*)ie,
i, (void*)&(ie->ie_cm_id_cache[i]->cm_id));
@ -1378,7 +1377,7 @@ static int ibcm_endpoint_finalize(struct mca_btl_base_endpoint_t *endpoint)
endpoint->endpoint_local_cpc_data = NULL;
}
opal_output(-1, "ibcm endpoint finalize done: %p", (void*)endpoint);
orte_output(-1, "ibcm endpoint finalize done: %p", (void*)endpoint);
return OMPI_SUCCESS;
}
@ -1429,7 +1428,7 @@ static int qp_to_rtr(int qp_index, struct ib_cm_id *cm_id,
(mtu == IBV_MTU_4096) ? "4096" :
"unknown (!)"));
}
opal_output(-1, "ibm cm handler: connect qp set to IBV value %d (%s bytes)", mtu,
orte_output(-1, "ibm cm handler: connect qp set to IBV value %d (%s bytes)", mtu,
(mtu == IBV_MTU_256) ? "256" :
(mtu == IBV_MTU_512) ? "512" :
(mtu == IBV_MTU_1024) ? "1024" :
@ -1464,7 +1463,7 @@ static int qp_to_rtr(int qp_index, struct ib_cm_id *cm_id,
/* Setup attributes */
attr.path_mtu = mtu;
attr.rq_psn = endpoint->qps[qp_index].qp->lcl_psn;
opal_output(-1, "ib cm qp connect: setting rq psn: %d", attr.rq_psn);
orte_output(-1, "ib cm qp connect: setting rq psn: %d", attr.rq_psn);
/* IBM CM does not set these values for us */
attr.max_dest_rd_atomic = mca_btl_openib_component.ib_max_rdma_dst_ops;
attr.min_rnr_timer = mca_btl_openib_component.ib_min_rnr_timer;
@ -1508,7 +1507,7 @@ static int qp_to_rts(int qp_index, struct ib_cm_id *cm_id,
}
/* All done */
opal_output(-1, "successfully set RTS");
orte_output(-1, "successfully set RTS");
return OMPI_SUCCESS;
}
@ -1521,7 +1520,7 @@ static void *callback_set_endpoint_connecting(void *context)
mca_btl_openib_endpoint_t *endpoint =
(mca_btl_openib_endpoint_t *) context;
opal_output(-1, "ibcm scheduled callback: setting endpoint to CONNECTING");
orte_output(-1, "ibcm scheduled callback: setting endpoint to CONNECTING");
endpoint->endpoint_state = MCA_BTL_IB_CONNECTING;
return NULL;
@ -1536,14 +1535,14 @@ static void *callback_start_connect(void *context)
callback_start_connect_data_t *cbdata =
(callback_start_connect_data_t *) context;
opal_output(-1, "ibcm scheduled callback: calling start_connect()");
opal_output(-1, "ibcm scheduled callback: cbdata %p",
orte_output(-1, "ibcm scheduled callback: calling start_connect()");
orte_output(-1, "ibcm scheduled callback: cbdata %p",
(void*)cbdata);
opal_output(-1, "ibcm scheduled callback: endpoint %p",
orte_output(-1, "ibcm scheduled callback: endpoint %p",
(void*)cbdata->cscd_endpoint);
opal_output(-1, "ibcm scheduled callback: ie %p",
orte_output(-1, "ibcm scheduled callback: ie %p",
(void*)cbdata->cscd_endpoint->endpoint_local_cpc_data);
opal_output(-1, "ibcm scheduled callback: msg %p",
orte_output(-1, "ibcm scheduled callback: msg %p",
(void*)cbdata->cscd_endpoint->endpoint_remote_cpc_data->cbm_modex_message);
ibcm_module_start_connect(cbdata->cscd_cpc, cbdata->cscd_endpoint);
free(cbdata);
@ -1573,7 +1572,7 @@ static int request_received(ibcm_listen_cm_id_t *cmh,
ibcm_module_t *m;
ibcm_reply_t *rep;
opal_output(-1, "ibcm req handler: remote qp index %d, remote guid %lx, remote qkey %u, remote qpn %d, remote psn %d",
orte_output(-1, "ibcm req handler: remote qp index %d, remote guid %lx, remote qkey %u, remote qpn %d, remote psn %d",
qp_index,
ntoh64(req->primary_path->dgid.global.interface_id),
req->remote_qkey, req->remote_qpn,
@ -1583,7 +1582,7 @@ static int request_received(ibcm_listen_cm_id_t *cmh,
events come in per *device*, not per *port*. So we just got a
device event, and have to find the ibcm_module_t (i.e., local
port/openib BTL module ) that corresponds to it. */
opal_output(-1, "looking for ibcm module -- source port guid: 0x%lx (%p)",
orte_output(-1, "looking for ibcm module -- source port guid: 0x%lx (%p)",
ntoh64(req->primary_path->sgid.global.interface_id),
(void*)cmh);
for (item = opal_list_get_first(&(cmh->ibcm_modules));
@ -1593,7 +1592,7 @@ static int request_received(ibcm_listen_cm_id_t *cmh,
imli = (ibcm_module_list_item_t*) item;
m = imli->ibcm_module;
msg = imli->ibcm_module->cpc.data.cbm_modex_message;
opal_output(-1, "comparing ibcm module port guid: 0x%lx",
orte_output(-1, "comparing ibcm module port guid: 0x%lx",
msg->mm_port_guid);
if (msg->mm_port_guid ==
ntoh64(req->primary_path->sgid.global.interface_id)) {
@ -1613,37 +1612,37 @@ static int request_received(ibcm_listen_cm_id_t *cmh,
ib_proc != (mca_btl_openib_proc_t*)
opal_list_get_end(&mca_btl_openib_component.ib_procs);
ib_proc = (mca_btl_openib_proc_t*)opal_list_get_next(ib_proc)) {
opal_output(-1, "ibcm req: checking ib_proc %p", (void*)ib_proc);
orte_output(-1, "ibcm req: checking ib_proc %p", (void*)ib_proc);
/* Now cycle through all the endpoints on that proc */
for (i = 0; !found && i < (int) ib_proc->proc_endpoint_count; ++i) {
opal_output(-1, "ibcm req: checking endpoint %d of %d (ep %p, cpc data %p)",
orte_output(-1, "ibcm req: checking endpoint %d of %d (ep %p, cpc data %p)",
i, (int) ib_proc->proc_endpoint_count,
(void*)ib_proc->proc_endpoints[i],
(void*)ib_proc->proc_endpoints[i]->endpoint_remote_cpc_data);
if (NULL == ib_proc->proc_endpoints[i]->endpoint_remote_cpc_data) {
opal_output(-1, "NULL remote cpc data!");
orte_output(-1, "NULL remote cpc data!");
}
msg = ib_proc->proc_endpoints[i]->endpoint_remote_cpc_data->cbm_modex_message;
opal_output(-1, "ibcm req: my guid 0x%lx, remote guid 0x%lx",
orte_output(-1, "ibcm req: my guid 0x%lx, remote guid 0x%lx",
msg->mm_port_guid,
ntoh64(req->primary_path->dgid.global.interface_id));
if (msg->mm_port_guid ==
ntoh64(req->primary_path->dgid.global.interface_id) &&
msg->mm_service_id == active_private_data->ireqd_pid &&
msg->mm_port_num == req->port) {
opal_output(-1, "*** found matching endpoint!!!");
orte_output(-1, "*** found matching endpoint!!!");
endpoint = ib_proc->proc_endpoints[i];
found = true;
}
}
}
if (!found) {
opal_output(-1, "ibcm req: could not find match for calling endpoint!");
orte_output(-1, "ibcm req: could not find match for calling endpoint!");
rc = OMPI_ERR_NOT_FOUND;
rej_reason = REJ_PEER_NOT_FOUND;
goto reject;
}
opal_output(-1, "ibcm req: Found endpoint %p", (void*)endpoint);
orte_output(-1, "ibcm req: Found endpoint %p", (void*)endpoint);
/* Get our CPC-local data on the endpoint */
ie = (ibcm_endpoint_t*) endpoint->endpoint_local_cpc_data;
@ -1660,25 +1659,25 @@ static int request_received(ibcm_listen_cm_id_t *cmh,
debugging. */
opal_mutex_lock(&ie->ie_lock);
if (do_initiate) {
opal_output(-1, "ibcm request: request came from wrong direction");
orte_output(-1, "ibcm request: request came from wrong direction");
rc = OMPI_SUCCESS;
rej_reason = REJ_WRONG_DIRECTION;
} else if (ie->ie_connection_flags & CFLAGS_COMPLETED) {
opal_output(-1, "ibcm request: all QPs already connected");
orte_output(-1, "ibcm request: all QPs already connected");
rej_reason = REJ_ALREADY_CONNECTED;
rc = OMPI_SUCCESS;
} else if (ie->ie_connection_flags & CFLAGS_ONGOING) {
/* See if the request for this QP already arrived */
if (ie->ie_qps_created &&
IBV_QPS_RESET != endpoint->qps[qp_index].qp->lcl_qp->state) {
opal_output(-1, "ibcm request: this QP (%d) already connected",
orte_output(-1, "ibcm request: this QP (%d) already connected",
qp_index);
rej_reason = REJ_QP_ALREADY_CONNECTED;
rc = OMPI_SUCCESS;
}
} else {
/* this is the first activity -- accept */
opal_output(-1, "ibcm request: first initiation request");
orte_output(-1, "ibcm request: first initiation request");
ie->ie_connection_flags |= CFLAGS_ONGOING;
}
opal_mutex_unlock(&ie->ie_lock);
@ -1688,11 +1687,11 @@ static int request_received(ibcm_listen_cm_id_t *cmh,
IBCM will trigger a new event and we'll just reject it
again. */
if (REJ_MAX != rej_reason) {
opal_output(-1, "arbitrartion failed -- reject");
orte_output(-1, "arbitrartion failed -- reject");
goto reject;
}
opal_output(-1, "ibcm req handler: initiation arbitration successful -- proceeding");
orte_output(-1, "ibcm req handler: initiation arbitration successful -- proceeding");
/* If this is the first request we have received for this
endpoint, then make *all* the QP's (because we analyze all the
@ -1705,11 +1704,11 @@ static int request_received(ibcm_listen_cm_id_t *cmh,
endpoint);
if (OMPI_SUCCESS != (rc = qp_create_all(endpoint, m))) {
rej_reason = REJ_PASSIVE_SIDE_ERROR;
opal_output(-1, "qp_create_all failed -- reject");
orte_output(-1, "qp_create_all failed -- reject");
goto reject;
}
ie->ie_qps_created = true;
opal_output(-1, "ibcm request: created qp's");
orte_output(-1, "ibcm request: created qp's");
}
/* Save these numbers on the endpoint for reference. Other values
@ -1723,7 +1722,7 @@ static int request_received(ibcm_listen_cm_id_t *cmh,
/* Connect this QP to the peer */
if (OMPI_SUCCESS != (rc = qp_to_rtr(qp_index,
event->cm_id, endpoint))) {
opal_output(-1, "ib cm req handler: failed to connect qp");
orte_output(-1, "ib cm req handler: failed to connect qp");
rej_reason = REJ_PASSIVE_SIDE_ERROR;
goto reject;
}
@ -1737,7 +1736,7 @@ static int request_received(ibcm_listen_cm_id_t *cmh,
if (OMPI_SUCCESS !=
(rc = mca_btl_openib_endpoint_post_recvs(endpoint))) {
/* JMS */
opal_output(-1, "ib cm req handler: failed to post recv buffers");
orte_output(-1, "ib cm req handler: failed to post recv buffers");
rej_reason = REJ_PASSIVE_SIDE_ERROR;
goto reject;
}
@ -1751,7 +1750,7 @@ static int request_received(ibcm_listen_cm_id_t *cmh,
sizeof(ibcm_base_cm_id_t*));
if (NULL == ie->ie_cm_id_cache) {
rej_reason = REJ_PASSIVE_SIDE_ERROR;
opal_output(-1, "malloc failed -- reject");
orte_output(-1, "malloc failed -- reject");
goto reject;
}
}
@ -1759,7 +1758,7 @@ static int request_received(ibcm_listen_cm_id_t *cmh,
/* Save the CM ID on the endpoint for destruction later */
ie->ie_cm_id_cache[qp_index] = OBJ_NEW(ibcm_base_cm_id_t);
if (NULL == ie->ie_cm_id_cache[qp_index]) {
opal_output(-1, "ib cm req handler: malloc failed");
orte_output(-1, "ib cm req handler: malloc failed");
rej_reason = REJ_PASSIVE_SIDE_ERROR;
goto reject;
}
@ -1770,7 +1769,7 @@ static int request_received(ibcm_listen_cm_id_t *cmh,
if (NULL == req) {
rej_reason = REJ_PASSIVE_SIDE_ERROR;
rc = OMPI_ERR_OUT_OF_RESOURCE;
opal_output(-1, "OBJ_NEW failed -- reject");
orte_output(-1, "OBJ_NEW failed -- reject");
goto reject;
}
rep->super.cm_id = event->cm_id;
@ -1779,7 +1778,7 @@ static int request_received(ibcm_listen_cm_id_t *cmh,
rep->cm_rep.qp_num = endpoint->qps[qp_index].qp->lcl_qp->qp_num;
rep->cm_rep.srq = BTL_OPENIB_QP_TYPE_SRQ(qp_index);
rep->cm_rep.starting_psn = endpoint->qps[qp_index].qp->lcl_psn;
opal_output(-1, "ib cm reply: setting reply psn %d\n",
orte_output(-1, "ib cm reply: setting reply psn %d\n",
rep->cm_rep.starting_psn);
rep->cm_rep.responder_resources = req->responder_resources;
rep->cm_rep.initiator_depth = req->initiator_depth;
@ -1794,22 +1793,22 @@ static int request_received(ibcm_listen_cm_id_t *cmh,
if (0 != (rc = ib_cm_send_rep(event->cm_id, &(rep->cm_rep)))) {
/* JMS */
opal_output(-1, "ibcm req handler: failed to send reply for qp index %d",
orte_output(-1, "ibcm req handler: failed to send reply for qp index %d",
qp_index);
OBJ_RELEASE(rep);
rej_reason = REJ_PASSIVE_SIDE_ERROR;
opal_output(-1, "failed to send request -- reject");
orte_output(-1, "failed to send request -- reject");
goto reject;
}
opal_list_append(&ibcm_pending_replies, &(rep->super.super));
opal_output(-1, "ibcm req handler: sent reply for qp index %d",
orte_output(-1, "ibcm req handler: sent reply for qp index %d",
qp_index);
return OMPI_SUCCESS;
reject:
/* Reject the request */
opal_output(-1, "rejecting request");
orte_output(-1, "rejecting request");
ib_cm_send_rej(event->cm_id, IB_CM_REJ_CONSUMER_DEFINED,
&rej_reason, sizeof(rej_reason),
event->private_data, sizeof(ibcm_req_data_t));
@ -1837,9 +1836,9 @@ static void *callback_set_endpoint_connected(void *context)
{
mca_btl_openib_endpoint_t *endpoint = (mca_btl_openib_endpoint_t*) context;
opal_output(-1, "ibcm: calling endpoint_connected");
orte_output(-1, "ibcm: calling endpoint_connected");
mca_btl_openib_endpoint_connected(endpoint);
opal_output(-1, "ibcm: *** CONNECTED endpoint_connected done!");
orte_output(-1, "ibcm: *** CONNECTED endpoint_connected done!");
return NULL;
}
@ -1878,7 +1877,7 @@ static int reply_received(ibcm_listen_cm_id_t *cmh, struct ib_cm_event *event)
ibcm_endpoint_t *ie;
ibcm_rtu_data_t rtu_data;
opal_output(-1, "ibcm handler: got reply! (qp index %d) endpoint: %p",
orte_output(-1, "ibcm handler: got reply! (qp index %d) endpoint: %p",
p->irepd_qp_index, (void*) endpoint);
ie = (ibcm_endpoint_t*) endpoint->endpoint_local_cpc_data;
@ -1889,13 +1888,13 @@ static int reply_received(ibcm_listen_cm_id_t *cmh, struct ib_cm_event *event)
/* Move the QP to RTR and RTS */
if (OMPI_SUCCESS != (rc = qp_to_rtr(p->irepd_qp_index,
event->cm_id, endpoint))) {
opal_output(-1, "ib cm req handler: failed move to RTR");
orte_output(-1, "ib cm req handler: failed move to RTR");
return rc;
}
if (OMPI_SUCCESS != (rc = qp_to_rts(p->irepd_qp_index,
event->cm_id, endpoint))) {
opal_output(-1, "ib cm req handler: failed move to RTS");
orte_output(-1, "ib cm req handler: failed move to RTS");
return rc;
}
@ -1908,7 +1907,7 @@ static int reply_received(ibcm_listen_cm_id_t *cmh, struct ib_cm_event *event)
if (!ie->ie_recv_buffers_posted) {
if (OMPI_SUCCESS !=
(rc = mca_btl_openib_endpoint_post_recvs(endpoint))) {
opal_output(-1, "ib cm: failed to post recv buffers");
orte_output(-1, "ib cm: failed to post recv buffers");
return rc;
}
ie->ie_recv_buffers_posted = true;
@ -1918,13 +1917,13 @@ static int reply_received(ibcm_listen_cm_id_t *cmh, struct ib_cm_event *event)
rtu_data.irtud_reply = reply;
rtu_data.irtud_qp_index = p->irepd_qp_index;
if (0 != ib_cm_send_rtu(event->cm_id, &rtu_data, sizeof(rtu_data))) {
opal_output(-1, "ib cm rep handler: failed to send RTU");
orte_output(-1, "ib cm rep handler: failed to send RTU");
return OMPI_ERR_IN_ERRNO;
}
/* Remove the pending request because we won't need to handle
errors for it */
opal_output(-1, "reply received cm id %p -- original cached req %p",
orte_output(-1, "reply received cm id %p -- original cached req %p",
(void*)cmh->listen_cm_id, (void*)request);
opal_list_remove_item(&ibcm_pending_requests, &(request->super.super));
OBJ_RELEASE(request);
@ -1932,7 +1931,7 @@ static int reply_received(ibcm_listen_cm_id_t *cmh, struct ib_cm_event *event)
/* Have all the QP's been connected? If so, tell the main BTL
that we're done. */
if (0 == --(ie->ie_qps_to_connect)) {
opal_output(-1, "ib cm rep handler: REPLY telling main BTL we're connected");
orte_output(-1, "ib cm rep handler: REPLY telling main BTL we're connected");
ompi_btl_openib_fd_schedule(callback_set_endpoint_connected, endpoint);
}
@ -1951,19 +1950,19 @@ static int ready_to_use_received(ibcm_listen_cm_id_t *h,
mca_btl_openib_endpoint_t *endpoint = reply->endpoint;
ibcm_endpoint_t *ie = (ibcm_endpoint_t*) endpoint->endpoint_local_cpc_data;
opal_output(-1, "ibcm handler: got RTU! (index %d)", p->irtud_qp_index);
orte_output(-1, "ibcm handler: got RTU! (index %d)", p->irtud_qp_index);
/* Move the QP to RTS */
if (OMPI_SUCCESS != (rc = qp_to_rts(p->irtud_qp_index,
event->cm_id, endpoint))) {
opal_output(-1, "ib cm rtu handler: failed move to RTS (index %d)",
orte_output(-1, "ib cm rtu handler: failed move to RTS (index %d)",
p->irtud_qp_index);
return rc;
}
/* Remove the pending reply because we won't need to handle errors
for it */
opal_output(-1, "RTU received cm id %p -- original cached reply %p",
orte_output(-1, "RTU received cm id %p -- original cached reply %p",
(void*)event->cm_id, (void*)reply);
opal_list_remove_item(&ibcm_pending_replies, &(reply->super.super));
OBJ_RELEASE(reply);
@ -1971,11 +1970,11 @@ static int ready_to_use_received(ibcm_listen_cm_id_t *h,
/* Have all the QP's been connected? If so, tell the main BTL
that we're done. */
if (0 == --(ie->ie_qps_to_connect)) {
opal_output(-1, "ib cm rtu handler: RTU telling main BTL we're connected");
orte_output(-1, "ib cm rtu handler: RTU telling main BTL we're connected");
ompi_btl_openib_fd_schedule(callback_set_endpoint_connected, endpoint);
}
opal_output(-1, "ib cm rtu handler: all done");
orte_output(-1, "ib cm rtu handler: all done");
return OMPI_SUCCESS;
}
@ -1983,7 +1982,7 @@ static int ready_to_use_received(ibcm_listen_cm_id_t *h,
static int disconnect_request_received(ibcm_listen_cm_id_t *cmh,
struct ib_cm_event *event)
{
opal_output(-1, "ibcm handler: disconnect request received");
orte_output(-1, "ibcm handler: disconnect request received");
return OMPI_SUCCESS;
}
@ -1991,7 +1990,7 @@ static int disconnect_request_received(ibcm_listen_cm_id_t *cmh,
static int disconnect_reply_received(ibcm_listen_cm_id_t *cmd,
struct ib_cm_event *event)
{
opal_output(-1, "ibcm handler: disconnect reply received");
orte_output(-1, "ibcm handler: disconnect reply received");
#if 0
ib_cm_send_drep(event->cm_id, NULL, 0);
#endif
@ -2005,7 +2004,7 @@ static int reject_received(ibcm_listen_cm_id_t *cmh, struct ib_cm_event *event)
ibcm_reject_reason_t *rej_reason =
(ibcm_reject_reason_t *) event->param.rej_rcvd.ari;
opal_output(-1, "ibcm handler: reject received: reason %d, official reason: %d",
orte_output(-1, "ibcm handler: reject received: reason %d, official reason: %d",
reason, *rej_reason);
/* Determine if we expected this reject or not */
@ -2019,18 +2018,18 @@ static int reject_received(ibcm_listen_cm_id_t *cmh, struct ib_cm_event *event)
ibcm_endpoint_t *ie = (ibcm_endpoint_t*)
endpoint->endpoint_local_cpc_data;
opal_output(-1, "ibcm rej handler: got WRONG_DIRECTION reject, endpoint: %p, pid %d, ep_index %d, qp_index %d",
orte_output(-1, "ibcm rej handler: got WRONG_DIRECTION reject, endpoint: %p, pid %d, ep_index %d, qp_index %d",
(void*)my_private_data->ireqd_request->endpoint,
my_private_data->ireqd_pid,
my_private_data->ireqd_ep_index,
my_private_data->ireqd_qp_index);
if (NULL == ie->ie_bogus_qp) {
opal_output(-1, "ibcm rej handler: WRONG_DIRECTION unexpected!");
orte_output(-1, "ibcm rej handler: WRONG_DIRECTION unexpected!");
} else {
/* Remove from the global pending_requests list because we
no longer need to handle errors for it */
opal_output(-1, "reply received cm id %p -- original cached req %p",
orte_output(-1, "reply received cm id %p -- original cached req %p",
(void*)cmh->listen_cm_id,
(void*)request);
opal_list_remove_item(&ibcm_pending_requests,
@ -2039,13 +2038,13 @@ static int reject_received(ibcm_listen_cm_id_t *cmh, struct ib_cm_event *event)
/* We ack the event and then destroy the CM ID (you *must*
ACK it first -- the destroy will block until all
outstand events on this ID are complete) */
opal_output(-1, "ibcm rej handler: destroying bogus CM ID: %p",
orte_output(-1, "ibcm rej handler: destroying bogus CM ID: %p",
(void*)request->super.cm_id);
ib_cm_ack_event(event);
ib_cm_destroy_id(request->super.cm_id);
/* Destroy the QP */
opal_output(-1, "ibcm rej handler: destroying bogus qp");
orte_output(-1, "ibcm rej handler: destroying bogus qp");
ibv_destroy_qp(ie->ie_bogus_qp);
ie->ie_bogus_qp = NULL;
@ -2056,7 +2055,7 @@ static int reject_received(ibcm_listen_cm_id_t *cmh, struct ib_cm_event *event)
return OMPI_SUCCESS;
}
opal_output(-1, "ibcm rej handler: got unexpected reject type: %d",
orte_output(-1, "ibcm rej handler: got unexpected reject type: %d",
reason);
return OMPI_ERR_NOT_FOUND;
}
@ -2064,22 +2063,22 @@ static int reject_received(ibcm_listen_cm_id_t *cmh, struct ib_cm_event *event)
static int request_error(ibcm_listen_cm_id_t *cmh, struct ib_cm_event *event)
{
ibcm_request_t *req;
opal_output(-1, "ibcm handler: request error!");
orte_output(-1, "ibcm handler: request error!");
if (IBV_WC_RESP_TIMEOUT_ERR != event->param.send_status) {
opal_show_help("help-mpi-btl-openib-cpc-ibcm.txt",
orte_show_help("help-mpi-btl-openib-cpc-ibcm.txt",
"unhandled error", true,
"request", orte_process_info.nodename,
event->param.send_status);
return OMPI_ERROR;
}
opal_output(-1, "Got timeout in IBCM request (CM ID: %p)",
orte_output(-1, "Got timeout in IBCM request (CM ID: %p)",
(void*)event->cm_id);
req = (ibcm_request_t*) find_cm_id(event->cm_id,
&ibcm_pending_requests);
if (NULL == req) {
opal_show_help("help-mpi-btl-openib-cpc-ibcm.txt",
orte_show_help("help-mpi-btl-openib-cpc-ibcm.txt",
"timeout not found", true,
"request", orte_process_info.nodename);
return OMPI_ERR_NOT_FOUND;
@ -2093,22 +2092,22 @@ static int request_error(ibcm_listen_cm_id_t *cmh, struct ib_cm_event *event)
static int reply_error(ibcm_listen_cm_id_t *cmh, struct ib_cm_event *event)
{
ibcm_reply_t *rep;
opal_output(-1, "ibcm handler: reply error!");
orte_output(-1, "ibcm handler: reply error!");
if (IBV_WC_RESP_TIMEOUT_ERR != event->param.send_status) {
opal_show_help("help-mpi-btl-openib-cpc-ibcm.txt",
orte_show_help("help-mpi-btl-openib-cpc-ibcm.txt",
"unhandled error", true,
"reply", orte_process_info.nodename,
event->param.send_status);
return OMPI_ERROR;
}
opal_output(-1, "Got timeout in IBCM reply (id: %p) -- aborting because resend is not written yet...",
orte_output(-1, "Got timeout in IBCM reply (id: %p) -- aborting because resend is not written yet...",
(void*)event->cm_id);
rep = (ibcm_reply_t*) find_cm_id(event->cm_id,
&ibcm_pending_replies);
if (NULL == rep) {
opal_show_help("help-mpi-btl-openib-cpc-ibcm.txt",
orte_show_help("help-mpi-btl-openib-cpc-ibcm.txt",
"timeout not found", true,
"reply", orte_process_info.nodename);
return OMPI_ERR_NOT_FOUND;
@ -2122,14 +2121,14 @@ static int reply_error(ibcm_listen_cm_id_t *cmh, struct ib_cm_event *event)
static int disconnect_request_error(ibcm_listen_cm_id_t *cmh,
struct ib_cm_event *e)
{
opal_output(-1, "ibcm handler: disconnect request error!");
orte_output(-1, "ibcm handler: disconnect request error!");
return OMPI_SUCCESS;
}
static int unhandled_event(ibcm_listen_cm_id_t *cmh, struct ib_cm_event *e)
{
opal_output(-1, "ibcm handler: unhandled event error (%p, %d)",
orte_output(-1, "ibcm handler: unhandled event error (%p, %d)",
(void*) e, e->event);
return OMPI_ERR_NOT_FOUND;
}
@ -2204,7 +2203,7 @@ static void *ibcm_event_dispatch(int fd, int flags, void *context)
}
if (OMPI_SUCCESS != rc) {
opal_output(-1, "An error occurred handling an IBCM event. Bad things are likely to happen.");
orte_output(-1, "An error occurred handling an IBCM event. Bad things are likely to happen.");
}
}

10
ompi/mca/btl/openib/connect/btl_openib_connect_oob.c
Просмотреть файл

@ -23,7 +23,7 @@
#include "ompi_config.h"
#include "opal/dss/dss.h"
#include "opal/util/output.h"
#include "orte/util/output.h"
#include "opal/util/error.h"
#include "orte/mca/oob/base/base.h"
#include "orte/mca/rml/rml.h"
@ -117,7 +117,7 @@ static int oob_component_query(mca_btl_openib_module_t *btl,
therefore we must be IB. */
#if defined(HAVE_STRUCT_IBV_DEVICE_TRANSPORT_TYPE)
if (IBV_TRANSPORT_IB != btl->hca->ib_dev->transport_type) {
opal_output_verbose(5, mca_btl_base_output,
orte_output_verbose(5, mca_btl_base_output,
"openib BTL: oob CPC only supported on InfiniBand; skipped on device %s",
ibv_get_device_name(btl->hca->ib_dev));
return OMPI_ERR_NOT_SUPPORTED;
@ -134,7 +134,7 @@ static int oob_component_query(mca_btl_openib_module_t *btl,
rml_recv_cb,
NULL);
if (ORTE_SUCCESS != rc) {
opal_output_verbose(5, mca_btl_base_output,
orte_output_verbose(5, mca_btl_base_output,
"openib BTL: oob CPC system error %d (%s)",
rc, opal_strerror(rc));
return rc;
@ -146,7 +146,7 @@ static int oob_component_query(mca_btl_openib_module_t *btl,
if (NULL == *cpc) {
orte_rml.recv_cancel(ORTE_NAME_WILDCARD, OMPI_RML_TAG_OPENIB);
rml_recv_posted = false;
opal_output_verbose(5, mca_btl_base_output,
orte_output_verbose(5, mca_btl_base_output,
"openib BTL: oob CPC system error (malloc failed)");
return OMPI_ERR_OUT_OF_RESOURCE;
}
@ -160,7 +160,7 @@ static int oob_component_query(mca_btl_openib_module_t *btl,
(*cpc)->cbm_endpoint_finalize = NULL;
(*cpc)->cbm_finalize = NULL;
opal_output_verbose(5, mca_btl_base_output,
orte_output_verbose(5, mca_btl_base_output,
"openib BTL: oob CPC available for use on %s",
ibv_get_device_name(btl->hca->ib_dev));
return OMPI_SUCCESS;

34
ompi/mca/btl/openib/connect/btl_openib_connect_rdmacm.c
Просмотреть файл

@ -28,9 +28,8 @@
#include <malloc.h>
#include "opal/util/argv.h"
#include "opal/util/show_help.h"
#include "opal/util/error.h"
#include "opal/util/output.h"
#include "orte/util/output.h"
#include "btl_openib_fd.h"
#include "btl_openib_proc.h"
@ -953,7 +952,7 @@ static int ipaddrcheck(struct rdmacm_contents *server, mca_btl_openib_module_t *
rc = ibv_query_device(openib_btl->hca->ib_dev_context, &attr);
if (-1 == rc) {
opal_output_verbose(5, mca_btl_base_output,
orte_output_verbose(5, mca_btl_base_output,
"openib BTL: rdmacm CPC system error (verbs failure)");
goto out;
}
@ -983,7 +982,7 @@ static int ipaddrcheck(struct rdmacm_contents *server, mca_btl_openib_module_t *
supported on this HCA. So just gracefully return "sorry,
Charlie" */
if (0 == server->ipaddr) {
opal_output_verbose(5, mca_btl_base_output, "openib BTL: rdmacm CPC unable to find IP address for %s", ibv_get_device_name(openib_btl->hca->ib_dev));
orte_output_verbose(5, mca_btl_base_output, "openib BTL: rdmacm CPC unable to find IP address for %s", ibv_get_device_name(openib_btl->hca->ib_dev));
goto out;
}
@ -1029,7 +1028,8 @@ static int rdmacm_component_query(mca_btl_openib_module_t *openib_btl, ompi_btl_
/* RDMACM is not supported if we have any XRC QPs */
if (mca_btl_openib_component.num_xrc_qps > 0) {
opal_output_verbose(5, mca_btl_base_output, "openib BTL: rdmacm CPC not supported with XRC receive queues; skipped");
orte_output_verbose(5, mca_btl_base_output,
"openib BTL: rdmacm CPC not supported with XRC receive queues; skipped");
rc = OMPI_ERR_NOT_SUPPORTED;
goto out;
}
@ -1066,7 +1066,7 @@ static int rdmacm_component_query(mca_btl_openib_module_t *openib_btl, ompi_btl_
context = malloc(sizeof(struct id_contexts));
if (NULL == context) {
opal_output_verbose(5, mca_btl_base_output,
orte_output_verbose(5, mca_btl_base_output,
"openib BTL: rdmacm CPC system error (malloc failed)");
rc = OMPI_ERR_OUT_OF_RESOURCE;
goto out3;
@ -1077,7 +1077,7 @@ static int rdmacm_component_query(mca_btl_openib_module_t *openib_btl, ompi_btl_
rc = rdma_create_id(event_channel, &server->id[0], context, RDMA_PS_TCP);
if (0 != rc) {
opal_output_verbose(5, mca_btl_base_output,
orte_output_verbose(5, mca_btl_base_output,
"openib BTL: rdmacm CPC failed to create ID");
rc = OMPI_ERR_OUT_OF_RESOURCE;
goto out4;
@ -1093,7 +1093,7 @@ static int rdmacm_component_query(mca_btl_openib_module_t *openib_btl, ompi_btl_
*/
rc = rdma_bind_addr(server->id[0], (struct sockaddr *)&sin);
if (0 != rc) {
opal_output_verbose(5, mca_btl_base_output,
orte_output_verbose(5, mca_btl_base_output,
"openib BTL: rdmacm CPC unable to bind to address");
rc = OMPI_ERR_UNREACH;
goto out5;
@ -1102,7 +1102,7 @@ static int rdmacm_component_query(mca_btl_openib_module_t *openib_btl, ompi_btl_
/* Verify that the HCA has a valid IP address on it, or we cannot use the cpc */
rc = ipaddrcheck(server, openib_btl);
if (0 != rc) {
opal_output_verbose(5, mca_btl_base_output,
orte_output_verbose(5, mca_btl_base_output,
"openib BTL: rdmacm IP address not found on port");
rc = OMPI_ERR_NOT_SUPPORTED;
goto out5;
@ -1112,7 +1112,7 @@ static int rdmacm_component_query(mca_btl_openib_module_t *openib_btl, ompi_btl_
/* FIXME - 1024 should be (num of connectors * mca_btl_openib_component.num_qps) */
rc = rdma_listen(server->id[0], 1024);
if (0 != rc) {
opal_output_verbose(5, mca_btl_base_output,
orte_output_verbose(5, mca_btl_base_output,
"openib BTL: rdmacm CPC unable to listen");
rc = OMPI_ERR_UNREACH;
goto out5;
@ -1120,7 +1120,7 @@ static int rdmacm_component_query(mca_btl_openib_module_t *openib_btl, ompi_btl_
rc = create_message(server, openib_btl, &(*cpc)->data);
if (0 != rc) {
opal_output_verbose(5, mca_btl_base_output,
orte_output_verbose(5, mca_btl_base_output,
"openib BTL: rdmacm CPC unable to create message");
rc = OMPI_ERR_OUT_OF_RESOURCE;
goto out5;
@ -1128,7 +1128,7 @@ static int rdmacm_component_query(mca_btl_openib_module_t *openib_btl, ompi_btl_
li = OBJ_NEW(list_item_t);
if (NULL== li) {
opal_output_verbose(5, mca_btl_base_output,
orte_output_verbose(5, mca_btl_base_output,
"openib BTL: rdmacm CPC unable to add to list");
rc = OMPI_ERR_OUT_OF_RESOURCE;
goto out6;
@ -1136,7 +1136,7 @@ static int rdmacm_component_query(mca_btl_openib_module_t *openib_btl, ompi_btl_
li->item = server;
opal_list_append(&server_list, &(li->super));
opal_output_verbose(5, mca_btl_base_output,
orte_output_verbose(5, mca_btl_base_output,
"openib BTL: rdmacm CPC available for use on %s",
ibv_get_device_name(openib_btl->hca->ib_dev));
return OMPI_SUCCESS;
@ -1155,11 +1155,11 @@ out1:
free(*cpc);
out:
if (OMPI_ERR_NOT_SUPPORTED == rc) {
opal_output_verbose(5, mca_btl_base_output,
orte_output_verbose(5, mca_btl_base_output,
"openib BTL: rdmacm CPC unavailable for use on %s; skipped",
ibv_get_device_name(openib_btl->hca->ib_dev));
} else {
opal_output_verbose(5, mca_btl_base_output,
orte_output_verbose(5, mca_btl_base_output,
"openib BTL: rmacm CPC unavailable for use on %s; fatal error %d (%s)",
ibv_get_device_name(openib_btl->hca->ib_dev), rc,
opal_strerror(rc));
@ -1216,14 +1216,14 @@ static int rdmacm_component_init(void)
rc = build_rdma_addr_list();
if (-1 == rc) {
opal_output_verbose(5, mca_btl_base_output,
orte_output_verbose(5, mca_btl_base_output,
"openib BTL: rdmacm CPC unable to find any valid IP address");
return OMPI_ERR_NOT_SUPPORTED;
}
event_channel = rdma_create_event_channel();
if (NULL == event_channel) {
opal_output_verbose(5, mca_btl_base_output,
orte_output_verbose(5, mca_btl_base_output,
"openib BTL: rdmacm CPC failed to create channel");
return OMPI_ERR_UNREACH;
}

10
ompi/mca/btl/openib/connect/btl_openib_connect_xoob.c
Просмотреть файл

@ -13,7 +13,7 @@
#include "opal/dss/dss.h"
#include "opal/util/error.h"
#include "opal/util/output.h"
#include "orte/util/output.h"
#include "orte/util/name_fns.h"
#include "orte/mca/rml/rml.h"
#include "orte/mca/errmgr/errmgr.h"
@ -923,7 +923,7 @@ static int xoob_component_query(mca_btl_openib_module_t *openib_btl,
int rc;
if (mca_btl_openib_component.num_xrc_qps <= 0) {
opal_output_verbose(5, mca_btl_base_output,
orte_output_verbose(5, mca_btl_base_output,
"openib BTL: xoob CPC only supported with XRC receive queues; skipped on device %s",
ibv_get_device_name(openib_btl->hca->ib_dev));
return OMPI_ERR_NOT_SUPPORTED;
@ -931,7 +931,7 @@ static int xoob_component_query(mca_btl_openib_module_t *openib_btl,
*cpc = malloc(sizeof(ompi_btl_openib_connect_base_module_t));
if (NULL == *cpc) {
opal_output_verbose(5, mca_btl_base_output,
orte_output_verbose(5, mca_btl_base_output,
"openib BTL: xoob CPC system error (malloc failed)");
return OMPI_ERR_OUT_OF_RESOURCE;
}
@ -946,7 +946,7 @@ static int xoob_component_query(mca_btl_openib_module_t *openib_btl,
xoob_rml_recv_cb,
NULL);
if (ORTE_SUCCESS != rc) {
opal_output_verbose(5, mca_btl_base_output,
orte_output_verbose(5, mca_btl_base_output,
"openib BTL: xoob CPC system error %d (%s)",
rc, opal_strerror(rc));
return rc;
@ -964,7 +964,7 @@ static int xoob_component_query(mca_btl_openib_module_t *openib_btl,
(*cpc)->cbm_endpoint_finalize = NULL;
(*cpc)->cbm_finalize = NULL;
opal_output_verbose(5, mca_btl_base_output,
orte_output_verbose(5, mca_btl_base_output,
"openib BTL: xoob CPC available for use on %s",
ibv_get_device_name(openib_btl->hca->ib_dev));
return OMPI_SUCCESS;

36
ompi/mca/btl/portals/btl_portals.c
Просмотреть файл

@ -26,7 +26,7 @@
#include <inttypes.h>
#include "ompi/constants.h"
#include "opal/util/output.h"
#include "orte/util/output.h"
#include "ompi/mca/pml/pml.h"
#include "ompi/mca/btl/btl.h"
#include "ompi/datatype/convertor.h"
@ -91,7 +91,7 @@ mca_btl_portals_add_procs(struct mca_btl_base_module_t* btl_base,
bool accel;
assert(&mca_btl_portals_module == (mca_btl_portals_module_t*) btl_base);
opal_output_verbose(50, mca_btl_portals_component.portals_output,
orte_output_verbose(50, mca_btl_portals_component.portals_output,
"Adding %d procs (%d)", (int) nprocs,
(int) mca_btl_portals_module.portals_num_procs);
@ -130,7 +130,7 @@ mca_btl_portals_add_procs(struct mca_btl_base_module_t* btl_base,
portals_procs[i],
&distance);
if (ret != PTL_OK) {
opal_output_verbose(10, mca_btl_portals_component.portals_output,
orte_output_verbose(10, mca_btl_portals_component.portals_output,
"Could not find distance to process %d", (int) i);
continue;
}
@ -147,7 +147,7 @@ mca_btl_portals_add_procs(struct mca_btl_base_module_t* btl_base,
/* create eqs */
int i;
opal_output_verbose(50, mca_btl_portals_component.portals_output,
orte_output_verbose(50, mca_btl_portals_component.portals_output,
"Enabling progress");
for (i = 0 ; i < OMPI_BTL_PORTALS_EQ_SIZE ; ++i) {
@ -156,7 +156,7 @@ mca_btl_portals_add_procs(struct mca_btl_base_module_t* btl_base,
PTL_EQ_HANDLER_NONE,
&(mca_btl_portals_module.portals_eq_handles[i]));
if (PTL_OK != ptl_ret) {
opal_output(mca_btl_portals_component.portals_output,
orte_output(mca_btl_portals_component.portals_output,
"Error creating EQ %d: %d", i, ptl_ret);
/* BWB - better error code? */
return OMPI_ERROR;
@ -192,7 +192,7 @@ mca_btl_portals_del_procs(struct mca_btl_base_module_t *btl_base,
int ret = OMPI_SUCCESS;
assert(&mca_btl_portals_module == (mca_btl_portals_module_t*) btl_base);
opal_output_verbose(50, mca_btl_portals_component.portals_output,
orte_output_verbose(50, mca_btl_portals_component.portals_output,
"Removing %d procs (%d)", (int) nprocs,
(int) mca_btl_portals_module.portals_num_procs);
@ -204,7 +204,7 @@ mca_btl_portals_del_procs(struct mca_btl_base_module_t *btl_base,
if (0 == mca_btl_portals_module.portals_num_procs) {
int i;
opal_output_verbose(50, mca_btl_portals_component.portals_output,
orte_output_verbose(50, mca_btl_portals_component.portals_output,
"Disabling progress");
ret = mca_btl_portals_recv_disable(&mca_btl_portals_module);
@ -213,7 +213,7 @@ mca_btl_portals_del_procs(struct mca_btl_base_module_t *btl_base,
for (i = 0 ; i < OMPI_BTL_PORTALS_EQ_SIZE ; ++i) {
int ptl_ret = PtlEQFree(mca_btl_portals_module.portals_eq_handles[i]);
if (PTL_OK != ptl_ret) {
opal_output(mca_btl_portals_component.portals_output,
orte_output(mca_btl_portals_component.portals_output,
"Error freeing EQ %d: %d", i, ptl_ret);
}
}
@ -362,7 +362,7 @@ mca_btl_portals_prepare_src(struct mca_btl_base_module_t* btl_base,
frag->base.des_src_cnt = 1;
/* either a put or get. figure out which later */
OPAL_OUTPUT_VERBOSE((90, mca_btl_portals_component.portals_output,
ORTE_OUTPUT_VERBOSE((90, mca_btl_portals_component.portals_output,
"rdma src posted for frag 0x%lx, callback 0x%lx, bits %"PRIu64", flags say %d" ,
(unsigned long) frag,
(unsigned long) frag->base.des_cbfunc,
@ -378,7 +378,7 @@ mca_btl_portals_prepare_src(struct mca_btl_base_module_t* btl_base,
PTL_INS_AFTER,
&me_h);
if (PTL_OK != ret) {
opal_output(mca_btl_portals_component.portals_output,
orte_output(mca_btl_portals_component.portals_output,
"Error creating rdma src ME: %d", ret);
OMPI_BTL_PORTALS_FRAG_RETURN_USER(&mca_btl_portals_module.super, frag);
OPAL_THREAD_ADD32(&mca_btl_portals_module.portals_outstanding_ops, -1);
@ -399,7 +399,7 @@ mca_btl_portals_prepare_src(struct mca_btl_base_module_t* btl_base,
PTL_UNLINK,
&(frag->md_h));
if (PTL_OK != ret) {
opal_output(mca_btl_portals_component.portals_output,
orte_output(mca_btl_portals_component.portals_output,
"Error creating rdma src MD: %d", ret);
PtlMEUnlink(me_h);
OMPI_BTL_PORTALS_FRAG_RETURN_USER(&mca_btl_portals_module.super, frag);
@ -457,7 +457,7 @@ mca_btl_portals_prepare_dst(struct mca_btl_base_module_t* btl_base,
frag->base.des_dst_cnt = 1;
frag->base.des_flags = flags;
OPAL_OUTPUT_VERBOSE((90, mca_btl_portals_component.portals_output,
ORTE_OUTPUT_VERBOSE((90, mca_btl_portals_component.portals_output,
"rdma dest posted for frag 0x%lx, callback 0x%lx, bits %" PRIu64 " flags %d",
(unsigned long) frag,
(unsigned long) frag->base.des_cbfunc,
@ -474,7 +474,7 @@ mca_btl_portals_prepare_dst(struct mca_btl_base_module_t* btl_base,
PTL_INS_AFTER,
&me_h);
if (PTL_OK != ret) {
opal_output(mca_btl_portals_component.portals_output,
orte_output(mca_btl_portals_component.portals_output,
"Error creating rdma dest ME: %d", ret);
OPAL_THREAD_ADD32(&mca_btl_portals_module.portals_outstanding_ops, -1);
OMPI_BTL_PORTALS_FRAG_RETURN_USER(&mca_btl_portals_module.super, frag);
@ -495,7 +495,7 @@ mca_btl_portals_prepare_dst(struct mca_btl_base_module_t* btl_base,
PTL_UNLINK,
&(frag->md_h));
if (PTL_OK != ret) {
opal_output(mca_btl_portals_component.portals_output,
orte_output(mca_btl_portals_component.portals_output,
"Error creating rdma dest MD: %d", ret);
PtlMEUnlink(me_h);
OPAL_THREAD_ADD32(&mca_btl_portals_module.portals_outstanding_ops, -1);
@ -513,7 +513,7 @@ mca_btl_portals_finalize(struct mca_btl_base_module_t *btl_base)
int ret;
assert(&mca_btl_portals_module == (mca_btl_portals_module_t*) btl_base);
OPAL_OUTPUT_VERBOSE((90, mca_btl_portals_component.portals_output,
ORTE_OUTPUT_VERBOSE((90, mca_btl_portals_component.portals_output,
"in mca_btl_portals_finalize"));
/* sanity check */
@ -521,7 +521,7 @@ mca_btl_portals_finalize(struct mca_btl_base_module_t *btl_base)
/* finalize all communication */
while (mca_btl_portals_module.portals_outstanding_ops > 0) {
OPAL_OUTPUT_VERBOSE((90, mca_btl_portals_component.portals_output,
ORTE_OUTPUT_VERBOSE((90, mca_btl_portals_component.portals_output,
"portals_outstanding_ops: %d",
mca_btl_portals_module.portals_outstanding_ops));
@ -543,7 +543,7 @@ mca_btl_portals_finalize(struct mca_btl_base_module_t *btl_base)
/* The PML isn't great about cleaning up after itself.
Ignore related errors. */
#endif
opal_output(mca_btl_portals_component.portals_output,
orte_output(mca_btl_portals_component.portals_output,
"Error freeing EQ %d: %d", i, ptl_ret);
#if (OMPI_PORTALS_CRAYXT3 || OMPI_PORTALS_CRAYXT3_MODEX)
}
@ -562,7 +562,7 @@ mca_btl_portals_finalize(struct mca_btl_base_module_t *btl_base)
ompi_common_portals_ni_finalize();
ompi_common_portals_finalize();
opal_output_verbose(20, mca_btl_portals_component.portals_output,
orte_output_verbose(20, mca_btl_portals_component.portals_output,
"successfully finalized module");
return OMPI_SUCCESS;

65
ompi/mca/btl/portals/btl_portals_component.c
Просмотреть файл

@ -25,9 +25,12 @@
#include "ompi/constants.h"
#include "opal/util/output.h"
#include "orte/util/output.h"
#include "opal/threads/threads.h"
#include "opal/mca/base/mca_base_param.h"
#include "orte/util/output.h"
#include "ompi/mca/common/portals/common_portals.h"
#include "btl_portals.h"
@ -67,7 +70,7 @@ mca_btl_portals_component_t mca_btl_portals_component = {
};
static opal_output_stream_t portals_output_stream;
static orte_output_stream_t portals_output_stream;
int
mca_btl_portals_component_open(void)
@ -81,7 +84,7 @@ mca_btl_portals_component_open(void)
*/
/* start up debugging output */
OBJ_CONSTRUCT(&portals_output_stream, opal_output_stream_t);
OBJ_CONSTRUCT(&portals_output_stream, orte_output_stream_t);
portals_output_stream.lds_is_debugging = true;
portals_output_stream.lds_want_stdout = true;
portals_output_stream.lds_file_suffix = "btl-portals";
@ -95,7 +98,7 @@ mca_btl_portals_component_open(void)
asprintf(&(portals_output_stream.lds_prefix),
"btl: portals (%s): ", ompi_common_portals_nodeid());
mca_btl_portals_component.portals_output =
opal_output_open(&portals_output_stream);
orte_output_open(&portals_output_stream, "BTL", "PORTALS", "DEBUG", NULL);
mca_base_param_reg_int(&mca_btl_portals_component.super.btl_version,
"free_list_init_num",
@ -226,7 +229,7 @@ mca_btl_portals_component_close(void)
}
/* close debugging stream */
opal_output_close(mca_btl_portals_component.portals_output);
orte_output_close(mca_btl_portals_component.portals_output);
mca_btl_portals_component.portals_output = -1;
return OMPI_SUCCESS;
@ -243,7 +246,7 @@ mca_btl_portals_component_init(int *num_btls,
btls[0] = (mca_btl_base_module_t*) &mca_btl_portals_module;
if (enable_progress_threads || enable_mpi_threads) {
opal_output_verbose(20, mca_btl_portals_component.portals_output,
orte_output_verbose(20, mca_btl_portals_component.portals_output,
"disabled because threads enabled");
return NULL;
}
@ -251,7 +254,7 @@ mca_btl_portals_component_init(int *num_btls,
/* initialize portals btl. note that this is in the compat code because
it's fairly non-portable between implementations */
if (OMPI_SUCCESS != ompi_common_portals_initialize(&mca_btl_portals_module.portals_ni_h, &accel)) {
opal_output_verbose(20, mca_btl_portals_component.portals_output,
orte_output_verbose(20, mca_btl_portals_component.portals_output,
"disabled because compatibility init failed");
return NULL;
}
@ -308,7 +311,7 @@ mca_btl_portals_component_init(int *num_btls,
*num_btls = 1;
opal_output_verbose(20, mca_btl_portals_component.portals_output,
orte_output_verbose(20, mca_btl_portals_component.portals_output,
"initialized Portals module");
return btls;
@ -344,7 +347,7 @@ mca_btl_portals_component_progress(void)
switch (ev.type) {
case PTL_EVENT_GET_START:
/* generated on source (target) when a get from memory starts */
OPAL_OUTPUT_VERBOSE((90, mca_btl_portals_component.portals_output,
ORTE_OUTPUT_VERBOSE((90, mca_btl_portals_component.portals_output,
"PTL_EVENT_GET_START for 0x%lx, %d",
(unsigned long) frag, (int) ev.hdr_data));
@ -352,13 +355,13 @@ mca_btl_portals_component_progress(void)
case PTL_EVENT_GET_END:
/* generated on source (target) when a get from memory ends */
OPAL_OUTPUT_VERBOSE((90, mca_btl_portals_component.portals_output,
ORTE_OUTPUT_VERBOSE((90, mca_btl_portals_component.portals_output,
"PTL_EVENT_GET_END for 0x%lx, %d, flags %d",
(unsigned long) frag, (int) ev.hdr_data,
frag->base.des_flags));
if( btl_ownership ) {
OPAL_OUTPUT_VERBOSE((90, mca_btl_portals_component.portals_output,
ORTE_OUTPUT_VERBOSE((90, mca_btl_portals_component.portals_output,
"in PTL_EVENT_GET_END received a frag with btl_ownership!"));
mca_btl_portals_free(&mca_btl_portals_module.super,
&frag->base);
@ -366,13 +369,13 @@ mca_btl_portals_component_progress(void)
break;
case PTL_EVENT_PUT_START:
/* generated on destination (target) when a put into memory starts */
OPAL_OUTPUT_VERBOSE((90, mca_btl_portals_component.portals_output,
ORTE_OUTPUT_VERBOSE((90, mca_btl_portals_component.portals_output,
"PTL_EVENT_PUT_START for 0x%lx, %d",
(unsigned long) frag, (int) ev.hdr_data));
#if OMPI_ENABLE_DEBUG
if (ev.ni_fail_type != PTL_NI_OK) {
opal_output(mca_btl_portals_component.portals_output,
orte_output(mca_btl_portals_component.portals_output,
"Failure to start event\n");
return OMPI_ERROR;
}
@ -387,13 +390,13 @@ mca_btl_portals_component_progress(void)
case PTL_EVENT_PUT_END:
/* generated on destination (target) when a put into memory ends */
OPAL_OUTPUT_VERBOSE((90, mca_btl_portals_component.portals_output,
ORTE_OUTPUT_VERBOSE((90, mca_btl_portals_component.portals_output,
"PTL_EVENT_PUT_END for 0x%lx, %d",
(unsigned long) frag, (int) ev.hdr_data));
#if OMPI_ENABLE_DEBUG
if (ev.ni_fail_type != PTL_NI_OK) {
opal_output(mca_btl_portals_component.portals_output,
orte_output(mca_btl_portals_component.portals_output,
"Failure to end event\n");
mca_btl_portals_return_block_part(&mca_btl_portals_module,
block);
@ -411,7 +414,7 @@ mca_btl_portals_component_progress(void)
frag->segments[0].seg_addr.pval = (((char*) ev.md.start) + ev.offset);
frag->segments[0].seg_len = ev.mlength;
OPAL_OUTPUT_VERBOSE((90, mca_btl_portals_component.portals_output,
ORTE_OUTPUT_VERBOSE((90, mca_btl_portals_component.portals_output,
"received send fragment 0x%lx (thresh: %d, length %d)",
(unsigned long) frag,
ev.md.threshold, (int) ev.mlength));
@ -422,7 +425,7 @@ mca_btl_portals_component_progress(void)
can't start it up again until everyone is done with it.
The actual reactivation and all that will happen after the
free completes the last operation... */
OPAL_OUTPUT_VERBOSE((90, mca_btl_portals_component.portals_output,
ORTE_OUTPUT_VERBOSE((90, mca_btl_portals_component.portals_output,
"marking block 0x%lx as full",
(unsigned long) block->start));
block->full = true;
@ -441,7 +444,7 @@ mca_btl_portals_component_progress(void)
/* generated on destination (origin) when a get starts
returning data */
OPAL_OUTPUT_VERBOSE((90, mca_btl_portals_component.portals_output,
ORTE_OUTPUT_VERBOSE((90, mca_btl_portals_component.portals_output,
"PTL_EVENT_REPLY_START for 0x%lx, %d",
(unsigned long) frag, (int) ev.hdr_data));
@ -451,7 +454,7 @@ mca_btl_portals_component_progress(void)
/* generated on destination (origin) when a get is
done returning data */
OPAL_OUTPUT_VERBOSE((90, mca_btl_portals_component.portals_output,
ORTE_OUTPUT_VERBOSE((90, mca_btl_portals_component.portals_output,
"PTL_EVENT_REPLY_END for 0x%lx",
(unsigned long) frag));
@ -461,7 +464,7 @@ mca_btl_portals_component_progress(void)
&frag->base,
OMPI_SUCCESS);
if( btl_ownership ) {
OPAL_OUTPUT_VERBOSE((90, mca_btl_portals_component.portals_output,
ORTE_OUTPUT_VERBOSE((90, mca_btl_portals_component.portals_output,
"in PTL_EVENT_REPLY_END received a frag with btl_ownership!"));
mca_btl_portals_free(&mca_btl_portals_module.super,
&frag->base);
@ -473,12 +476,12 @@ mca_btl_portals_component_progress(void)
/* generated on source (origin) when put starts sending */
#if OMPI_ENABLE_DEBUG
OPAL_OUTPUT_VERBOSE((90, mca_btl_portals_component.portals_output,
ORTE_OUTPUT_VERBOSE((90, mca_btl_portals_component.portals_output,
"PTL_EVENT_SEND_START for 0x%lx, %d",
(unsigned long) frag, (int) ev.hdr_data));
if (ev.ni_fail_type != PTL_NI_OK) {
opal_output(mca_btl_portals_component.portals_output,
orte_output(mca_btl_portals_component.portals_output,
"Failure to start send event\n");
frag->base.des_cbfunc(&mca_btl_portals_module.super,
frag->endpoint,
@ -495,12 +498,12 @@ mca_btl_portals_component_progress(void)
case PTL_EVENT_SEND_END:
/* generated on source (origin) when put stops sending */
#if OMPI_ENABLE_DEBUG
OPAL_OUTPUT_VERBOSE((90, mca_btl_portals_component.portals_output,
ORTE_OUTPUT_VERBOSE((90, mca_btl_portals_component.portals_output,
"PTL_EVENT_SEND_END for 0x%lx, %d",
(unsigned long) frag, (int) ev.hdr_data));
if (ev.ni_fail_type != PTL_NI_OK) {
opal_output(mca_btl_portals_component.portals_output,
orte_output(mca_btl_portals_component.portals_output,
"Failure to end send event\n");
frag->base.des_cbfunc(&mca_btl_portals_module.super,
frag->endpoint,
@ -537,18 +540,18 @@ mca_btl_portals_component_progress(void)
just call the callback function on goodness.
Requeue the put on badness */
OPAL_OUTPUT_VERBOSE((90, mca_btl_portals_component.portals_output,
ORTE_OUTPUT_VERBOSE((90, mca_btl_portals_component.portals_output,
"PTL_EVENT_ACK for 0x%lx",
(unsigned long) frag));
#if OMPI_ENABLE_DEBUG
if(!mca_btl_portals_component.portals_need_ack) {
opal_output(mca_btl_portals_component.portals_output,
orte_output(mca_btl_portals_component.portals_output,
"Received PTL_EVENT_ACK but ACK's are disabled!\n");
abort();
}
if (ev.ni_fail_type != PTL_NI_OK) {
opal_output(mca_btl_portals_component.portals_output,
orte_output(mca_btl_portals_component.portals_output,
"Failure to ack event\n");
frag->base.des_cbfunc(&mca_btl_portals_module.super,
frag->endpoint,
@ -566,7 +569,7 @@ mca_btl_portals_component_progress(void)
This should only happen for unexpected
messages, and only when the other side has no
buffer space available for receiving */
opal_output_verbose(50,
orte_output_verbose(50,
mca_btl_portals_component.portals_output,
"message was dropped. Trying again");
@ -611,15 +614,15 @@ mca_btl_portals_component_progress(void)
case PTL_EQ_DROPPED:
/* not sure how we could deal with this more gracefully */
opal_output(mca_btl_portals_component.portals_output,
orte_output(mca_btl_portals_component.portals_output,
"WARNING: EQ events dropped. Too many messages pending.");
opal_output(mca_btl_portals_component.portals_output,
orte_output(mca_btl_portals_component.portals_output,
"WARNING: Giving up in dispair");
abort();
break;
default:
opal_output(mca_btl_portals_component.portals_output,
orte_output(mca_btl_portals_component.portals_output,
"WARNING: Error in PtlEQPoll (%d). This shouldn't happen",
ret);
abort();

10
ompi/mca/btl/portals/btl_portals_rdma.c
Просмотреть файл

@ -23,7 +23,7 @@
#include <inttypes.h>
#include "ompi/constants.h"
#include "opal/util/output.h"
#include "orte/util/output.h"
#include "btl_portals.h"
#include "btl_portals_frag.h"
@ -36,7 +36,7 @@ mca_btl_portals_put(struct mca_btl_base_module_t* btl_base,
mca_btl_portals_frag_t *frag = (mca_btl_portals_frag_t*) descriptor;
int ret;
OPAL_OUTPUT_VERBOSE((90, mca_btl_portals_component.portals_output,
ORTE_OUTPUT_VERBOSE((90, mca_btl_portals_component.portals_output,
"PtlPut (rdma) fragment %lx, bits %" PRIx64,
(unsigned long) frag,
frag->base.des_dst[0].seg_key.key64));
@ -59,7 +59,7 @@ mca_btl_portals_put(struct mca_btl_base_module_t* btl_base,
0, /* remote offset - not used */
MCA_BTL_TAG_MAX); /* hdr_data - invalid tag */
if (ret != PTL_OK) {
opal_output(mca_btl_portals_component.portals_output,
orte_output(mca_btl_portals_component.portals_output,
"PtlPut failed with error %d", ret);
return OMPI_ERROR;
}
@ -76,7 +76,7 @@ mca_btl_portals_get(struct mca_btl_base_module_t* btl_base,
mca_btl_portals_frag_t *frag = (mca_btl_portals_frag_t*) descriptor;
int ret;
OPAL_OUTPUT_VERBOSE((90, mca_btl_portals_component.portals_output,
ORTE_OUTPUT_VERBOSE((90, mca_btl_portals_component.portals_output,
"PtlGet (rdma) fragment %lx, bits %" PRIx64,
(unsigned long) frag,
frag->base.des_src[0].seg_key.key64));
@ -94,7 +94,7 @@ mca_btl_portals_get(struct mca_btl_base_module_t* btl_base,
frag->base.des_src[0].seg_key.key64, /* match bits */
0); /* remote offset - not used */
if (ret != PTL_OK) {
opal_output(mca_btl_portals_component.portals_output,
orte_output(mca_btl_portals_component.portals_output,
"PtlGet failed with error %d", ret);
return OMPI_ERROR;
}

8
ompi/mca/btl/portals/btl_portals_recv.c
Просмотреть файл

@ -20,7 +20,7 @@
#include "ompi_config.h"
#include "ompi/constants.h"
#include "opal/util/output.h"
#include "orte/util/output.h"
#include "btl_portals.h"
#include "btl_portals_recv.h"
@ -49,7 +49,7 @@ mca_btl_portals_recv_enable(mca_btl_portals_module_t *btl)
md.user_ptr = NULL;
md.eq_handle = PTL_EQ_NONE;
opal_output_verbose(90, mca_btl_portals_component.portals_output,
orte_output_verbose(90, mca_btl_portals_component.portals_output,
"About to create reject entry");
ret = PtlMEAttach(btl->portals_ni_h,
OMPI_BTL_PORTALS_SEND_TABLE_ID,
@ -60,7 +60,7 @@ mca_btl_portals_recv_enable(mca_btl_portals_module_t *btl)
PTL_INS_BEFORE,
&(btl->portals_recv_reject_me_h));
if (PTL_OK != ret) {
opal_output(mca_btl_portals_component.portals_output,
orte_output(mca_btl_portals_component.portals_output,
"Error creating recv reject ME: %d", ret);
return OMPI_ERROR;
}
@ -70,7 +70,7 @@ mca_btl_portals_recv_enable(mca_btl_portals_module_t *btl)
PTL_RETAIN,
&md_h);
if (PTL_OK != ret) {
opal_output(mca_btl_portals_component.portals_output,
orte_output(mca_btl_portals_component.portals_output,
"Error attaching recv reject MD: %d", ret);
mca_btl_portals_recv_disable(btl);
return OMPI_ERROR;

12
ompi/mca/btl/portals/btl_portals_send.c
Просмотреть файл

@ -23,7 +23,7 @@
#include <assert.h>
#include "ompi/constants.h"
#include "opal/util/output.h"
#include "orte/util/output.h"
#include "btl_portals.h"
#include "btl_portals_send.h"
@ -43,14 +43,14 @@ mca_btl_portals_send(struct mca_btl_base_module_t* btl_base,
frag->endpoint = endpoint;
frag->hdr.tag = tag;
OPAL_OUTPUT_VERBOSE((90, mca_btl_portals_component.portals_output,
ORTE_OUTPUT_VERBOSE((90, mca_btl_portals_component.portals_output,
"PtlPut (send) fragment %lx",
(unsigned long) frag));
if (OPAL_THREAD_ADD32(&mca_btl_portals_module.portals_outstanding_ops, 1) >
mca_btl_portals_module.portals_max_outstanding_ops) {
/* no space - queue and continute */
opal_output_verbose(50, mca_btl_portals_component.portals_output,
orte_output_verbose(50, mca_btl_portals_component.portals_output,
"no space for message 0x%lx. Adding to back of queue",
(unsigned long) frag);
OPAL_THREAD_ADD32(&mca_btl_portals_module.portals_outstanding_ops, -1);
@ -81,13 +81,13 @@ mca_btl_portals_send(struct mca_btl_base_module_t* btl_base,
PTL_UNLINK,
&frag->md_h);
if (ret != PTL_OK) {
opal_output(mca_btl_portals_component.portals_output,
orte_output(mca_btl_portals_component.portals_output,
"PtlMDBind failed with error %d", ret);
return OMPI_ERROR;
}
}
OPAL_OUTPUT_VERBOSE((90, mca_btl_portals_component.portals_output,
ORTE_OUTPUT_VERBOSE((90, mca_btl_portals_component.portals_output,
"fragment info:\n"
"\tstart: 0x%lx\n"
"\tlen: %d",
@ -105,7 +105,7 @@ mca_btl_portals_send(struct mca_btl_base_module_t* btl_base,
0, /* remote offset - not used */
frag->hdr.tag); /* hdr_data: tag */
if (ret != PTL_OK) {
opal_output(mca_btl_portals_component.portals_output,
orte_output(mca_btl_portals_component.portals_output,
"send: PtlPut failed with error %d", ret);
return OMPI_ERROR;
}

2
ompi/mca/btl/portals/btl_portals_send.h
Просмотреть файл

@ -28,7 +28,7 @@
mca_btl_portals_module.portals_max_outstanding_ops)) { \
mca_btl_portals_frag_t *qfrag = (mca_btl_portals_frag_t*) \
opal_list_remove_first(&(mca_btl_portals_module.portals_queued_sends)); \
OPAL_OUTPUT_VERBOSE((90, mca_btl_portals_component.portals_output, \
ORTE_OUTPUT_VERBOSE((90, mca_btl_portals_component.portals_output, \
"retransmit for frag 0x%lx, 0x%lx", \
(unsigned long) qfrag, \
(unsigned long) qfrag->base.des_cbfunc)); \

2
ompi/mca/btl/sctp/btl_sctp.c
Просмотреть файл

@ -18,7 +18,7 @@
#include "ompi_config.h"
#include <string.h>
#include "opal/util/output.h"
#include "orte/util/output.h"
#include "opal/util/if.h"
#include "ompi/mca/pml/pml.h"
#include "ompi/mca/btl/btl.h"

2
ompi/mca/btl/sctp/btl_sctp.h
Просмотреть файл

@ -35,7 +35,7 @@
/* Open MPI includes */
#include "opal/event/event.h"
#include "opal/util/output.h"
#include "orte/util/output.h"
#include "ompi/class/ompi_bitmap.h"
#include "ompi/class/ompi_free_list.h"
#include "ompi/mca/pml/pml.h"

2
ompi/mca/btl/sctp/btl_sctp_component.c
Просмотреть файл

@ -46,7 +46,7 @@
#include "opal/event/event.h"
#include "opal/util/if.h"
#include "opal/util/argv.h"
#include "opal/util/output.h"
#include "orte/util/output.h"
#include "orte/mca/oob/base/base.h"
#include "ompi/mca/pml/pml.h"
#include "ompi/mca/btl/btl.h"

8
ompi/mca/btl/sctp/btl_sctp_frag.c
Просмотреть файл

@ -398,11 +398,11 @@ repeat11:
case EWOULDBLOCK:
return false;
case EFAULT:
opal_output( 0, "mca_btl_sctp_frag_recv: readv error (%p, %d)\n\t%s(%d)\n",
orte_output( 0, "mca_btl_sctp_frag_recv: readv error (%p, %d)\n\t%s(%d)\n",
frag->iov_ptr[0].iov_base, (int) frag->iov_ptr[0].iov_len,
strerror(opal_socket_errno), (int) frag->iov_cnt );
default:
opal_output(0, "mca_btl_sctp_frag_recv: readv failed with errno=%d",
orte_output(0, "mca_btl_sctp_frag_recv: readv failed with errno=%d",
opal_socket_errno);
mca_btl_sctp_endpoint_close(btl_endpoint);
return false;
@ -542,11 +542,11 @@ repeat:
case EWOULDBLOCK:
return false;
case EFAULT:
opal_output( 0, "mca_btl_sctp_frag_recv: error (%p, %d)\n\t%s(%d)\n",
orte_output( 0, "mca_btl_sctp_frag_recv: error (%p, %d)\n\t%s(%d)\n",
frag->iov_ptr[0].iov_base, (int) frag->iov_ptr[0].iov_len,
strerror(opal_socket_errno), (int) frag->iov_cnt );
default:
opal_output(0, "mca_btl_sctp_frag_recv: failed with errno=%d",
orte_output(0, "mca_btl_sctp_frag_recv: failed with errno=%d",
opal_socket_errno);
mca_btl_sctp_endpoint_close(btl_endpoint);
return false;

2
ompi/mca/btl/sctp/btl_sctp_recv_handler.c
Просмотреть файл

@ -41,7 +41,7 @@
#include "opal/event/event.h"
#include "opal/util/if.h"
#include "opal/util/argv.h"
#include "opal/util/output.h"
#include "orte/util/output.h"
#include "orte/mca/oob/base/base.h"
#include "ompi/mca/pml/pml.h"
#include "ompi/mca/btl/btl.h"

2
ompi/mca/btl/self/btl_self.c
Просмотреть файл

@ -29,7 +29,7 @@
#include "ompi/datatype/convertor.h"
#include "ompi/datatype/datatype.h"
#include "opal/sys/atomic.h"
#include "opal/util/output.h"
#include "orte/util/output.h"
#include "opal/util/if.h"
#include "orte/util/proc_info.h"
#include "opal/util/printf.h"

2
ompi/mca/btl/self/btl_self_component.c
Просмотреть файл

@ -31,7 +31,7 @@
#include "opal/event/event.h"
#include "opal/util/if.h"
#include "opal/util/argv.h"
#include "opal/util/output.h"
#include "orte/util/output.h"
#include "orte/util/proc_info.h"
#include "ompi/mca/pml/pml.h"
#include "opal/mca/base/mca_base_param.h"

6
ompi/mca/btl/sm/btl_sm.c
Просмотреть файл

@ -29,7 +29,7 @@
#include "opal/threads/mutex.h"
#include "ompi/datatype/convertor.h"
#include "opal/sys/atomic.h"
#include "opal/util/output.h"
#include "orte/util/output.h"
#include "opal/util/if.h"
#include "orte/util/proc_info.h"
#include "opal/util/printf.h"
@ -177,7 +177,7 @@ static int sm_btl_first_time_init(mca_btl_sm_t *sm_btl, int n)
mca_common_sm_mmap_init(size, sm_ctl_file,
sizeof(mca_common_sm_file_header_t),
CACHE_LINE_SIZE))) {
opal_output(0, "mca_btl_sm_add_procs: unable to create shared memory "
orte_output(0, "mca_btl_sm_add_procs: unable to create shared memory "
"BTL coordinating strucure :: size %lu \n",
(unsigned long)size);
free(sm_ctl_file);
@ -311,7 +311,7 @@ create_sm_endpoint(int local_proc, struct ompi_proc_t *proc)
(unsigned long)proc->proc_name.vpid);
ep->fifo_fd = open(path, O_WRONLY);
if(ep->fifo_fd < 0) {
opal_output(0, "mca_btl_sm_add_procs: open(%s) failed with errno=%d\n",
orte_output(0, "mca_btl_sm_add_procs: open(%s) failed with errno=%d\n",
path, errno);
free(ep);
return NULL;

2
ompi/mca/btl/sm/btl_sm.h
Просмотреть файл

@ -299,7 +299,7 @@ void mca_btl_sm_component_event_thread(opal_object_t*);
{ \
unsigned char cmd = DATA; \
if(write(peer->fifo_fd, &cmd, sizeof(cmd)) != sizeof(cmd)) { \
opal_output(0, "mca_btl_sm_send: write fifo failed: errno=%d\n", errno); \
orte_output(0, "mca_btl_sm_send: write fifo failed: errno=%d\n", errno); \
} \
}
#else

10
ompi/mca/btl/sm/btl_sm_component.c
Просмотреть файл

@ -42,7 +42,7 @@
#include "opal/event/event.h"
#include "opal/util/if.h"
#include "opal/util/argv.h"
#include "opal/util/output.h"
#include "orte/util/output.h"
#include "orte/util/proc_info.h"
#include "orte/runtime/orte_globals.h"
@ -207,7 +207,7 @@ int mca_btl_sm_component_close(void)
return_value = mca_common_sm_mmap_fini( mca_btl_sm_component.mmap_file );
if( OMPI_SUCCESS != return_value ) {
return_value=OMPI_ERROR;
opal_output(0," munmap failed :: file - %s :: errno - %d \n",
orte_output(0," munmap failed :: file - %s :: errno - %d \n",
mca_btl_sm_component.mmap_file->map_addr,
errno);
goto CLEANUP;
@ -228,7 +228,7 @@ int mca_btl_sm_component_close(void)
unsigned char cmd = DONE;
if( write(mca_btl_sm_component.sm_fifo_fd,&cmd,sizeof(cmd)) !=
sizeof(cmd)){
opal_output(0, "mca_btl_sm_component_close: write fifo failed: errno=%d\n",
orte_output(0, "mca_btl_sm_component_close: write fifo failed: errno=%d\n",
errno);
}
opal_thread_join(&mca_btl_sm_component.sm_fifo_thread, NULL);
@ -266,12 +266,12 @@ mca_btl_base_module_t** mca_btl_sm_component_init(
"%s"OPAL_PATH_SEP"sm_fifo.%lu", orte_process_info.job_session_dir,
(unsigned long)ORTE_PROC_MY_NAME->vpid );
if(mkfifo(mca_btl_sm_component.sm_fifo_path, 0660) < 0) {
opal_output(0, "mca_btl_sm_component_init: mkfifo failed with errno=%d\n",errno);
orte_output(0, "mca_btl_sm_component_init: mkfifo failed with errno=%d\n",errno);
return NULL;
}
mca_btl_sm_component.sm_fifo_fd = open(mca_btl_sm_component.sm_fifo_path, O_RDWR);
if(mca_btl_sm_component.sm_fifo_fd < 0) {
opal_output(0, "mca_btl_sm_component_init: open(%s) failed with errno=%d\n",
orte_output(0, "mca_btl_sm_component_init: open(%s) failed with errno=%d\n",
mca_btl_sm_component.sm_fifo_path, errno);
return NULL;
}

2
ompi/mca/btl/tcp/btl_tcp.c
Просмотреть файл

@ -21,7 +21,7 @@
#include "ompi_config.h"
#include <string.h>
#include "opal/util/output.h"
#include "orte/util/output.h"
#include "opal/util/if.h"
#include "ompi/mca/pml/pml.h"
#include "ompi/mca/btl/btl.h"

2
ompi/mca/btl/tcp/btl_tcp.h
Просмотреть файл

@ -36,7 +36,7 @@
/* Open MPI includes */
#include "opal/event/event.h"
#include "opal/util/output.h"
#include "orte/util/output.h"
#include "ompi/class/ompi_bitmap.h"
#include "ompi/class/ompi_free_list.h"
#include "ompi/mca/pml/pml.h"

10
ompi/mca/btl/tcp/btl_tcp_component.c
Просмотреть файл

@ -48,7 +48,7 @@
#include "opal/event/event.h"
#include "opal/util/if.h"
#include "opal/util/argv.h"
#include "opal/util/output.h"
#include "orte/util/output.h"
#include "orte/mca/oob/base/base.h"
#include "orte/types.h"
#include "ompi/mca/pml/pml.h"
@ -532,7 +532,7 @@ static int mca_btl_tcp_component_create_listen(uint16_t af_family)
hints.ai_flags = AI_PASSIVE;
if ((error = getaddrinfo(NULL, "0", &hints, &res))) {
opal_output (0,
orte_output (0,
"mca_btl_tcp_create_listen: unable to resolve. %s\n",
gai_strerror (error));
CLOSE_THE_SOCKET(sd);
@ -549,7 +549,7 @@ static int mca_btl_tcp_component_create_listen(uint16_t af_family)
int flg = 0;
if (setsockopt (sd, IPPROTO_IPV6, IPV6_V6ONLY,
&flg, sizeof (flg)) < 0) {
opal_output(0,
orte_output(0,
"mca_btl_tcp_create_listen: unable to disable v4-mapped addresses\n");
}
}
@ -724,7 +724,7 @@ static int mca_btl_tcp_component_exchange(void)
if (OPAL_SUCCESS !=
opal_ifindextoaddr(index, (struct sockaddr*) &my_ss,
sizeof (my_ss))) {
opal_output (0,
orte_output (0,
"btl_tcp_component: problems getting address for index %i (kernel index %i)\n",
index, opal_ifindextokindex (index));
continue;
@ -829,7 +829,7 @@ mca_btl_base_module_t** mca_btl_tcp_component_init(int *num_btl_modules,
#if OPAL_WANT_IPV6
if((ret = mca_btl_tcp_component_create_listen(AF_INET6)) != OMPI_SUCCESS) {
if (!(OMPI_ERR_IN_ERRNO == ret && EAFNOSUPPORT == opal_socket_errno)) {
opal_output (0, "mca_btl_tcp_component: IPv6 listening socket failed\n");
orte_output (0, "mca_btl_tcp_component: IPv6 listening socket failed\n");
return 0;
}
}

2
ompi/mca/btl/tcp/btl_tcp_ft.h
Просмотреть файл

@ -24,7 +24,7 @@
#ifdef HAVE_SYS_TYPES_H
#include <sys/types.h>
#endif
#include "opal/util/output.h"
#include "orte/util/output.h"
#if defined(c_plusplus) || defined(__cplusplus)
extern "C" {

6
ompi/mca/btl/tcp/btl_tcp_proc.c
Просмотреть файл

@ -326,7 +326,7 @@ int mca_btl_tcp_proc_insert( mca_btl_tcp_proc_t* btl_proc,
sizeof(int));
break;
default:
opal_output(0, "unknown address family for tcp: %d\n",
orte_output(0, "unknown address family for tcp: %d\n",
local_addr.ss_family);
}
}
@ -376,7 +376,7 @@ int mca_btl_tcp_proc_insert( mca_btl_tcp_proc_t* btl_proc,
&endpoint_addr_ss, sizeof(endpoint_addr_ss));
break;
default:
opal_output(0, "unknown address family for tcp: %d\n",
orte_output(0, "unknown address family for tcp: %d\n",
local_addr.ss_family);
/*
* return OMPI_UNREACH or some error, as this is not
@ -647,7 +647,7 @@ bool mca_btl_tcp_proc_tosocks(mca_btl_tcp_addr_t* proc_addr,
break;
#endif
default:
opal_output( 0, "mca_btl_tcp_proc: unknown af_family received: %d\n",
orte_output( 0, "mca_btl_tcp_proc: unknown af_family received: %d\n",
proc_addr->addr_family );
return false;
}

2
ompi/mca/btl/template/btl_template.c
Просмотреть файл

@ -18,7 +18,7 @@
#include "ompi_config.h"
#include <string.h>
#include "opal/util/output.h"
#include "orte/util/output.h"
#include "opal/util/if.h"
#include "ompi/mca/pml/pml.h"
#include "ompi/mca/btl/btl.h"

2
ompi/mca/btl/template/btl_template.h
Просмотреть файл

@ -33,7 +33,7 @@
#include "ompi/mca/pml/pml.h"
#include "ompi/mca/btl/btl.h"
#include "ompi/mca/btl/base/base.h"
#include "opal/util/output.h"
#include "orte/util/output.h"
#include "ompi/mca/mpool/mpool.h"
#include "ompi/mca/btl/btl.h"

2
ompi/mca/btl/template/btl_template_component.c
Просмотреть файл

@ -22,7 +22,7 @@
#include "opal/event/event.h"
#include "opal/util/if.h"
#include "opal/util/argv.h"
#include "opal/util/output.h"
#include "orte/util/output.h"
#include "ompi/mca/pml/pml.h"
#include "ompi/mca/btl/btl.h"

4
ompi/mca/btl/udapl/btl_udapl.c
Просмотреть файл

@ -24,9 +24,9 @@
#include "ompi_config.h"
#include <errno.h>
#include <string.h>
#include "opal/util/output.h"
#include "orte/util/output.h"
#include "opal/util/if.h"
#include "opal/util/show_help.h"
#include "orte/util/show_help.h"
#include "ompi/mca/pml/pml.h"
#include "ompi/mca/btl/btl.h"

4
ompi/mca/btl/udapl/btl_udapl.h
Просмотреть файл

@ -38,7 +38,7 @@
#include "ompi/mca/pml/pml.h"
#include "ompi/mca/btl/btl.h"
#include "ompi/mca/btl/base/base.h"
#include "opal/util/output.h"
#include "orte/util/output.h"
#include "ompi/mca/mpool/mpool.h"
#include "ompi/mca/btl/btl.h"
#include "btl_udapl_endpoint.h"
@ -236,7 +236,7 @@ do { \
#define BTL_UDAPL_VERBOSE_HELP(verbose_level, args) \
do { \
if (verbose_level <= mca_btl_udapl_component.udapl_verbosity) { \
opal_show_help args; \
orte_show_help args; \
} \
} while(0);

6
ompi/mca/btl/udapl/btl_udapl_component.c
Просмотреть файл

@ -28,8 +28,8 @@
#include "opal/event/event.h"
#include "opal/util/if.h"
#include "opal/util/argv.h"
#include "opal/util/output.h"
#include "opal/util/show_help.h"
#include "orte/util/output.h"
#include "orte/util/show_help.h"
#include "ompi/mca/pml/pml.h"
#include "ompi/mca/btl/btl.h"
#include "ompi/runtime/params.h"
@ -183,7 +183,7 @@ mca_btl_udapl_error(DAT_RETURN ret, char* str)
exit(-1);
}
OPAL_OUTPUT((0, "ERROR: %s %s %s\n", str, major, minor));
ORTE_OUTPUT((0, "ERROR: %s %s %s\n", str, major, minor));
}
#endif

2
ompi/mca/btl/udapl/btl_udapl_endpoint.c
Просмотреть файл

@ -27,7 +27,7 @@
#include <time.h>
#include "ompi/types.h"
#include "opal/include/opal/align.h"
#include "opal/util/show_help.h"
#include "orte/util/show_help.h"
#include "orte/mca/oob/base/base.h"
#include "orte/mca/rml/rml.h"

2
ompi/mca/btl/udapl/btl_udapl_mca.c
Просмотреть файл

@ -19,7 +19,7 @@
*/
#include "ompi_config.h"
#include "opal/util/output.h"
#include "orte/util/output.h"
#include "opal/mca/base/mca_base_param.h"
#include "btl_udapl.h"
#include "btl_udapl_mca.h"

2
ompi/mca/btl/udapl/btl_udapl_proc.c
Просмотреть файл

@ -22,7 +22,7 @@
#include "ompi_config.h"
#include "opal/class/opal_hash_table.h"
#include "opal/util/show_help.h"
#include "orte/util/show_help.h"
#include "ompi/runtime/ompi_module_exchange.h"
#include "opal/util/net.h"
#include "btl_udapl.h"

4
ompi/mca/coll/base/base.h
Просмотреть файл

@ -173,8 +173,8 @@ OMPI_DECLSPEC int mca_coll_base_close(void);
*/
OMPI_DECLSPEC extern int mca_coll_base_param;
/**
* Coll framework debugging stream ID used with opal_output() and
* opal_output_verbose().
* Coll framework debugging stream ID used with orte_output() and
* orte_output_verbose().
*/
OMPI_DECLSPEC extern int mca_coll_base_output;

14
ompi/mca/coll/base/coll_base_comm_select.c
Просмотреть файл

@ -27,7 +27,7 @@
#include "mpi.h"
#include "ompi/communicator/communicator.h"
#include "opal/util/argv.h"
#include "opal/util/show_help.h"
#include "orte/util/output.h"
#include "opal/class/opal_list.h"
#include "opal/class/opal_object.h"
#include "opal/mca/mca.h"
@ -108,7 +108,7 @@ int mca_coll_base_comm_select(ompi_communicator_t *comm)
snprintf(name, sizeof(name), "%s (cid %d)", comm->c_name,
comm->c_contextid);
name[sizeof(name) - 1] = '\0';
opal_output_verbose(10, mca_coll_base_output,
orte_output_verbose(10, mca_coll_base_output,
"coll:base:comm_select: new communicator: %s",
name);
@ -126,7 +126,7 @@ int mca_coll_base_comm_select(ompi_communicator_t *comm)
name_array = opal_argv_split(names, ',');
num_names = opal_argv_count(name_array);
opal_output_verbose(10, mca_coll_base_output,
orte_output_verbose(10, mca_coll_base_output,
"coll:base:comm_select: Checking specific modules: %s",
names);
selectable = check_components(&mca_coll_base_components_available,
@ -134,7 +134,7 @@ int mca_coll_base_comm_select(ompi_communicator_t *comm)
opal_argv_free(name_array);
} else {
/* no specific components given -- try all */
opal_output_verbose(10, mca_coll_base_output,
orte_output_verbose(10, mca_coll_base_output,
"coll:base:comm_select: Checking all available modules");
selectable = check_components(&mca_coll_base_components_available,
comm, NULL, 0);
@ -145,7 +145,7 @@ int mca_coll_base_comm_select(ompi_communicator_t *comm)
collective modules available, then use the basic component */
if (NULL == selectable) {
/* There's no modules available */
opal_show_help("help-mca-coll-base",
orte_show_help("help-mca-coll-base",
"comm-select:none-available", true);
return OMPI_ERROR;
}
@ -321,13 +321,13 @@ static int check_one_component(ompi_communicator_t *comm,
if (OMPI_SUCCESS == err) {
priority = (priority < 100) ? priority : 100;
opal_output_verbose(10, mca_coll_base_output,
orte_output_verbose(10, mca_coll_base_output,
"coll:base:comm_select: component available: %s, priority: %d",
component->mca_component_name, priority);
} else {
priority = -1;
opal_output_verbose(10, mca_coll_base_output,
orte_output_verbose(10, mca_coll_base_output,
"coll:base:comm_select: component not available: %s",
component->mca_component_name);
}

2
ompi/mca/coll/base/coll_base_comm_unselect.c
Просмотреть файл

@ -24,7 +24,7 @@
#include "mpi.h"
#include "ompi/communicator/communicator.h"
#include "opal/util/show_help.h"
#include "orte/util/output.h"
#include "opal/mca/mca.h"
#include "opal/mca/base/base.h"
#include "ompi/mca/coll/coll.h"

15
ompi/mca/coll/base/coll_base_find_available.c
Просмотреть файл

@ -25,8 +25,7 @@
#include "mpi.h"
#include "ompi/constants.h"
#include "opal/class/opal_list.h"
#include "opal/util/output.h"
#include "opal/util/show_help.h"
#include "orte/util/output.h"
#include "opal/mca/mca.h"
#include "opal/mca/base/base.h"
#include "opal/mca/base/mca_base_component_repository.h"
@ -127,9 +126,9 @@ int mca_coll_base_find_available(bool enable_progress_threads,
/* Need to free all items in the list */
OBJ_DESTRUCT(&mca_coll_base_components_available);
mca_coll_base_components_available_valid = false;
opal_output_verbose(10, mca_coll_base_output,
orte_output_verbose(10, mca_coll_base_output,
"coll:find_available: no coll components available!");
opal_show_help("help-mca-base", "find-available:none-found", true,
orte_show_help("help-mca-base", "find-available:none-found", true,
"coll");
return OMPI_ERROR;
}
@ -151,7 +150,7 @@ static int init_query(const mca_base_component_t *m,
{
int ret;
opal_output_verbose(10, mca_coll_base_output,
orte_output_verbose(10, mca_coll_base_output,
"coll:find_available: querying coll component %s",
m->mca_component_name);
@ -166,7 +165,7 @@ static int init_query(const mca_base_component_t *m,
} else {
/* Unrecognized coll API version */
opal_output_verbose(10, mca_coll_base_output,
orte_output_verbose(10, mca_coll_base_output,
"coll:find_available: unrecognized coll API version (%d.%d.%d, ignored)",
m->mca_type_major_version,
m->mca_type_minor_version,
@ -177,14 +176,14 @@ static int init_query(const mca_base_component_t *m,
/* Query done -- look at the return value to see what happened */
if (OMPI_SUCCESS != ret) {
opal_output_verbose(10, mca_coll_base_output,
orte_output_verbose(10, mca_coll_base_output,
"coll:find_available: coll component %s is not available",
m->mca_component_name);
if (NULL != m->mca_close_component) {
m->mca_close_component();
}
} else {
opal_output_verbose(10, mca_coll_base_output,
orte_output_verbose(10, mca_coll_base_output,
"coll:find_available: coll component %s is available",
m->mca_component_name);
}

Некоторые файлы не были показаны из-за слишком большого количества измененных файлов Показать больше