Silence some compiler warnings, and reindent the code.
This commit was SVN r20385.
Этот коммит содержится в:
родитель
35c5e28a8e
Коммит
04a3b29b76
@ -55,8 +55,8 @@ ompi_convertor_raw( ompi_convertor_t* pConvertor,
|
||||
return 1; /* we're done */
|
||||
}
|
||||
|
||||
DO_DEBUG( opal_output( 0, "ompi_convertor_raw( %p, {%p, %lu}, %p )\n", (void*)pConvertor,
|
||||
iov, *iov_count, *length ); );
|
||||
DO_DEBUG( opal_output( 0, "ompi_convertor_raw( %p, {%p, %u}, %lu )\n", (void*)pConvertor,
|
||||
(void*)iov, *iov_count, *length ); );
|
||||
|
||||
description = pConvertor->use_desc->desc;
|
||||
|
||||
@ -72,17 +72,15 @@ ompi_convertor_raw( ompi_convertor_t* pConvertor,
|
||||
pConvertor->stack_pos--;
|
||||
pElem = &(description[pos_desc]);
|
||||
source_base += pStack->disp;
|
||||
|
||||
DO_DEBUG( opal_output( 0, "raw start pos_desc %d count_desc %d disp %ld\n"
|
||||
"stack_pos %d pos_desc %d count_desc %d disp %ld\n",
|
||||
pos_desc, count_desc, (long)(source_base - pConvertor->pBaseBuf),
|
||||
pConvertor->stack_pos, pStack->index, (int)pStack->count, (long)pStack->disp ); );
|
||||
|
||||
while( 1 ) {
|
||||
while( pElem->elem.common.flags & DT_FLAG_DATA ) {
|
||||
size_t blength = ompi_ddt_basicDatatypes[pElem->elem.common.type]->size;
|
||||
source_base += pElem->elem.disp;
|
||||
if( blength == pElem->elem.extent ) { /* no resized data */
|
||||
if( blength == (size_t)pElem->elem.extent ) { /* no resized data */
|
||||
if( index < *iov_count ) {
|
||||
blength *= count_desc;
|
||||
/* now here we have a basic datatype */
|
||||
@ -157,7 +155,6 @@ ompi_convertor_raw( ompi_convertor_t* pConvertor,
|
||||
|
||||
if( pElem->loop.common.flags & DT_FLAG_CONTIGUOUS ) {
|
||||
uint32_t i;
|
||||
|
||||
source_base += end_loop->first_elem_disp;
|
||||
for( i = count_desc; (i > 0) && (index < *iov_count); i--, index++ ) {
|
||||
OMPI_DDT_SAFEGUARD_POINTER( source_base, end_loop->size, pConvertor->pBaseBuf,
|
||||
@ -185,11 +182,10 @@ ompi_convertor_raw( ompi_convertor_t* pConvertor,
|
||||
continue;
|
||||
}
|
||||
}
|
||||
complete_loop:
|
||||
complete_loop:
|
||||
pConvertor->bConverted += raw_data; /* update the already converted bytes */
|
||||
*length = raw_data;
|
||||
*iov_count = index;
|
||||
|
||||
if( pConvertor->bConverted == pConvertor->local_size ) {
|
||||
pConvertor->flags |= CONVERTOR_COMPLETED;
|
||||
return 1;
|
||||
|
Загрузка…
x
Ссылка в новой задаче
Block a user