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

* rename ompi_output to opal_output

Просмотр исходного кода 
This commit was SVN r6329.
Этот коммит содержится в:
Brian Barrett 2005-07-03 23:31:27 +00:00
родитель 23b687b0f4
Коммит a13166b500
325 изменённых файлов: 1536 добавлений и 1537 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

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

@ -253,7 +253,7 @@ int ompi_attr_create_predefined(void)
trig1 = &trig;
rc = orte_gpr.subscribe(1, &sub1, 1, &trig1);
if(ORTE_SUCCESS != rc) {
ompi_output(0, "ompi_attr_create_predefined: subscribe failed");
opal_output(0, "ompi_attr_create_predefined: subscribe failed");
OBJ_DESTRUCT(&value);
sub.values = NULL;
OBJ_DESTRUCT(&sub);

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

@ -22,7 +22,7 @@
#include "include/constants.h"
#include "class/ompi_pointer_array.h"
#include "util/output.h"
#include "opal/util/output.h"
enum { TABLE_INIT = 1, TABLE_GROW = 2 };
@ -74,7 +74,7 @@ int ompi_pointer_array_add(ompi_pointer_array_t *table, void *ptr)
int index;
if (0) {
ompi_output(0,"ompi_pointer_array_add: IN: "
opal_output(0,"ompi_pointer_array_add: IN: "
" table %p (size %ld, lowest free %ld, number free %ld)"
" ptr = %p\n",
table, table->size, table->lowest_free, table->number_free,
@ -92,7 +92,7 @@ int ompi_pointer_array_add(ompi_pointer_array_t *table, void *ptr)
*/
if (0) {
ompi_output(0,"ompi_pointer_array_add: INIT: table %p\n", table);
opal_output(0,"ompi_pointer_array_add: INIT: table %p\n", table);
}
p = (void **) malloc(TABLE_INIT * sizeof(void *));
@ -147,7 +147,7 @@ int ompi_pointer_array_add(ompi_pointer_array_t *table, void *ptr)
}
if (0) {
ompi_output(0,"ompi_pointer_array_add: OUT: "
opal_output(0,"ompi_pointer_array_add: OUT: "
" table %p (size %ld, lowest free %ld, number free %ld)"
" addr[%d] = %p\n",
table, table->size, table->lowest_free, table->number_free,
@ -175,7 +175,7 @@ int ompi_pointer_array_set_item(ompi_pointer_array_t *table, int index,
assert(table != NULL);
#if 0
ompi_output(0,"ompi_pointer_array_set_item: IN: "
opal_output(0,"ompi_pointer_array_set_item: IN: "
" table %p (size %ld, lowest free %ld, number free %ld)"
" addr[%d] = %p\n",
table, table->size, table->lowest_free, table->number_free,
@ -248,7 +248,7 @@ int ompi_pointer_array_set_item(ompi_pointer_array_t *table, int index,
#if 0
ompi_output(0,"ompi_pointer_array_set_item: OUT: "
opal_output(0,"ompi_pointer_array_set_item: OUT: "
" table %p (size %ld, lowest free %ld, number free %ld)"
" addr[%d] = %p\n",
table, table->size, table->lowest_free, table->number_free,
@ -280,7 +280,7 @@ bool ompi_pointer_array_test_and_set_item (ompi_pointer_array_t *table,
assert(index >= 0);
#if 0
ompi_output(0,"ompi_pointer_array_test_and_set_item: IN: "
opal_output(0,"ompi_pointer_array_test_and_set_item: IN: "
" table %p (size %ld, lowest free %ld, number free %ld)"
" addr[%d] = %p\n",
table, table->size, table->lowest_free, table->number_free,
@ -324,7 +324,7 @@ bool ompi_pointer_array_test_and_set_item (ompi_pointer_array_t *table,
}
#if 0
ompi_output(0,"ompi_pointer_array_test_and_set_item: OUT: "
opal_output(0,"ompi_pointer_array_test_and_set_item: OUT: "
" table %p (size %ld, lowest free %ld, number free %ld)"
" addr[%d] = %p\n",
table, table->size, table->lowest_free, table->number_free,

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

@ -24,7 +24,7 @@
#include "proc/proc.h"
#include "opal/threads/mutex.h"
#include "util/bit_ops.h"
#include "util/output.h"
#include "opal/util/output.h"
#include "util/convert.h"
#include "mca/topo/topo.h"
#include "mca/topo/base/base.h"
@ -938,7 +938,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 ) {
ompi_output(0, "%d: Error in ompi_get_rprocs\n", local_rank);
opal_output(0, "%d: Error in ompi_get_rprocs\n", local_rank);
if ( NULL != rprocs ) {
free ( rprocs );
rprocs=NULL;
@ -1049,25 +1049,25 @@ int ompi_comm_determine_first ( ompi_communicator_t *intercomm, int high )
/********************************************************************************/
int ompi_comm_dump ( ompi_communicator_t *comm )
{
ompi_output(0, "Dumping information for comm_cid %d\n", comm->c_contextid);
ompi_output(0," f2c index:%d cube_dim: %d\n", comm->c_f_to_c_index,
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,
comm->c_cube_dim);
ompi_output(0," Local group: size = %d my_rank = %d\n",
opal_output(0," Local group: size = %d my_rank = %d\n",
comm->c_local_group->grp_proc_count,
comm->c_local_group->grp_my_rank );
ompi_output(0," Communicator is:");
opal_output(0," Communicator is:");
/* Display flags */
if ( OMPI_COMM_IS_INTER(comm) )
ompi_output(0," inter-comm,");
opal_output(0," inter-comm,");
if ( OMPI_COMM_IS_CART(comm))
ompi_output(0," topo-cart,");
opal_output(0," topo-cart,");
if ( OMPI_COMM_IS_GRAPH(comm))
ompi_output(0," topo-graph");
ompi_output(0,"\n");
opal_output(0," topo-graph");
opal_output(0,"\n");
if (OMPI_COMM_IS_INTER(comm)) {
ompi_output(0," Remote group size:%d\n", comm->c_remote_group->grp_proc_count);
opal_output(0," Remote group size:%d\n", comm->c_remote_group->grp_proc_count);
}
return MPI_SUCCESS;
}

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

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

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

@ -22,7 +22,7 @@
#include "errhandler/errhandler.h"
#include "opal/threads/mutex.h"
#include "util/output.h"
#include "opal/util/output.h"
#include "mpi.h"
#include "group/group.h"
#include "mca/coll/coll.h"
@ -212,7 +212,7 @@ struct ompi_communicator_t {
{
#if OMPI_ENABLE_DEBUG
if(peer_id >= comm->c_remote_group->grp_proc_count) {
ompi_output(0, "ompi_comm_lookup_peer: invalid peer index (%d)", peer_id);
opal_output(0, "ompi_comm_lookup_peer: invalid peer index (%d)", peer_id);
return (ompi_proc_t *) NULL;
}
#endif

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

@ -192,7 +192,7 @@ int ompi_convertor_create_stack_at_begining( ompi_convertor_t* pConvertor, const
PUSH_STACK( pStack, pConvertor->stack_pos, index, pElems[index].elem.common.type,
pElems[index].elem.count, pElems[index].elem.disp, 0 );
} else {
ompi_output( 0, "Here we should have a data in the datatype description\n" );
opal_output( 0, "Here we should have a data in the datatype description\n" );
ompi_ddt_dump( pConvertor->pDesc );
}
pConvertor->bConverted = 0;

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

@ -18,7 +18,7 @@
#ifndef DATATYPE_INTERNAL_H_HAS_BEEN_INCLUDED
#define DATATYPE_INTERNAL_H_HAS_BEEN_INCLUDED
#include "util/output.h"
#include "opal/util/output.h"
extern int ompi_ddt_dfd;
@ -26,17 +26,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... ) ompi_output(ompi_ddt_dfd, __VA_ARGS__)
# define DUMP( ARGS... ) opal_output(ompi_ddt_dfd, __VA_ARGS__)
# else
# if defined(__GNUC__) && !defined(__STDC__)
# define DUMP(ARGS...) ompi_output( ompi_ddt_dfd, ARGS)
# define DUMP(ARGS...) opal_output( ompi_ddt_dfd, ARGS)
# else
static inline void DUMP( char* fmt, ... )
{
va_list list;
va_start( list, fmt );
ompi_output( ompi_ddt_dfd, fmt, list );
opal_output( ompi_ddt_dfd, fmt, list );
va_end( list );
}
# define DUMP printf
@ -235,7 +235,7 @@ do { \
#define MEMCPY( DST, SRC, BLENGTH ) \
do { \
/*ompi_output( 0, "memcpy dest = %p src = %p length = %d\n", (void*)(DST), (void*)(SRC), (int)(BLENGTH) ); */\
/*opal_output( 0, "memcpy dest = %p src = %p length = %d\n", (void*)(DST), (void*)(SRC), (int)(BLENGTH) ); */\
memcpy( (DST), (SRC), (BLENGTH) ); \
} while (0)
@ -251,7 +251,7 @@ OMPI_DECLSPEC int ompi_ddt_safeguard_pointer_debug_breakpoint( const void* actua
__lower_bound += (PDATA)->true_lb; \
__upper_bound = (INITPTR) + ((PDATA)->ub - (PDATA)->lb) * ((COUNT) - 1) + (PDATA)->true_ub; \
if( ((ACTPTR) < __lower_bound) || ((ACTPTR) >= __upper_bound) ) { \
ompi_output( 0, "%s:%d\n\tPointer %p size %d is outside [%p,%p] for\n\tbase ptr %p count %d and data \n", \
opal_output( 0, "%s:%d\n\tPointer %p size %d is outside [%p,%p] for\n\tbase ptr %p count %d and data \n", \
__FILE__, __LINE__, (ACTPTR), (LENGTH), __lower_bound, __upper_bound, \
(INITPTR), (COUNT) ); \
ompi_ddt_dump( (PDATA) ); \

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

@ -518,7 +518,7 @@ int32_t ompi_ddt_init( void )
#if defined(VERBOSE)
{
ompi_ddt_dfd = ompi_output_open( NULL );
ompi_ddt_dfd = opal_output_open( NULL );
}
#endif /* VERBOSE */
@ -546,7 +546,7 @@ int32_t ompi_ddt_finalize( void )
#if defined(VERBOSE)
if( ompi_ddt_dfd != -1 )
ompi_output_close( ompi_ddt_dfd );
opal_output_close( ompi_ddt_dfd );
ompi_ddt_dfd = -1;
#endif /* VERBOSE */
@ -682,6 +682,6 @@ void ompi_ddt_dump( const ompi_datatype_t* pData )
index += __dump_data_desc( pData->opt_desc.desc, pData->opt_desc.used, buffer + index, length - index );
}
buffer[index] = '\0'; /* make sure we end the string with 0 */
ompi_output( 0, "%s\n", buffer );
opal_output( 0, "%s\n", buffer );
free(buffer);
}

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

@ -336,7 +336,7 @@ int ompi_convertor_pack_no_conversion( ompi_convertor_t* pConv,
pack_elem.common.type = pElems[pos_desc].elem.common.type;
last_blength = pack_elem.count * BASIC_DDT_FROM_ELEM(pElems[pos_desc])->size;
lastDisp = pStack->disp;
DO_DEBUG( ompi_output( 0, "pack_no_conversion stack_pos %d index %d count %d last_blength %ld lastDisp %ld savePos %p bConverted %d\n",
DO_DEBUG( opal_output( 0, "pack_no_conversion stack_pos %d index %d count %d last_blength %ld lastDisp %ld savePos %p bConverted %d\n",
pConv->stack_pos, pStack->index, pStack->count, last_blength, lastDisp, savePos,
pConv->bConverted ); );
saveLength = 0;
@ -372,7 +372,7 @@ int ompi_convertor_pack_no_conversion( ompi_convertor_t* pConv,
}
OMPI_DDT_SAFEGUARD_POINTER( source, copy_length,
pConv->pBaseBuf, pData, pConv->count );
DO_DEBUG( ompi_output( 0, "1. memcpy( %p, %p, %ld ) bConverted %ld space %ld pConv->bConverted %ld\n", destination, source,
DO_DEBUG( opal_output( 0, "1. memcpy( %p, %p, %ld ) bConverted %ld space %ld pConv->bConverted %ld\n", destination, source,
copy_length, bConverted, space_on_iovec, pConv->bConverted ); );
MEMCPY( destination, source, copy_length );
source += copy_length;
@ -431,13 +431,13 @@ int ompi_convertor_pack_no_conversion( ompi_convertor_t* pConv,
for( i = 0; i < (int)pack_elem.count; i++ ) {
OMPI_DDT_SAFEGUARD_POINTER( pConv->pBaseBuf + lastDisp, end_loop->size,
pConv->pBaseBuf, pData, pConv->count );
DO_DEBUG (ompi_output( 0, "2. memcpy( %p, %p, %ld )\n", destination, pConv->pBaseBuf + lastDisp,
DO_DEBUG (opal_output( 0, "2. memcpy( %p, %p, %ld )\n", destination, pConv->pBaseBuf + lastDisp,
end_loop->size ); );
MEMCPY( destination, pConv->pBaseBuf + lastDisp, end_loop->size );
lastDisp += pElems[pos_desc].loop.extent;
destination += end_loop->size;
}
DO_DEBUG( ompi_output( 0, "\t\tbConverted %d space %d pConv->bConverted %d\n",
DO_DEBUG( opal_output( 0, "\t\tbConverted %d space %d pConv->bConverted %d\n",
bConverted, space_on_iovec, pConv->bConverted ); );
i = end_loop->size * pack_elem.count; /* temporary value */
space_on_iovec -= i;
@ -511,7 +511,7 @@ int ompi_convertor_pack_no_conversion( ompi_convertor_t* pConv,
if( space_on_iovec > saveLength ) {
OMPI_DDT_SAFEGUARD_POINTER( source, saveLength,
pConv->pBaseBuf, pData, pConv->count );
DO_DEBUG( ompi_output( 0, "3. memcpy( %p, %p, %ld ) bConverted %ld space %ld pConv->bConverted %ld\n", destination, source,
DO_DEBUG( opal_output( 0, "3. memcpy( %p, %p, %ld ) bConverted %ld space %ld pConv->bConverted %ld\n", destination, source,
saveLength, bConverted, space_on_iovec, pConv->bConverted ); );
MEMCPY( destination, source, saveLength );
destination += saveLength;
@ -526,7 +526,7 @@ int ompi_convertor_pack_no_conversion( ompi_convertor_t* pConv,
}
OMPI_DDT_SAFEGUARD_POINTER( source, space_on_iovec,
pConv->pBaseBuf, pData, pConv->count );
DO_DEBUG( ompi_output( 0, "4. memcpy( %p, %p, %ld ) bConverted %ld space %ld pConv->bConverted %ld\n", destination, source,
DO_DEBUG( opal_output( 0, "4. memcpy( %p, %p, %ld ) bConverted %ld space %ld pConv->bConverted %ld\n", destination, source,
space_on_iovec, bConverted, space_on_iovec, pConv->bConverted ); );
MEMCPY( destination, source, space_on_iovec );
/* let's prepare for the next round. As I keep trace of the amount that I still
@ -574,7 +574,7 @@ int ompi_convertor_pack_no_conversion( ompi_convertor_t* pConv,
if( ((*out_size) == iov_pos) || (iov[iov_pos].iov_base == NULL) ) *out_size = iov_pos;
else *out_size = iov_pos + 1;
assert( pConv->bConverted <= (pData->size * pConv->count) );
DO_DEBUG( ompi_output( 0, "--------------------------------------------------------------------\n" ); );
DO_DEBUG( opal_output( 0, "--------------------------------------------------------------------\n" ); );
return (pConv->bConverted == (pData->size * pConv->count));
}

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

@ -28,19 +28,19 @@
void ompi_ddt_dump_stack( const dt_stack_t* pStack, int stack_pos,
const union dt_elem_desc* pDesc, const char* name )
{
ompi_output( 0, "\nStack %p stack_pos %d name %s\n", (void*)pStack, stack_pos, name );
opal_output( 0, "\nStack %p stack_pos %d name %s\n", (void*)pStack, stack_pos, name );
for( ; stack_pos >= 0; stack_pos-- ) {
ompi_output( 0, "%d: pos %d count %d disp %ld end_loop %d ", stack_pos, pStack[stack_pos].index,
opal_output( 0, "%d: pos %d count %d disp %ld end_loop %d ", stack_pos, pStack[stack_pos].index,
pStack[stack_pos].count, pStack[stack_pos].disp, pStack[stack_pos].end_loop );
if( pStack->index != -1 )
ompi_output( 0, "\t[desc count %d disp %ld extent %d]\n",
opal_output( 0, "\t[desc count %d disp %ld extent %d]\n",
pDesc[pStack[stack_pos].index].elem.count,
pDesc[pStack[stack_pos].index].elem.disp,
pDesc[pStack[stack_pos].index].elem.extent );
else
ompi_output( 0, "\n" );
opal_output( 0, "\n" );
}
ompi_output( 0, "\n" );
opal_output( 0, "\n" );
}
/*
@ -190,7 +190,7 @@ static int ompi_convertor_unpack_homogeneous( ompi_convertor_t* pConv,
pos_desc = pStack->index;
lastDisp = pStack->disp;
last_count = pStack->count;
/*ompi_output( 0, "ompi_convertor_unpack_homogeneous stack_pos %d index %d count %d lastDisp %ld bConverted %d\n",
/*opal_output( 0, "ompi_convertor_unpack_homogeneous stack_pos %d index %d count %d lastDisp %ld bConverted %d\n",
pConv->stack_pos, pStack->index, pStack->count, lastDisp, pConv->bConverted );*/
pStack--;
pConv->stack_pos--;
@ -230,7 +230,7 @@ static int ompi_convertor_unpack_homogeneous( ompi_convertor_t* pConv,
for( i = 0; i < last_count; i++ ) {
OMPI_DDT_SAFEGUARD_POINTER( pConv->pBaseBuf + lastDisp, end_loop->size,
pConv->pBaseBuf, pData, pConv->count );
/*ompi_output( 0, "3. memcpy %p, %p, %d", pConv->pBaseBuf + lastDisp, pSrcBuf, end_loop->size );*/
/*opal_output( 0, "3. memcpy %p, %p, %d", pConv->pBaseBuf + lastDisp, pSrcBuf, end_loop->size );*/
MEMCPY( pConv->pBaseBuf + lastDisp, pSrcBuf, end_loop->size );
pSrcBuf += end_loop->size;
lastDisp += pElems[pos_desc].loop.extent;
@ -267,7 +267,7 @@ static int ompi_convertor_unpack_homogeneous( ompi_convertor_t* pConv,
}
OMPI_DDT_SAFEGUARD_POINTER( pConv->pBaseBuf + lastDisp, last_blength,
pConv->pBaseBuf, pData, pConv->count );
/*ompi_output( 0, "1. memcpy %p, %p, %d -> %d", pConv->pBaseBuf + lastDisp, pSrcBuf, last_blength, bConverted );*/
/*opal_output( 0, "1. memcpy %p, %p, %d -> %d", pConv->pBaseBuf + lastDisp, pSrcBuf, last_blength, bConverted );*/
MEMCPY( pConv->pBaseBuf + lastDisp, pSrcBuf, last_blength );
bConverted += last_blength;
space -= last_blength;
@ -279,7 +279,7 @@ static int ompi_convertor_unpack_homogeneous( ompi_convertor_t* pConv,
for( i = 0; i < last_count; i++ ) {
OMPI_DDT_SAFEGUARD_POINTER( pConv->pBaseBuf + lastDisp, last_blength,
pConv->pBaseBuf, pData, pConv->count );
/*ompi_output( 0, "2. memcpy %p, %p, %d", pConv->pBaseBuf + lastDisp, pSrcBuf, last_blength );*/
/*opal_output( 0, "2. memcpy %p, %p, %d", pConv->pBaseBuf + lastDisp, pSrcBuf, last_blength );*/
MEMCPY( pConv->pBaseBuf + lastDisp, pSrcBuf, last_blength );
lastDisp += pElems[pos_desc].elem.extent;
pSrcBuf += basic_type->size;
@ -297,7 +297,7 @@ static int ompi_convertor_unpack_homogeneous( ompi_convertor_t* pConv,
OMPI_DDT_SAFEGUARD_POINTER( pConv->pBaseBuf + lastDisp, last_blength,
pConv->pBaseBuf, pData, pConv->count );
MEMCPY( pConv->pBaseBuf + lastDisp, pSrcBuf, last_blength );
/*ompi_output( 0, "1. memcpy %p, %p, %d -> %d", pConv->pBaseBuf + lastDisp, pSrcBuf, last_blength, bConverted );*/
/*opal_output( 0, "1. memcpy %p, %p, %d -> %d", pConv->pBaseBuf + lastDisp, pSrcBuf, last_blength, bConverted );*/
bConverted += last_blength;
lastDisp += last_blength;
}

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

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

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

@ -84,7 +84,7 @@ do { \
for( i = 0; i < copy_loops; i++ ) { \
OMPI_DDT_SAFEGUARD_POINTER( (CONVERTOR)->pBaseBuf + lastDisp, end_loop->size, \
(CONVERTOR)->pBaseBuf, (CONVERTOR)->pDesc, (CONVERTOR)->count ); \
DO_DEBUG (ompi_output( 0, "2. memcpy( %p, %p, %ld )\n", pDestBuf, (CONVERTOR)->pBaseBuf + lastDisp, \
DO_DEBUG (opal_output( 0, "2. memcpy( %p, %p, %ld )\n", pDestBuf, (CONVERTOR)->pBaseBuf + lastDisp, \
end_loop->size ); ); \
MEMCPY( pDestBuf, (CONVERTOR)->pBaseBuf + lastDisp, end_loop->size ); \
lastDisp += loop->extent; \

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

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

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

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

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

@ -23,7 +23,7 @@
#ifndef OMPI_GROUP_H
#define OMPI_GROUP_H
#include "util/output.h"
#include "opal/util/output.h"
#include "mpi.h"
#include "class/ompi_pointer_array.h"
#if defined(c_plusplus) || defined(__cplusplus)

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

@ -19,7 +19,7 @@
#include "include/constants.h"
#include "info/info.h"
#include "ompi/runtime/params.h"
#include "util/output.h"
#include "opal/util/output.h"
/*
@ -322,12 +322,12 @@ int ompi_info_finalize(void)
if (!info->i_freed && ompi_debug_show_handle_leaks) {
if (ompi_debug_show_handle_leaks) {
ompi_output(0, "WARNING: MPI_Info still allocated at MPI_FINALIZE");
opal_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;
ompi_output(0, "WARNING: key=\"%s\", value=\"%s\"",
opal_output(0, "WARNING: key=\"%s\", value=\"%s\"",
entry->ie_key,
NULL != entry->ie_value ? entry->ie_value : "(null)");
found = true;
@ -341,7 +341,7 @@ int ompi_info_finalize(void)
since we're destroying everything, it isn't worth it */
if (!found && ompi_debug_show_handle_leaks) {
ompi_output(0, "WARNING: (no keys)");
opal_output(0, "WARNING: (no keys)");
}
}
}

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

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

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

@ -94,12 +94,12 @@ int mca_btl_base_select(bool enable_progress_threads,
}
}
ompi_output_verbose(10, mca_btl_base_output,
opal_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) {
ompi_output_verbose(10, mca_btl_base_output,
opal_output_verbose(10, mca_btl_base_output,
"select: no init function; ignoring component");
} else {
modules = component->btl_init(&num_btls, enable_progress_threads,
@ -109,9 +109,9 @@ int mca_btl_base_select(bool enable_progress_threads,
list and remove it from the component repository */
if (NULL == modules) {
ompi_output_verbose(10, mca_btl_base_output,
opal_output_verbose(10, mca_btl_base_output,
"select: init returned failure");
ompi_output_verbose(10, mca_btl_base_output,
opal_output_verbose(10, mca_btl_base_output,
"select: module %s unloaded",
component->btl_version.mca_component_name);
@ -122,7 +122,7 @@ int mca_btl_base_select(bool enable_progress_threads,
/* Otherwise, it initialized properly. Save it. */
else {
ompi_output_verbose(10, mca_btl_base_output,
opal_output_verbose(10, mca_btl_base_output,
"select: init returned success");
for (i = 0; i < num_btls; ++i) {

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

@ -17,7 +17,7 @@
#include "ompi_config.h"
#include "gm_config.h"
#include <string.h>
#include "util/output.h"
#include "opal/util/output.h"
#include "util/if.h"
#include "mca/pml/pml.h"
#include "mca/btl/btl.h"
@ -579,7 +579,7 @@ static void mca_btl_gm_send_callback( struct gm_port* port, void* context, gm_st
default:
/* error condition can't deal with */
ompi_output(0, "[%s:%d] send completed with unhandled gm error %d\n", __FILE__,__LINE__,status);
opal_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 );
@ -602,7 +602,7 @@ static void mca_btl_gm_rdma_callback( struct gm_port* port, void* context, gm_st
frag->base.des_cbfunc(&btl->super, frag->endpoint, &frag->base, OMPI_SUCCESS);
break;
default:
ompi_output(0, "[%s:%d] gm rdma operation failed with status %d\n", __FILE__, __LINE__, status);
opal_output(0, "[%s:%d] gm rdma operation failed with status %d\n", __FILE__, __LINE__, status);
frag->base.des_cbfunc(&btl->super, frag->endpoint, &frag->base, OMPI_ERROR);
break;
}
@ -738,19 +738,19 @@ int mca_btl_gm_finalize(struct mca_btl_base_module_t* btl)
if(gm_btl->gm_frag_eager.fl_num_allocated !=
gm_btl->gm_frag_eager.super.opal_list_length){
ompi_output(0, "btl gm_frag_eager: %d allocated %d returned \n",
opal_output(0, "btl gm_frag_eager: %d allocated %d returned \n",
gm_btl->gm_frag_eager.fl_num_allocated,
gm_btl->gm_frag_eager.super.opal_list_length);
}
if(gm_btl->gm_frag_max.fl_num_allocated !=
gm_btl->gm_frag_max.super.opal_list_length) {
ompi_output(0, "btl gm_frag_max: %d allocated %d returned \n",
opal_output(0, "btl gm_frag_max: %d allocated %d returned \n",
gm_btl->gm_frag_max.fl_num_allocated,
gm_btl->gm_frag_max.super.opal_list_length);
}
if(gm_btl->gm_frag_user.fl_num_allocated !=
gm_btl->gm_frag_user.super.opal_list_length){
ompi_output(0, "btl gm_frag_user: %d allocated %d returned \n",
opal_output(0, "btl gm_frag_user: %d allocated %d returned \n",
gm_btl->gm_frag_user.fl_num_allocated,
gm_btl->gm_frag_user.super.opal_list_length);
}

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

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

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

@ -21,7 +21,7 @@
#include "opal/event/event.h"
#include "util/if.h"
#include "util/argv.h"
#include "util/output.h"
#include "opal/util/output.h"
#include "mca/pml/pml.h"
#include "mca/btl/btl.h"
@ -201,7 +201,7 @@ mca_btl_gm_module_init (mca_btl_gm_module_t * btl)
&btl->super,
&resources);
if(NULL == btl->gm_mpool) {
ompi_output (0, "[%s:%d] unable to initialize mpool", __FILE__, __LINE__);
opal_output (0, "[%s:%d] unable to initialize mpool", __FILE__, __LINE__);
return OMPI_ERROR;
}
@ -250,7 +250,7 @@ mca_btl_gm_module_init (mca_btl_gm_module_t * btl)
/* enable rdma */
if( GM_SUCCESS != gm_allow_remote_memory_access (btl->gm_port) ) {
ompi_output (0, "[%s:%d] unable to allow remote memory access", __FILE__, __LINE__);
opal_output (0, "[%s:%d] unable to allow remote memory access", __FILE__, __LINE__);
return OMPI_ERROR;
}
return OMPI_SUCCESS;
@ -294,18 +294,18 @@ static int mca_btl_gm_discover( void )
/* Get node local Id */
if( GM_SUCCESS != gm_get_node_id( gm_port, &local_id) ) {
ompi_output (0, " failure to get local_id \n");
opal_output (0, " failure to get local_id \n");
continue;
}
/* Gather an unique id for the node */
#if GM_API_VERSION > 0x200
if (GM_SUCCESS != gm_node_id_to_global_id( gm_port, local_id, &global_id) ) {
ompi_output (0, "[%s:%d] Unable to get my GM global unique id", __FILE__, __LINE__);
opal_output (0, "[%s:%d] Unable to get my GM global unique id", __FILE__, __LINE__);
continue;
}
#else
if( GM_SUCCESS != gm_get_host_name( gm_port, global_id ) ) {
ompi_output( 0, "[%s:%d] Unable to get the GM host name\n", __FILE__, __LINE__);
opal_output( 0, "[%s:%d] Unable to get the GM host name\n", __FILE__, __LINE__);
continue;
}
#endif /* GM_API_VERSION > 0x200 */
@ -313,7 +313,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) {
ompi_output( 0, "[%s:%d] out of resources", __FILE__, __LINE__);
opal_output( 0, "[%s:%d] out of resources", __FILE__, __LINE__);
return OMPI_ERR_OUT_OF_RESOURCE;
}
/* copy the basic informations into the new BTL */
@ -330,7 +330,7 @@ static int mca_btl_gm_discover( void )
#endif /* GM_API_VERSION > 0x200 */
if((rc = mca_btl_gm_module_init(btl)) != OMPI_SUCCESS) {
ompi_output(0, "[%s:%d] unable to initialze gm port", __FILE__, __LINE__);
opal_output(0, "[%s:%d] unable to initialze gm port", __FILE__, __LINE__);
return rc;
}
@ -389,14 +389,14 @@ mca_btl_gm_component_init (int *num_btl_modules,
/* s try to initialize GM */
if( GM_SUCCESS != gm_init() ) {
ompi_output( 0, "[%s:%d] error in initializing the gm library\n", __FILE__, __LINE__ );
opal_output( 0, "[%s:%d] error in initializing the gm library\n", __FILE__, __LINE__ );
return NULL;
}
/* 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) {
ompi_output( 0, "[%s:%d] out of resources.", __FILE__, __LINE__ );
opal_output( 0, "[%s:%d] out of resources.", __FILE__, __LINE__ );
return NULL;
}

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

@ -123,14 +123,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) {
ompi_output(0, "[%s:%d] mca_base_modex_recv failed for peer [%d,%d,%d]",
opal_output(0, "[%s:%d] mca_base_modex_recv failed for peer [%d,%d,%d]",
__FILE__,__LINE__,ORTE_NAME_ARGS(&ompi_proc->proc_name));
OBJ_RELEASE(gm_proc);
return NULL;
}
if((size % sizeof(mca_btl_gm_addr_t)) != 0) {
ompi_output(0, "[%s:%d] invalid gm address for peer [%d,%d,%d]",
opal_output(0, "[%s:%d] invalid gm address for peer [%d,%d,%d]",
__FILE__,__LINE__,ORTE_NAME_ARGS(&ompi_proc->proc_name));
OBJ_RELEASE(gm_proc);
return NULL;

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

@ -16,7 +16,7 @@
#include "ompi_config.h"
#include <string.h>
#include "util/output.h"
#include "opal/util/output.h"
#include "util/if.h"
#include "mca/pml/pml.h"
#include "mca/btl/btl.h"
@ -262,13 +262,13 @@ mca_btl_base_descriptor_t* mca_btl_mvapi_prepare_src(
rc = mca_mpool_base_remove((void*) vapi_reg->base_reg.base);
if(OMPI_SUCCESS != rc) {
ompi_output(0, "%s:%d:%s error removing memory region from memory pool tree", __FILE__, __LINE__, __func__);
opal_output(0, "%s:%d:%s error removing memory region from memory pool tree", __FILE__, __LINE__, __func__);
return NULL;
}
if(is_leave_pinned) {
if(NULL == opal_list_remove_item(&mvapi_btl->reg_mru_list, (opal_list_item_t*) vapi_reg)){
ompi_output(0,"%s:%d:%s error removing item from reg_mru_list", __FILE__, __LINE__, __func__);
opal_output(0,"%s:%d:%s error removing item from reg_mru_list", __FILE__, __LINE__, __func__);
return NULL;
}
}
@ -289,7 +289,7 @@ mca_btl_base_descriptor_t* mca_btl_mvapi_prepare_src(
if(rc != OMPI_SUCCESS) {
ompi_output(0,"%s:%d:%s error inserting memory region into memory pool tree", __FILE__, __LINE__, __func__);
opal_output(0,"%s:%d:%s error inserting memory region into memory pool tree", __FILE__, __LINE__, __func__);
return NULL;
}
@ -301,7 +301,7 @@ mca_btl_base_descriptor_t* mca_btl_mvapi_prepare_src(
}
else if(is_leave_pinned) {
if(NULL == opal_list_remove_item(&mvapi_btl->reg_mru_list, (opal_list_item_t*) vapi_reg)) {
ompi_output(0,"%s:%d:%s error removing item from reg_mru_list", __FILE__, __LINE__, __func__);
opal_output(0,"%s:%d:%s error removing item from reg_mru_list", __FILE__, __LINE__, __func__);
return NULL;
}
opal_list_append(&mvapi_btl->reg_mru_list, (opal_list_item_t*) vapi_reg);
@ -352,7 +352,7 @@ mca_btl_base_descriptor_t* mca_btl_mvapi_prepare_src(
opal_list_remove_last(&mvapi_btl->reg_mru_list);
if( NULL == old_reg) {
ompi_output(0,"%s:%d:%s error removing item from reg_mru_list", __FILE__, __LINE__, __func__);
opal_output(0,"%s:%d:%s error removing item from reg_mru_list", __FILE__, __LINE__, __func__);
return NULL;
}
@ -360,7 +360,7 @@ mca_btl_base_descriptor_t* mca_btl_mvapi_prepare_src(
rc = mca_mpool_base_remove((void*) old_reg->base_reg.base);
if(OMPI_SUCCESS != rc) {
ompi_output(0,"%s:%d:%s error removing memory region from memory pool tree", __FILE__, __LINE__, __func__);
opal_output(0,"%s:%d:%s error removing memory region from memory pool tree", __FILE__, __LINE__, __func__);
return NULL;
}
@ -517,13 +517,13 @@ mca_btl_base_descriptor_t* mca_btl_mvapi_prepare_dst(
rc = mca_mpool_base_remove((void*) vapi_reg->base_reg.base);
if(OMPI_SUCCESS != rc) {
ompi_output(0,"%s:%d:%s error removing memory region from memory pool tree", __FILE__, __LINE__, __func__);
opal_output(0,"%s:%d:%s error removing memory region from memory pool tree", __FILE__, __LINE__, __func__);
return NULL;
}
if(is_leave_pinned) {
if(NULL == opal_list_remove_item(&mvapi_btl->reg_mru_list, (opal_list_item_t*) vapi_reg)) {
ompi_output(0,"%s:%d:%s error removing item from reg_mru_list", __FILE__, __LINE__, __func__);
opal_output(0,"%s:%d:%s error removing item from reg_mru_list", __FILE__, __LINE__, __func__);
return NULL;
}
}
@ -542,7 +542,7 @@ mca_btl_base_descriptor_t* mca_btl_mvapi_prepare_dst(
(mca_mpool_base_registration_t*) vapi_reg);
if(OMPI_SUCCESS != rc) {
ompi_output(0,"%s:%d:%s error inserting memory region into memory pool tree", __FILE__, __LINE__, __func__);
opal_output(0,"%s:%d:%s error inserting memory region into memory pool tree", __FILE__, __LINE__, __func__);
return NULL;
}
OBJ_RETAIN(vapi_reg);
@ -555,7 +555,7 @@ mca_btl_base_descriptor_t* mca_btl_mvapi_prepare_dst(
}
else if(is_leave_pinned){
if(NULL == opal_list_remove_item(&mvapi_btl->reg_mru_list, (opal_list_item_t*) vapi_reg)) {
ompi_output(0,"%s:%d:%s error removing item from reg_mru_list", __FILE__, __LINE__, __func__);
opal_output(0,"%s:%d:%s error removing item from reg_mru_list", __FILE__, __LINE__, __func__);
return NULL;
}
opal_list_append(&mvapi_btl->reg_mru_list, (opal_list_item_t*) vapi_reg);
@ -572,13 +572,13 @@ mca_btl_base_descriptor_t* mca_btl_mvapi_prepare_dst(
opal_list_remove_last(&mvapi_btl->reg_mru_list);
if( NULL == old_reg) {
ompi_output(0,"%s:%d:%s error removing item from reg_mru_list", __FILE__, __LINE__, __func__);
opal_output(0,"%s:%d:%s error removing item from reg_mru_list", __FILE__, __LINE__, __func__);
return NULL;
}
rc = mca_mpool_base_remove((void*) old_reg->base_reg.base);
if(OMPI_SUCCESS !=rc ) {
ompi_output(0,"%s:%d:%s error removing memory region from memory pool tree", __FILE__, __LINE__, __func__);
opal_output(0,"%s:%d:%s error removing memory region from memory pool tree", __FILE__, __LINE__, __func__);
return NULL;
}
@ -598,7 +598,7 @@ mca_btl_base_descriptor_t* mca_btl_mvapi_prepare_dst(
(void*) (&mvapi_btl->super),
(mca_mpool_base_registration_t*) vapi_reg);
if(OMPI_SUCCESS != rc){
ompi_output(0,"%s:%d:%s error inserting memory region into memory pool", __FILE__, __LINE__, __func__);
opal_output(0,"%s:%d:%s error inserting memory region into memory pool", __FILE__, __LINE__, __func__);
return NULL;
}
@ -642,33 +642,33 @@ int mca_btl_mvapi_finalize(struct mca_btl_base_module_t* btl)
if(mvapi_btl->send_free_eager.fl_num_allocated !=
mvapi_btl->send_free_eager.super.opal_list_length){
ompi_output(0, "btl ib send_free_eager frags: %d allocated %d returned \n",
opal_output(0, "btl ib send_free_eager frags: %d allocated %d returned \n",
mvapi_btl->send_free_eager.fl_num_allocated,
mvapi_btl->send_free_eager.super.opal_list_length);
}
if(mvapi_btl->send_free_max.fl_num_allocated !=
mvapi_btl->send_free_max.super.opal_list_length){
ompi_output(0, "btl ib send_free_max frags: %d allocated %d returned \n",
opal_output(0, "btl ib send_free_max frags: %d allocated %d returned \n",
mvapi_btl->send_free_max.fl_num_allocated,
mvapi_btl->send_free_max.super.opal_list_length);
}
if(mvapi_btl->send_free_frag.fl_num_allocated !=
mvapi_btl->send_free_frag.super.opal_list_length){
ompi_output(0, "btl ib send_free_frag frags: %d allocated %d returned \n",
opal_output(0, "btl ib send_free_frag frags: %d allocated %d returned \n",
mvapi_btl->send_free_frag.fl_num_allocated,
mvapi_btl->send_free_frag.super.opal_list_length);
}
if(mvapi_btl->recv_free_eager.fl_num_allocated !=
mvapi_btl->recv_free_eager.super.opal_list_length){
ompi_output(0, "btl ib recv_free_eager frags: %d allocated %d returned \n",
opal_output(0, "btl ib recv_free_eager frags: %d allocated %d returned \n",
mvapi_btl->recv_free_eager.fl_num_allocated,
mvapi_btl->recv_free_eager.super.opal_list_length);
}
if(mvapi_btl->recv_free_max.fl_num_allocated !=
mvapi_btl->recv_free_max.super.opal_list_length){
ompi_output(0, "btl ib recv_free_max frags: %d allocated %d returned \n",
opal_output(0, "btl ib recv_free_max frags: %d allocated %d returned \n",
mvapi_btl->recv_free_max.fl_num_allocated,
mvapi_btl->recv_free_max.super.opal_list_length);
}
@ -766,14 +766,14 @@ static void async_event_handler(VAPI_hca_hndl_t hca_hndl,
case VAPI_LOCAL_CATASTROPHIC_ERROR:
case VAPI_PORT_ERROR:
{
ompi_output(0, "Got an asynchronous event: %s (%s)",
opal_output(0, "Got an asynchronous event: %s (%s)",
VAPI_event_record_sym(event_p->type),
VAPI_event_syndrome_sym(event_p->
syndrome));
break;
}
default:
ompi_output(0, "Warning!! Got an undefined "
opal_output(0, "Warning!! Got an undefined "
"asynchronous event\n");
}
@ -816,7 +816,7 @@ int mca_btl_mvapi_module_init(mca_btl_mvapi_module_t *mvapi_btl)
if(cqe_cnt <= 0) {
ompi_output(0, "%s: error creating completion queue ", __func__);
opal_output(0, "%s: error creating completion queue ", __func__);
return OMPI_ERROR;
}

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

@ -30,7 +30,7 @@
#include "opal/event/event.h"
#include "mca/pml/pml.h"
#include "mca/btl/btl.h"
#include "util/output.h"
#include "opal/util/output.h"
#include "mca/mpool/mpool.h"
#include "btl_mvapi_error.h"

22
ompi/mca/btl/mvapi/btl_mvapi_component.c
Просмотреть файл

@ -20,7 +20,7 @@
#include "opal/event/event.h"
#include "util/if.h"
#include "util/argv.h"
#include "util/output.h"
#include "opal/util/output.h"
#include "mca/pml/pml.h"
#include "mca/btl/btl.h"
@ -260,7 +260,7 @@ mca_btl_base_module_t** mca_btl_mvapi_component_init(int *num_btl_modules,
/* Determine the number of hca's available on the host */
vapi_ret=EVAPI_list_hcas(0, &num_hcas, NULL);
if( VAPI_EAGAIN != vapi_ret || 0 == num_hcas ) {
ompi_output(0,"No hca's found on this host \n");
opal_output(0,"No hca's found on this host \n");
return NULL;
}
@ -289,14 +289,14 @@ mca_btl_base_module_t** mca_btl_mvapi_component_init(int *num_btl_modules,
for(i = 0; i < num_hcas; i++){
vapi_ret = EVAPI_get_hca_hndl(hca_ids[i], &hca_hndl);
if(VAPI_OK != vapi_ret) {
ompi_output(0, "%s:error getting hca handle\n", __func__);
opal_output(0, "%s:error getting hca handle\n", __func__);
return NULL;
}
vapi_ret = VAPI_query_hca_cap(hca_hndl, &hca_vendor, &hca_cap);
if(VAPI_OK != vapi_ret) {
ompi_output(0, "%s:error getting hca properties\n", __func__);
opal_output(0, "%s:error getting hca properties\n", __func__);
return NULL;
}
@ -305,7 +305,7 @@ mca_btl_base_module_t** mca_btl_mvapi_component_init(int *num_btl_modules,
for(j = 1; j <= hca_cap.phys_port_num; j++){
vapi_ret = VAPI_query_hca_port_prop(hca_hndl, (IB_port_t) j, &hca_port);
if(VAPI_OK != vapi_ret) {
ompi_output(0, "%s:error getting hca port properties\n", __func__);
opal_output(0, "%s:error getting hca port properties\n", __func__);
return NULL;
}
@ -390,7 +390,7 @@ mca_btl_base_module_t** mca_btl_mvapi_component_init(int *num_btl_modules,
&hca_pd);
if(NULL == mvapi_btl->ib_pool) {
ompi_output(0, "%s: error creating vapi memory pool! aborting ib btl initialization", __func__);
opal_output(0, "%s: error creating vapi memory pool! aborting ib btl initialization", __func__);
return NULL;
}
/* Initialize pool of send fragments */
@ -499,7 +499,7 @@ int mca_btl_mvapi_component_progress()
ret = VAPI_poll_cq(mvapi_btl->nic, mvapi_btl->cq_hndl_high, &comp);
if(VAPI_OK == ret) {
if(comp.status != VAPI_SUCCESS) {
ompi_output(0, "Got error : %s, Vendor code : %d Frag : %p",
opal_output(0, "Got error : %s, Vendor code : %d Frag : %p",
VAPI_wc_status_sym(comp.status),
comp.vendor_err_syndrome, comp.id);
return OMPI_ERROR;
@ -509,7 +509,7 @@ int mca_btl_mvapi_component_progress()
switch(comp.opcode) {
case VAPI_CQE_RQ_RDMA_WITH_IMM:
if(comp.imm_data_valid){
ompi_output(0, "Got an RQ_RDMA_WITH_IMM!\n");
opal_output(0, "Got an RQ_RDMA_WITH_IMM!\n");
}
break;
@ -541,7 +541,7 @@ int mca_btl_mvapi_component_progress()
break;
default:
ompi_output(0, "Errorneous network completion");
opal_output(0, "Errorneous network completion");
break;
}
}
@ -551,7 +551,7 @@ int mca_btl_mvapi_component_progress()
ret = VAPI_poll_cq(mvapi_btl->nic, mvapi_btl->cq_hndl_low, &comp);
if(VAPI_OK == ret) {
if(comp.status != VAPI_SUCCESS) {
ompi_output(0, "Got error : %s, Vendor code : %d Frag : %p",
opal_output(0, "Got error : %s, Vendor code : %d Frag : %p",
VAPI_wc_status_sym(comp.status),
comp.vendor_err_syndrome, comp.id);
return OMPI_ERROR;
@ -588,7 +588,7 @@ int mca_btl_mvapi_component_progress()
break;
default:
ompi_output(0, "Errorneous network completion");
opal_output(0, "Errorneous network completion");
break;
}
}

24
ompi/mca/btl/mvapi/btl_mvapi_endpoint.c
Просмотреть файл

@ -282,7 +282,7 @@ static int mca_btl_mvapi_endpoint_start_connect(mca_btl_base_endpoint_t* endpoin
&endpoint->lcl_qp_hndl_high,
&endpoint->lcl_qp_prop_high,
VAPI_TS_RC))) {
ompi_output(0, "[%lu,%lu,%lu] %s:%d errcode %d\n",
opal_output(0, "[%lu,%lu,%lu] %s:%d errcode %d\n",
ORTE_NAME_ARGS(orte_process_info.my_name), __FILE__,__LINE__,rc);
return rc;
}
@ -296,7 +296,7 @@ static int mca_btl_mvapi_endpoint_start_connect(mca_btl_base_endpoint_t* endpoin
&endpoint->lcl_qp_hndl_low,
&endpoint->lcl_qp_prop_low,
VAPI_TS_RC))) {
ompi_output(0, "[%lu,%lu,%lu] %s:%d errcode %d\n",
opal_output(0, "[%lu,%lu,%lu] %s:%d errcode %d\n",
ORTE_NAME_ARGS(orte_process_info.my_name), __FILE__,__LINE__,rc);
return rc;
}
@ -309,7 +309,7 @@ static int mca_btl_mvapi_endpoint_start_connect(mca_btl_base_endpoint_t* endpoin
/* Send connection info over to remote endpoint */
endpoint->endpoint_state = MCA_BTL_IB_CONNECTING;
if(OMPI_SUCCESS != (rc = mca_btl_mvapi_endpoint_send_connect_req(endpoint))) {
ompi_output(0, "[%lu,%lu,%lu] %s:%d errcode %d\n",
opal_output(0, "[%lu,%lu,%lu] %s:%d errcode %d\n",
ORTE_NAME_ARGS(orte_process_info.my_name), __FILE__,__LINE__,rc);
return rc;
}
@ -333,7 +333,7 @@ static int mca_btl_mvapi_endpoint_reply_start_connect(mca_btl_mvapi_endpoint_t *
&endpoint->lcl_qp_hndl_high,
&endpoint->lcl_qp_prop_high,
VAPI_TS_RC))) {
ompi_output(0, "[%lu,%lu,%lu] %s:%d errcode %d\n",
opal_output(0, "[%lu,%lu,%lu] %s:%d errcode %d\n",
ORTE_NAME_ARGS(orte_process_info.my_name), __FILE__,__LINE__,rc);
return rc;
}
@ -347,7 +347,7 @@ static int mca_btl_mvapi_endpoint_reply_start_connect(mca_btl_mvapi_endpoint_t *
&endpoint->lcl_qp_hndl_low,
&endpoint->lcl_qp_prop_low,
VAPI_TS_RC))) {
ompi_output(0, "[%lu,%lu,%lu] %s:%d errcode %d\n",
opal_output(0, "[%lu,%lu,%lu] %s:%d errcode %d\n",
ORTE_NAME_ARGS(orte_process_info.my_name), __FILE__,__LINE__,rc);
return rc;
}
@ -367,14 +367,14 @@ static int mca_btl_mvapi_endpoint_reply_start_connect(mca_btl_mvapi_endpoint_t *
rc = mca_btl_mvapi_endpoint_connect(endpoint);
if(rc != OMPI_SUCCESS) {
ompi_output(0, "[%lu,%lu,%lu] %s:%d errcode %d\n",
opal_output(0, "[%lu,%lu,%lu] %s:%d errcode %d\n",
ORTE_NAME_ARGS(orte_process_info.my_name), __FILE__,__LINE__,rc);
return rc;
}
/* Send connection info over to remote endpoint */
if(OMPI_SUCCESS != (rc = mca_btl_mvapi_endpoint_send_connect_req(endpoint))) {
ompi_output(0, "[%lu,%lu,%lu] %s:%d errcode %d\n",
opal_output(0, "[%lu,%lu,%lu] %s:%d errcode %d\n",
ORTE_NAME_ARGS(orte_process_info.my_name), __FILE__,__LINE__,rc);
return rc;
}
@ -438,7 +438,7 @@ static void mca_btl_mvapi_endpoint_recv(
* and then reply with our QP information */
if(OMPI_SUCCESS != (rc = mca_btl_mvapi_endpoint_reply_start_connect(ib_endpoint, buffer))) {
ompi_output(0, "[%lu,%lu,%lu] %s:%d errcode %d\n",
opal_output(0, "[%lu,%lu,%lu] %s:%d errcode %d\n",
ORTE_NAME_ARGS(orte_process_info.my_name), __FILE__,__LINE__,rc);
break;
}
@ -451,7 +451,7 @@ static void mca_btl_mvapi_endpoint_recv(
mca_btl_mvapi_endpoint_set_remote_info(ib_endpoint, buffer);
if(OMPI_SUCCESS != (rc = mca_btl_mvapi_endpoint_connect(ib_endpoint))) {
ompi_output(0, "[%lu,%lu,%lu] %s:%d errcode %d\n",
opal_output(0, "[%lu,%lu,%lu] %s:%d errcode %d\n",
ORTE_NAME_ARGS(orte_process_info.my_name), __FILE__,__LINE__,rc);
break;
}
@ -472,7 +472,7 @@ static void mca_btl_mvapi_endpoint_recv(
case MCA_BTL_IB_CONNECTED :
break;
default :
ompi_output(0, "Connected -> Connecting not possible.\n");
opal_output(0, "Connected -> Connecting not possible.\n");
}
break;
@ -594,7 +594,7 @@ void mca_btl_mvapi_progress_send_frags(mca_btl_mvapi_endpoint_t* endpoint)
/* We need to post this one */
if(OMPI_SUCCESS != mca_btl_mvapi_endpoint_post_send(mvapi_btl, endpoint, frag))
ompi_output(0, "error in mca_btl_mvapi_endpoint_send");
opal_output(0, "error in mca_btl_mvapi_endpoint_send");
}
}
@ -790,7 +790,7 @@ int mca_btl_mvapi_endpoint_qp_init_query(
ret = VAPI_query_qp(nic, qp_hndl, &qp_attr, &qp_attr_mask, &qp_init_attr );
if (ret != VAPI_OK) {
ompi_output(0, "error querying the queue pair");
opal_output(0, "error querying the queue pair");
return OMPI_ERROR;
}

12
ompi/mca/btl/mvapi/btl_mvapi_endpoint.h
Просмотреть файл

@ -199,16 +199,16 @@ static inline int mca_btl_mvapi_endpoint_post_rr( mca_btl_mvapi_endpoint_t * end
}
#define DUMP_ENDPOINT(endpoint_ptr) { \
ompi_output(0, "[%s:%d] ", __FILE__, __LINE__); \
ompi_output(0, "Dumping endpoint %d state", \
opal_output(0, "[%s:%d] ", __FILE__, __LINE__); \
opal_output(0, "Dumping endpoint %d state", \
endpoint->endpoint_proc->proc_guid.vpid); \
ompi_output(0, "Local QP hndl : %d", \
opal_output(0, "Local QP hndl : %d", \
endpoint_ptr->endpoint_conn->lres->qp_hndl); \
ompi_output(0, "Local QP num : %d", \
opal_output(0, "Local QP num : %d", \
endpoint_ptr->endpoint_conn->lres->qp_prop.qp_num); \
ompi_output(0, "Remote QP num : %d", \
opal_output(0, "Remote QP num : %d", \
endpoint_ptr->endpoint_conn->rres->qp_num); \
ompi_output(0, "Remote LID : %d", \
opal_output(0, "Remote LID : %d", \
endpoint_ptr->endpoint_conn->rres->lid); \
}

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

@ -26,14 +26,14 @@
*
*/
#define MCA_BTL_IB_VAPI_ERROR(vapi_ret, func_name) { \
ompi_output(0,"[%s:%d] ", __FILE__, __LINE__); \
ompi_output(0,"%s : %s",func_name,VAPI_strerror(vapi_ret)); \
opal_output(0,"[%s:%d] ", __FILE__, __LINE__); \
opal_output(0,"%s : %s",func_name,VAPI_strerror(vapi_ret)); \
}
/* Debug Print */
#if 0
#define DEBUG_OUT(fmt, args...) { \
ompi_output(0, "[%s:%d:%s] " fmt, __FILE__, __LINE__, __func__, \
opal_output(0, "[%s:%d:%s] " fmt, __FILE__, __LINE__, __func__, \
##args); \
}
#else

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

@ -16,7 +16,7 @@
#include "ompi_config.h"
#include <string.h>
#include "util/output.h"
#include "opal/util/output.h"
#include "util/if.h"
#include "mca/pml/pml.h"
#include "mca/btl/btl.h"
@ -262,13 +262,13 @@ mca_btl_base_descriptor_t* mca_btl_openib_prepare_src(
rc = mca_mpool_base_remove((void*) vapi_reg->base_reg.base);
if(OMPI_SUCCESS != rc) {
ompi_output(0, "%s:%d:%s error removing memory region from memory pool tree", __FILE__, __LINE__, __func__);
opal_output(0, "%s:%d:%s error removing memory region from memory pool tree", __FILE__, __LINE__, __func__);
return NULL;
}
if(is_leave_pinned) {
if(NULL == opal_list_remove_item(&mvapi_btl->reg_mru_list, (opal_list_item_t*) vapi_reg)){
ompi_output(0,"%s:%d:%s error removing item from reg_mru_list", __FILE__, __LINE__, __func__);
opal_output(0,"%s:%d:%s error removing item from reg_mru_list", __FILE__, __LINE__, __func__);
return NULL;
}
}
@ -289,7 +289,7 @@ mca_btl_base_descriptor_t* mca_btl_openib_prepare_src(
if(rc != OMPI_SUCCESS) {
ompi_output(0,"%s:%d:%s error inserting memory region into memory pool tree", __FILE__, __LINE__, __func__);
opal_output(0,"%s:%d:%s error inserting memory region into memory pool tree", __FILE__, __LINE__, __func__);
return NULL;
}
@ -301,7 +301,7 @@ mca_btl_base_descriptor_t* mca_btl_openib_prepare_src(
}
else if(is_leave_pinned) {
if(NULL == opal_list_remove_item(&mvapi_btl->reg_mru_list, (opal_list_item_t*) vapi_reg)) {
ompi_output(0,"%s:%d:%s error removing item from reg_mru_list", __FILE__, __LINE__, __func__);
opal_output(0,"%s:%d:%s error removing item from reg_mru_list", __FILE__, __LINE__, __func__);
return NULL;
}
opal_list_append(&mvapi_btl->reg_mru_list, (opal_list_item_t*) vapi_reg);
@ -352,7 +352,7 @@ mca_btl_base_descriptor_t* mca_btl_openib_prepare_src(
opal_list_remove_last(&mvapi_btl->reg_mru_list);
if( NULL == old_reg) {
ompi_output(0,"%s:%d:%s error removing item from reg_mru_list", __FILE__, __LINE__, __func__);
opal_output(0,"%s:%d:%s error removing item from reg_mru_list", __FILE__, __LINE__, __func__);
return NULL;
}
@ -360,7 +360,7 @@ mca_btl_base_descriptor_t* mca_btl_openib_prepare_src(
rc = mca_mpool_base_remove((void*) old_reg->base_reg.base);
if(OMPI_SUCCESS != rc) {
ompi_output(0,"%s:%d:%s error removing memory region from memory pool tree", __FILE__, __LINE__, __func__);
opal_output(0,"%s:%d:%s error removing memory region from memory pool tree", __FILE__, __LINE__, __func__);
return NULL;
}
@ -517,13 +517,13 @@ mca_btl_base_descriptor_t* mca_btl_openib_prepare_dst(
rc = mca_mpool_base_remove((void*) vapi_reg->base_reg.base);
if(OMPI_SUCCESS != rc) {
ompi_output(0,"%s:%d:%s error removing memory region from memory pool tree", __FILE__, __LINE__, __func__);
opal_output(0,"%s:%d:%s error removing memory region from memory pool tree", __FILE__, __LINE__, __func__);
return NULL;
}
if(is_leave_pinned) {
if(NULL == opal_list_remove_item(&mvapi_btl->reg_mru_list, (opal_list_item_t*) vapi_reg)) {
ompi_output(0,"%s:%d:%s error removing item from reg_mru_list", __FILE__, __LINE__, __func__);
opal_output(0,"%s:%d:%s error removing item from reg_mru_list", __FILE__, __LINE__, __func__);
return NULL;
}
}
@ -542,7 +542,7 @@ mca_btl_base_descriptor_t* mca_btl_openib_prepare_dst(
(mca_mpool_base_registration_t*) vapi_reg);
if(OMPI_SUCCESS != rc) {
ompi_output(0,"%s:%d:%s error inserting memory region into memory pool tree", __FILE__, __LINE__, __func__);
opal_output(0,"%s:%d:%s error inserting memory region into memory pool tree", __FILE__, __LINE__, __func__);
return NULL;
}
OBJ_RETAIN(vapi_reg);
@ -555,7 +555,7 @@ mca_btl_base_descriptor_t* mca_btl_openib_prepare_dst(
}
else if(is_leave_pinned){
if(NULL == opal_list_remove_item(&mvapi_btl->reg_mru_list, (opal_list_item_t*) vapi_reg)) {
ompi_output(0,"%s:%d:%s error removing item from reg_mru_list", __FILE__, __LINE__, __func__);
opal_output(0,"%s:%d:%s error removing item from reg_mru_list", __FILE__, __LINE__, __func__);
return NULL;
}
opal_list_append(&mvapi_btl->reg_mru_list, (opal_list_item_t*) vapi_reg);
@ -572,13 +572,13 @@ mca_btl_base_descriptor_t* mca_btl_openib_prepare_dst(
opal_list_remove_last(&mvapi_btl->reg_mru_list);
if( NULL == old_reg) {
ompi_output(0,"%s:%d:%s error removing item from reg_mru_list", __FILE__, __LINE__, __func__);
opal_output(0,"%s:%d:%s error removing item from reg_mru_list", __FILE__, __LINE__, __func__);
return NULL;
}
rc = mca_mpool_base_remove((void*) old_reg->base_reg.base);
if(OMPI_SUCCESS !=rc ) {
ompi_output(0,"%s:%d:%s error removing memory region from memory pool tree", __FILE__, __LINE__, __func__);
opal_output(0,"%s:%d:%s error removing memory region from memory pool tree", __FILE__, __LINE__, __func__);
return NULL;
}
@ -598,7 +598,7 @@ mca_btl_base_descriptor_t* mca_btl_openib_prepare_dst(
(void*) (&mvapi_btl->super),
(mca_mpool_base_registration_t*) vapi_reg);
if(OMPI_SUCCESS != rc){
ompi_output(0,"%s:%d:%s error inserting memory region into memory pool", __FILE__, __LINE__, __func__);
opal_output(0,"%s:%d:%s error inserting memory region into memory pool", __FILE__, __LINE__, __func__);
return NULL;
}
@ -642,33 +642,33 @@ int mca_btl_openib_finalize(struct mca_btl_base_module_t* btl)
if(mvapi_btl->send_free_eager.fl_num_allocated !=
mvapi_btl->send_free_eager.super.opal_list_length){
ompi_output(0, "btl ib send_free_eager frags: %d allocated %d returned \n",
opal_output(0, "btl ib send_free_eager frags: %d allocated %d returned \n",
mvapi_btl->send_free_eager.fl_num_allocated,
mvapi_btl->send_free_eager.super.opal_list_length);
}
if(mvapi_btl->send_free_max.fl_num_allocated !=
mvapi_btl->send_free_max.super.opal_list_length){
ompi_output(0, "btl ib send_free_max frags: %d allocated %d returned \n",
opal_output(0, "btl ib send_free_max frags: %d allocated %d returned \n",
mvapi_btl->send_free_max.fl_num_allocated,
mvapi_btl->send_free_max.super.opal_list_length);
}
if(mvapi_btl->send_free_frag.fl_num_allocated !=
mvapi_btl->send_free_frag.super.opal_list_length){
ompi_output(0, "btl ib send_free_frag frags: %d allocated %d returned \n",
opal_output(0, "btl ib send_free_frag frags: %d allocated %d returned \n",
mvapi_btl->send_free_frag.fl_num_allocated,
mvapi_btl->send_free_frag.super.opal_list_length);
}
if(mvapi_btl->recv_free_eager.fl_num_allocated !=
mvapi_btl->recv_free_eager.super.opal_list_length){
ompi_output(0, "btl ib recv_free_eager frags: %d allocated %d returned \n",
opal_output(0, "btl ib recv_free_eager frags: %d allocated %d returned \n",
mvapi_btl->recv_free_eager.fl_num_allocated,
mvapi_btl->recv_free_eager.super.opal_list_length);
}
if(mvapi_btl->recv_free_max.fl_num_allocated !=
mvapi_btl->recv_free_max.super.opal_list_length){
ompi_output(0, "btl ib recv_free_max frags: %d allocated %d returned \n",
opal_output(0, "btl ib recv_free_max frags: %d allocated %d returned \n",
mvapi_btl->recv_free_max.fl_num_allocated,
mvapi_btl->recv_free_max.super.opal_list_length);
}
@ -766,14 +766,14 @@ static void async_event_handler(VAPI_hca_hndl_t hca_hndl,
case VAPI_LOCAL_CATASTROPHIC_ERROR:
case VAPI_PORT_ERROR:
{
ompi_output(0, "Got an asynchronous event: %s (%s)",
opal_output(0, "Got an asynchronous event: %s (%s)",
VAPI_event_record_sym(event_p->type),
VAPI_event_syndrome_sym(event_p->
syndrome));
break;
}
default:
ompi_output(0, "Warning!! Got an undefined "
opal_output(0, "Warning!! Got an undefined "
"asynchronous event\n");
}
@ -816,7 +816,7 @@ int mca_btl_openib_module_init(mca_btl_openib_module_t *mvapi_btl)
if(cqe_cnt <= 0) {
ompi_output(0, "%s: error creating completion queue ", __func__);
opal_output(0, "%s: error creating completion queue ", __func__);
return OMPI_ERROR;
}

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

@ -30,7 +30,7 @@
#include "opal/event/event.h"
#include "mca/pml/pml.h"
#include "mca/btl/btl.h"
#include "util/output.h"
#include "opal/util/output.h"
#include "mca/mpool/mpool.h"
#include "btl_openib_error.h"

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

@ -20,7 +20,7 @@
#include "opal/event/event.h"
#include "util/if.h"
#include "util/argv.h"
#include "util/output.h"
#include "opal/util/output.h"
#include "mca/pml/pml.h"
#include "mca/btl/btl.h"
@ -270,7 +270,7 @@ mca_btl_base_module_t** mca_btl_openib_component_init(int *num_btl_modules,
num_devs++;
if(0 == num_devs) {
ompi_output(0, "No hca's found on this host! \n");
opal_output(0, "No hca's found on this host! \n");
return NULL;
}
@ -305,7 +305,7 @@ mca_btl_base_module_t** mca_btl_openib_component_init(int *num_btl_modules,
vapi_ret = VAPI_query_hca_cap(hca_hndl, &hca_vendor, &hca_cap);
if(VAPI_OK != vapi_ret) {
ompi_output(0, "%s:error getting hca properties\n", __func__);
opal_output(0, "%s:error getting hca properties\n", __func__);
return NULL;
}
@ -314,7 +314,7 @@ mca_btl_base_module_t** mca_btl_openib_component_init(int *num_btl_modules,
for(j = 1; j <= hca_cap.phys_port_num; j++){
vapi_ret = VAPI_query_hca_port_prop(hca_hndl, (IB_port_t) j, &hca_port);
if(VAPI_OK != vapi_ret) {
ompi_output(0, "%s:error getting hca port properties\n", __func__);
opal_output(0, "%s:error getting hca port properties\n", __func__);
return NULL;
}
@ -399,7 +399,7 @@ mca_btl_base_module_t** mca_btl_openib_component_init(int *num_btl_modules,
&hca_pd);
if(NULL == mvapi_btl->ib_pool) {
ompi_output(0, "%s: error creating vapi memory pool! aborting ib btl initialization", __func__);
opal_output(0, "%s: error creating vapi memory pool! aborting ib btl initialization", __func__);
return NULL;
}
/* Initialize pool of send fragments */
@ -508,7 +508,7 @@ int mca_btl_openib_component_progress()
ret = VAPI_poll_cq(mvapi_btl->nic, mvapi_btl->cq_hndl_high, &comp);
if(VAPI_OK == ret) {
if(comp.status != VAPI_SUCCESS) {
ompi_output(0, "Got error : %s, Vendor code : %d Frag : %p",
opal_output(0, "Got error : %s, Vendor code : %d Frag : %p",
VAPI_wc_status_sym(comp.status),
comp.vendor_err_syndrome, comp.id);
return OMPI_ERROR;
@ -518,7 +518,7 @@ int mca_btl_openib_component_progress()
switch(comp.opcode) {
case VAPI_CQE_RQ_RDMA_WITH_IMM:
if(comp.imm_data_valid){
ompi_output(0, "Got an RQ_RDMA_WITH_IMM!\n");
opal_output(0, "Got an RQ_RDMA_WITH_IMM!\n");
}
break;
@ -550,7 +550,7 @@ int mca_btl_openib_component_progress()
break;
default:
ompi_output(0, "Errorneous network completion");
opal_output(0, "Errorneous network completion");
break;
}
}
@ -560,7 +560,7 @@ int mca_btl_openib_component_progress()
ret = VAPI_poll_cq(mvapi_btl->nic, mvapi_btl->cq_hndl_low, &comp);
if(VAPI_OK == ret) {
if(comp.status != VAPI_SUCCESS) {
ompi_output(0, "Got error : %s, Vendor code : %d Frag : %p",
opal_output(0, "Got error : %s, Vendor code : %d Frag : %p",
VAPI_wc_status_sym(comp.status),
comp.vendor_err_syndrome, comp.id);
return OMPI_ERROR;
@ -597,7 +597,7 @@ int mca_btl_openib_component_progress()
break;
default:
ompi_output(0, "Errorneous network completion");
opal_output(0, "Errorneous network completion");
break;
}
}

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

@ -282,7 +282,7 @@ static int mca_btl_openib_endpoint_start_connect(mca_btl_base_endpoint_t* endpoi
&endpoint->lcl_qp_hndl_high,
&endpoint->lcl_qp_prop_high,
VAPI_TS_RC))) {
ompi_output(0, "[%lu,%lu,%lu] %s:%d errcode %d\n",
opal_output(0, "[%lu,%lu,%lu] %s:%d errcode %d\n",
ORTE_NAME_ARGS(orte_process_info.my_name), __FILE__,__LINE__,rc);
return rc;
}
@ -296,7 +296,7 @@ static int mca_btl_openib_endpoint_start_connect(mca_btl_base_endpoint_t* endpoi
&endpoint->lcl_qp_hndl_low,
&endpoint->lcl_qp_prop_low,
VAPI_TS_RC))) {
ompi_output(0, "[%lu,%lu,%lu] %s:%d errcode %d\n",
opal_output(0, "[%lu,%lu,%lu] %s:%d errcode %d\n",
ORTE_NAME_ARGS(orte_process_info.my_name), __FILE__,__LINE__,rc);
return rc;
}
@ -309,7 +309,7 @@ static int mca_btl_openib_endpoint_start_connect(mca_btl_base_endpoint_t* endpoi
/* Send connection info over to remote endpoint */
endpoint->endpoint_state = MCA_BTL_IB_CONNECTING;
if(OMPI_SUCCESS != (rc = mca_btl_openib_endpoint_send_connect_req(endpoint))) {
ompi_output(0, "[%lu,%lu,%lu] %s:%d errcode %d\n",
opal_output(0, "[%lu,%lu,%lu] %s:%d errcode %d\n",
ORTE_NAME_ARGS(orte_process_info.my_name), __FILE__,__LINE__,rc);
return rc;
}
@ -333,7 +333,7 @@ static int mca_btl_openib_endpoint_reply_start_connect(mca_btl_openib_endpoint_t
&endpoint->lcl_qp_hndl_high,
&endpoint->lcl_qp_prop_high,
VAPI_TS_RC))) {
ompi_output(0, "[%lu,%lu,%lu] %s:%d errcode %d\n",
opal_output(0, "[%lu,%lu,%lu] %s:%d errcode %d\n",
ORTE_NAME_ARGS(orte_process_info.my_name), __FILE__,__LINE__,rc);
return rc;
}
@ -347,7 +347,7 @@ static int mca_btl_openib_endpoint_reply_start_connect(mca_btl_openib_endpoint_t
&endpoint->lcl_qp_hndl_low,
&endpoint->lcl_qp_prop_low,
VAPI_TS_RC))) {
ompi_output(0, "[%lu,%lu,%lu] %s:%d errcode %d\n",
opal_output(0, "[%lu,%lu,%lu] %s:%d errcode %d\n",
ORTE_NAME_ARGS(orte_process_info.my_name), __FILE__,__LINE__,rc);
return rc;
}
@ -367,14 +367,14 @@ static int mca_btl_openib_endpoint_reply_start_connect(mca_btl_openib_endpoint_t
rc = mca_btl_openib_endpoint_connect(endpoint);
if(rc != OMPI_SUCCESS) {
ompi_output(0, "[%lu,%lu,%lu] %s:%d errcode %d\n",
opal_output(0, "[%lu,%lu,%lu] %s:%d errcode %d\n",
ORTE_NAME_ARGS(orte_process_info.my_name), __FILE__,__LINE__,rc);
return rc;
}
/* Send connection info over to remote endpoint */
if(OMPI_SUCCESS != (rc = mca_btl_openib_endpoint_send_connect_req(endpoint))) {
ompi_output(0, "[%lu,%lu,%lu] %s:%d errcode %d\n",
opal_output(0, "[%lu,%lu,%lu] %s:%d errcode %d\n",
ORTE_NAME_ARGS(orte_process_info.my_name), __FILE__,__LINE__,rc);
return rc;
}
@ -438,7 +438,7 @@ static void mca_btl_openib_endpoint_recv(
* and then reply with our QP information */
if(OMPI_SUCCESS != (rc = mca_btl_openib_endpoint_reply_start_connect(ib_endpoint, buffer))) {
ompi_output(0, "[%lu,%lu,%lu] %s:%d errcode %d\n",
opal_output(0, "[%lu,%lu,%lu] %s:%d errcode %d\n",
ORTE_NAME_ARGS(orte_process_info.my_name), __FILE__,__LINE__,rc);
break;
}
@ -451,7 +451,7 @@ static void mca_btl_openib_endpoint_recv(
mca_btl_openib_endpoint_set_remote_info(ib_endpoint, buffer);
if(OMPI_SUCCESS != (rc = mca_btl_openib_endpoint_connect(ib_endpoint))) {
ompi_output(0, "[%lu,%lu,%lu] %s:%d errcode %d\n",
opal_output(0, "[%lu,%lu,%lu] %s:%d errcode %d\n",
ORTE_NAME_ARGS(orte_process_info.my_name), __FILE__,__LINE__,rc);
break;
}
@ -472,7 +472,7 @@ static void mca_btl_openib_endpoint_recv(
case MCA_BTL_IB_CONNECTED :
break;
default :
ompi_output(0, "Connected -> Connecting not possible.\n");
opal_output(0, "Connected -> Connecting not possible.\n");
}
break;
@ -594,7 +594,7 @@ void mca_btl_openib_progress_send_frags(mca_btl_openib_endpoint_t* endpoint)
/* We need to post this one */
if(OMPI_SUCCESS != mca_btl_openib_endpoint_post_send(mvapi_btl, endpoint, frag))
ompi_output(0, "error in mca_btl_openib_endpoint_send");
opal_output(0, "error in mca_btl_openib_endpoint_send");
}
}
@ -789,7 +789,7 @@ int mca_btl_openib_endpoint_qp_init_query(
ret = VAPI_query_qp(nic, qp_hndl, &qp_attr, &qp_attr_mask, &qp_init_attr );
if (ret != VAPI_OK) {
ompi_output(0, "error querying the queue pair");
opal_output(0, "error querying the queue pair");
return OMPI_ERROR;
}

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

@ -199,16 +199,16 @@ static inline int mca_btl_openib_endpoint_post_rr( mca_btl_openib_endpoint_t * e
}
#define DUMP_ENDPOINT(endpoint_ptr) { \
ompi_output(0, "[%s:%d] ", __FILE__, __LINE__); \
ompi_output(0, "Dumping endpoint %d state", \
opal_output(0, "[%s:%d] ", __FILE__, __LINE__); \
opal_output(0, "Dumping endpoint %d state", \
endpoint->endpoint_proc->proc_guid.vpid); \
ompi_output(0, "Local QP hndl : %d", \
opal_output(0, "Local QP hndl : %d", \
endpoint_ptr->endpoint_conn->lres->qp_hndl); \
ompi_output(0, "Local QP num : %d", \
opal_output(0, "Local QP num : %d", \
endpoint_ptr->endpoint_conn->lres->qp_prop.qp_num); \
ompi_output(0, "Remote QP num : %d", \
opal_output(0, "Remote QP num : %d", \
endpoint_ptr->endpoint_conn->rres->qp_num); \
ompi_output(0, "Remote LID : %d", \
opal_output(0, "Remote LID : %d", \
endpoint_ptr->endpoint_conn->rres->lid); \
}

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

@ -26,14 +26,14 @@
*
*/
#define MCA_BTL_IB_VAPI_ERROR(vapi_ret, func_name) { \
ompi_output(0,"[%s:%d] ", __FILE__, __LINE__); \
ompi_output(0,"%s : %s",func_name,VAPI_strerror(vapi_ret)); \
opal_output(0,"[%s:%d] ", __FILE__, __LINE__); \
opal_output(0,"%s : %s",func_name,VAPI_strerror(vapi_ret)); \
}
/* Debug Print */
#if 0
#define DEBUG_OUT(fmt, args...) { \
ompi_output(0, "[%s:%d:%s] " fmt, __FILE__, __LINE__, __func__, \
opal_output(0, "[%s:%d:%s] " fmt, __FILE__, __LINE__, __func__, \
##args); \
}
#else

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

@ -23,7 +23,7 @@
#include <errno.h>
#include "include/constants.h"
#include "util/output.h"
#include "opal/util/output.h"
#include "mca/pml/pml.h"
#include "mca/btl/btl.h"
@ -98,7 +98,7 @@ mca_btl_portals_add_procs(struct mca_btl_base_module_t* btl,
portals_procs[i],
&distance);
if (ret != PTL_OK) {
ompi_output_verbose(10, mca_btl_portals_component.portals_output,
opal_output_verbose(10, mca_btl_portals_component.portals_output,
"Could not find distance to process %d", i);
continue;
}
@ -137,12 +137,12 @@ mca_btl_portals_finalize(struct mca_btl_base_module_t *btl_base)
if (PTL_INVALID_HANDLE != btl->ni_handle) {
ret = PtlNIFini(btl->ni_handle);
if (PTL_OK != ret) {
ompi_output_verbose(20, mca_btl_portals_component.portals_output,
opal_output_verbose(20, mca_btl_portals_component.portals_output,
"PtlNIFini returned %d", ret);
return OMPI_ERROR;
}
}
ompi_output_verbose(20, mca_btl_portals_component.portals_output,
opal_output_verbose(20, mca_btl_portals_component.portals_output,
"successfully finalized module");
return OMPI_SUCCESS;

14
ompi/mca/btl/portals/src/btl_portals_compat_redstorm.c
Просмотреть файл

@ -18,7 +18,7 @@
#include "portals_config.h"
#include "include/constants.h"
#include "util/output.h"
#include "opal/util/output.h"
#include "btl_portals.h"
#include "btl_portals_compat.h"
@ -35,7 +35,7 @@ mca_btl_portals_init(mca_btl_portals_component_t *comp)
*/
ret = PtlInit(&max_interfaces);
if (PTL_OK != ret) {
ompi_output_verbose(10, mca_btl_portals_component.portals_output,
opal_output_verbose(10, mca_btl_portals_component.portals_output,
"PtlInit failed, returning %d\n", ret);
return OMPI_ERR_FATAL;
}
@ -47,13 +47,13 @@ mca_btl_portals_init(mca_btl_portals_component_t *comp)
comp->portals_modules = calloc(comp->portals_num_modules,
sizeof(mca_btl_portals_module_t *));
if (NULL == comp->portals_modules) {
ompi_output_verbose(10, mca_btl_portals_component.portals_output,
opal_output_verbose(10, mca_btl_portals_component.portals_output,
"malloc failed in mca_btl_portals_init");
return OMPI_ERR_TEMP_OUT_OF_RESOURCE;
}
comp->portals_modules[0] = malloc(sizeof(mca_btl_portals_module_t));
if (NULL == comp->portals_modules) {
ompi_output_verbose(10, mca_btl_portals_component.portals_output,
opal_output_verbose(10, mca_btl_portals_component.portals_output,
"malloc failed in mca_btl_portals_init");
return OMPI_ERR_TEMP_OUT_OF_RESOURCE;
}
@ -71,7 +71,7 @@ mca_btl_portals_init(mca_btl_portals_component_t *comp)
&(btl->ni_handle) /* our interface handle */
);
if (PTL_OK != ret) {
ompi_output_verbose(10, mca_ptl_portals_component.portals_output,
opal_output_verbose(10, mca_ptl_portals_component.portals_output,
"PtlNIInit failed, returning %d\n", ret);
return OMPI_ERR_FATAL;
}
@ -96,11 +96,11 @@ mca_btl_portals_add_procs_compat(struct mca_btl_portals_module_t* btl,
nptl_procs = cnos_get_nidpid_map(portals_procs);
if (nptl_procs <= 0) {
ompi_output_verbose(10, mca_btl_portals_component.portals_output,
opal_output_verbose(10, mca_btl_portals_component.portals_output,
"cnos_get_nidpid_map() returned %d", nptl_procs);
return OMPI_ERR_FATAL;
} else if (nptl_procs != nprocs) {
ompi_output_verbose(10, mca_btl_portals_component.portals_output,
opal_output_verbose(10, mca_btl_portals_component.portals_output,
"nptl_procs != nprocs (%d, %d)", nptl_procs,
nprocs);
return OMPI_ERR_FATAL;

26
ompi/mca/btl/portals/src/btl_portals_compat_utcp.c
Просмотреть файл

@ -25,7 +25,7 @@
#include <netinet/in.h>
#include "include/constants.h"
#include "util/output.h"
#include "opal/util/output.h"
#include "btl_portals.h"
#include "btl_portals_compat.h"
@ -62,14 +62,14 @@ mca_btl_portals_init(mca_btl_portals_component_t *comp)
info.nid = htonl(utcp_my_nid(mca_btl_portals_component.portals_ifname));
info.pid = htonl((ptl_pid_t) getpid());
ompi_output_verbose(100, mca_btl_portals_component.portals_output,
opal_output_verbose(100, mca_btl_portals_component.portals_output,
"contact info: %u, %u", ntohl(info.nid),
ntohl(info.pid));
ret = mca_base_modex_send(&mca_btl_portals_component.super.btl_version,
&info, sizeof(ptl_process_id_t));
if (OMPI_SUCCESS != ret) {
ompi_output_verbose(10, mca_btl_portals_component.portals_output,
opal_output_verbose(10, mca_btl_portals_component.portals_output,
"mca_base_modex_send failed: %d", ret);
return ret;
}
@ -79,7 +79,7 @@ mca_btl_portals_init(mca_btl_portals_component_t *comp)
comp->portals_modules = calloc(comp->portals_num_modules,
sizeof(mca_btl_portals_module_t));
if (NULL == comp->portals_modules) {
ompi_output_verbose(10, mca_btl_portals_component.portals_output,
opal_output_verbose(10, mca_btl_portals_component.portals_output,
"malloc failed in mca_btl_portals_init");
return OMPI_ERR_TEMP_OUT_OF_RESOURCE;
}
@ -130,7 +130,7 @@ mca_btl_portals_add_procs_compat(struct mca_btl_portals_module_t* btl,
/* get space for the portals procs list */
*portals_procs = calloc(nprocs, sizeof(ptl_process_id_t));
if (NULL == *portals_procs) {
ompi_output_verbose(10, mca_btl_portals_component.portals_output,
opal_output_verbose(10, mca_btl_portals_component.portals_output,
"calloc(nprocs, sizeof(ptl_process_id_t)) failed");
return OMPI_ERR_TEMP_OUT_OF_RESOURCE;
}
@ -141,11 +141,11 @@ mca_btl_portals_add_procs_compat(struct mca_btl_portals_module_t* btl,
ret = mca_base_modex_recv(&mca_btl_portals_component.super.btl_version,
procs[i], (void**) &info, &size);
if (OMPI_SUCCESS != ret) {
ompi_output_verbose(10, mca_btl_portals_component.portals_output,
opal_output_verbose(10, mca_btl_portals_component.portals_output,
"mca_base_modex_recv failed: %d", ret);
return ret;
} else if (sizeof(ptl_process_id_t) != size) {
ompi_output_verbose(10, mca_btl_portals_component.portals_output,
opal_output_verbose(10, mca_btl_portals_component.portals_output,
"mca_base_modex_recv returned size %d, expected %d",
size, sizeof(ptl_process_id_t));
return OMPI_ERROR;
@ -168,13 +168,13 @@ mca_btl_portals_add_procs_compat(struct mca_btl_portals_module_t* btl,
free(info);
}
ompi_output_verbose(100, mca_btl_portals_component.portals_output,
opal_output_verbose(100, mca_btl_portals_component.portals_output,
"my rid: %u", my_rid);
ompi_output_verbose(100, mca_btl_portals_component.portals_output,
opal_output_verbose(100, mca_btl_portals_component.portals_output,
"nid map: %s", nidmap);
ompi_output_verbose(100, mca_btl_portals_component.portals_output,
opal_output_verbose(100, mca_btl_portals_component.portals_output,
"pid map: %s", pidmap);
ompi_output_verbose(100, mca_btl_portals_component.portals_output,
opal_output_verbose(100, mca_btl_portals_component.portals_output,
"iface: %s",
mca_btl_portals_component.portals_ifname);
@ -197,7 +197,7 @@ mca_btl_portals_add_procs_compat(struct mca_btl_portals_module_t* btl,
*/
ret = PtlInit(&max_interfaces);
if (PTL_OK != ret) {
ompi_output_verbose(10, mca_btl_portals_component.portals_output,
opal_output_verbose(10, mca_btl_portals_component.portals_output,
"PtlInit failed, returning %d\n", ret);
return OMPI_ERR_FATAL;
}
@ -209,7 +209,7 @@ mca_btl_portals_add_procs_compat(struct mca_btl_portals_module_t* btl,
&(btl->portals_ni_h) /* our interface handle */
);
if (PTL_OK != ret) {
ompi_output_verbose(10, mca_btl_portals_component.portals_output,
opal_output_verbose(10, mca_btl_portals_component.portals_output,
"PtlNIInit failed, returning %d\n", ret);
return OMPI_ERR_FATAL;
}

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

@ -22,7 +22,7 @@
#include "include/constants.h"
#include "util/output.h"
#include "opal/util/output.h"
#include "opal/threads/thread.h"
#include "btl_portals.h"
@ -61,7 +61,7 @@ mca_btl_portals_component_t mca_btl_portals_component = {
};
static ompi_output_stream_t portals_output_stream = {
static opal_output_stream_t portals_output_stream = {
true, /* is debugging */
0, /* verbose level */
0, /* want syslog */
@ -139,7 +139,7 @@ mca_btl_portals_component_open(void)
"btl: portals (%5d): ", getpid());
mca_btl_portals_component.portals_output =
ompi_output_open(&portals_output_stream);
opal_output_open(&portals_output_stream);
/* fill default module state */
mca_ptl_portals_module.super.btl_flags = MCA_BMI_FLAGS_RDMA;
@ -201,7 +201,7 @@ mca_btl_portals_component_close(void)
free(portals_output_stream.lds_prefix);
}
ompi_output_close(mca_btl_portals_component.portals_output);
opal_output_close(mca_btl_portals_component.portals_output);
mca_btl_portals_component.portals_output = -1;
return OMPI_SUCCESS;
@ -219,7 +219,7 @@ mca_btl_portals_component_init(int *num_btls,
uint32_t length;
if (enable_progress_threads) {
ompi_output_verbose(20, mca_btl_portals_component.portals_output,
opal_output_verbose(20, mca_btl_portals_component.portals_output,
"disabled because progress threads enabled");
return NULL;
}
@ -227,7 +227,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 != mca_btl_portals_init(&mca_btl_portals_component)) {
ompi_output_verbose(20, mca_btl_portals_component.portals_output,
opal_output_verbose(20, mca_btl_portals_component.portals_output,
"disabled because compatibility init failed");
return NULL;
}
@ -270,7 +270,7 @@ mca_btl_portals_component_init(int *num_btls,
}
*num_btls = mca_btl_portals_component.portals_num_modules;
ompi_output_verbose(20, mca_btl_portals_component.portals_output,
opal_output_verbose(20, mca_btl_portals_component.portals_output,
"initialized %d modules",
*num_btls);
@ -301,7 +301,7 @@ mca_btl_portals_component_progress(void)
PTL_SR_DROP_COUNT,
&numdropped);
if (numdropped != module->dropped) {
ompi_output_verbose(30, mca_btl_portals_component.portals_output,
opal_output_verbose(30, mca_btl_portals_component.portals_output,
"*** Dropped message count changed. %lld, %lld",
module->dropped, numdropped);
module->dropped = numdropped;
@ -318,11 +318,11 @@ mca_btl_portals_component_progress(void)
continue;
} else if (!(PTL_OK == ret || PTL_EQ_DROPPED == ret)) {
/* BWB - how can we report errors? */
ompi_output(mca_btl_portals_component.portals_output,
opal_output(mca_btl_portals_component.portals_output,
"Error calling PtlEQGet: %d", ret);
continue;
} else if (PTL_EQ_DROPPED == ret) {
ompi_output_verbose(10, mca_btl_portals_component.portals_output,
opal_output_verbose(10, mca_btl_portals_component.portals_output,
"*** Event queue entries were dropped");
}
@ -331,7 +331,7 @@ mca_btl_portals_component_progress(void)
so we can make sure we properly re-initialize the ones that
need to be re-initialized */
if (PTL_EVENT_UNLINK == ev.type) {
OMPI_OUTPUT_VERBOSE((100, mca_btl_portals_component.portals_output,
OPAL_OUTPUT_VERBOSE((100, mca_btl_portals_component.portals_output,
"unlink event occurred"));
continue;
}

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

@ -26,7 +26,7 @@
#include "opal/threads/mutex.h"
#include "datatype/convertor.h"
#include "include/sys/atomic.h"
#include "util/output.h"
#include "opal/util/output.h"
#include "util/if.h"
#include "util/proc_info.h"
#include "util/printf.h"

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

@ -27,7 +27,7 @@
#include "opal/event/event.h"
#include "util/if.h"
#include "util/argv.h"
#include "util/output.h"
#include "opal/util/output.h"
#include "util/sys_info.h"
#include "util/proc_info.h"
#include "mca/pml/pml.h"

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

@ -26,7 +26,7 @@
#include "opal/threads/mutex.h"
#include "datatype/convertor.h"
#include "include/sys/atomic.h"
#include "util/output.h"
#include "opal/util/output.h"
#include "util/if.h"
#include "util/proc_info.h"
#include "util/printf.h"
@ -171,7 +171,7 @@ int mca_btl_sm_add_procs_same_base_addr(
&mca_btl_sm_component.super.btl_version, procs[proc],
(void**)(&(sm_proc_info[proc])), &size);
if(return_code != OMPI_SUCCESS) {
ompi_output(0, "mca_btl_sm_add_procs: mca_base_modex_recv: failed with return value=%d", return_code);
opal_output(0, "mca_btl_sm_add_procs: mca_base_modex_recv: failed with return value=%d", return_code);
goto CLEANUP;
}
@ -205,7 +205,7 @@ int mca_btl_sm_add_procs_same_base_addr(
procs[proc]->proc_name.vpid);
peer->fifo_fd = open(path, O_WRONLY);
if(peer->fifo_fd < 0) {
ompi_output(0, "mca_btl_sm_add_procs: open(%s) failed with errno=%d\n", path, errno);
opal_output(0, "mca_btl_sm_add_procs: open(%s) failed with errno=%d\n", path, errno);
goto CLEANUP;
}
#endif
@ -304,7 +304,7 @@ int mca_btl_sm_add_procs_same_base_addr(
mca_btl_sm_component.sm_resouce_ctl_file,
sizeof(mca_btl_sm_module_resource_t), 8 )))
{
ompi_output(0, "mca_btl_sm_add_procs: unable to create shared memory BTL coordinating strucure :: size %ld \n",
opal_output(0, "mca_btl_sm_add_procs: unable to create shared memory BTL coordinating strucure :: size %ld \n",
size);
return_code=OMPI_ERROR;
goto CLEANUP;

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

@ -338,7 +338,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)) { \
ompi_output(0, "mca_btl_sm_send: write fifo failed: errno=%d\n", errno); \
opal_output(0, "mca_btl_sm_send: write fifo failed: errno=%d\n", errno); \
} \
}
#else

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

@ -27,7 +27,7 @@
#include "opal/event/event.h"
#include "util/if.h"
#include "util/argv.h"
#include "util/output.h"
#include "opal/util/output.h"
#include "util/sys_info.h"
#include "util/proc_info.h"
#include "mca/pml/pml.h"
@ -175,7 +175,7 @@ int mca_btl_sm_component_close(void)
mca_btl_sm_component.mmap_file->map_size);
if(-1 == return_value) {
return_value=OMPI_ERROR;
ompi_output(0," munmap failed :: file - %s :: errno - %d \n",
opal_output(0," munmap failed :: file - %s :: errno - %d \n",
mca_btl_sm_component.mmap_file->map_addr,
errno);
goto CLEANUP;
@ -195,7 +195,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)){
ompi_output(0, "mca_btl_sm_component_close: write fifo failed: errno=%d\n",
opal_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);
@ -240,12 +240,12 @@ mca_btl_base_module_t** mca_btl_sm_component_init(
"%s/sm_fifo.%d", orte_process_info.job_session_dir,
orte_process_info.my_name->vpid);
if(mkfifo(mca_btl_sm_component.sm_fifo_path, 0660) < 0) {
ompi_output(0, "mca_btl_sm_component_init: mkfifo failed with errno=%d\n",errno);
opal_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) {
ompi_output(0, "mca_btl_sm_component_init: open(%s) failed with errno=%d\n",
opal_output(0, "mca_btl_sm_component_init: open(%s) failed with errno=%d\n",
mca_btl_sm_component.sm_fifo_path, errno);
return NULL;
}

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

@ -16,7 +16,7 @@
#include "ompi_config.h"
#include <string.h>
#include "util/output.h"
#include "opal/util/output.h"
#include "util/if.h"
#include "mca/pml/pml.h"
#include "mca/btl/btl.h"
@ -597,19 +597,19 @@ int mca_btl_template_finalize(struct mca_btl_base_module_t* btl)
if(template_btl->template_frag_eager.fl_num_allocated !=
template_btl->template_frag_eager.super.opal_list_length){
ompi_output(0, "btl template_frag_eager: %d allocated %d returned \n",
opal_output(0, "btl template_frag_eager: %d allocated %d returned \n",
template_btl->template_frag_eager.fl_num_allocated,
template_btl->template_frag_eager.super.opal_list_length);
}
if(template_btl->template_frag_max.fl_num_allocated !=
template_btl->template_frag_max.super.opal_list_length) {
ompi_output(0, "btl template_frag_max: %d allocated %d returned \n",
opal_output(0, "btl template_frag_max: %d allocated %d returned \n",
template_btl->template_frag_max.fl_num_allocated,
template_btl->template_frag_max.super.opal_list_length);
}
if(template_btl->template_frag_user.fl_num_allocated !=
template_btl->template_frag_user.super.opal_list_length){
ompi_output(0, "btl template_frag_user: %d allocated %d returned \n",
opal_output(0, "btl template_frag_user: %d allocated %d returned \n",
template_btl->template_frag_user.fl_num_allocated,
template_btl->template_frag_user.super.opal_list_length);
}

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

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

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

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

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

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

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

@ -130,7 +130,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';
ompi_output_verbose(10, mca_coll_base_output,
opal_output_verbose(10, mca_coll_base_output,
"coll:base:comm_select: new communicator: %s",
name);
@ -166,7 +166,7 @@ int mca_coll_base_comm_select(ompi_communicator_t *comm,
if (NULL != preferred) {
str = &(preferred->mca_component_name[0]);
ompi_output_verbose(10, mca_coll_base_output,
opal_output_verbose(10, mca_coll_base_output,
"coll:base:comm_select: Checking preferred module: %s",
str);
selectable = check_components(&mca_coll_base_components_available,
@ -191,7 +191,7 @@ int mca_coll_base_comm_select(ompi_communicator_t *comm,
name_array = ompi_argv_split(names, ',');
num_names = ompi_argv_count(name_array);
ompi_output_verbose(10, mca_coll_base_output,
opal_output_verbose(10, mca_coll_base_output,
"coll:base:comm_select: Checking specific modules: %s",
names);
selectable = check_components(&mca_coll_base_components_available,
@ -203,7 +203,7 @@ int mca_coll_base_comm_select(ompi_communicator_t *comm,
check them all. */
else {
ompi_output_verbose(10, mca_coll_base_output,
opal_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);
@ -296,7 +296,7 @@ int mca_coll_base_comm_select(ompi_communicator_t *comm,
/* Announce the winner */
ompi_output_verbose(10, mca_coll_base_output,
opal_output_verbose(10, mca_coll_base_output,
"coll:base:comm_select: Selected coll module %s",
selected_component->collm_version.mca_component_name);
@ -429,13 +429,13 @@ static int check_one_component(ompi_communicator_t *comm,
if (OMPI_SUCCESS == err) {
priority = (priority < 100) ? priority : 100;
ompi_output_verbose(10, mca_coll_base_output,
opal_output_verbose(10, mca_coll_base_output,
"coll:base:comm_select: component available: %s, priority: %d",
component->mca_component_name, priority);
} else {
priority = -1;
ompi_output_verbose(10, mca_coll_base_output,
opal_output_verbose(10, mca_coll_base_output,
"coll:base:comm_select: component not available: %s",
component->mca_component_name);
}

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

@ -23,7 +23,7 @@
#include "mpi.h"
#include "include/constants.h"
#include "opal/class/opal_list.h"
#include "util/output.h"
#include "opal/util/output.h"
#include "util/show_help.h"
#include "mca/mca.h"
#include "mca/base/base.h"
@ -148,7 +148,7 @@ 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;
ompi_output_verbose(10, mca_coll_base_output,
opal_output_verbose(10, mca_coll_base_output,
"coll:find_available: no coll components available!");
ompi_show_help("help-mca-base", "find-available:none-found", true,
"coll");
@ -172,7 +172,7 @@ static int init_query(const mca_base_component_t *m,
{
int ret;
ompi_output_verbose(10, mca_coll_base_output,
opal_output_verbose(10, mca_coll_base_output,
"coll:find_available: querying coll component %s",
m->mca_component_name);
@ -187,7 +187,7 @@ static int init_query(const mca_base_component_t *m,
} else {
/* Unrecognized coll API version */
ompi_output_verbose(10, mca_coll_base_output,
opal_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,
@ -198,14 +198,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) {
ompi_output_verbose(10, mca_coll_base_output,
opal_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 {
ompi_output_verbose(10, mca_coll_base_output,
opal_output_verbose(10, mca_coll_base_output,
"coll:find_available: coll component %s is available",
m->mca_component_name);
}

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

@ -19,7 +19,7 @@
#include <stdio.h>
#include "include/constants.h"
#include "util/output.h"
#include "opal/util/output.h"
#include "mca/mca.h"
#include "mca/base/base.h"
#include "mca/base/mca_base_param.h"
@ -61,7 +61,7 @@ int mca_coll_base_open(void)
{
/* Open an output stream for this framework */
mca_coll_base_output = ompi_output_open(NULL);
mca_coll_base_output = opal_output_open(NULL);
/* Open up all available components */

6
ompi/mca/coll/demo/coll_demo_allgather.c
Просмотреть файл

@ -18,7 +18,7 @@
#include "mpi.h"
#include "include/constants.h"
#include "util/output.h"
#include "opal/util/output.h"
#include "mca/coll/coll.h"
#include "mca/coll/base/base.h"
#include "coll_demo.h"
@ -36,7 +36,7 @@ int mca_coll_demo_allgather_intra(void *sbuf, int scount,
int rcount, struct ompi_datatype_t *rdtype,
struct ompi_communicator_t *comm)
{
ompi_output_verbose(10, mca_coll_base_output, "In demo allgather_intra");
opal_output_verbose(10, mca_coll_base_output, "In demo allgather_intra");
return comm->c_coll_basic_module->coll_allgather(sbuf, scount, sdtype, rbuf,
rcount, rdtype, comm);
}
@ -55,7 +55,7 @@ int mca_coll_demo_allgather_inter(void *sbuf, int scount,
struct ompi_datatype_t *rdtype,
struct ompi_communicator_t *comm)
{
ompi_output_verbose(10, mca_coll_base_output, "In demo allgather_inter");
opal_output_verbose(10, mca_coll_base_output, "In demo allgather_inter");
return comm->c_coll_basic_module->coll_allgather(sbuf, scount, sdtype, rbuf,
rcount, rdtype, comm);
}

6
ompi/mca/coll/demo/coll_demo_allgatherv.c
Просмотреть файл

@ -18,7 +18,7 @@
#include "mpi.h"
#include "include/constants.h"
#include "util/output.h"
#include "opal/util/output.h"
#include "mca/coll/coll.h"
#include "mca/coll/base/base.h"
#include "coll_demo.h"
@ -37,7 +37,7 @@ int mca_coll_demo_allgatherv_intra(void *sbuf, int scount,
struct ompi_datatype_t *rdtype,
struct ompi_communicator_t *comm)
{
ompi_output_verbose(10, mca_coll_base_output, "In demo allgatherv_intra");
opal_output_verbose(10, mca_coll_base_output, "In demo allgatherv_intra");
return comm->c_coll_basic_module->coll_allgatherv(sbuf, scount, sdtype,
rbuf, rcounts, disps,
rdtype, comm);
@ -57,7 +57,7 @@ int mca_coll_demo_allgatherv_inter(void *sbuf, int scount,
struct ompi_datatype_t *rdtype,
struct ompi_communicator_t *comm)
{
ompi_output_verbose(10, mca_coll_base_output, "In demo allgatherv_inter");
opal_output_verbose(10, mca_coll_base_output, "In demo allgatherv_inter");
return comm->c_coll_basic_module->coll_allgatherv(sbuf, scount, sdtype,
rbuf, rcounts, disps,
rdtype, comm);

6
ompi/mca/coll/demo/coll_demo_allreduce.c
Просмотреть файл

@ -18,7 +18,7 @@
#include "mpi.h"
#include "include/constants.h"
#include "util/output.h"
#include "opal/util/output.h"
#include "mca/coll/coll.h"
#include "mca/coll/base/base.h"
#include "coll_demo.h"
@ -36,7 +36,7 @@ int mca_coll_demo_allreduce_intra(void *sbuf, void *rbuf, int count,
struct ompi_op_t *op,
struct ompi_communicator_t *comm)
{
ompi_output_verbose(10, mca_coll_base_output, "In demo allreduce_intra");
opal_output_verbose(10, mca_coll_base_output, "In demo allreduce_intra");
return comm->c_coll_basic_module->coll_allreduce(sbuf, rbuf, count, dtype,
op, comm);
}
@ -54,7 +54,7 @@ int mca_coll_demo_allreduce_inter(void *sbuf, void *rbuf, int count,
struct ompi_op_t *op,
struct ompi_communicator_t *comm)
{
ompi_output_verbose(10, mca_coll_base_output, "In demo allreduce_inter");
opal_output_verbose(10, mca_coll_base_output, "In demo allreduce_inter");
return comm->c_coll_basic_module->coll_allreduce(sbuf, rbuf, count, dtype,
op, comm);
}

6
ompi/mca/coll/demo/coll_demo_alltoall.c
Просмотреть файл

@ -18,7 +18,7 @@
#include "mpi.h"
#include "include/constants.h"
#include "util/output.h"
#include "opal/util/output.h"
#include "mca/coll/coll.h"
#include "mca/coll/base/base.h"
#include "coll_demo.h"
@ -37,7 +37,7 @@ int mca_coll_demo_alltoall_intra(void *sbuf, int scount,
struct ompi_datatype_t *rdtype,
struct ompi_communicator_t *comm)
{
ompi_output_verbose(10, mca_coll_base_output, "In demo alltoall_intra\n");
opal_output_verbose(10, mca_coll_base_output, "In demo alltoall_intra\n");
return comm->c_coll_basic_module->coll_alltoall(sbuf, scount, sdtype,
rbuf, rcount, rdtype,
comm);
@ -57,7 +57,7 @@ int mca_coll_demo_alltoall_inter(void *sbuf, int scount,
struct ompi_datatype_t *rdtype,
struct ompi_communicator_t *comm)
{
ompi_output_verbose(10, mca_coll_base_output, "In demo alltoall_inter\n");
opal_output_verbose(10, mca_coll_base_output, "In demo alltoall_inter\n");
return comm->c_coll_basic_module->coll_alltoall(sbuf, scount, sdtype,
rbuf, rcount, rdtype,
comm);

6
ompi/mca/coll/demo/coll_demo_alltoallv.c
Просмотреть файл

@ -18,7 +18,7 @@
#include "mpi.h"
#include "include/constants.h"
#include "util/output.h"
#include "opal/util/output.h"
#include "mca/coll/coll.h"
#include "mca/coll/base/base.h"
#include "coll_demo.h"
@ -38,7 +38,7 @@ mca_coll_demo_alltoallv_intra(void *sbuf, int *scounts, int *sdisps,
struct ompi_datatype_t *rdtype,
struct ompi_communicator_t *comm)
{
ompi_output_verbose(10, mca_coll_base_output, "In demo alltoallv_intra");
opal_output_verbose(10, mca_coll_base_output, "In demo alltoallv_intra");
return comm->c_coll_basic_module->coll_alltoallv(sbuf, scounts, sdisps,
sdtype, rbuf, rcounts,
rdisps, rdtype, comm);
@ -59,7 +59,7 @@ mca_coll_demo_alltoallv_inter(void *sbuf, int *scounts, int *sdisps,
struct ompi_datatype_t *rdtype,
struct ompi_communicator_t *comm)
{
ompi_output_verbose(10, mca_coll_base_output, "In demo alltoallv_inter");
opal_output_verbose(10, mca_coll_base_output, "In demo alltoallv_inter");
return comm->c_coll_basic_module->coll_alltoallv(sbuf, scounts, sdisps,
sdtype, rbuf, rcounts,
rdisps, rdtype, comm);

6
ompi/mca/coll/demo/coll_demo_alltoallw.c
Просмотреть файл

@ -18,7 +18,7 @@
#include "mpi.h"
#include "include/constants.h"
#include "util/output.h"
#include "opal/util/output.h"
#include "mca/coll/coll.h"
#include "mca/coll/base/base.h"
#include "coll_demo.h"
@ -37,7 +37,7 @@ int mca_coll_demo_alltoallw_intra(void *sbuf, int *scounts, int *sdisps,
struct ompi_datatype_t **rdtypes,
struct ompi_communicator_t *comm)
{
ompi_output_verbose(10, mca_coll_base_output, "In demo alltoallw_intra");
opal_output_verbose(10, mca_coll_base_output, "In demo alltoallw_intra");
return comm->c_coll_basic_module->coll_alltoallw(sbuf, scounts, sdisps,
sdtypes, rbuf, rcounts,
rdisps, rdtypes, comm);
@ -57,7 +57,7 @@ int mca_coll_demo_alltoallw_inter(void *sbuf, int *scounts, int *sdisps,
struct ompi_datatype_t **rdtypes,
struct ompi_communicator_t *comm)
{
ompi_output_verbose(10, mca_coll_base_output, "In demo alltoallw_inter");
opal_output_verbose(10, mca_coll_base_output, "In demo alltoallw_inter");
return comm->c_coll_basic_module->coll_alltoallw(sbuf, scounts, sdisps,
sdtypes, rbuf, rcounts,
rdisps, rdtypes, comm);

6
ompi/mca/coll/demo/coll_demo_barrier.c
Просмотреть файл

@ -18,7 +18,7 @@
#include "mpi.h"
#include "include/constants.h"
#include "util/output.h"
#include "opal/util/output.h"
#include "mca/coll/coll.h"
#include "mca/coll/base/base.h"
#include "coll_demo.h"
@ -33,7 +33,7 @@
*/
int mca_coll_demo_barrier_intra(struct ompi_communicator_t *comm)
{
ompi_output_verbose(10, mca_coll_base_output, "In demo barrier_intra");
opal_output_verbose(10, mca_coll_base_output, "In demo barrier_intra");
return comm->c_coll_basic_module->coll_barrier(comm);
}
@ -47,6 +47,6 @@ int mca_coll_demo_barrier_intra(struct ompi_communicator_t *comm)
*/
int mca_coll_demo_barrier_inter(struct ompi_communicator_t *comm)
{
ompi_output_verbose(10, mca_coll_base_output, "In demo barrier_inter");
opal_output_verbose(10, mca_coll_base_output, "In demo barrier_inter");
return comm->c_coll_basic_module->coll_barrier(comm);
}

6
ompi/mca/coll/demo/coll_demo_bcast.c
Просмотреть файл

@ -18,7 +18,7 @@
#include "mpi.h"
#include "include/constants.h"
#include "util/output.h"
#include "opal/util/output.h"
#include "mca/coll/coll.h"
#include "mca/coll/base/base.h"
#include "coll_demo.h"
@ -35,7 +35,7 @@ int mca_coll_demo_bcast_intra(void *buff, int count,
struct ompi_datatype_t *datatype, int root,
struct ompi_communicator_t *comm)
{
ompi_output_verbose(10, mca_coll_base_output, "In demo bcast_intra");
opal_output_verbose(10, mca_coll_base_output, "In demo bcast_intra");
return comm->c_coll_basic_module->coll_bcast(buff, count, datatype,
root, comm);
}
@ -52,7 +52,7 @@ int mca_coll_demo_bcast_inter(void *buff, int count,
struct ompi_datatype_t *datatype, int root,
struct ompi_communicator_t *comm)
{
ompi_output_verbose(10, mca_coll_base_output, "In demo bcast_inter");
opal_output_verbose(10, mca_coll_base_output, "In demo bcast_inter");
return comm->c_coll_basic_module->coll_bcast(buff, count, datatype,
root, comm);
}

6
ompi/mca/coll/demo/coll_demo_exscan.c
Просмотреть файл

@ -18,7 +18,7 @@
#include "mpi.h"
#include "include/constants.h"
#include "util/output.h"
#include "opal/util/output.h"
#include "mca/coll/coll.h"
#include "mca/coll/base/base.h"
#include "coll_demo.h"
@ -36,7 +36,7 @@ int mca_coll_demo_exscan_intra(void *sbuf, void *rbuf, int count,
struct ompi_op_t *op,
struct ompi_communicator_t *comm)
{
ompi_output_verbose(10, mca_coll_base_output, "In demo exscan_intra");
opal_output_verbose(10, mca_coll_base_output, "In demo exscan_intra");
return comm->c_coll_basic_module->coll_exscan(sbuf, rbuf, count, dtype,
op, comm);
}
@ -54,7 +54,7 @@ int mca_coll_demo_exscan_inter(void *sbuf, void *rbuf, int count,
struct ompi_op_t *op,
struct ompi_communicator_t *comm)
{
ompi_output_verbose(10, mca_coll_base_output, "In demo exscan_inter");
opal_output_verbose(10, mca_coll_base_output, "In demo exscan_inter");
return comm->c_coll_basic_module->coll_exscan(sbuf, rbuf, count, dtype,
op, comm);
}

6
ompi/mca/coll/demo/coll_demo_gather.c
Просмотреть файл

@ -18,7 +18,7 @@
#include "mpi.h"
#include "include/constants.h"
#include "util/output.h"
#include "opal/util/output.h"
#include "mca/coll/coll.h"
#include "mca/coll/base/base.h"
#include "coll_demo.h"
@ -36,7 +36,7 @@ int mca_coll_demo_gather_intra(void *sbuf, int scount,
struct ompi_datatype_t *rdtype,
int root, struct ompi_communicator_t *comm)
{
ompi_output_verbose(10, mca_coll_base_output, "In demo gather_intra");
opal_output_verbose(10, mca_coll_base_output, "In demo gather_intra");
return comm->c_coll_basic_module->coll_gather(sbuf, scount, sdtype,
rbuf, rcount, rdtype,
root, comm);
@ -56,7 +56,7 @@ int mca_coll_demo_gather_inter(void *sbuf, int scount,
struct ompi_datatype_t *rdtype,
int root, struct ompi_communicator_t *comm)
{
ompi_output_verbose(10, mca_coll_base_output, "In demo gather_inter");
opal_output_verbose(10, mca_coll_base_output, "In demo gather_inter");
return comm->c_coll_basic_module->coll_gather(sbuf, scount, sdtype,
rbuf, rcount, rdtype,
root, comm);

6
ompi/mca/coll/demo/coll_demo_gatherv.c
Просмотреть файл

@ -18,7 +18,7 @@
#include "mpi.h"
#include "include/constants.h"
#include "util/output.h"
#include "opal/util/output.h"
#include "mca/coll/coll.h"
#include "mca/coll/base/base.h"
#include "coll_demo.h"
@ -37,7 +37,7 @@ int mca_coll_demo_gatherv_intra(void *sbuf, int scount,
struct ompi_datatype_t *rdtype, int root,
struct ompi_communicator_t *comm)
{
ompi_output_verbose(10, mca_coll_base_output, "In demo gatherv_intra");
opal_output_verbose(10, mca_coll_base_output, "In demo gatherv_intra");
return comm->c_coll_basic_module->coll_gatherv(sbuf, scount, sdtype,
rbuf, rcounts, disps,
rdtype, root, comm);
@ -57,7 +57,7 @@ int mca_coll_demo_gatherv_inter(void *sbuf, int scount,
struct ompi_datatype_t *rdtype, int root,
struct ompi_communicator_t *comm)
{
ompi_output_verbose(10, mca_coll_base_output, "In demo gatherv_inter");
opal_output_verbose(10, mca_coll_base_output, "In demo gatherv_inter");
return comm->c_coll_basic_module->coll_gatherv(sbuf, scount, sdtype,
rbuf, rcounts, disps,
rdtype, root, comm);

6
ompi/mca/coll/demo/coll_demo_reduce.c
Просмотреть файл

@ -18,7 +18,7 @@
#include "mpi.h"
#include "include/constants.h"
#include "util/output.h"
#include "opal/util/output.h"
#include "mca/coll/coll.h"
#include "mca/coll/base/base.h"
#include "coll_demo.h"
@ -36,7 +36,7 @@ int mca_coll_demo_reduce_intra(void *sbuf, void *rbuf, int count,
struct ompi_op_t *op,
int root, struct ompi_communicator_t *comm)
{
ompi_output_verbose(10, mca_coll_base_output, "In demo reduce_intra");
opal_output_verbose(10, mca_coll_base_output, "In demo reduce_intra");
return comm->c_coll_basic_module->coll_reduce(sbuf, rbuf, count, dtype,
op, root, comm);
}
@ -54,7 +54,7 @@ int mca_coll_demo_reduce_inter(void *sbuf, void *rbuf, int count,
struct ompi_op_t *op,
int root, struct ompi_communicator_t *comm)
{
ompi_output_verbose(10, mca_coll_base_output, "In demo reduce_inter");
opal_output_verbose(10, mca_coll_base_output, "In demo reduce_inter");
return comm->c_coll_basic_module->coll_reduce(sbuf, rbuf, count, dtype,
op, root, comm);
}

6
ompi/mca/coll/demo/coll_demo_reduce_scatter.c
Просмотреть файл

@ -18,7 +18,7 @@
#include "mpi.h"
#include "include/constants.h"
#include "util/output.h"
#include "opal/util/output.h"
#include "mca/coll/coll.h"
#include "mca/coll/base/base.h"
#include "coll_demo.h"
@ -36,7 +36,7 @@ int mca_coll_demo_reduce_scatter_intra(void *sbuf, void *rbuf, int *rcounts,
struct ompi_op_t *op,
struct ompi_communicator_t *comm)
{
ompi_output_verbose(10, mca_coll_base_output, "In demo scatter_intra");
opal_output_verbose(10, mca_coll_base_output, "In demo scatter_intra");
return comm->c_coll_basic_module->coll_reduce_scatter(sbuf, rbuf, rcounts,
dtype, op, comm);
}
@ -54,7 +54,7 @@ int mca_coll_demo_reduce_scatter_inter(void *sbuf, void *rbuf, int *rcounts,
struct ompi_op_t *op,
struct ompi_communicator_t *comm)
{
ompi_output_verbose(10, mca_coll_base_output, "In demo scatter_inter");
opal_output_verbose(10, mca_coll_base_output, "In demo scatter_inter");
return comm->c_coll_basic_module->coll_reduce_scatter(sbuf, rbuf, rcounts,
dtype, op, comm);
}

4
ompi/mca/coll/demo/coll_demo_scan.c
Просмотреть файл

@ -18,7 +18,7 @@
#include "mpi.h"
#include "include/constants.h"
#include "util/output.h"
#include "opal/util/output.h"
#include "mca/coll/coll.h"
#include "mca/coll/base/base.h"
#include "coll_demo.h"
@ -36,7 +36,7 @@ int mca_coll_demo_scan_intra(void *sbuf, void *rbuf, int count,
struct ompi_op_t *op,
struct ompi_communicator_t *comm)
{
ompi_output_verbose(10, mca_coll_base_output, "In demo scan_intra");
opal_output_verbose(10, mca_coll_base_output, "In demo scan_intra");
return comm->c_coll_basic_module->coll_scan(sbuf, rbuf, count,
dtype, op, comm);
}

6
ompi/mca/coll/demo/coll_demo_scatter.c
Просмотреть файл

@ -18,7 +18,7 @@
#include "mpi.h"
#include "include/constants.h"
#include "util/output.h"
#include "opal/util/output.h"
#include "mca/coll/coll.h"
#include "mca/coll/base/base.h"
#include "coll_demo.h"
@ -38,7 +38,7 @@ int mca_coll_demo_scatter_intra(void *sbuf, int scount,
int root,
struct ompi_communicator_t *comm)
{
ompi_output_verbose(10, mca_coll_base_output, "In demo scatter_intra");
opal_output_verbose(10, mca_coll_base_output, "In demo scatter_intra");
return comm->c_coll_basic_module->coll_scatter(sbuf, scount, sdtype,
rbuf, rcount, rdtype,
root, comm);
@ -59,7 +59,7 @@ int mca_coll_demo_scatter_inter(void *sbuf, int scount,
int root,
struct ompi_communicator_t *comm)
{
ompi_output_verbose(10, mca_coll_base_output, "In demo scatter_inter");
opal_output_verbose(10, mca_coll_base_output, "In demo scatter_inter");
return comm->c_coll_basic_module->coll_scatter(sbuf, scount, sdtype,
rbuf, rcount, rdtype,
root, comm);

6
ompi/mca/coll/demo/coll_demo_scatterv.c
Просмотреть файл

@ -18,7 +18,7 @@
#include "mpi.h"
#include "include/constants.h"
#include "util/output.h"
#include "opal/util/output.h"
#include "mca/coll/coll.h"
#include "mca/coll/base/base.h"
#include "coll_demo.h"
@ -37,7 +37,7 @@ int mca_coll_demo_scatterv_intra(void *sbuf, int *scounts,
struct ompi_datatype_t *rdtype, int root,
struct ompi_communicator_t *comm)
{
ompi_output_verbose(10, mca_coll_base_output, "In demo scatterv_intra");
opal_output_verbose(10, mca_coll_base_output, "In demo scatterv_intra");
return comm->c_coll_basic_module->coll_scatterv(sbuf, scounts, disps,
sdtype, rbuf, rcount,
rdtype, root, comm);
@ -57,7 +57,7 @@ int mca_coll_demo_scatterv_inter(void *sbuf, int *scounts,
struct ompi_datatype_t *rdtype, int root,
struct ompi_communicator_t *comm)
{
ompi_output_verbose(10, mca_coll_base_output, "In demo scatterv_inter");
opal_output_verbose(10, mca_coll_base_output, "In demo scatterv_inter");
return comm->c_coll_basic_module->coll_scatterv(sbuf, scounts, disps,
sdtype, rbuf, rcount,
rdtype, root, comm);

4
ompi/mca/coll/hierarch/coll_hierarch_barrier.c
Просмотреть файл

@ -19,7 +19,7 @@
#include "mpi.h"
#include "include/constants.h"
#include "util/output.h"
#include "opal/util/output.h"
#include "mca/coll/coll.h"
#include "mca/coll/base/base.h"
#include "coll_hierarch.h"
@ -34,7 +34,7 @@
*/
int mca_coll_hierarch_barrier_intra(struct ompi_communicator_t *comm)
{
ompi_output_verbose(10, mca_coll_base_output, "In hierarch barrier_intra");
opal_output_verbose(10, mca_coll_base_output, "In hierarch barrier_intra");
return comm->c_coll_basic_module->coll_barrier(comm);
}

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

@ -19,7 +19,7 @@
#include "mpi.h"
#include "include/constants.h"
#include "util/output.h"
#include "opal/util/output.h"
#include "mca/coll/coll.h"
#include "mca/coll/base/base.h"
#include "mca/coll/base/coll_tags.h"

4
ompi/mca/coll/hierarch/coll_hierarch_reduce.c
Просмотреть файл

@ -21,7 +21,7 @@
#include "mpi.h"
#include "include/constants.h"
#include "util/output.h"
#include "opal/util/output.h"
#include "mca/coll/coll.h"
#include "mca/coll/base/base.h"
#include "coll_hierarch.h"
@ -132,7 +132,7 @@ int mca_coll_hierarch_reduce_intra(void *sbuf, void *rbuf, int count,
struct ompi_op_t *op,
int root, struct ompi_communicator_t *comm)
{
ompi_output_verbose(10, mca_coll_base_output, "In hierarch reduce_intra");
opal_output_verbose(10, mca_coll_base_output, "In hierarch reduce_intra");
return comm->c_coll_basic_module->coll_reduce(sbuf, rbuf, count, dtype,
op, root, comm);
}

16
ompi/mca/common/sm/common_sm_mmap.c
Просмотреть файл

@ -33,7 +33,7 @@
#include "include/constants.h"
#include "common_sm_mmap.h"
#include "util/output.h"
#include "opal/util/output.h"
#include "util/sys_info.h"
#include "util/proc_info.h"
@ -61,7 +61,7 @@ static int mca_common_sm_mmap_open(char* path)
struct timespec ts;
fd = open(path, O_CREAT|O_RDWR, 0000);
if(fd < 0 && errno != EACCES) {
ompi_output(0,
opal_output(0,
"mca_ptl_sm_mmap_open: open %s failed with errno=%d\n", path, errno);
return -1;
}
@ -118,7 +118,7 @@ mca_common_sm_mmap_t* mca_common_sm_mmap_init(size_t size, char *file_name,
* file will succeed. */
fd=mca_common_sm_mmap_open(file_name);
if( -1 == fd ) {
ompi_output(0, "mca_common_sm_mmap_init: mca_common_sm_mmap_open failed \n");
opal_output(0, "mca_common_sm_mmap_init: mca_common_sm_mmap_open failed \n");
return NULL;
}
@ -126,7 +126,7 @@ mca_common_sm_mmap_t* mca_common_sm_mmap_init(size_t size, char *file_name,
file_previously_opened=false;
return_code=fstat(fd,&s_stat);
if( 0 > return_code ) {
ompi_output(0, "mca_common_sm_mmap_init: fstat failed with errno=%d\n", errno);
opal_output(0, "mca_common_sm_mmap_init: fstat failed with errno=%d\n", errno);
close(fd);
return NULL;
}
@ -139,7 +139,7 @@ mca_common_sm_mmap_t* mca_common_sm_mmap_init(size_t size, char *file_name,
if( !file_previously_opened ) {
/* truncate the file to the requested size */
if(ftruncate(fd, size) != 0) {
ompi_output(0,
opal_output(0,
"mca_common_sm_mmap_init: ftruncate failed with errno=%d\n",
errno);
close(fd);
@ -150,7 +150,7 @@ mca_common_sm_mmap_t* mca_common_sm_mmap_init(size_t size, char *file_name,
/* map the file and initialize segment state */
seg = mmap(NULL, size, PROT_READ|PROT_WRITE, MAP_SHARED, fd, 0);
if( (void*)-1 == seg ) {
ompi_output(0, "mca_common_sm_mmap_init: mmap failed with errno=%d\n",
opal_output(0, "mca_common_sm_mmap_init: mmap failed with errno=%d\n",
errno);
close(fd);
return NULL;
@ -170,7 +170,7 @@ mca_common_sm_mmap_t* mca_common_sm_mmap_init(size_t size, char *file_name,
addr=(unsigned char *)( (tmp/data_seg_alignment)*data_seg_alignment);
/* is addr past end of file ? */
if( (unsigned char*)seg+size < addr ){
ompi_output(0, "mca_common_sm_mmap_init: memory region too small len %d addr %p\n",
opal_output(0, "mca_common_sm_mmap_init: memory region too small len %d addr %p\n",
size,addr);
fchmod(fd, 0600);
close(fd);
@ -192,7 +192,7 @@ mca_common_sm_mmap_t* mca_common_sm_mmap_init(size_t size, char *file_name,
/* enable access by other processes on this host */
if(fchmod(fd, 0600) != 0) {
ompi_output(0, "mca_common_sm_mmap_init: fchmod failed with errno=%d :: fd %d\n",
opal_output(0, "mca_common_sm_mmap_init: fchmod failed with errno=%d :: fd %d\n",
errno,fd);
OBJ_RELEASE(map);
close(fd);

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

@ -276,8 +276,8 @@ extern "C" {
*/
OMPI_DECLSPEC extern int mca_io_base_param;
/**
* io framework debugging stream ID used with ompi_output() and
* ompi_output_verbose().
* io framework debugging stream ID used with opal_output() and
* opal_output_verbose().
*/
OMPI_DECLSPEC extern int mca_io_base_output;

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

@ -24,7 +24,7 @@
#include "file/file.h"
#include "opal/class/opal_list.h"
#include "util/argv.h"
#include "util/output.h"
#include "opal/util/output.h"
#include "mca/mca.h"
#include "mca/base/base.h"
#include "mca/io/io.h"
@ -81,7 +81,7 @@ int mca_io_base_delete(char *filename, struct ompi_info_t *info)
/* Announce */
ompi_output_verbose(10, mca_io_base_output,
opal_output_verbose(10, mca_io_base_output,
"io:base:delete: deleting file: %s",
filename);
@ -104,7 +104,7 @@ int mca_io_base_delete(char *filename, struct ompi_info_t *info)
name_array = ompi_argv_split(names, ',');
num_names = ompi_argv_count(name_array);
ompi_output_verbose(10, mca_io_base_output,
opal_output_verbose(10, mca_io_base_output,
"io:base:delete: Checking specific modules: %s",
names);
selectable = check_components(&mca_io_base_components_available,
@ -116,7 +116,7 @@ int mca_io_base_delete(char *filename, struct ompi_info_t *info)
check them all. */
else {
ompi_output_verbose(10, mca_io_base_output,
opal_output_verbose(10, mca_io_base_output,
"io:base:delete: Checking all available modules");
selectable = check_components(&mca_io_base_components_available,
filename, info, NULL, 0);
@ -167,7 +167,7 @@ int mca_io_base_delete(char *filename, struct ompi_info_t *info)
/* Announce the winner */
ompi_output_verbose(10, mca_io_base_output,
opal_output_verbose(10, mca_io_base_output,
"io:base:delete: Selected io component %s",
selected.ai_component.v1_0_0.io_version.mca_component_name);
@ -286,12 +286,12 @@ static avail_io_t *check_one_component(const mca_base_component_t *component,
avail->ai_priority : 100;
avail->ai_priority = (avail->ai_priority < 0) ?
0 : avail->ai_priority;
ompi_output_verbose(10, mca_io_base_output,
opal_output_verbose(10, mca_io_base_output,
"io:base:delete: component available: %s, priority: %d",
component->mca_component_name,
avail->ai_priority);
} else {
ompi_output_verbose(10, mca_io_base_output,
opal_output_verbose(10, mca_io_base_output,
"io:base:delete: component not available: %s",
component->mca_component_name);
}

16
ompi/mca/io/base/io_base_file_select.c
Просмотреть файл

@ -23,7 +23,7 @@
#include "mpi.h"
#include "file/file.h"
#include "util/argv.h"
#include "util/output.h"
#include "opal/util/output.h"
#include "opal/class/opal_list.h"
#include "opal/class/opal_object.h"
#include "mca/mca.h"
@ -90,7 +90,7 @@ int mca_io_base_file_select(ompi_file_t *file,
/* Announce */
ompi_output_verbose(10, mca_io_base_output,
opal_output_verbose(10, mca_io_base_output,
"io:base:file_select: new file: %s",
file->f_filename);
@ -119,7 +119,7 @@ int mca_io_base_file_select(ompi_file_t *file,
if (NULL != preferred) {
str = &(preferred->mca_component_name[0]);
ompi_output_verbose(10, mca_io_base_output,
opal_output_verbose(10, mca_io_base_output,
"io:base:file_select: Checking preferred module: %s",
str);
selectable = check_components(&mca_io_base_components_available,
@ -144,7 +144,7 @@ int mca_io_base_file_select(ompi_file_t *file,
name_array = ompi_argv_split(names, ',');
num_names = ompi_argv_count(name_array);
ompi_output_verbose(10, mca_io_base_output,
opal_output_verbose(10, mca_io_base_output,
"io:base:file_select: Checking specific modules: %s",
names);
selectable = check_components(&mca_io_base_components_available,
@ -156,7 +156,7 @@ int mca_io_base_file_select(ompi_file_t *file,
check them all. */
else {
ompi_output_verbose(10, mca_io_base_output,
opal_output_verbose(10, mca_io_base_output,
"io:base:file_select: Checking all available modules");
selectable = check_components(&mca_io_base_components_available,
file, NULL, 0);
@ -219,7 +219,7 @@ int mca_io_base_file_select(ompi_file_t *file,
/* Announce the winner */
ompi_output_verbose(10, mca_io_base_output,
opal_output_verbose(10, mca_io_base_output,
"io:base:file_select: Selected io module %s",
selected.ai_component.v1_0_0.io_version.mca_component_name);
@ -338,12 +338,12 @@ static avail_io_t *check_one_component(ompi_file_t *file,
avail->ai_priority : 100;
avail->ai_priority = (avail->ai_priority < 0) ?
0 : avail->ai_priority;
ompi_output_verbose(10, mca_io_base_output,
opal_output_verbose(10, mca_io_base_output,
"io:base:file_select: component available: %s, priority: %d",
component->mca_component_name,
avail->ai_priority);
} else {
ompi_output_verbose(10, mca_io_base_output,
opal_output_verbose(10, mca_io_base_output,
"io:base:file_select: component not available: %s",
component->mca_component_name);
}

10
ompi/mca/io/base/io_base_find_available.c
Просмотреть файл

@ -22,7 +22,7 @@
#include "mpi.h"
#include "include/constants.h"
#include "opal/class/opal_list.h"
#include "util/output.h"
#include "opal/util/output.h"
#include "mca/mca.h"
#include "mca/base/base.h"
#include "mca/io/io.h"
@ -139,7 +139,7 @@ static int init_query(const mca_base_component_t *m,
{
int ret;
ompi_output_verbose(10, mca_io_base_output,
opal_output_verbose(10, mca_io_base_output,
"io:find_available: querying io component %s",
m->mca_component_name);
@ -154,7 +154,7 @@ static int init_query(const mca_base_component_t *m,
} else {
/* Unrecognized io API version */
ompi_output_verbose(10, mca_io_base_output,
opal_output_verbose(10, mca_io_base_output,
"io:find_available: unrecognized io API version (%d.%d.%d)",
m->mca_type_major_version,
m->mca_type_minor_version,
@ -166,14 +166,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) {
ompi_output_verbose(10, mca_io_base_output,
opal_output_verbose(10, mca_io_base_output,
"io:find_available: io component %s is not available",
m->mca_component_name);
if (NULL != m->mca_close_component) {
m->mca_close_component();
}
} else {
ompi_output_verbose(10, mca_io_base_output,
opal_output_verbose(10, mca_io_base_output,
"io:find_available: io component %s is available",
m->mca_component_name);
}

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

@ -19,7 +19,7 @@
#include <stdio.h>
#include "class/ompi_free_list.h"
#include "util/output.h"
#include "opal/util/output.h"
#include "mca/mca.h"
#include "mca/base/base.h"
#include "mca/base/mca_base_param.h"
@ -61,7 +61,7 @@ int mca_io_base_open(void)
{
/* Open an output stream for this framework */
mca_io_base_output = ompi_output_open(NULL);
mca_io_base_output = opal_output_open(NULL);
/* Create some parameters */

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

@ -17,7 +17,7 @@
#include "ompi_config.h"
#include "runtime/runtime.h"
#include "util/output.h"
#include "opal/util/output.h"
#include "mca/mca.h"
#include "mca/base/base.h"
#include "mca/mpool/mpool.h"

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

@ -15,7 +15,7 @@
*/
#include "ompi_config.h"
#include "util/output.h"
#include "opal/util/output.h"
#include "mca/base/base.h"
#include "mca/base/mca_base_param.h"
#include "mca/allocator/base/base.h"
@ -121,12 +121,12 @@ static mca_mpool_base_module_t* mca_mpool_gm_init(
mca_base_component_list_item_t* item = (mca_base_component_list_item_t*)
opal_list_get_first(&mca_allocator_base_components);
allocator_component = (mca_allocator_base_component_t*)item->cli_component;
ompi_output(0, "[%d:%d] unable to locate allocator: %s - using %s\n",
opal_output(0, "[%d:%d] unable to locate allocator: %s - using %s\n",
__FILE__, __LINE__,
mca_mpool_gm_component.gm_allocator_name,
allocator_component->allocator_version.mca_component_name);
} else {
ompi_output(0, "[%s:%d] unable to locate allocator: %s\n",
opal_output(0, "[%s:%d] unable to locate allocator: %s\n",
__FILE__, __LINE__,
mca_mpool_gm_component.gm_allocator_name);
return NULL;
@ -141,7 +141,7 @@ static mca_mpool_base_module_t* mca_mpool_gm_init(
gm_mpool->gm_allocator =
allocator_component->allocator_init(true, mca_common_gm_segment_alloc, NULL, &gm_mpool->super);
if(NULL == gm_mpool->gm_allocator) {
ompi_output(0, "[%s:%d] unable to initialize allocator", __FILE__, __LINE__);
opal_output(0, "[%s:%d] unable to initialize allocator", __FILE__, __LINE__);
return NULL;
}
return &gm_mpool->super;

6
ompi/mca/mpool/gm/mpool_gm_module.c
Просмотреть файл

@ -16,7 +16,7 @@
#include "ompi_config.h"
#include <string.h>
#include "util/output.h"
#include "opal/util/output.h"
#include "mpool_gm.h"
@ -67,7 +67,7 @@ int mca_mpool_gm_register(
return OMPI_ERR_OUT_OF_RESOURCE;
}
if((rc = gm_register_memory(gm_mpool->gm_port, addr, size)) != GM_SUCCESS) {
ompi_output(0, "[%s:%d] error(%d) registering gm memory\n", __FILE__, __LINE__, rc);
opal_output(0, "[%s:%d] error(%d) registering gm memory\n", __FILE__, __LINE__, rc);
OBJ_RELEASE(reg);
return OMPI_ERR_OUT_OF_RESOURCE;
}
@ -91,7 +91,7 @@ int mca_mpool_gm_deregister(mca_mpool_base_module_t* mpool, void *addr, size_t s
addr,
size);
if(GM_SUCCESS != rc) {
ompi_output(0, "[%s:%d] error(%d) deregistering gm memory\n", __FILE__, __LINE__, rc);
opal_output(0, "[%s:%d] error(%d) deregistering gm memory\n", __FILE__, __LINE__, rc);
return OMPI_ERROR;
}
return OMPI_SUCCESS;

8
ompi/mca/mpool/mvapi/mpool_mvapi_component.c
Просмотреть файл

@ -15,7 +15,7 @@
*/
#include "ompi_config.h"
#include "util/output.h"
#include "opal/util/output.h"
#include "mca/base/base.h"
#include "mca/base/mca_base_param.h"
#include "mca/allocator/base/base.h"
@ -149,10 +149,10 @@ static mca_mpool_base_module_t* mca_mpool_mvapi_init(
mca_base_component_list_item_t* item = (mca_base_component_list_item_t*)
opal_list_get_first(&mca_allocator_base_components);
allocator_component = (mca_allocator_base_component_t*)item->cli_component;
ompi_output(0, "mca_mpool_mvapi_init: unable to locate allocator: %s - using %s\n",
opal_output(0, "mca_mpool_mvapi_init: unable to locate allocator: %s - using %s\n",
mca_mpool_mvapi_component.vapi_allocator_name, allocator_component->allocator_version.mca_component_name);
} else {
ompi_output(0, "mca_mpool_mvapi_init: unable to locate allocator: %s\n",
opal_output(0, "mca_mpool_mvapi_init: unable to locate allocator: %s\n",
mca_mpool_mvapi_component.vapi_allocator_name);
return NULL;
}
@ -166,7 +166,7 @@ static mca_mpool_base_module_t* mca_mpool_mvapi_init(
mpool_module->vapi_allocator =
allocator_component->allocator_init(true, mca_common_vapi_segment_alloc, NULL, &mpool_module->super);
if(NULL == mpool_module->vapi_allocator) {
ompi_output(0, "mca_mpool_mvapi_init: unable to initialize allocator");
opal_output(0, "mca_mpool_mvapi_init: unable to initialize allocator");
return NULL;
}
return &mpool_module->super;

6
ompi/mca/mpool/mvapi/mpool_mvapi_module.c
Просмотреть файл

@ -16,7 +16,7 @@
#include "ompi_config.h"
#include <string.h>
#include "util/output.h"
#include "opal/util/output.h"
#include "mca/mpool/mvapi/mpool_mvapi.h"
@ -93,7 +93,7 @@ int mca_mpool_mvapi_register(mca_mpool_base_module_t* mpool,
);
if(VAPI_OK != ret){
ompi_output(0, "error pinning vapi memory\n");
opal_output(0, "error pinning vapi memory\n");
return OMPI_ERROR;
}
@ -122,7 +122,7 @@ int mca_mpool_mvapi_deregister(mca_mpool_base_module_t* mpool, void *addr, size_
);
if(VAPI_OK != ret){
ompi_output(0, "%s: error unpinning vapi memory\n", __func__);
opal_output(0, "%s: error unpinning vapi memory\n", __func__);
return OMPI_ERROR;
}
free(registration);

8
ompi/mca/mpool/openib/mpool_openib_component.c
Просмотреть файл

@ -15,7 +15,7 @@
*/
#include "ompi_config.h"
#include "util/output.h"
#include "opal/util/output.h"
#include "mca/base/base.h"
#include "mca/base/mca_base_param.h"
#include "mca/allocator/base/base.h"
@ -156,10 +156,10 @@ static mca_mpool_base_module_t* mca_mpool_openib_init(
mca_base_component_list_item_t* item = (mca_base_component_list_item_t*)
opal_list_get_first(&mca_allocator_base_components);
allocator_component = (mca_allocator_base_component_t*)item->cli_component;
ompi_output(0, "mca_mpool_openib_init: unable to locate allocator: %s - using %s\n",
opal_output(0, "mca_mpool_openib_init: unable to locate allocator: %s - using %s\n",
mca_mpool_openib_component.vapi_allocator_name, allocator_component->allocator_version.mca_component_name);
} else {
ompi_output(0, "mca_mpool_openib_init: unable to locate allocator: %s\n",
opal_output(0, "mca_mpool_openib_init: unable to locate allocator: %s\n",
mca_mpool_openib_component.vapi_allocator_name);
return NULL;
}
@ -173,7 +173,7 @@ static mca_mpool_base_module_t* mca_mpool_openib_init(
mpool_module->vapi_allocator =
allocator_component->allocator_init(true, mca_common_vapi_segment_alloc, NULL, &mpool_module->super);
if(NULL == mpool_module->vapi_allocator) {
ompi_output(0, "mca_mpool_openib_init: unable to initialize allocator");
opal_output(0, "mca_mpool_openib_init: unable to initialize allocator");
return NULL;
}
return &mpool_module->super;

6
ompi/mca/mpool/openib/mpool_openib_module.c
Просмотреть файл

@ -16,7 +16,7 @@
#include "ompi_config.h"
#include <string.h>
#include "util/output.h"
#include "opal/util/output.h"
#include "mca/mpool/mvapi/mpool_openib.h"
@ -93,7 +93,7 @@ int mca_mpool_openib_register(mca_mpool_base_module_t* mpool,
);
if(VAPI_OK != ret){
ompi_output(0, "error pinning vapi memory\n");
opal_output(0, "error pinning vapi memory\n");
return OMPI_ERROR;
}
@ -122,7 +122,7 @@ int mca_mpool_openib_deregister(mca_mpool_base_module_t* mpool, void *addr, size
);
if(VAPI_OK != ret){
ompi_output(0, "%s: error unpinning vapi memory\n", __func__);
opal_output(0, "%s: error unpinning vapi memory\n", __func__);
return OMPI_ERROR;
}
free(registration);

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

@ -15,7 +15,7 @@
*/
#include "ompi_config.h"
#include "util/output.h"
#include "opal/util/output.h"
#include "mca/base/base.h"
#include "mca/base/mca_base_param.h"
#include "mca/allocator/base/base.h"
@ -112,10 +112,10 @@ static mca_mpool_base_module_t* mca_mpool_sm_init(
mca_base_component_list_item_t* item = (mca_base_component_list_item_t*)
opal_list_get_first(&mca_allocator_base_components);
allocator_component = (mca_allocator_base_component_t*)item->cli_component;
ompi_output(0, "mca_mpool_sm_init: unable to locate allocator: %s - using %s\n",
opal_output(0, "mca_mpool_sm_init: unable to locate allocator: %s - using %s\n",
mca_mpool_sm_component.sm_allocator_name, allocator_component->allocator_version.mca_component_name);
} else {
ompi_output(0, "mca_mpool_sm_init: unable to locate allocator: %s\n",
opal_output(0, "mca_mpool_sm_init: unable to locate allocator: %s\n",
mca_mpool_sm_component.sm_allocator_name);
return NULL;
}
@ -140,7 +140,7 @@ static mca_mpool_base_module_t* mca_mpool_sm_init(
))
{
free(file_name);
ompi_output(0, "mca_mpool_sm_init: unable to create shared memory mapping");
opal_output(0, "mca_mpool_sm_init: unable to create shared memory mapping");
return NULL;
}
free(file_name);
@ -153,7 +153,7 @@ static mca_mpool_base_module_t* mca_mpool_sm_init(
allocator_component->allocator_init(true,
mca_common_sm_mmap_seg_alloc, NULL, NULL);
if(NULL == mpool_module->sm_allocator) {
ompi_output(0, "mca_mpool_sm_init: unable to initialize allocator");
opal_output(0, "mca_mpool_sm_init: unable to initialize allocator");
return NULL;
}

2
ompi/mca/mpool/sm/mpool_sm_module.c
Просмотреть файл

@ -16,7 +16,7 @@
#include "ompi_config.h"
#include <string.h>
#include "util/output.h"
#include "opal/util/output.h"
#include "mca/mpool/sm/mpool_sm.h"
#include "mca/common/sm/common_sm_mmap.h"

16
ompi/mca/pml/base/pml_base_module_exchange.c
Просмотреть файл

@ -18,7 +18,7 @@
#include "class/opal_hash_table.h"
#include "opal/threads/condition.h"
#include "util/output.h"
#include "opal/util/output.h"
#include "util/proc_info.h"
#include "dps/dps.h"
@ -215,7 +215,7 @@ static void mca_base_modex_registry_callback(
int rc;
#if 0
ompi_output(0, "[%lu,%lu,%lu] mca_base_modex_registry_callback\n",
opal_output(0, "[%lu,%lu,%lu] mca_base_modex_registry_callback\n",
ORTE_NAME_ARGS(orte_process_info.my_name));
orte_gpr_base_dump_notify_data(data,0);
#endif
@ -254,7 +254,7 @@ orte_gpr_base_dump_notify_data(data,0);
if(NULL == (modex = (mca_base_modex_t*)proc->proc_modex)) {
modex = OBJ_NEW(mca_base_modex_t);
if(NULL == modex) {
ompi_output(0, "mca_base_modex_registry_callback: unable to allocate mca_base_modex_t\n");
opal_output(0, "mca_base_modex_registry_callback: unable to allocate mca_base_modex_t\n");
OPAL_THREAD_UNLOCK(&proc->proc_lock);
return;
}
@ -319,7 +319,7 @@ orte_gpr_base_dump_notify_data(data,0);
}
if (num_bytes != 0) {
if(NULL == (bytes = malloc(num_bytes))) {
ompi_output(0, "Unable to allocate memory (length %d bytes).\n", num_bytes );
opal_output(0, "Unable to allocate memory (length %d bytes).\n", num_bytes );
ORTE_ERROR_LOG(ORTE_ERR_OUT_OF_RESOURCE);
continue;
}
@ -333,7 +333,7 @@ orte_gpr_base_dump_notify_data(data,0);
* Lookup the corresponding modex structure
*/
if(NULL == (modex_module = mca_base_modex_create_module(modex, &component))) {
ompi_output(0, "mca_base_modex_registry_callback: mca_base_modex_create_module failed\n");
opal_output(0, "mca_base_modex_registry_callback: mca_base_modex_create_module failed\n");
OBJ_RELEASE(data);
OPAL_THREAD_UNLOCK(&proc->proc_lock);
return;
@ -343,7 +343,7 @@ orte_gpr_base_dump_notify_data(data,0);
modex_module->module_data_size = num_bytes;
modex_module->module_data_avail = true;
#if 0
ompi_output(0, "[%lu,%lu,%lu] mca_base_modex_registry_callback: %s-%s-%d-%d received %d bytes\n",
opal_output(0, "[%lu,%lu,%lu] mca_base_modex_registry_callback: %s-%s-%d-%d received %d bytes\n",
ORTE_NAME_ARGS(orte_process_info.my_name),
component.mca_type_name,
component.mca_component_name,
@ -492,7 +492,7 @@ static int mca_base_modex_subscribe(orte_process_name_t* name)
trigs = &trig;
rc = orte_gpr.subscribe(1, &subs, 1, &trigs);
if(ORTE_SUCCESS != rc) {
ompi_output(0, "mca_base_modex_exchange: "
opal_output(0, "mca_base_modex_exchange: "
"orte_gpr.subscribe failed with return code %d\n", rc);
OBJ_DESTRUCT(&sub);
OBJ_DESTRUCT(&trig);
@ -651,7 +651,7 @@ int mca_base_modex_recv(
/* wait until data is available */
while(modex_module->module_data_avail == false) {
#if 0
ompi_output(0, "[%lu,%lu,%lu] mca_base_modex_registry_callback: waiting for %s-%s-%d-%d\n",
opal_output(0, "[%lu,%lu,%lu] mca_base_modex_registry_callback: waiting for %s-%s-%d-%d\n",
ORTE_NAME_ARGS(orte_process_info.my_name),
component->mca_type_name,
component->mca_component_name,

12
ompi/mca/pml/base/pml_base_select.c
Просмотреть файл

@ -69,21 +69,21 @@ int mca_pml_base_select(bool enable_progress_threads,
strcmp(component->pmlm_version.mca_component_name, mca_pml_base_pml) != 0)
continue;
ompi_output_verbose(10, mca_pml_base_output,
opal_output_verbose(10, mca_pml_base_output,
"select: initializing %s component %s",
component->pmlm_version.mca_type_name,
component->pmlm_version.mca_component_name);
if (NULL == component->pmlm_init) {
ompi_output_verbose(10, mca_pml_base_output,
opal_output_verbose(10, mca_pml_base_output,
"select: no init function; ignoring component");
} else {
module = component->pmlm_init(&priority, enable_progress_threads,
enable_mpi_threads);
if (NULL == module) {
ompi_output_verbose(10, mca_pml_base_output,
opal_output_verbose(10, mca_pml_base_output,
"select: init returned failure");
} else {
ompi_output_verbose(10, mca_pml_base_output,
opal_output_verbose(10, mca_pml_base_output,
"select: init returned priority %d", priority);
if (priority > best_priority) {
best_priority = priority;
@ -126,7 +126,7 @@ int mca_pml_base_select(bool enable_progress_threads,
don't matter anymore) */
om->om_component->pmlm_finalize();
ompi_output_verbose(10, mca_pml_base_output,
opal_output_verbose(10, mca_pml_base_output,
"select: component %s not selected / finalized",
component->pmlm_version.mca_component_name);
}
@ -146,7 +146,7 @@ int mca_pml_base_select(bool enable_progress_threads,
mca_pml_base_selected_component = *best_component;
mca_pml = *best_module;
ompi_output_verbose(10, mca_pml_base_output,
opal_output_verbose(10, mca_pml_base_output,
"select: component %s selected",
component->pmlm_version.mca_component_name);

2
ompi/mca/pml/ob1/pml_ob1.c
Просмотреть файл

@ -243,7 +243,7 @@ int mca_pml_ob1_add_procs(ompi_proc_t** procs, size_t nprocs)
/* allocate pml specific proc data */
proc_pml = OBJ_NEW(mca_pml_ob1_proc_t);
if (NULL == proc_pml) {
ompi_output(0, "mca_pml_ob1_add_procs: unable to allocate resources");
opal_output(0, "mca_pml_ob1_add_procs: unable to allocate resources");
free(btl_endpoints);
return OMPI_ERR_OUT_OF_RESOURCE;
}

6
ompi/mca/pml/ob1/pml_ob1_component.c
Просмотреть файл

@ -136,13 +136,13 @@ int mca_pml_ob1_component_close(void)
#if OMPI_ENABLE_DEBUG
if (mca_pml_ob1.send_requests.fl_num_allocated !=
mca_pml_ob1.send_requests.super.opal_list_length) {
ompi_output(0, "ob1 send requests: %d allocated %d returned\n",
opal_output(0, "ob1 send requests: %d allocated %d returned\n",
mca_pml_ob1.send_requests.fl_num_allocated,
mca_pml_ob1.send_requests.super.opal_list_length);
}
if (mca_pml_ob1.recv_requests.fl_num_allocated !=
mca_pml_ob1.recv_requests.super.opal_list_length) {
ompi_output(0, "ob1 recv requests: %d allocated %d returned\n",
opal_output(0, "ob1 recv requests: %d allocated %d returned\n",
mca_pml_ob1.recv_requests.fl_num_allocated,
mca_pml_ob1.recv_requests.super.opal_list_length);
}
@ -218,7 +218,7 @@ mca_pml_base_module_t* mca_pml_ob1_component_init(int* priority,
/* buffered send */
if(OMPI_SUCCESS != mca_pml_base_bsend_init(enable_mpi_threads)) {
ompi_output(0, "mca_pml_ob1_component_init: mca_pml_bsend_init failed\n");
opal_output(0, "mca_pml_ob1_component_init: mca_pml_bsend_init failed\n");
return NULL;
}

8
ompi/mca/pml/ob1/pml_ob1_endpoint.h
Просмотреть файл

@ -19,7 +19,7 @@
#ifndef MCA_PML_OB1_ENDPOINT_H
#define MCA_PML_OB1_ENDPOINT_H
#include "util/output.h"
#include "opal/util/output.h"
#include "mca/btl/btl.h"
#if defined(c_plusplus) || defined(__cplusplus)
extern "C" {
@ -107,7 +107,7 @@ static inline mca_pml_ob1_endpoint_t* mca_pml_ob1_ep_array_insert(mca_pml_ob1_ep
{
#if OMPI_ENABLE_DEBUG
if(array->arr_size >= array->arr_reserve) {
ompi_output(0, "mca_pml_ob1_ep_array_insert: invalid array index %d >= %d",
opal_output(0, "mca_pml_ob1_ep_array_insert: invalid array index %d >= %d",
array->arr_size, array->arr_reserve);
return 0;
}
@ -125,7 +125,7 @@ static inline mca_pml_ob1_endpoint_t* mca_pml_ob1_ep_array_get_index(mca_pml_ob1
{
#if OMPI_ENABLE_DEBUG
if(index >= array->arr_size) {
ompi_output(0, "mca_pml_ob1_ep_array_get_index: invalid array index %d >= %d",
opal_output(0, "mca_pml_ob1_ep_array_get_index: invalid array index %d >= %d",
index, array->arr_size);
return 0;
}
@ -144,7 +144,7 @@ static inline mca_pml_ob1_endpoint_t* mca_pml_ob1_ep_array_get_next(mca_pml_ob1_
mca_pml_ob1_endpoint_t* endpoint;
#if OMPI_ENABLE_DEBUG
if(array->arr_size == 0) {
ompi_output(0, "mca_pml_ob1_ep_array_get_next: invalid array size");
opal_output(0, "mca_pml_ob1_ep_array_get_next: invalid array size");
return 0;
}
#endif

6
ompi/mca/pml/ob1/pml_ob1_recvreq.c
Просмотреть файл

@ -295,14 +295,14 @@ void mca_pml_ob1_recv_request_progress(
#if MCA_PML_OB1_TIMESTAMPS
if(recvreq->req_bytes_received > 0) {
int i;
ompi_output(0, "[%d,%d,%d] dst ack: %llu",
opal_output(0, "[%d,%d,%d] dst ack: %llu",
ORTE_NAME_ARGS(orte_process_info.my_name), recvreq->ack);
for(i=0; i<recvreq->pin_index; i++) {
ompi_output(0, "[%d,%d,%d] dst pin, %llu %llu",
opal_output(0, "[%d,%d,%d] dst pin, %llu %llu",
ORTE_NAME_ARGS(orte_process_info.my_name), recvreq->pin1[i], recvreq->pin2[i] - recvreq->pin1[i]);
}
for(i=0; i<recvreq->fin_index; i++) {
ompi_output(0, "[%d,%d,%d] dst fin: %llu %llu",
opal_output(0, "[%d,%d,%d] dst fin: %llu %llu",
ORTE_NAME_ARGS(orte_process_info.my_name), recvreq->fin1[i], recvreq->fin2[i] - recvreq->fin1[i]);
}
}

6
ompi/mca/pml/ob1/pml_ob1_sendreq.c
Просмотреть файл

@ -87,7 +87,7 @@ static void mca_pml_ob1_short_completion(
/* check completion status */
if(OMPI_SUCCESS != status) {
/* TSW - FIX */
ompi_output(0, "%s:%d FATAL", __FILE__, __LINE__);
opal_output(0, "%s:%d FATAL", __FILE__, __LINE__);
orte_errmgr.abort();
}
@ -120,7 +120,7 @@ static void mca_pml_ob1_send_completion(
/* check completion status */
if(OMPI_SUCCESS != status) {
/* TSW - FIX */
ompi_output(0, "%s:%d FATAL", __FILE__, __LINE__);
opal_output(0, "%s:%d FATAL", __FILE__, __LINE__);
orte_errmgr.abort();
}
@ -141,7 +141,7 @@ static void mca_pml_ob1_send_completion(
sendreq->req_bytes_delivered -= sizeof(mca_pml_ob1_frag_hdr_t);
break;
default:
ompi_output(0, "mca_pml_ob1_send_completion: invalid header type\n");
opal_output(0, "mca_pml_ob1_send_completion: invalid header type\n");
break;
}

14
ompi/mca/pml/ob1/pml_ob1_sendreq.h
Просмотреть файл

@ -123,28 +123,28 @@ OBJ_CLASS_DECLARATION(mca_pml_ob1_send_request_t);
#define MCA_PML_OB1_SEND_REQUEST_TSTAMPS_DUMP(sendreq) \
{ \
int i; \
ompi_output(0, "[%d,%d,%d] src start, %llu\n", \
opal_output(0, "[%d,%d,%d] src start, %llu\n", \
ORTE_NAME_ARGS(orte_process_info.my_name), (sendreq)->t_start); \
\
ompi_output(0, "[%d,%d,%d] src send start, %llu\n", \
opal_output(0, "[%d,%d,%d] src send start, %llu\n", \
ORTE_NAME_ARGS(orte_process_info.my_name), (sendreq)->t_send1); \
\
ompi_output(0, "[%d,%d,%d] src scheduled, %llu\n", \
opal_output(0, "[%d,%d,%d] src scheduled, %llu\n", \
ORTE_NAME_ARGS(orte_process_info.my_name), (sendreq)->t_scheduled); \
\
ompi_output(0, "[%d,%d,%d] src send complete, %llu\n", \
opal_output(0, "[%d,%d,%d] src send complete, %llu\n", \
ORTE_NAME_ARGS(orte_process_info.my_name), (sendreq)->t_send2); \
\
for(i=0; i<(sendreq)->t_pin_index; i++) \
ompi_output(0, "[%d,%d,%d] src pin, %llu %llu\n", \
opal_output(0, "[%d,%d,%d] src pin, %llu %llu\n", \
ORTE_NAME_ARGS(orte_process_info.my_name), (sendreq)->t_pin[i], \
(sendreq)->t_put[i] - (sendreq)->t_pin[i]); \
for(i=0; i<(sendreq)->t_put_index; i++) \
ompi_output(0, "[%d,%d,%d] src put, %llu %llu\n", \
opal_output(0, "[%d,%d,%d] src put, %llu %llu\n", \
ORTE_NAME_ARGS(orte_process_info.my_name), (sendreq)->t_put[i], \
(sendreq)->t_fin[i] - (sendreq)->t_put[i]); \
for(i=0; i<(sendreq)->t_fin_index; i++) \
ompi_output(0, "[%d,%d,%d] src fin, %llu\n", \
opal_output(0, "[%d,%d,%d] src fin, %llu\n", \
ORTE_NAME_ARGS(orte_process_info.my_name), (sendreq)->t_fin[i]); \
}

8
ompi/mca/pml/teg/pml_ptl_array.h
Просмотреть файл

@ -19,7 +19,7 @@
#ifndef OMPI_PTL_ARRAY_H
#define OMPI_PTL_ARRAY_H
#include "util/output.h"
#include "opal/util/output.h"
#include "mca/ptl/ptl.h"
#if defined(c_plusplus) || defined(__cplusplus)
extern "C" {
@ -91,7 +91,7 @@ static inline mca_ptl_proc_t* mca_ptl_array_insert(mca_ptl_array_t* array)
{
#if OMPI_ENABLE_DEBUG
if(array->ptl_size >= array->ptl_reserve) {
ompi_output(0, "mca_ptl_array_insert: invalid array index %d >= %d",
opal_output(0, "mca_ptl_array_insert: invalid array index %d >= %d",
array->ptl_size, array->ptl_reserve);
return 0;
}
@ -109,7 +109,7 @@ static inline mca_ptl_proc_t* mca_ptl_array_get_index(mca_ptl_array_t* array, si
{
#if OMPI_ENABLE_DEBUG
if(index >= array->ptl_size) {
ompi_output(0, "mca_ptl_array_get_index: invalid array index %d >= %d",
opal_output(0, "mca_ptl_array_get_index: invalid array index %d >= %d",
index, array->ptl_size);
return 0;
}
@ -128,7 +128,7 @@ static inline mca_ptl_proc_t* mca_ptl_array_get_next(mca_ptl_array_t* array)
mca_ptl_proc_t* ptl_proc;
#if OMPI_ENABLE_DEBUG
if(array->ptl_size == 0) {
ompi_output(0, "mca_ptl_array_get_next: invalid array size");
opal_output(0, "mca_ptl_array_get_next: invalid array size");
return 0;
}
#endif

2
ompi/mca/pml/teg/pml_teg.c
Просмотреть файл

@ -250,7 +250,7 @@ int mca_pml_teg_add_procs(ompi_proc_t** procs, size_t nprocs)
/* allocate pml specific proc data */
proc_pml = OBJ_NEW(mca_pml_teg_proc_t);
if (NULL == proc_pml) {
ompi_output(0, "mca_pml_teg_add_procs: unable to allocate resources");
opal_output(0, "mca_pml_teg_add_procs: unable to allocate resources");
free(ptl_peers);
return OMPI_ERR_OUT_OF_RESOURCE;
}

6
ompi/mca/pml/teg/pml_teg_component.c
Просмотреть файл

@ -77,7 +77,7 @@ int mca_pml_teg_component_open(void)
#ifdef WIN32
WSADATA win_sock_data;
if (WSAStartup(MAKEWORD(2,2), &win_sock_data) != 0) {
ompi_output (0, "mca_oob_tcp_component_init: failed to initialise windows sockets: %d\n", WSAGetLastError());
opal_output (0, "mca_oob_tcp_component_init: failed to initialise windows sockets: %d\n", WSAGetLastError());
return OMPI_ERROR;
}
#endif
@ -123,7 +123,7 @@ int mca_pml_teg_component_close(void)
#if OMPI_ENABLE_DEBUG
if (mca_pml_teg.teg_recv_requests.fl_num_allocated !=
mca_pml_teg.teg_recv_requests.super.opal_list_length) {
ompi_output(0, "teg recv requests: %d allocated %d returned\n",
opal_output(0, "teg recv requests: %d allocated %d returned\n",
mca_pml_teg.teg_recv_requests.fl_num_allocated,
mca_pml_teg.teg_recv_requests.super.opal_list_length);
}
@ -167,7 +167,7 @@ mca_pml_base_module_t* mca_pml_teg_component_init(int* priority,
/* buffered send */
if(OMPI_SUCCESS != mca_pml_base_bsend_init(enable_mpi_threads)) {
ompi_output(0, "mca_pml_teg_component_init: mca_pml_bsend_init failed\n");
opal_output(0, "mca_pml_teg_component_init: mca_pml_bsend_init failed\n");
return NULL;
}

4
ompi/mca/pml/uniq/pml_uniq.c
Просмотреть файл

@ -253,7 +253,7 @@ int mca_pml_uniq_add_procs(ompi_proc_t** procs, size_t nprocs)
/* allocate pml specific proc data */
proc_pml = OBJ_NEW(mca_pml_uniq_proc_t);
if (NULL == proc_pml) {
ompi_output(0, "mca_pml_uniq_add_procs: unable to allocate resources");
opal_output(0, "mca_pml_uniq_add_procs: unable to allocate resources");
free(ptl_peers);
return OMPI_ERR_OUT_OF_RESOURCE;
}
@ -284,7 +284,7 @@ int mca_pml_uniq_add_procs(ompi_proc_t** procs, size_t nprocs)
/* choose the best for first and next. For the first look at the latency when
* for the next at the maximum bandwidth.
*/
ompi_output( 0, "Not yet done dude !!!" );
opal_output( 0, "Not yet done dude !!!" );
#if PML_UNIQ_ACCEPT_NEXT_PTL
#endif /* PML_UNIQ_ACCEPT_NEXT_PTL */
}

6
ompi/mca/pml/uniq/pml_uniq_component.c
Просмотреть файл

@ -77,7 +77,7 @@ int mca_pml_uniq_component_open(void)
#ifdef WIN32
WSADATA win_sock_data;
if (WSAStartup(MAKEWORD(2,2), &win_sock_data) != 0) {
ompi_output (0, "mca_oob_tcp_component_init: failed to initialise windows sockets: %d\n", WSAGetLastError());
opal_output (0, "mca_oob_tcp_component_init: failed to initialise windows sockets: %d\n", WSAGetLastError());
return OMPI_ERROR;
}
#endif
@ -121,7 +121,7 @@ int mca_pml_uniq_component_close(void)
#if OMPI_ENABLE_DEBUG
if (mca_pml_uniq.uniq_recv_requests.fl_num_allocated !=
mca_pml_uniq.uniq_recv_requests.super.opal_list_length) {
ompi_output(0, "uniq recv requests: %d allocated %d returned\n",
opal_output(0, "uniq recv requests: %d allocated %d returned\n",
mca_pml_uniq.uniq_recv_requests.fl_num_allocated,
mca_pml_uniq.uniq_recv_requests.super.opal_list_length);
}
@ -165,7 +165,7 @@ mca_pml_base_module_t* mca_pml_uniq_component_init(int* priority,
/* buffered send */
if(OMPI_SUCCESS != mca_pml_base_bsend_init(enable_mpi_threads)) {
ompi_output(0, "mca_pml_uniq_component_init: mca_pml_bsend_init failed\n");
opal_output(0, "mca_pml_uniq_component_init: mca_pml_bsend_init failed\n");
return NULL;
}

10
ompi/mca/ptl/base/ptl_base_select.c
Просмотреть файл

@ -88,12 +88,12 @@ int mca_ptl_base_select(bool enable_progress_threads,
}
}
ompi_output_verbose(10, mca_ptl_base_output,
opal_output_verbose(10, mca_ptl_base_output,
"select: initializing %s component %s",
component->ptlm_version.mca_type_name,
component->ptlm_version.mca_component_name);
if (NULL == component->ptlm_init) {
ompi_output_verbose(10, mca_ptl_base_output,
opal_output_verbose(10, mca_ptl_base_output,
"select: no init function; ignoring component");
} else {
modules = component->ptlm_init(&num_ptls, enable_progress_threads,
@ -103,9 +103,9 @@ int mca_ptl_base_select(bool enable_progress_threads,
list and remove it from the component repository */
if (NULL == modules) {
ompi_output_verbose(10, mca_ptl_base_output,
opal_output_verbose(10, mca_ptl_base_output,
"select: init returned failure");
ompi_output_verbose(10, mca_ptl_base_output,
opal_output_verbose(10, mca_ptl_base_output,
"select: module %s unloaded",
component->ptlm_version.mca_component_name);
@ -116,7 +116,7 @@ int mca_ptl_base_select(bool enable_progress_threads,
/* Otherwise, it initialized properly. Save it. */
else {
ompi_output_verbose(10, mca_ptl_base_output,
opal_output_verbose(10, mca_ptl_base_output,
"select: init returned success");
for (i = 0; i < num_ptls; ++i) {

18
ompi/mca/ptl/elan/src/ptl_elan.c
Просмотреть файл

@ -16,7 +16,7 @@
#include "ompi_config.h"
#include <string.h>
#include "util/output.h"
#include "opal/util/output.h"
#include "util/if.h"
#include "mca/pml/pml.h"
#include "mca/ptl/ptl.h"
@ -83,7 +83,7 @@ mca_ptl_elan_add_procs (struct mca_ptl_base_module_t *ptl,
ptl_proc = mca_ptl_elan_proc_create (ompi_proc);
if (NULL == ptl_proc) {
ompi_output (0,
opal_output (0,
"[%s:%d] could not create a ptl proc\n",
__FILE__, __LINE__);
return OMPI_ERR_OUT_OF_RESOURCE;
@ -97,7 +97,7 @@ mca_ptl_elan_add_procs (struct mca_ptl_base_module_t *ptl,
if (ptl_proc->proc_addr_count == ptl_proc->proc_peer_count) {
OPAL_THREAD_UNLOCK (&ptl_proc->proc_lock);
ompi_output (0, "all peers are taken already\n");
opal_output (0, "all peers are taken already\n");
return OMPI_ERR_UNREACH;
}
@ -108,7 +108,7 @@ mca_ptl_elan_add_procs (struct mca_ptl_base_module_t *ptl,
ptl_peer = OBJ_NEW (mca_ptl_elan_peer_t);
if (NULL == ptl_peer) {
OPAL_THREAD_UNLOCK (&ptl_proc->proc_lock);
ompi_output (0, "[%s:%d] unabled to allocate ptl_peer \n",
opal_output (0, "[%s:%d] unabled to allocate ptl_peer \n",
__FILE__, __LINE__);
return OMPI_ERR_OUT_OF_RESOURCE;
}
@ -191,7 +191,7 @@ mca_ptl_elan_req_init (struct mca_ptl_base_module_t *ptl,
(struct mca_pml_base_request_t *) request,
MCA_PTL_ELAN_DESC_QDMA);
if (NULL == desc) {
ompi_output(0,
opal_output(0,
"[%s:%d] Unable to allocate an elan send descriptors \n",
__FILE__, __LINE__);
return OMPI_ERR_OUT_OF_RESOURCE;
@ -268,7 +268,7 @@ mca_ptl_elan_isend (struct mca_ptl_base_module_t *ptl,
(struct mca_pml_base_request_t *) sendreq,
MCA_PTL_ELAN_DESC_QDMA);
if (NULL == desc) {
ompi_output(0,
opal_output(0,
"[%s:%d] Unable to allocate an elan send descriptors \n",
__FILE__, __LINE__);
}
@ -318,7 +318,7 @@ mca_ptl_elan_put (struct mca_ptl_base_module_t *ptl,
(struct mca_pml_base_request_t *) sendreq,
MCA_PTL_ELAN_DESC_PUT);
if (NULL == desc) {
ompi_output(0,
opal_output(0,
"[%s:%d] Unable to allocate an elan send descriptors \n",
__FILE__, __LINE__);
}
@ -371,7 +371,7 @@ mca_ptl_elan_get (struct mca_ptl_base_module_t *ptl,
(struct mca_pml_base_request_t *) req,
MCA_PTL_ELAN_DESC_GET);
if (NULL == desc) {
ompi_output(0,
opal_output(0,
"[%s:%d] Unable to allocate an elan send descriptors \n",
__FILE__, __LINE__);
}
@ -420,7 +420,7 @@ mca_ptl_elan_matched (mca_ptl_base_module_t * ptl,
/* Get a frag desc and allocate a send desc */
desc = mca_ptl_elan_alloc_desc(ptl, NULL, desc_type);
if (NULL == desc) {
ompi_output(0,
opal_output(0,
"[%s:%d] Unable to allocate an elan send descriptors \n",
__FILE__, __LINE__);
OPAL_THREAD_LOCK(&mca_ptl_elan_component.elan_lock);

14
ompi/mca/ptl/elan/src/ptl_elan_component.c
Просмотреть файл

@ -28,7 +28,7 @@
#include "opal/event/event.h"
#include "util/if.h"
#include "util/argv.h"
#include "util/output.h"
#include "opal/util/output.h"
#include "mca/pml/pml.h"
#include "mca/ptl/ptl.h"
#include "mca/pml/base/pml_base_sendreq.h"
@ -151,7 +151,7 @@ mca_ptl_elan_component_close (void)
#if OMPI_PTL_ELAN_THREADING
if ((mca_ptl_elan_thread_close(elan_mp)) != OMPI_SUCCESS) {
ompi_output(0, "unable to close asynchronous threads\n");
opal_output(0, "unable to close asynchronous threads\n");
}
#endif
/* cleanup the proc, ptl, and the module */
@ -177,7 +177,7 @@ mca_ptl_elan_component_close (void)
* before desctructing this free_list */
if (elan_mp->elan_recv_frags_free.fl_num_allocated !=
elan_mp->elan_recv_frags_free.super.opal_list_length) {
ompi_output (0,
opal_output (0,
"[%s:%d] recv_frags : %d allocated %d returned\n",
__FILE__, __LINE__,
elan_mp->elan_recv_frags_free.fl_num_allocated,
@ -215,14 +215,14 @@ mca_ptl_elan_component_init (int *num_ptls,
/* open basic elan device */
if (OMPI_SUCCESS != mca_ptl_elan_state_init(&mca_ptl_elan_component)) {
ompi_output(0,
opal_output(0,
"[%s:%d] error in initializing elan state and PTL's.\n",
__FILE__, __LINE__);
return NULL;
}
if (OMPI_SUCCESS != mca_ptl_elan_addr_put(&mca_ptl_elan_component)) {
ompi_output(0,
opal_output(0,
"[%s:%d] error in registering with Runtime/OOB \n",
__FILE__, __LINE__);
return NULL;
@ -231,7 +231,7 @@ mca_ptl_elan_component_init (int *num_ptls,
ptls = (mca_ptl_base_module_t **) malloc (elan_mp->num_modules *
sizeof (mca_ptl_elan_module_t *));
if (NULL == ptls) {
ompi_output(0,
opal_output(0,
"[%s:%d] error in allocating memory \n",
__FILE__, __LINE__);
return NULL;
@ -257,7 +257,7 @@ mca_ptl_elan_component_init (int *num_ptls,
#if OMPI_PTL_ELAN_THREADING
if ((mca_ptl_elan_thread_init(elan_mp)) != OMPI_SUCCESS) {
ompi_output(0,
opal_output(0,
"unable to initialize %d asynchronous threads\n",
elan_mp->num_modules);
}

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