1
1
This commit was SVN r29197.
Этот коммит содержится в:
George Bosilca 2013-09-18 00:07:58 +00:00
родитель 9e6c3c0646
Коммит 55273f1c98
3 изменённых файлов: 8 добавлений и 8 удалений

Просмотреть файл

@ -472,7 +472,7 @@ int mca_pml_ob1_send_request_start_buffered(
/**
* We work on a buffered request with a size smaller than the eager size
* We work on a buffered request with a size smaller than the eager size
* or the BTL is not able to send the data IN_PLACE. Request a segment
* that is used for initial hdr and any eager data. This is used only
* from the _START macro.
@ -497,16 +497,16 @@ int mca_pml_ob1_send_request_start_copy( mca_pml_ob1_send_request_t* sendreq,
match.hdr_src = sendreq->req_send.req_base.req_comm->c_my_rank;
match.hdr_tag = sendreq->req_send.req_base.req_tag;
match.hdr_seq = (uint16_t)sendreq->req_send.req_base.req_sequence;
ob1_hdr_hton(&match, MCA_PML_OB1_HDR_TYPE_MATCH,
sendreq->req_send.req_base.req_proc);
/* try to send immediately */
rc = mca_bml_base_sendi( bml_btl, &sendreq->req_send.req_base.req_convertor,
&match, OMPI_PML_OB1_MATCH_HDR_LEN,
size, MCA_BTL_NO_ORDER,
&match, OMPI_PML_OB1_MATCH_HDR_LEN,
size, MCA_BTL_NO_ORDER,
MCA_BTL_DES_FLAGS_PRIORITY | MCA_BTL_DES_FLAGS_BTL_OWNERSHIP,
MCA_PML_OB1_HDR_TYPE_MATCH,
MCA_PML_OB1_HDR_TYPE_MATCH,
&des);
if( OPAL_LIKELY(OMPI_SUCCESS == rc) ) {
/* signal request completion */

Просмотреть файл

@ -395,7 +395,7 @@ mca_pml_ob1_send_request_start_btl( mca_pml_ob1_send_request_t* sendreq,
(opal_convertor_need_buffers(&sendreq->req_send.req_base.req_convertor) == false) {
unsigned char *base;
opal_convertor_get_current_pointer( &sendreq->req_send.req_base.req_convertor, (void**)&base );
if( 0 != (sendreq->req_rdma_cnt = (uint32_t)mca_pml_ob1_rdma_btls(
sendreq->req_endpoint,
base,

Просмотреть файл

@ -310,9 +310,9 @@ opal_generic_simple_pack_function( opal_convertor_t* pConvertor,
}
if( OPAL_DATATYPE_END_LOOP == pElem->elem.common.type ) { /* end of the current loop */
DO_DEBUG( opal_output( 0, "pack end_loop count %d stack_pos %d"
" pos_desc %d disp %ld space %lu\n",
" pos_desc %d disp %ld space %lu\n",
(int)pStack->count, pConvertor->stack_pos,
pos_desc, (long)pStack->disp, (unsigned long)iov_len_local ); );
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