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

No more warnings from the datatype engine.

Просмотр исходного кода 
This commit was SVN r13423.
Этот коммит содержится в:
George Bosilca 2007-02-01 18:57:48 +00:00
родитель 49bcec64e4
Коммит f3a5fe488e
7 изменённых файлов: 60 добавлений и 58 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

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

@ -603,12 +603,12 @@ void ompi_ddt_dump_stack( const dt_stack_t* pStack, int stack_pos,
opal_output( 0, "\nStack %p stack_pos %d name %s\n", (void*)pStack, stack_pos, name );
for( ; stack_pos >= 0; stack_pos-- ) {
opal_output( 0, "%d: pos %d count %d disp %ld ", stack_pos, pStack[stack_pos].index,
pStack[stack_pos].count, pStack[stack_pos].disp );
(int)pStack[stack_pos].count, (long)pStack[stack_pos].disp );
if( pStack->index != -1 )
opal_output( 0, "\t[desc count %d disp %ld extent %d]\n",
opal_output( 0, "\t[desc count %d disp %ld extent %ld]\n",
pDesc[pStack[stack_pos].index].elem.count,
pDesc[pStack[stack_pos].index].elem.disp,
pDesc[pStack[stack_pos].index].elem.extent );
(long)pDesc[pStack[stack_pos].index].elem.disp,
(long)pDesc[pStack[stack_pos].index].elem.extent );
else
opal_output( 0, "\n" );
}

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

@ -264,8 +264,8 @@ OMPI_DECLSPEC int ompi_ddt_safeguard_pointer_debug_breakpoint( const void* actua
((PDATA)->ub - (PDATA)->lb) * ((COUNT) - 1); \
if( ((ACTPTR) < __lower_bound) || ((ACTPTR) >= __upper_bound) ) { \
ompi_ddt_safeguard_pointer_debug_breakpoint( (ACTPTR), (LENGTH), (INITPTR), (PDATA), (COUNT) ); \
opal_output( 0, "%s:%d\n\tPointer %p size %d is outside [%p,%p] for\n\tbase ptr %p count %d and data \n", \
__FILE__, __LINE__, (ACTPTR), (LENGTH), __lower_bound, __upper_bound, \
opal_output( 0, "%s:%d\n\tPointer %p size %lu is outside [%p,%p] for\n\tbase ptr %p count %d and data \n", \
__FILE__, __LINE__, (ACTPTR), (unsigned long)(LENGTH), __lower_bound, __upper_bound, \
(INITPTR), (COUNT) ); \
ompi_ddt_dump( (PDATA) ); \
} \

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

@ -253,8 +253,8 @@ ompi_generic_simple_pack_function( ompi_convertor_t* pConvertor,
size_t iov_len_local;
uint32_t iov_count;
DO_DEBUG( opal_output( 0, "ompi_convertor_generic_simple_pack( %p, {%p, %d}, %d )\n", (void*)pConvertor,
iov[0].iov_base, iov[0].iov_len, *out_size ); );
DO_DEBUG( opal_output( 0, "ompi_convertor_generic_simple_pack( %p, {%p, %lu}, %d )\n", (void*)pConvertor,
iov[0].iov_base, (unsigned long)iov[0].iov_len, *out_size ); );
description = pConvertor->use_desc->desc;
@ -273,8 +273,8 @@ ompi_generic_simple_pack_function( ompi_convertor_t* pConvertor,
DO_DEBUG( opal_output( 0, "unpack start pos_desc %d count_desc %d disp %ld\n"
"stack_pos %d pos_desc %d count_desc %d disp %ld\n",
pos_desc, count_desc, source_base - pConvertor->pBaseBuf,
pConvertor->stack_pos, pStack->index, pStack->count, pStack->disp ); );
pos_desc, count_desc, (long)(source_base - pConvertor->pBaseBuf),
pConvertor->stack_pos, pStack->index, (int)pStack->count, (long)pStack->disp ); );
for( iov_count = 0; iov_count < (*out_size); iov_count++ ) {
destination = iov[iov_count].iov_base;
@ -294,8 +294,8 @@ ompi_generic_simple_pack_function( ompi_convertor_t* pConvertor,
goto complete_loop;
}
if( DT_END_LOOP == pElem->elem.common.type ) { /* end of the current loop */
DO_DEBUG( opal_output( 0, "pack end_loop count %d stack_pos %d pos_desc %d disp %ld space %d\n",
pStack->count, pConvertor->stack_pos, pos_desc, pStack->disp, iov_len_local ); );
DO_DEBUG( opal_output( 0, "pack end_loop count %d stack_pos %d pos_desc %d disp %ld space %lu\n",
(int)pStack->count, pConvertor->stack_pos, pos_desc, (long)pStack->disp, (unsigned long)iov_len_local ); );
if( --(pStack->count) == 0 ) { /* end of loop */
if( pConvertor->stack_pos == 0 ) {
/* we lie about the size of the next element in order to
@ -318,8 +318,8 @@ ompi_generic_simple_pack_function( ompi_convertor_t* pConvertor,
}
source_base = pConvertor->pBaseBuf + pStack->disp;
UPDATE_INTERNAL_COUNTERS( description, pos_desc, pElem, count_desc );
DO_DEBUG( opal_output( 0, "pack new_loop count %d stack_pos %d pos_desc %d disp %ld space %d\n",
pStack->count, pConvertor->stack_pos, pos_desc, pStack->disp, iov_len_local ); );
DO_DEBUG( opal_output( 0, "pack new_loop count %d stack_pos %d pos_desc %d disp %ld space %lu\n",
(int)pStack->count, pConvertor->stack_pos, pos_desc, (long)pStack->disp, (unsigned long)iov_len_local ); );
}
if( DT_LOOP == pElem->elem.common.type ) {
ptrdiff_t local_disp = (ptrdiff_t)source_base;
@ -359,6 +359,6 @@ ompi_generic_simple_pack_function( ompi_convertor_t* pConvertor,
PUSH_STACK( pStack, pConvertor->stack_pos, pos_desc, DT_BYTE, count_desc,
source_base - pStack->disp - pConvertor->pBaseBuf );
DO_DEBUG( opal_output( 0, "pack save stack stack_pos %d pos_desc %d count_desc %d disp %ld\n",
pConvertor->stack_pos, pStack->index, pStack->count, pStack->disp ); );
pConvertor->stack_pos, pStack->index, (int)pStack->count, (long)pStack->disp ); );
return 0;
}

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

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

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

@ -203,8 +203,8 @@ ompi_unpack_homogeneous_contig_function( ompi_convertor_t* pConv,
bConverted = remaining; /* how much will get unpacked this time */
user_memory = pConv->pBaseBuf + initial_displ;
DO_DEBUG( opal_output( 0, "unpack_homogeneous_contig( user_memory %p, packed_buffer %p length %d\n",
user_memory, packed_buffer, remaining ); );
DO_DEBUG( opal_output( 0, "unpack_homogeneous_contig( user_memory %p, packed_buffer %p length %lu\n",
user_memory, packed_buffer, (unsigned long)remaining ); );
if( (ptrdiff_t)pData->size == extent ) {
user_memory += pConv->bConverted;
@ -212,8 +212,8 @@ ompi_unpack_homogeneous_contig_function( ompi_convertor_t* pConv,
/* contiguous data or basic datatype with count */
OMPI_DDT_SAFEGUARD_POINTER( user_memory, remaining,
pConv->pBaseBuf, pData, pConv->count );
DO_DEBUG( opal_output( 0, "1. unpack contig dest %p src %p length %d\n",
user_memory, packed_buffer, remaining ); );
DO_DEBUG( opal_output( 0, "1. unpack contig dest %p src %p length %lu\n",
user_memory, packed_buffer, (unsigned long)remaining ); );
MEMCPY_CSUM( user_memory, packed_buffer, remaining, pConv );
} else {
user_memory += stack->disp;
@ -227,8 +227,8 @@ ompi_unpack_homogeneous_contig_function( ompi_convertor_t* pConv,
if( length <= remaining ) {
OMPI_DDT_SAFEGUARD_POINTER( user_memory, length, pConv->pBaseBuf,
pData, pConv->count );
DO_DEBUG( opal_output( 0, "2. unpack dest %p src %p length %d\n",
user_memory, packed_buffer, length ); );
DO_DEBUG( opal_output( 0, "2. unpack dest %p src %p length %lu\n",
user_memory, packed_buffer, (unsigned long)length ); );
MEMCPY_CSUM( user_memory, packed_buffer, length, pConv );
packed_buffer += length;
user_memory += (extent - (pData->size - length));
@ -238,8 +238,8 @@ ompi_unpack_homogeneous_contig_function( ompi_convertor_t* pConv,
for( i = 0; pData->size <= remaining; i++ ) {
OMPI_DDT_SAFEGUARD_POINTER( user_memory, pData->size, pConv->pBaseBuf,
pData, pConv->count );
DO_DEBUG( opal_output( 0, "3. unpack dest %p src %p length %d\n",
user_memory, packed_buffer, pData->size ); );
DO_DEBUG( opal_output( 0, "3. unpack dest %p src %p length %lu\n",
user_memory, packed_buffer, (unsigned long)pData->size ); );
MEMCPY_CSUM( user_memory, packed_buffer, pData->size, pConv );
packed_buffer += pData->size;
user_memory += extent;
@ -249,8 +249,8 @@ ompi_unpack_homogeneous_contig_function( ompi_convertor_t* pConv,
if( remaining != 0 ) {
OMPI_DDT_SAFEGUARD_POINTER( user_memory, remaining, pConv->pBaseBuf,
pData, pConv->count );
DO_DEBUG( opal_output( 0, "4. unpack dest %p src %p length %d\n",
user_memory, packed_buffer, remaining ); );
DO_DEBUG( opal_output( 0, "4. unpack dest %p src %p length %lu\n",
user_memory, packed_buffer, (unsigned long)remaining ); );
MEMCPY_CSUM( user_memory, packed_buffer, remaining, pConv );
user_memory += remaining;
}
@ -291,10 +291,10 @@ ompi_unpack_partial_datatype( ompi_convertor_t* pConvertor, dt_elem_desc_t* pEle
uint32_t i, length, count_desc = 1;
size_t data_length = ompi_ddt_basicDatatypes[pElem->elem.common.type]->size;
DO_DEBUG( opal_output( 0, "unpack partial data start %d end %d data_length %d user %p\n"
"\tbConverted %d total_length %d count %d\n",
start_position, end_position, data_length, *user_buffer,
pConvertor->bConverted, pConvertor->local_size, pConvertor->count ); );
DO_DEBUG( opal_output( 0, "unpack partial data start %d end %d data_length %lu user %p\n"
"\tbConverted %lu total_length %lu count %d\n",
start_position, end_position, (unsigned long)data_length, *user_buffer,
(unsigned long)pConvertor->bConverted, (unsigned long)pConvertor->local_size, pConvertor->count ); );
/* Find a byte that is not used in the partial buffer */
find_unused_byte:
@ -358,7 +358,7 @@ ompi_generic_simple_unpack_function( ompi_convertor_t* pConvertor,
uint32_t iov_count;
DO_DEBUG( opal_output( 0, "ompi_convertor_generic_simple_unpack( %p, {%p, %lu}, %u )\n",
(void*)pConvertor, iov[0].iov_base, (size_t)iov[0].iov_len, *out_size ); );
(void*)pConvertor, iov[0].iov_base, (unsigned long)iov[0].iov_len, *out_size ); );
description = pConvertor->use_desc->desc;
@ -377,8 +377,8 @@ ompi_generic_simple_unpack_function( ompi_convertor_t* pConvertor,
DO_DEBUG( opal_output( 0, "unpack start pos_desc %d count_desc %d disp %ld\n"
"stack_pos %d pos_desc %d count_desc %d disp %ld\n",
pos_desc, count_desc, user_memory_base - pConvertor->pBaseBuf,
pConvertor->stack_pos, pStack->index, pStack->count, pStack->disp ); );
pos_desc, count_desc, (long)(user_memory_base - pConvertor->pBaseBuf),
pConvertor->stack_pos, pStack->index, (int)pStack->count, (long)(pStack->disp) ); );
for( iov_count = 0; iov_count < (*out_size); iov_count++ ) {
@ -435,8 +435,9 @@ ompi_generic_simple_unpack_function( ompi_convertor_t* pConvertor,
goto complete_loop;
}
if( DT_END_LOOP == pElem->elem.common.type ) { /* end of the current loop */
DO_DEBUG( opal_output( 0, "unpack end_loop count %d stack_pos %d pos_desc %d disp %ld space %d\n",
pStack->count, pConvertor->stack_pos, pos_desc, pStack->disp, iov_len_local ); );
DO_DEBUG( opal_output( 0, "unpack end_loop count %d stack_pos %d pos_desc %d disp %ld space %lu\n",
(int)pStack->count, pConvertor->stack_pos, pos_desc,
(long)pStack->disp, (unsigned long)iov_len_local ); );
if( --(pStack->count) == 0 ) { /* end of loop */
if( pConvertor->stack_pos == 0 ) {
/* Force the conversion to stop by lowering the number of iovecs. */
@ -457,8 +458,9 @@ ompi_generic_simple_unpack_function( ompi_convertor_t* pConvertor,
}
user_memory_base = pConvertor->pBaseBuf + pStack->disp;
UPDATE_INTERNAL_COUNTERS( description, pos_desc, pElem, count_desc );
DO_DEBUG( opal_output( 0, "unpack new_loop count %d stack_pos %d pos_desc %d disp %ld space %d\n",
pStack->count, pConvertor->stack_pos, pos_desc, pStack->disp, iov_len_local ); );
DO_DEBUG( opal_output( 0, "unpack new_loop count %d stack_pos %d pos_desc %d disp %ld space %lu\n",
(int)pStack->count, pConvertor->stack_pos, pos_desc,
(long)pStack->disp, (unsigned long)iov_len_local ); );
}
if( DT_LOOP == pElem->elem.common.type ) {
ptrdiff_t local_disp = (ptrdiff_t)user_memory_base;
@ -497,6 +499,6 @@ ompi_generic_simple_unpack_function( ompi_convertor_t* pConvertor,
PUSH_STACK( pStack, pConvertor->stack_pos, pos_desc, DT_BYTE, count_desc,
user_memory_base - pStack->disp - pConvertor->pBaseBuf );
DO_DEBUG( opal_output( 0, "unpack save stack stack_pos %d pos_desc %d count_desc %d disp %ld\n",
pConvertor->stack_pos, pStack->index, pStack->count, pStack->disp ); );
pConvertor->stack_pos, pStack->index, (int)pStack->count, (long)pStack->disp ); );
return 0;
}

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

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

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

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