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

Use the new memchecker function call which is based on convertor.

Просмотр исходного кода 
Remove one unnecessary call.

This commit was SVN r18085.
Этот коммит содержится в:
Shiqing Fan 2008-04-07 07:52:04 +00:00
родитель a913a60c24
Коммит a1e5df1cc9
3 изменённых файлов: 54 добавлений и 49 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

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

@ -72,10 +72,8 @@ static int mca_pml_ob1_recv_request_free(struct ompi_request_t** request)
* Package successfully received, make user buffer accessable. * Package successfully received, make user buffer accessable.
*/ */
MEMCHECKER( MEMCHECKER(
memchecker_call(&opal_memchecker_base_mem_defined, memchecker_convertor_call(&opal_memchecker_base_mem_defined,
recvreq->req_recv.req_base.req_addr, &recvreq->req_recv.req_base.req_convertor);
recvreq->req_recv.req_base.req_count,
recvreq->req_recv.req_base.req_datatype);
); );
*request = MPI_REQUEST_NULL; *request = MPI_REQUEST_NULL;
return OMPI_SUCCESS; return OMPI_SUCCESS;
@ -91,10 +89,8 @@ static int mca_pml_ob1_recv_request_cancel(struct ompi_request_t* ompi_request,
* Receive request completed, make user buffer accessable. * Receive request completed, make user buffer accessable.
*/ */
MEMCHECKER( MEMCHECKER(
memchecker_call(&opal_memchecker_base_mem_defined, memchecker_convertor_call(&opal_memchecker_base_mem_defined,
request->req_recv.req_base.req_addr, &request->req_recv.req_base.req_convertor);
request->req_recv.req_base.req_count,
request->req_recv.req_base.req_datatype);
); );
return OMPI_SUCCESS; return OMPI_SUCCESS;
} }
@ -130,10 +126,8 @@ static int mca_pml_ob1_recv_request_cancel(struct ompi_request_t* ompi_request,
* Receive request cancelled, make user buffer accessable. * Receive request cancelled, make user buffer accessable.
*/ */
MEMCHECKER( MEMCHECKER(
memchecker_call(&opal_memchecker_base_mem_defined, memchecker_convertor_call(&opal_memchecker_base_mem_defined,
request->req_recv.req_base.req_addr, &request->req_recv.req_base.req_convertor);
request->req_recv.req_base.req_count,
request->req_recv.req_base.req_datatype);
); );
return OMPI_SUCCESS; return OMPI_SUCCESS;
} }
@ -484,10 +478,8 @@ void mca_pml_ob1_recv_request_progress( mca_pml_ob1_recv_request_t* recvreq,
* Make user buffer accessible (defined) before unpacking. * Make user buffer accessible (defined) before unpacking.
*/ */
MEMCHECKER( MEMCHECKER(
memchecker_call(&opal_memchecker_base_mem_defined, memchecker_convertor_call(&opal_memchecker_base_mem_defined,
recvreq->req_recv.req_base.req_addr, &recvreq->req_recv.req_base.req_convertor);
recvreq->req_recv.req_base.req_count,
recvreq->req_recv.req_base.req_datatype);
); );
MCA_PML_OB1_RECV_REQUEST_UNPACK( recvreq, MCA_PML_OB1_RECV_REQUEST_UNPACK( recvreq,
segments, segments,
@ -500,19 +492,17 @@ void mca_pml_ob1_recv_request_progress( mca_pml_ob1_recv_request_t* recvreq,
* Unpacking finished, make the user buffer unaccessable again. * Unpacking finished, make the user buffer unaccessable again.
*/ */
MEMCHECKER( MEMCHECKER(
memchecker_call(&opal_memchecker_base_mem_noaccess, memchecker_convertor_call(&opal_memchecker_base_mem_noaccess,
recvreq->req_recv.req_base.req_addr, &recvreq->req_recv.req_base.req_convertor);
recvreq->req_recv.req_base.req_count,
recvreq->req_recv.req_base.req_datatype);
); );
break; break;
case MCA_PML_OB1_HDR_TYPE_RNDV: case MCA_PML_OB1_HDR_TYPE_RNDV:
bytes_received -= sizeof(mca_pml_ob1_rendezvous_hdr_t); bytes_received -= sizeof(mca_pml_ob1_rendezvous_hdr_t);
recvreq->req_recv.req_bytes_packed = hdr->hdr_rndv.hdr_msg_length; recvreq->req_recv.req_bytes_packed = hdr->hdr_rndv.hdr_msg_length;
recvreq->req_send = hdr->hdr_rndv.hdr_src_req; recvreq->req_send = hdr->hdr_rndv.hdr_src_req;
recvreq->req_rdma_offset = bytes_received; recvreq->req_rdma_offset = bytes_received;
MCA_PML_OB1_RECV_REQUEST_MATCHED(recvreq, &hdr->hdr_match); MCA_PML_OB1_RECV_REQUEST_MATCHED(recvreq, &hdr->hdr_match);
mca_pml_ob1_recv_request_ack(recvreq, &hdr->hdr_rndv, bytes_received); mca_pml_ob1_recv_request_ack(recvreq, &hdr->hdr_rndv, bytes_received);
/** /**
@ -521,6 +511,10 @@ void mca_pml_ob1_recv_request_progress( mca_pml_ob1_recv_request_t* recvreq,
* unpack. * unpack.
*/ */
if( 0 < bytes_received ) { if( 0 < bytes_received ) {
MEMCHECKER(
memchecker_convertor_call(&opal_memchecker_base_mem_defined,
&recvreq->req_recv.req_base.req_convertor);
);
MCA_PML_OB1_RECV_REQUEST_UNPACK( recvreq, MCA_PML_OB1_RECV_REQUEST_UNPACK( recvreq,
segments, segments,
num_segments, num_segments,
@ -528,6 +522,10 @@ void mca_pml_ob1_recv_request_progress( mca_pml_ob1_recv_request_t* recvreq,
data_offset, data_offset,
bytes_received, bytes_received,
bytes_delivered ); bytes_delivered );
MEMCHECKER(
memchecker_convertor_call(&opal_memchecker_base_mem_noaccess,
&recvreq->req_recv.req_base.req_convertor);
);
} }
break; break;
@ -545,10 +543,8 @@ void mca_pml_ob1_recv_request_progress( mca_pml_ob1_recv_request_t* recvreq,
* Make user buffer accessable(defined) before unpacking. * Make user buffer accessable(defined) before unpacking.
*/ */
MEMCHECKER( MEMCHECKER(
memchecker_call(&opal_memchecker_base_mem_defined, memchecker_convertor_call(&opal_memchecker_base_mem_defined,
recvreq->req_recv.req_base.req_addr, &recvreq->req_recv.req_base.req_convertor);
recvreq->req_recv.req_base.req_count,
recvreq->req_recv.req_base.req_datatype);
); );
MCA_PML_OB1_RECV_REQUEST_UNPACK( recvreq, MCA_PML_OB1_RECV_REQUEST_UNPACK( recvreq,
segments, segments,
@ -561,10 +557,8 @@ void mca_pml_ob1_recv_request_progress( mca_pml_ob1_recv_request_t* recvreq,
* Unpacking finished, make the user buffer unaccessable again. * Unpacking finished, make the user buffer unaccessable again.
*/ */
MEMCHECKER( MEMCHECKER(
memchecker_call(&opal_memchecker_base_mem_noaccess, memchecker_convertor_call(&opal_memchecker_base_mem_noaccess,
recvreq->req_recv.req_base.req_addr, &recvreq->req_recv.req_base.req_convertor);
recvreq->req_recv.req_base.req_count,
recvreq->req_recv.req_base.req_datatype);
); );
break; break;

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

@ -436,10 +436,8 @@ int mca_pml_ob1_send_request_start_copy( mca_pml_ob1_send_request_t* sendreq,
* accessable. * accessable.
*/ */
MEMCHECKER( MEMCHECKER(
memchecker_call(&opal_memchecker_base_mem_defined, memchecker_convertor_call(&opal_memchecker_base_mem_defined,
sendreq->req_send.req_base.req_addr, &sendreq->req_send.req_base.req_convertor);
sendreq->req_send.req_base.req_count,
sendreq->req_send.req_base.req_datatype);
); );
(void)ompi_convertor_pack( &sendreq->req_send.req_base.req_convertor, (void)ompi_convertor_pack( &sendreq->req_send.req_base.req_convertor,
&iov, &iov_count, &max_data ); &iov, &iov_count, &max_data );
@ -447,10 +445,8 @@ int mca_pml_ob1_send_request_start_copy( mca_pml_ob1_send_request_t* sendreq,
* Packing finished, make the user buffer unaccessable. * Packing finished, make the user buffer unaccessable.
*/ */
MEMCHECKER( MEMCHECKER(
memchecker_call(&opal_memchecker_base_mem_noaccess, memchecker_convertor_call(&opal_memchecker_base_mem_noaccess,
sendreq->req_send.req_base.req_addr, &sendreq->req_send.req_base.req_convertor);
sendreq->req_send.req_base.req_count,
sendreq->req_send.req_base.req_datatype);
); );
} }
@ -580,6 +576,10 @@ int mca_pml_ob1_send_request_start_rdma(
bml_btl->btl_flags & MCA_BTL_FLAGS_GET) { bml_btl->btl_flags & MCA_BTL_FLAGS_GET) {
size_t old_position = sendreq->req_send.req_base.req_convertor.bConverted; size_t old_position = sendreq->req_send.req_base.req_convertor.bConverted;
MEMCHECKER(
memchecker_convertor_call(&opal_memchecker_base_mem_defined,
&sendreq->req_send.req_base.req_convertor);
);
/* prepare source descriptor/segment(s) */ /* prepare source descriptor/segment(s) */
/* PML owns this descriptor and will free it in */ /* PML owns this descriptor and will free it in */
/* get_completion */ /* get_completion */
@ -591,6 +591,10 @@ int mca_pml_ob1_send_request_start_rdma(
&size, &size,
0, 0,
&src ); &src );
MEMCHECKER(
memchecker_convertor_call(&opal_memchecker_base_mem_noaccess,
&sendreq->req_send.req_base.req_convertor);
);
if( OPAL_UNLIKELY(NULL == src) ) { if( OPAL_UNLIKELY(NULL == src) ) {
ompi_convertor_set_position(&sendreq->req_send.req_base.req_convertor, ompi_convertor_set_position(&sendreq->req_send.req_base.req_convertor,
&old_position); &old_position);
@ -719,6 +723,10 @@ int mca_pml_ob1_send_request_start_rndv( mca_pml_ob1_send_request_t* sendreq,
sizeof(mca_pml_ob1_rendezvous_hdr_t), sizeof(mca_pml_ob1_rendezvous_hdr_t),
MCA_BTL_DES_FLAGS_PRIORITY | MCA_BTL_DES_FLAGS_BTL_OWNERSHIP ); MCA_BTL_DES_FLAGS_PRIORITY | MCA_BTL_DES_FLAGS_BTL_OWNERSHIP );
} else { } else {
MEMCHECKER(
memchecker_convertor_call(&opal_memchecker_base_mem_defined,
&sendreq->req_send.req_base.req_convertor);
);
mca_bml_base_prepare_src( bml_btl, mca_bml_base_prepare_src( bml_btl,
NULL, NULL,
&sendreq->req_send.req_base.req_convertor, &sendreq->req_send.req_base.req_convertor,
@ -727,6 +735,10 @@ int mca_pml_ob1_send_request_start_rndv( mca_pml_ob1_send_request_t* sendreq,
&size, &size,
MCA_BTL_DES_FLAGS_PRIORITY | MCA_BTL_DES_FLAGS_BTL_OWNERSHIP, MCA_BTL_DES_FLAGS_PRIORITY | MCA_BTL_DES_FLAGS_BTL_OWNERSHIP,
&des ); &des );
MEMCHECKER(
memchecker_convertor_call(&opal_memchecker_base_mem_noaccess,
&sendreq->req_send.req_base.req_convertor);
);
} }
if( OPAL_UNLIKELY(NULL == des) ) { if( OPAL_UNLIKELY(NULL == des) ) {
@ -918,11 +930,19 @@ cannot_pack:
range->range_send_offset = (uint64_t)offset; range->range_send_offset = (uint64_t)offset;
data_remaining = size; data_remaining = size;
MEMCHECKER(
memchecker_convertor_call(&opal_memchecker_base_mem_defined,
&sendreq->req_send.req_base.req_convertor);
);
mca_bml_base_prepare_src(bml_btl, NULL, mca_bml_base_prepare_src(bml_btl, NULL,
&sendreq->req_send.req_base.req_convertor, &sendreq->req_send.req_base.req_convertor,
MCA_BTL_NO_ORDER, MCA_BTL_NO_ORDER,
sizeof(mca_pml_ob1_frag_hdr_t), sizeof(mca_pml_ob1_frag_hdr_t),
&size, MCA_BTL_DES_FLAGS_BTL_OWNERSHIP, &des); &size, MCA_BTL_DES_FLAGS_BTL_OWNERSHIP, &des);
MEMCHECKER(
memchecker_convertor_call(&opal_memchecker_base_mem_noaccess,
&sendreq->req_send.req_base.req_convertor);
);
if( OPAL_UNLIKELY(des == NULL || size == 0) ) { if( OPAL_UNLIKELY(des == NULL || size == 0) ) {
if(des) { if(des) {

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

@ -107,15 +107,6 @@ int mca_pml_ob1_start(size_t count, ompi_request_t** requests)
return OMPI_ERR_REQUEST; return OMPI_ERR_REQUEST;
} }
/*
* We do not distinguish on SEND or RECV-requests.
*/
MEMCHECKER (memchecker_call(&opal_memchecker_base_mem_noaccess,
pml_request->req_addr,
pml_request->req_count,
pml_request->req_datatype));
/* start the request */ /* start the request */
switch(pml_request->req_type) { switch(pml_request->req_type) {
case MCA_PML_REQUEST_SEND: case MCA_PML_REQUEST_SEND: