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

MCA_PML_BASE_REQUEST_MPI_COMPLETE() macro does nothing except call to

Просмотр исходного кода 
ompi_request_complete(). Remove the macro and call the function directly.

This commit was SVN r16498.
Этот коммит содержится в:
Gleb Natapov 2007-10-18 14:20:24 +00:00
родитель aa20a94b6f
Коммит 52c6160252
8 изменённых файлов: 11 добавлений и 17 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

5
ompi/mca/pml/base/pml_base_request.h
Просмотреть файл

@ -76,11 +76,6 @@ typedef struct mca_pml_base_request_t mca_pml_base_request_t;
OMPI_DECLSPEC OBJ_CLASS_DECLARATION(mca_pml_base_request_t); OMPI_DECLSPEC OBJ_CLASS_DECLARATION(mca_pml_base_request_t);
/*
* Mark the MPI request as completed and trigger the condition if required.
*/
#define MCA_PML_BASE_REQUEST_MPI_COMPLETE(req) ompi_request_complete(req)
#if defined(c_plusplus) || defined(__cplusplus) #if defined(c_plusplus) || defined(__cplusplus)
} }
#endif #endif

6
ompi/mca/pml/cm/pml_cm_recvreq.h
Просмотреть файл

@ -214,7 +214,7 @@ do { \
*/ */
#define MCA_PML_CM_THIN_RECV_REQUEST_MPI_COMPLETE( recvreq ) \ #define MCA_PML_CM_THIN_RECV_REQUEST_MPI_COMPLETE( recvreq ) \
do { \ do { \
MCA_PML_BASE_REQUEST_MPI_COMPLETE( &(recvreq->req_base.req_ompi) ); \ ompi_request_complete( &(recvreq->req_base.req_ompi) ); \
} while (0) } while (0)
@ -233,7 +233,7 @@ do { \
MCA_PML_CM_THIN_RECV_REQUEST_RETURN( recvreq ); \ MCA_PML_CM_THIN_RECV_REQUEST_RETURN( recvreq ); \
} else { \ } else { \
recvreq->req_base.req_pml_complete = true; \ recvreq->req_base.req_pml_complete = true; \
MCA_PML_BASE_REQUEST_MPI_COMPLETE( &(recvreq->req_base.req_ompi) ); \ ompi_request_complete( &(recvreq->req_base.req_ompi) ); \
} \ } \
OPAL_THREAD_UNLOCK(&ompi_request_lock); \ OPAL_THREAD_UNLOCK(&ompi_request_lock); \
} while(0) } while(0)
@ -262,7 +262,7 @@ do { \
ompi_convertor_set_position(&recvreq->req_base.req_convertor, &offset); \ ompi_convertor_set_position(&recvreq->req_base.req_convertor, &offset); \
} \ } \
recvreq->req_base.req_pml_complete = true; \ recvreq->req_base.req_pml_complete = true; \
MCA_PML_BASE_REQUEST_MPI_COMPLETE( &(recvreq->req_base.req_ompi) ); \ ompi_request_complete( &(recvreq->req_base.req_ompi) ); \
} \ } \
OPAL_THREAD_UNLOCK(&ompi_request_lock); \ OPAL_THREAD_UNLOCK(&ompi_request_lock); \
} while(0) } while(0)

6
ompi/mca/pml/cm/pml_cm_sendreq.h
Просмотреть файл

@ -260,7 +260,7 @@ do { \
if(OMPI_SUCCESS == ret && \ if(OMPI_SUCCESS == ret && \
sendreq->req_send.req_send_mode == MCA_PML_BASE_SEND_BUFFERED) { \ sendreq->req_send.req_send_mode == MCA_PML_BASE_SEND_BUFFERED) { \
sendreq->req_send.req_base.req_ompi.req_status.MPI_ERROR = 0; \ sendreq->req_send.req_base.req_ompi.req_status.MPI_ERROR = 0; \
MCA_PML_BASE_REQUEST_MPI_COMPLETE(&(sendreq)->req_send.req_base.req_ompi); \ ompi_request_complete(&(sendreq)->req_send.req_base.req_ompi); \
} \ } \
} \ } \
} while (0) } while (0)
@ -284,7 +284,7 @@ do { \
OPAL_THREAD_LOCK(&ompi_request_lock); \ OPAL_THREAD_LOCK(&ompi_request_lock); \
if( false == sendreq->req_send.req_base.req_ompi.req_complete ) { \ if( false == sendreq->req_send.req_base.req_ompi.req_complete ) { \
/* Should only be called for long messages (maybe synchronous) */ \ /* Should only be called for long messages (maybe synchronous) */ \
MCA_PML_BASE_REQUEST_MPI_COMPLETE(&(sendreq->req_send.req_base.req_ompi)); \ ompi_request_complete(&(sendreq->req_send.req_base.req_ompi)); \
} \ } \
sendreq->req_send.req_base.req_pml_complete = true; \ sendreq->req_send.req_base.req_pml_complete = true; \
\ \
@ -330,7 +330,7 @@ do { \
OPAL_THREAD_LOCK(&ompi_request_lock); \ OPAL_THREAD_LOCK(&ompi_request_lock); \
if( false == sendreq->req_send.req_base.req_ompi.req_complete ) { \ if( false == sendreq->req_send.req_base.req_ompi.req_complete ) { \
/* Should only be called for long messages (maybe synchronous) */ \ /* Should only be called for long messages (maybe synchronous) */ \
MCA_PML_BASE_REQUEST_MPI_COMPLETE(&(sendreq->req_send.req_base.req_ompi)); \ ompi_request_complete(&(sendreq->req_send.req_base.req_ompi)); \
} \ } \
sendreq->req_send.req_base.req_pml_complete = true; \ sendreq->req_send.req_base.req_pml_complete = true; \
\ \

2
ompi/mca/pml/dr/pml_dr_recvreq.c
Просмотреть файл

@ -112,7 +112,7 @@ static int mca_pml_dr_recv_request_cancel(struct ompi_request_t* ompi_request, i
* on this request will be able to complete. As the status is marked as * on this request will be able to complete. As the status is marked as
* cancelled the cancel state will be detected. * cancelled the cancel state will be detected.
*/ */
MCA_PML_BASE_REQUEST_MPI_COMPLETE(ompi_request); ompi_request_complete(ompi_request);
OPAL_THREAD_UNLOCK(&ompi_request_lock); OPAL_THREAD_UNLOCK(&ompi_request_lock);
return OMPI_SUCCESS; return OMPI_SUCCESS;
} }

2
ompi/mca/pml/dr/pml_dr_recvreq.h
Просмотреть файл

@ -136,7 +136,7 @@ do {
recvreq->req_recv.req_base.req_ompi.req_status._count = \ recvreq->req_recv.req_base.req_ompi.req_status._count = \
recvreq->req_bytes_received; \ recvreq->req_bytes_received; \
} \ } \
MCA_PML_BASE_REQUEST_MPI_COMPLETE( &(recvreq->req_recv.req_base.req_ompi) ); \ ompi_request_complete( &(recvreq->req_recv.req_base.req_ompi) ); \
\ \
if( true == recvreq->req_recv.req_base.req_free_called ) { \ if( true == recvreq->req_recv.req_base.req_free_called ) { \
MCA_PML_DR_RECV_REQUEST_RETURN( recvreq ); \ MCA_PML_DR_RECV_REQUEST_RETURN( recvreq ); \

2
ompi/mca/pml/dr/pml_dr_sendreq.h
Просмотреть файл

@ -220,7 +220,7 @@ do {
(sendreq)->req_send.req_base.req_ompi.req_status.MPI_ERROR = OMPI_SUCCESS; \ (sendreq)->req_send.req_base.req_ompi.req_status.MPI_ERROR = OMPI_SUCCESS; \
(sendreq)->req_send.req_base.req_ompi.req_status._count = \ (sendreq)->req_send.req_base.req_ompi.req_status._count = \
(sendreq)->req_send.req_bytes_packed; \ (sendreq)->req_send.req_bytes_packed; \
MCA_PML_BASE_REQUEST_MPI_COMPLETE( &((sendreq)->req_send.req_base.req_ompi) ); \ ompi_request_complete( &((sendreq)->req_send.req_base.req_ompi) ); \
} while(0) } while(0)
/* /*

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

@ -121,7 +121,7 @@ do { \
do { \ do { \
PERUSE_TRACE_COMM_EVENT( PERUSE_COMM_REQ_COMPLETE, \ PERUSE_TRACE_COMM_EVENT( PERUSE_COMM_REQ_COMPLETE, \
&(recvreq->req_recv.req_base), PERUSE_RECV ); \ &(recvreq->req_recv.req_base), PERUSE_RECV ); \
MCA_PML_BASE_REQUEST_MPI_COMPLETE( &(recvreq->req_recv.req_base.req_ompi) ); \ ompi_request_complete( &(recvreq->req_recv.req_base.req_ompi) ); \
} while (0) } while (0)
/* /*

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

@ -189,9 +189,8 @@ do {
(sendreq)->req_send.req_base.req_ompi.req_status.MPI_ERROR = OMPI_SUCCESS; \ (sendreq)->req_send.req_base.req_ompi.req_status.MPI_ERROR = OMPI_SUCCESS; \
(sendreq)->req_send.req_base.req_ompi.req_status._count = \ (sendreq)->req_send.req_base.req_ompi.req_status._count = \
(int)(sendreq)->req_send.req_bytes_packed; \ (int)(sendreq)->req_send.req_bytes_packed; \
MCA_PML_BASE_REQUEST_MPI_COMPLETE( &((sendreq)->req_send.req_base.req_ompi) ); \ ompi_request_complete( &((sendreq)->req_send.req_base.req_ompi) ); \
\ \
/* Could be moved to MCA_PML_BASE_REQUEST_MPI_COMPLETE, but before broadcast */ \
PERUSE_TRACE_COMM_EVENT( PERUSE_COMM_REQ_COMPLETE, \ PERUSE_TRACE_COMM_EVENT( PERUSE_COMM_REQ_COMPLETE, \
&(sendreq->req_send.req_base), PERUSE_SEND); \ &(sendreq->req_send.req_base), PERUSE_SEND); \
} while(0) } while(0)