diff --git a/opal/datatype/opal_convertor_raw.c b/opal/datatype/opal_convertor_raw.c index b57d5aa1de..ce0eaf3330 100644 --- a/opal/datatype/opal_convertor_raw.c +++ b/opal/datatype/opal_convertor_raw.c @@ -101,7 +101,7 @@ opal_convertor_raw( opal_convertor_t* pConvertor, OPAL_DATATYPE_SAFEGUARD_POINTER( source_base, blength, pConvertor->pBaseBuf, pConvertor->pDesc, pConvertor->count ); DO_DEBUG( opal_output( 0, "raw 1. iov[%d] = {base %p, length %lu}\n", - index, source_base, (unsigned long)blength ); ); + index, (void*)source_base, (unsigned long)blength ); ); iov[index].iov_base = (IOVBASE_TYPE *) source_base; iov[index].iov_len = blength; source_base += blength; @@ -114,7 +114,7 @@ opal_convertor_raw( opal_convertor_t* pConvertor, OPAL_DATATYPE_SAFEGUARD_POINTER( source_base, blength, pConvertor->pBaseBuf, pConvertor->pDesc, pConvertor->count ); DO_DEBUG( opal_output( 0, "raw 2. iov[%d] = {base %p, length %lu}\n", - index, source_base, (unsigned long)blength ); ); + index, (void*)source_base, (unsigned long)blength ); ); iov[index].iov_base = (IOVBASE_TYPE *) source_base; iov[index].iov_len = blength; source_base += pElem->elem.extent; diff --git a/opal/datatype/opal_datatype_copy.c b/opal/datatype/opal_datatype_copy.c index 1e2c5f7000..d1027a2d63 100644 --- a/opal/datatype/opal_datatype_copy.c +++ b/opal/datatype/opal_datatype_copy.c @@ -107,7 +107,7 @@ int32_t opal_datatype_copy_content_same_ddt( const opal_datatype_t* datatype, in #endif DO_DEBUG( opal_output( 0, "opal_datatype_copy_content_same_ddt( %p, %d, dst %p, src %p )\n", - (void*)datatype, count, destination_base, source_base ); ); + (void*)datatype, count, (void*)destination_base, (void*)source_base ); ); /* empty data ? then do nothing. This should normally be trapped * at a higher level. diff --git a/opal/datatype/opal_datatype_copy.h b/opal/datatype/opal_datatype_copy.h index d4ed216a5d..5557142b1f 100644 --- a/opal/datatype/opal_datatype_copy.h +++ b/opal/datatype/opal_datatype_copy.h @@ -62,7 +62,7 @@ static inline void _predefined_data( const dt_elem_desc_t* ELEM, (DATATYPE), (TOTAL_COUNT) ); /* the extent and the size of the basic datatype are equals */ DO_DEBUG( opal_output( 0, "copy 1. %s( %p, %p, %lu ) => space %lu\n", - STRINGIFY(MEM_OP_NAME), _destination, _source, (unsigned long)_copy_blength, (unsigned long)(*(SPACE)) ); ); + STRINGIFY(MEM_OP_NAME), (void*)_destination, (void*)_source, (unsigned long)_copy_blength, (unsigned long)(*(SPACE)) ); ); MEM_OP( _destination, _source, _copy_blength ); _source += _copy_blength; _destination += _copy_blength; @@ -72,7 +72,7 @@ static inline void _predefined_data( const dt_elem_desc_t* ELEM, OPAL_DATATYPE_SAFEGUARD_POINTER( _source, _copy_blength, (SOURCE_BASE), (DATATYPE), (TOTAL_COUNT) ); DO_DEBUG( opal_output( 0, "copy 2. %s( %p, %p, %lu ) => space %lu\n", - STRINGIFY(MEM_OP_NAME), _destination, _source, (unsigned long)_copy_blength, (unsigned long)(*(SPACE) - (_i * _copy_blength)) ); ); + STRINGIFY(MEM_OP_NAME), (void*)_destination, (void*)_source, (unsigned long)_copy_blength, (unsigned long)(*(SPACE) - (_i * _copy_blength)) ); ); MEM_OP( _destination, _source, _copy_blength ); _source += _elem->extent; _destination += _elem->extent; @@ -108,7 +108,7 @@ static inline void _contiguous_loop( const dt_elem_desc_t* ELEM, OPAL_DATATYPE_SAFEGUARD_POINTER( _source, _end_loop->size, (SOURCE_BASE), (DATATYPE), (TOTAL_COUNT) ); DO_DEBUG( opal_output( 0, "copy 3. %s( %p, %p, %lu ) => space %lu\n", - STRINGIFY(MEM_OP_NAME), _destination, _source, (unsigned long)_end_loop->size, (unsigned long)(*(SPACE) - _i * _end_loop->size) ); ); + STRINGIFY(MEM_OP_NAME), (void*)_destination, (void*)_source, (unsigned long)_end_loop->size, (unsigned long)(*(SPACE) - _i * _end_loop->size) ); ); MEM_OP( _destination, _source, _end_loop->size ); _source += _loop->extent; _destination += _loop->extent; @@ -132,7 +132,7 @@ static inline int32_t _copy_content_same_ddt( const opal_datatype_t* datatype, i *destination = (unsigned char*)destination_base; DO_DEBUG( opal_output( 0, "_copy_content_same_ddt( %p, %d, dst %p, src %p )\n", - (void*)datatype, count, destination_base, source_base ); ); + (void*)datatype, count, (void*)destination_base, (void*)source_base ); ); iov_len_local = count * datatype->size; @@ -156,7 +156,7 @@ static inline int32_t _copy_content_same_ddt( const opal_datatype_t* datatype, i OPAL_DATATYPE_SAFEGUARD_POINTER( source, memop_chunk, (unsigned char*)source_base, datatype, count ); DO_DEBUG( opal_output( 0, "copy c1. %s( %p, %p, %lu ) => space %lu\n", - STRINGIFY(MEM_OP_NAME), destination, source, (unsigned long)memop_chunk, (unsigned long)total_length ); ); + STRINGIFY(MEM_OP_NAME), (void*)destination, (void*)source, (unsigned long)memop_chunk, (unsigned long)total_length ); ); MEM_OP( destination, source, memop_chunk ); destination += memop_chunk; source += memop_chunk; @@ -170,7 +170,7 @@ static inline int32_t _copy_content_same_ddt( const opal_datatype_t* datatype, i OPAL_DATATYPE_SAFEGUARD_POINTER( source, datatype->size, (unsigned char*)source_base, datatype, count ); DO_DEBUG( opal_output( 0, "copy c2. %s( %p, %p, %lu ) => space %lu\n", - STRINGIFY(MEM_OP_NAME), destination, source, (unsigned long)datatype->size, + STRINGIFY(MEM_OP_NAME), (void*)destination, (void*)source, (unsigned long)datatype->size, (unsigned long)(iov_len_local - (pos_desc * datatype->size)) ); ); MEM_OP( destination, source, datatype->size ); destination += extent; diff --git a/opal/datatype/opal_datatype_unpack.c b/opal/datatype/opal_datatype_unpack.c index e5c05e14e2..195bca48f1 100644 --- a/opal/datatype/opal_datatype_unpack.c +++ b/opal/datatype/opal_datatype_unpack.c @@ -75,7 +75,7 @@ opal_unpack_homogeneous_contig_function( opal_convertor_t* pConv, OPAL_PTRDIFF_TYPE initial_displ = pConv->use_desc->desc[pConv->use_desc->used].end_loop.first_elem_disp; DO_DEBUG( opal_output( 0, "unpack_homogeneous_contig( pBaseBuf %p, iov_count %d )\n", - pConv->pBaseBuf, *out_size ); ); + (void*)pConv->pBaseBuf, *out_size ); ); if( stack[1].type != opal_datatype_uint1.id ) { stack[1].count *= opal_datatype_basicDatatypes[stack[1].type]->size; stack[1].type = opal_datatype_uint1.id; @@ -92,19 +92,19 @@ opal_unpack_homogeneous_contig_function( opal_convertor_t* pConv, if( (OPAL_PTRDIFF_TYPE)pData->size == extent ) { user_memory += pConv->bConverted; DO_DEBUG( opal_output( 0, "unpack_homogeneous_contig( user_memory %p, packed_buffer %p length %lu\n", - user_memory, packed_buffer, (unsigned long)remaining ); ); + (void*)user_memory, (void*)packed_buffer, (unsigned long)remaining ); ); /* contiguous data or basic datatype with count */ OPAL_DATATYPE_SAFEGUARD_POINTER( user_memory, remaining, pConv->pBaseBuf, pData, pConv->count ); DO_DEBUG( opal_output( 0, "1. unpack contig dest %p src %p length %lu\n", - user_memory, packed_buffer, (unsigned long)remaining ); ); + (void*)user_memory, (void*)packed_buffer, (unsigned long)remaining ); ); MEMCPY_CSUM( user_memory, packed_buffer, remaining, pConv ); } else { user_memory += stack[0].disp + stack[1].disp; DO_DEBUG( opal_output( 0, "unpack_homogeneous_contig( user_memory %p, packed_buffer %p length %lu\n", - user_memory, packed_buffer, (unsigned long)remaining ); ); + (void*)user_memory, (void*)packed_buffer, (unsigned long)remaining ); ); length = (0 == pConv->stack_pos ? 0 : stack[1].count); /* left over from the last unpack */ /* complete the last copy */ @@ -112,7 +112,7 @@ opal_unpack_homogeneous_contig_function( opal_convertor_t* pConv, OPAL_DATATYPE_SAFEGUARD_POINTER( user_memory, length, pConv->pBaseBuf, pData, pConv->count ); DO_DEBUG( opal_output( 0, "2. unpack dest %p src %p length %lu\n", - user_memory, packed_buffer, (unsigned long)length ); ); + (void*)user_memory, (void*)packed_buffer, (unsigned long)length ); ); MEMCPY_CSUM( user_memory, packed_buffer, length, pConv ); packed_buffer += length; user_memory += (extent - (pData->size - length)); @@ -131,7 +131,7 @@ opal_unpack_homogeneous_contig_function( opal_convertor_t* pConv, OPAL_DATATYPE_SAFEGUARD_POINTER( user_memory, pData->size, pConv->pBaseBuf, pData, pConv->count ); DO_DEBUG( opal_output( 0, "3. unpack dest %p src %p length %lu\n", - user_memory, packed_buffer, (unsigned long)pData->size ); ); + (void*)user_memory, (void*)packed_buffer, (unsigned long)pData->size ); ); MEMCPY_CSUM( user_memory, packed_buffer, pData->size, pConv ); packed_buffer += pData->size; user_memory += extent; @@ -145,7 +145,7 @@ opal_unpack_homogeneous_contig_function( opal_convertor_t* pConv, OPAL_DATATYPE_SAFEGUARD_POINTER( user_memory, remaining, pConv->pBaseBuf, pData, pConv->count ); DO_DEBUG( opal_output( 0, "4. unpack dest %p src %p length %lu\n", - user_memory, packed_buffer, (unsigned long)remaining ); ); + (void*)user_memory, (void*)packed_buffer, (unsigned long)remaining ); ); MEMCPY_CSUM( user_memory, packed_buffer, remaining, pConv ); user_memory += remaining; stack[1].count -= remaining; @@ -188,7 +188,7 @@ opal_unpack_partial_datatype( opal_convertor_t* pConvertor, dt_elem_desc_t* pEle DO_DEBUG( opal_output( 0, "unpack partial data start %lu end %lu data_length %lu user %p\n" "\tbConverted %lu total_length %lu count %d\n", - (unsigned long)start_position, (unsigned long)start_position + length, (unsigned long)data_length, *user_buffer, + (unsigned long)start_position, (unsigned long)start_position + length, (unsigned long)data_length, (void*)*user_buffer, (unsigned long)pConvertor->bConverted, (unsigned long)pConvertor->local_size, pConvertor->count ); ); /* Find a byte that is not used in the partial buffer */ @@ -273,7 +273,7 @@ opal_generic_simple_unpack_function( opal_convertor_t* pConvertor, uint32_t iov_count; DO_DEBUG( opal_output( 0, "opal_convertor_generic_simple_unpack( %p, {%p, %lu}, %u )\n", - (void*)pConvertor, iov[0].iov_base, (unsigned long)iov[0].iov_len, *out_size ); ); + (void*)pConvertor, (void*)iov[0].iov_base, (unsigned long)iov[0].iov_len, *out_size ); ); description = pConvertor->use_desc->desc; @@ -452,7 +452,7 @@ opal_unpack_general_function( opal_convertor_t* pConvertor, int32_t rc; DO_DEBUG( opal_output( 0, "opal_convertor_general_unpack( %p, {%p, %lu}, %u )\n", - (void*)pConvertor, iov[0].iov_base, (unsigned long)iov[0].iov_len, *out_size ); ); + (void*)pConvertor, (void*)iov[0].iov_base, (unsigned long)iov[0].iov_len, *out_size ); ); description = pConvertor->use_desc->desc; @@ -484,8 +484,8 @@ opal_unpack_general_function( opal_convertor_t* pConvertor, OPAL_DATATYPE_SAFEGUARD_POINTER( conv_ptr + pElem->elem.disp, pData->size, pConvertor->pBaseBuf, pData, pConvertor->count ); DO_DEBUG( opal_output( 0, "unpack (%p, %ld) -> (%p:%ld, %d, %ld) type %s\n", - iov_ptr, iov_len_local, - pConvertor->pBaseBuf, conv_ptr + pElem->elem.disp - pConvertor->pBaseBuf, + (void*)iov_ptr, iov_len_local, + (void*)pConvertor->pBaseBuf, conv_ptr + pElem->elem.disp - pConvertor->pBaseBuf, count_desc, description[pos_desc].elem.extent, opal_datatype_basicDatatypes[type]->name ); ); rc = master->pFunctions[type]( pConvertor, count_desc,