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

Change #ifdef to #if to match OMPI coding conventions.

Просмотр исходного кода 
This commit was SVN r24067.
Этот коммит содержится в:
Rolf vandeVaart 2010-11-17 20:34:15 +00:00
родитель 90bbb33919
Коммит 9c57108e20
8 изменённых файлов: 73 добавлений и 73 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

14
ompi/mca/pml/bfo/pml_bfo.c
Просмотреть файл

@ -48,7 +48,7 @@
#include "pml_bfo_sendreq.h"
#include "pml_bfo_recvreq.h"
#include "pml_bfo_rdmafrag.h"
#ifdef PML_BFO
#if PML_BFO
#include "pml_bfo_failover.h"
#endif
@ -410,7 +410,7 @@ int mca_pml_bfo_add_procs(ompi_proc_t** procs, size_t nprocs)
if(OMPI_SUCCESS != rc)
goto cleanup_and_return;
#ifdef PML_BFO
#if PML_BFO
rc = mca_pml_bfo_register_callbacks();
if(OMPI_SUCCESS != rc)
goto cleanup_and_return;
@ -471,7 +471,7 @@ static void mca_pml_bfo_fin_completion( mca_btl_base_module_t* btl,
mca_bml_base_btl_t* bml_btl = (mca_bml_base_btl_t*) des->des_context;
#ifdef PML_BFO
#if PML_BFO
if( OPAL_UNLIKELY(OMPI_SUCCESS != status) ) {
mca_pml_bfo_repost_fin(des);
return;
@ -492,7 +492,7 @@ int mca_pml_bfo_send_fin( ompi_proc_t* proc,
mca_bml_base_btl_t* bml_btl,
ompi_ptr_t hdr_des,
uint8_t order,
#ifdef PML_BFO
#if PML_BFO
uint32_t status,
uint16_t seq,
uint8_t restartseq,
@ -521,7 +521,7 @@ int mca_pml_bfo_send_fin( ompi_proc_t* proc,
hdr->hdr_common.hdr_type = MCA_PML_BFO_HDR_TYPE_FIN;
hdr->hdr_des = hdr_des;
hdr->hdr_fail = status;
#ifdef PML_BFO
#if PML_BFO
fin->des_cbdata = proc;
hdr->hdr_match.hdr_seq = seq;
hdr->hdr_match.hdr_ctx = ctx;
@ -594,7 +594,7 @@ void mca_pml_bfo_process_pending_packets(mca_bml_base_btl_t* bml_btl)
rc = mca_pml_bfo_send_fin(pckt->proc, send_dst,
pckt->hdr.hdr_fin.hdr_des,
pckt->order,
#ifdef PML_BFO
#if PML_BFO
pckt->hdr.hdr_fin.hdr_fail,
pckt->hdr.hdr_fin.hdr_match.hdr_seq,
pckt->hdr.hdr_fin.hdr_match.hdr_common.hdr_flags,
@ -644,7 +644,7 @@ void mca_pml_bfo_process_pending_rdma(void)
void mca_pml_bfo_error_handler(
struct mca_btl_base_module_t* btl, int32_t flags,
ompi_proc_t* errproc, char* btlinfo ) {
#ifdef PML_BFO
#if PML_BFO
if (flags & MCA_BTL_ERROR_FLAGS_NONFATAL) {
mca_pml_bfo_failover_error_handler(btl, flags, errproc, btlinfo);
return;

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

@ -226,7 +226,7 @@ do { \
int mca_pml_bfo_send_fin(ompi_proc_t* proc, mca_bml_base_btl_t* bml_btl,
#ifdef PML_BFO
#if PML_BFO
ompi_ptr_t hdr_des, uint8_t order, uint32_t status,
uint16_t seq, uint8_t reqseq, uint16_t ctx, uint32_t src);
#else

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

@ -36,7 +36,7 @@ typedef enum {
struct mca_pml_bfo_rdma_frag_t {
ompi_free_list_item_t super;
mca_bml_base_btl_t* rdma_bml;
#ifdef PML_BFO
#if PML_BFO
mca_btl_base_module_t* rdma_btl;
#endif
mca_pml_bfo_hdr_t rdma_hdr;

18
ompi/mca/pml/bfo/pml_bfo_recvfrag.c
Просмотреть файл

@ -41,7 +41,7 @@
#include "pml_bfo_recvreq.h"
#include "pml_bfo_sendreq.h"
#include "pml_bfo_hdr.h"
#ifdef PML_BFO
#if PML_BFO
#include "pml_bfo_failover.h"
#endif
@ -242,7 +242,7 @@ void mca_pml_bfo_recv_frag_callback_match(mca_btl_base_module_t* btl,
slow_path:
OPAL_THREAD_UNLOCK(&comm->matching_lock);
#ifdef PML_BFO
#if PML_BFO
if (true == mca_pml_bfo_is_duplicate_msg(proc, hdr)) {
return;
}
@ -304,7 +304,7 @@ void mca_pml_bfo_recv_frag_callback_ack(mca_btl_base_module_t* btl,
bfo_hdr_ntoh(hdr, MCA_PML_BFO_HDR_TYPE_ACK);
sendreq = (mca_pml_bfo_send_request_t*)hdr->hdr_ack.hdr_src_req.pval;
sendreq->req_recv = hdr->hdr_ack.hdr_dst_req;
#ifdef PML_BFO
#if PML_BFO
MCA_PML_BFO_ERROR_CHECK_ON_ACK_CALLBACK(sendreq);
#endif
@ -350,7 +350,7 @@ void mca_pml_bfo_recv_frag_callback_frag(mca_btl_base_module_t* btl,
}
bfo_hdr_ntoh(hdr, MCA_PML_BFO_HDR_TYPE_FRAG);
recvreq = (mca_pml_bfo_recv_request_t*)hdr->hdr_frag.hdr_dst_req.pval;
#ifdef PML_BFO
#if PML_BFO
MCA_PML_BFO_ERROR_CHECK_ON_FRAG_CALLBACK(recvreq);
#endif
mca_pml_bfo_recv_request_progress_frag(recvreq,btl,segments,des->des_dst_cnt);
@ -373,7 +373,7 @@ void mca_pml_bfo_recv_frag_callback_put(mca_btl_base_module_t* btl,
bfo_hdr_ntoh(hdr, MCA_PML_BFO_HDR_TYPE_PUT);
sendreq = (mca_pml_bfo_send_request_t*)hdr->hdr_rdma.hdr_req.pval;
#ifdef PML_BFO
#if PML_BFO
MCA_PML_BFO_ERROR_CHECK_ON_PUT_CALLBACK(sendreq);
#endif
mca_pml_bfo_send_request_put(sendreq,btl,&hdr->hdr_rdma);
@ -396,7 +396,7 @@ void mca_pml_bfo_recv_frag_callback_fin(mca_btl_base_module_t* btl,
bfo_hdr_ntoh(hdr, MCA_PML_BFO_HDR_TYPE_FIN);
rdma = (mca_btl_base_descriptor_t*)hdr->hdr_fin.hdr_des.pval;
#ifdef PML_BFO
#if PML_BFO
if (true == mca_pml_bfo_is_duplicate_fin(hdr, rdma, btl)) {
return;
}
@ -625,7 +625,7 @@ static int mca_pml_bfo_recv_frag_match( mca_btl_base_module_t *btl,
*/
OPAL_THREAD_LOCK(&comm->matching_lock);
#ifdef PML_BFO
#if PML_BFO
if(OPAL_UNLIKELY(hdr->hdr_common.hdr_flags & MCA_PML_BFO_HDR_FLAGS_RESTART)) {
if (NULL == (match = mca_pml_bfo_get_request(hdr))) {
return OMPI_SUCCESS;
@ -668,7 +668,7 @@ out_of_order_match:
/* release matching lock before processing fragment */
OPAL_THREAD_UNLOCK(&comm->matching_lock);
#ifdef PML_BFO
#if PML_BFO
}
#endif
if(OPAL_LIKELY(match)) {
@ -712,7 +712,7 @@ wrong_seq:
* This message comes after the next expected, so it
* is ahead of sequence. Save it for later.
*/
#ifdef PML_BFO
#if PML_BFO
if (true == mca_pml_bfo_is_duplicate_msg(proc, hdr)) {
return OMPI_SUCCESS;
}

32
ompi/mca/pml/bfo/pml_bfo_recvreq.c
Просмотреть файл

@ -33,7 +33,7 @@
#include "orte/mca/errmgr/errmgr.h"
#include "opal/util/arch.h"
#include "ompi/memchecker.h"
#ifdef PML_BFO
#if PML_BFO
#include "pml_bfo_failover.h"
#endif
@ -170,7 +170,7 @@ static void mca_pml_bfo_recv_ctl_completion( mca_btl_base_module_t* btl,
{
mca_bml_base_btl_t* bml_btl = (mca_bml_base_btl_t*)des->des_context;
#ifdef PML_BFO
#if PML_BFO
if (btl->btl_flags & MCA_BTL_FLAGS_FAILOVER_SUPPORT) {
mca_pml_bfo_check_recv_ctl_completion_status(btl, des, status);
}
@ -198,7 +198,7 @@ static void mca_pml_bfo_put_completion( mca_btl_base_module_t* btl,
}
OPAL_THREAD_ADD_SIZE_T(&recvreq->req_pipeline_depth,-1);
#ifdef PML_BFO
#if PML_BFO
btl->btl_free(btl, des);
MCA_PML_BFO_ERROR_CHECK_ON_FIN_FOR_PUT(recvreq);
MCA_PML_BFO_CHECK_RECVREQ_EAGER_BML_BTL(bml_btl, btl, recvreq, "PUT");
@ -249,13 +249,13 @@ int mca_pml_bfo_recv_request_ack_send_btl(
/* initialize descriptor */
des->des_cbfunc = mca_pml_bfo_recv_ctl_completion;
#ifdef PML_BFO
#if PML_BFO
des->des_cbdata = hdr_dst_req;
#endif
rc = mca_bml_base_send(bml_btl, des, MCA_PML_BFO_HDR_TYPE_ACK);
if( OPAL_LIKELY( rc >= 0 ) ) {
#ifdef PML_BFO
#if PML_BFO
if ((bml_btl->btl_flags & MCA_BTL_FLAGS_FAILOVER_SUPPORT) &&
(des->des_flags & MCA_BTL_DES_SEND_ALWAYS_CALLBACK)) {
((mca_pml_bfo_recv_request_t *)hdr_dst_req)->req_events++;
@ -346,14 +346,14 @@ static void mca_pml_bfo_rget_completion( mca_btl_base_module_t* btl,
mca_pml_bfo_rdma_frag_t* frag = (mca_pml_bfo_rdma_frag_t*)des->des_cbdata;
mca_pml_bfo_recv_request_t* recvreq = (mca_pml_bfo_recv_request_t*)frag->rdma_req;
#ifdef PML_BFO
#if PML_BFO
if (btl->btl_flags & MCA_BTL_FLAGS_FAILOVER_SUPPORT) {
recvreq->req_events--;
}
#endif
/* check completion status */
if( OPAL_UNLIKELY(OMPI_SUCCESS != status) ) {
#ifdef PML_BFO
#if PML_BFO
MCA_PML_BFO_ERROR_CHECK_ON_RDMA_READ_COMPLETION(recvreq);
#else
/* TSW - FIX */
@ -361,7 +361,7 @@ static void mca_pml_bfo_rget_completion( mca_btl_base_module_t* btl,
orte_errmgr.abort(-1, NULL);
#endif
}
#ifdef PML_BFO
#if PML_BFO
MCA_PML_BFO_SECOND_ERROR_CHECK_ON_RDMA_READ_COMPLETION(recvreq, status, btl);
MCA_PML_BFO_CHECK_RECVREQ_RDMA_BML_BTL(bml_btl, btl, recvreq, "RDMA write");
#endif
@ -369,7 +369,7 @@ static void mca_pml_bfo_rget_completion( mca_btl_base_module_t* btl,
mca_pml_bfo_send_fin(recvreq->req_recv.req_base.req_proc,
bml_btl,
frag->rdma_hdr.hdr_rget.hdr_des,
#ifdef PML_BFO
#if PML_BFO
des->order, 0, (uint16_t)recvreq->req_msgseq, recvreq->req_restartseq,
recvreq->req_recv.req_base.req_comm->c_contextid,
recvreq->req_recv.req_base.req_comm->c_my_rank);
@ -439,7 +439,7 @@ int mca_pml_bfo_recv_request_get_frag( mca_pml_bfo_rdma_frag_t* frag )
orte_errmgr.abort(-1, NULL);
}
}
#ifdef PML_BFO
#if PML_BFO
if ((bml_btl->btl_flags & MCA_BTL_FLAGS_FAILOVER_SUPPORT) &&
(descriptor->des_flags & MCA_BTL_DES_SEND_ALWAYS_CALLBACK)) {
recvreq->req_events++;
@ -526,7 +526,7 @@ void mca_pml_bfo_recv_request_progress_rget( mca_pml_bfo_recv_request_t* recvreq
0, bytes_received );
recvreq->req_recv.req_bytes_packed = hdr->hdr_rndv.hdr_msg_length;
#ifdef PML_BFO
#if PML_BFO
recvreq->remote_req_send = hdr->hdr_rndv.hdr_src_req;
#endif
MCA_PML_BFO_RECV_REQUEST_MATCHED(recvreq, &hdr->hdr_rndv.hdr_match);
@ -563,7 +563,7 @@ void mca_pml_bfo_recv_request_progress_rget( mca_pml_bfo_recv_request_t* recvreq
size += hdr->hdr_segs[i].seg_len;
}
}
#ifdef PML_BFO
#if PML_BFO
frag->rdma_btl = btl;
#endif
frag->rdma_bml = mca_bml_base_btl_array_find(&bml_endpoint->btl_rdma, btl);
@ -835,7 +835,7 @@ int mca_pml_bfo_recv_request_schedule_once( mca_pml_bfo_recv_request_t* recvreq,
continue;
}
ctl->des_cbfunc = mca_pml_bfo_recv_ctl_completion;
#ifdef PML_BFO
#if PML_BFO
ctl->des_cbdata = recvreq;
#endif
@ -845,7 +845,7 @@ int mca_pml_bfo_recv_request_schedule_once( mca_pml_bfo_recv_request_t* recvreq,
hdr->hdr_common.hdr_flags =
(!recvreq->req_ack_sent) ? MCA_PML_BFO_HDR_TYPE_ACK : 0;
hdr->hdr_req = recvreq->remote_req_send;
#ifdef PML_BFO
#if PML_BFO
hdr->hdr_dst_req.pval = recvreq; /* only needed in the first put message */
#endif
hdr->hdr_des.pval = dst;
@ -869,7 +869,7 @@ int mca_pml_bfo_recv_request_schedule_once( mca_pml_bfo_recv_request_t* recvreq,
/* send rdma request to peer */
rc = mca_bml_base_send(bml_btl, ctl, MCA_PML_BFO_HDR_TYPE_PUT);
if( OPAL_LIKELY( rc >= 0 ) ) {
#ifdef PML_BFO
#if PML_BFO
if ((btl->btl_flags & MCA_BTL_FLAGS_FAILOVER_SUPPORT) &&
(ctl->des_flags & MCA_BTL_DES_SEND_ALWAYS_CALLBACK)) {
recvreq->req_events++;
@ -1000,7 +1000,7 @@ void mca_pml_bfo_recv_req_start(mca_pml_bfo_recv_request_t *req)
req->req_bytes_received = 0;
req->req_bytes_expected = 0;
/* What about req_rdma_cnt ? */
#ifdef PML_BFO
#if PML_BFO
req->req_rdma_cnt = 0;
req->req_events = 0;
req->req_restartseq = 0;

10
ompi/mca/pml/bfo/pml_bfo_recvreq.h
Просмотреть файл

@ -30,7 +30,7 @@
#include "ompi/mca/pml/bfo/pml_bfo_comm.h"
#include "ompi/mca/mpool/base/base.h"
#include "ompi/mca/pml/base/pml_base_recvreq.h"
#ifdef PML_BFO
#if PML_BFO
#define RECVREQ_RECVERRSENT 0x01
#define RECVREQ_RNDVRESTART_RECVED 0x02
#define RECVREQ_RNDVRESTART_ACKED 0x04
@ -41,7 +41,7 @@ BEGIN_C_DECLS
struct mca_pml_bfo_recv_request_t {
mca_pml_base_recv_request_t req_recv;
ompi_ptr_t remote_req_send;
#ifdef PML_BFO
#if PML_BFO
int32_t req_msgseq; /* PML sequence number */
int32_t req_events; /* number of outstanding events on request */
int32_t req_restartseq; /* sequence number of restarted request */
@ -168,7 +168,7 @@ recv_request_pml_complete(mca_pml_bfo_recv_request_t *recvreq)
}
}
recvreq->req_rdma_cnt = 0;
#ifdef PML_BFO
#if PML_BFO
recvreq->req_msgseq -= 100;
#endif
@ -199,7 +199,7 @@ recv_request_pml_complete_check(mca_pml_bfo_recv_request_t *recvreq)
#endif
if(recvreq->req_match_received &&
recvreq->req_bytes_received >= recvreq->req_recv.req_bytes_packed &&
#ifdef PML_BFO
#if PML_BFO
(0 == recvreq->req_events) && lock_recv_request(recvreq)) {
#else
lock_recv_request(recvreq)) {
@ -238,7 +238,7 @@ static inline void recv_req_matched(mca_pml_bfo_recv_request_t *req,
req->req_recv.req_base.req_ompi.req_status.MPI_SOURCE = hdr->hdr_src;
req->req_recv.req_base.req_ompi.req_status.MPI_TAG = hdr->hdr_tag;
req->req_match_received = true;
#ifdef PML_BFO
#if PML_BFO
req->req_msgseq = hdr->hdr_seq;
#endif
#if OPAL_HAVE_THREAD_SUPPORT

62
ompi/mca/pml/bfo/pml_bfo_sendreq.c
Просмотреть файл

@ -31,7 +31,7 @@
#include "pml_bfo_sendreq.h"
#include "pml_bfo_rdmafrag.h"
#include "pml_bfo_recvreq.h"
#ifdef PML_BFO
#if PML_BFO
#include "pml_bfo_failover.h"
#endif
#include "ompi/mca/bml/base/base.h"
@ -183,7 +183,7 @@ mca_pml_bfo_match_completion_free( struct mca_btl_base_module_t* btl,
/* check completion status */
if( OPAL_UNLIKELY(OMPI_SUCCESS != status) ) {
#ifdef PML_BFO
#if PML_BFO
mca_pml_bfo_repost_match_fragment(des);
return;
#else
@ -192,7 +192,7 @@ mca_pml_bfo_match_completion_free( struct mca_btl_base_module_t* btl,
orte_errmgr.abort(-1, NULL);
#endif
}
#ifdef PML_BFO
#if PML_BFO
MCA_PML_BFO_CHECK_SENDREQ_EAGER_BML_BTL(bml_btl, btl, sendreq, "MATCH");
#endif
mca_pml_bfo_match_completion_free_request( bml_btl, sendreq );
@ -235,7 +235,7 @@ mca_pml_bfo_rndv_completion( mca_btl_base_module_t* btl,
/* check completion status */
if( OPAL_UNLIKELY(OMPI_SUCCESS != status) ) {
#ifdef PML_BFO
#if PML_BFO
if (true == mca_pml_bfo_rndv_completion_status_error(des, sendreq))
return;
#else
@ -244,7 +244,7 @@ mca_pml_bfo_rndv_completion( mca_btl_base_module_t* btl,
orte_errmgr.abort(-1, NULL);
#endif
}
#ifdef PML_BFO
#if PML_BFO
sendreq->req_events--;
MCA_PML_BFO_RNDV_COMPLETION_SENDREQ_ERROR_CHECK(sendreq, status, btl,
MCA_PML_BFO_HDR_TYPE_RNDV, "RNDV");
@ -259,7 +259,7 @@ mca_pml_bfo_rndv_completion( mca_btl_base_module_t* btl,
sizeof(mca_pml_bfo_rendezvous_hdr_t),
req_bytes_delivered );
#ifdef PML_BFO
#if PML_BFO
MCA_PML_BFO_CHECK_SENDREQ_EAGER_BML_BTL(bml_btl, btl, sendreq, "RNDV");
#endif
mca_pml_bfo_rndv_completion_request( bml_btl, sendreq, req_bytes_delivered );
@ -279,7 +279,7 @@ mca_pml_bfo_rget_completion( mca_btl_base_module_t* btl,
mca_pml_bfo_send_request_t* sendreq = (mca_pml_bfo_send_request_t*)des->des_cbdata;
mca_bml_base_btl_t* bml_btl = (mca_bml_base_btl_t*)des->des_context;
size_t req_bytes_delivered = 0;
#ifdef PML_BFO
#if PML_BFO
MCA_PML_BFO_RGET_COMPLETION_SENDREQ_ERROR_CHECK(sendreq, btl, des);
#endif
@ -290,7 +290,7 @@ mca_pml_bfo_rget_completion( mca_btl_base_module_t* btl,
send_request_pml_complete_check(sendreq);
/* free the descriptor */
#ifdef PML_BFO
#if PML_BFO
btl->btl_free(btl, des);
MCA_PML_BFO_CHECK_SENDREQ_RDMA_BML_BTL(bml_btl, btl, sendreq, "RGET");
#else
@ -312,7 +312,7 @@ mca_pml_bfo_send_ctl_completion( mca_btl_base_module_t* btl,
{
mca_bml_base_btl_t* bml_btl = (mca_bml_base_btl_t*) des->des_context;
#ifdef PML_BFO
#if PML_BFO
if(OPAL_UNLIKELY(OMPI_SUCCESS != status)) {
mca_pml_bfo_send_ctl_completion_status_error(des);
return;
@ -337,13 +337,13 @@ mca_pml_bfo_frag_completion( mca_btl_base_module_t* btl,
mca_pml_bfo_send_request_t* sendreq = (mca_pml_bfo_send_request_t*)des->des_cbdata;
mca_bml_base_btl_t* bml_btl = (mca_bml_base_btl_t*) des->des_context;
size_t req_bytes_delivered = 0;
#ifdef PML_BFO
#if PML_BFO
sendreq->req_events--;
#endif
/* check completion status */
if( OPAL_UNLIKELY(OMPI_SUCCESS != status) ) {
#ifdef PML_BFO
#if PML_BFO
sendreq->req_error++;
#else
/* TSW - FIX */
@ -361,13 +361,13 @@ mca_pml_bfo_frag_completion( mca_btl_base_module_t* btl,
OPAL_THREAD_ADD_SIZE_T(&sendreq->req_pipeline_depth, -1);
OPAL_THREAD_ADD_SIZE_T(&sendreq->req_bytes_delivered, req_bytes_delivered);
#ifdef PML_BFO
#if PML_BFO
MCA_PML_BFO_FRAG_COMPLETION_SENDREQ_ERROR_CHECK(sendreq, status, btl,
MCA_PML_BFO_HDR_TYPE_FRAG, "FRAG");
#endif
if(send_request_pml_complete_check(sendreq) == false) {
mca_pml_bfo_send_request_schedule(sendreq);
#ifdef PML_BFO
#if PML_BFO
MCA_PML_BFO_FRAG_COMPLETION_SENDREQ_ERROR_CHECK(sendreq, status, btl,
MCA_PML_BFO_HDR_TYPE_FRAG,
"FRAG (BTL removal)");
@ -375,7 +375,7 @@ mca_pml_bfo_frag_completion( mca_btl_base_module_t* btl,
}
/* check for pending requests */
#ifdef PML_BFO
#if PML_BFO
MCA_PML_BFO_CHECK_SENDREQ_EAGER_BML_BTL(bml_btl, btl, sendreq, "FRAG");
#endif
MCA_PML_BFO_PROGRESS_PENDING(bml_btl);
@ -433,7 +433,7 @@ int mca_pml_bfo_send_request_start_buffered(
hdr->hdr_match.hdr_seq = (uint16_t)sendreq->req_send.req_base.req_sequence;
hdr->hdr_rndv.hdr_msg_length = sendreq->req_send.req_bytes_packed;
hdr->hdr_rndv.hdr_src_req.pval = sendreq;
#ifdef PML_BFO
#if PML_BFO
MCA_PML_BFO_CHECK_FOR_RNDV_RESTART(hdr, sendreq, "RNDV(buffered)");
#endif
@ -484,7 +484,7 @@ int mca_pml_bfo_send_request_start_buffered(
if( OPAL_LIKELY( 1 == rc ) ) {
mca_pml_bfo_rndv_completion_request( bml_btl, sendreq, req_bytes_delivered);
}
#ifdef PML_BFO
#if PML_BFO
if (des->des_flags & MCA_BTL_DES_SEND_ALWAYS_CALLBACK) {
sendreq->req_events++;
}
@ -534,7 +534,7 @@ int mca_pml_bfo_send_request_start_copy( mca_pml_bfo_send_request_t* sendreq,
MCA_PML_BFO_HDR_TYPE_MATCH,
&des);
if( OPAL_LIKELY(OMPI_SUCCESS == rc) ) {
#ifdef PML_BFO
#if PML_BFO
/* Needed in case of failover */
if (NULL != des) {
des->des_cbfunc = mca_pml_bfo_match_completion_free;
@ -770,7 +770,7 @@ int mca_pml_bfo_send_request_start_rdma( mca_pml_bfo_send_request_t* sendreq,
hdr->hdr_match.hdr_seq = (uint16_t)sendreq->req_send.req_base.req_sequence;
hdr->hdr_rndv.hdr_msg_length = sendreq->req_send.req_bytes_packed;
hdr->hdr_rndv.hdr_src_req.pval = sendreq;
#ifdef PML_BFO
#if PML_BFO
MCA_PML_BFO_CHECK_FOR_RNDV_RESTART(hdr, sendreq, "RGET");
#endif
hdr->hdr_rget.hdr_des.pval = src;
@ -822,7 +822,7 @@ int mca_pml_bfo_send_request_start_rdma( mca_pml_bfo_send_request_t* sendreq,
hdr->hdr_match.hdr_seq = (uint16_t)sendreq->req_send.req_base.req_sequence;
hdr->hdr_rndv.hdr_msg_length = sendreq->req_send.req_bytes_packed;
hdr->hdr_rndv.hdr_src_req.pval = sendreq;
#ifdef PML_BFO
#if PML_BFO
MCA_PML_BFO_CHECK_FOR_RNDV_RESTART(hdr, sendreq, "RNDV");
#endif
@ -848,7 +848,7 @@ int mca_pml_bfo_send_request_start_rdma( mca_pml_bfo_send_request_t* sendreq,
if( OPAL_LIKELY( 1 == rc ) && (true == need_local_cb)) {
mca_pml_bfo_rndv_completion_request( bml_btl, sendreq, 0 );
}
#ifdef PML_BFO
#if PML_BFO
if (MCA_PML_BFO_HDR_TYPE_RNDV == hdr->hdr_common.hdr_type) {
if (des->des_flags & MCA_BTL_DES_SEND_ALWAYS_CALLBACK) {
sendreq->req_events++;
@ -922,7 +922,7 @@ int mca_pml_bfo_send_request_start_rndv( mca_pml_bfo_send_request_t* sendreq,
hdr->hdr_match.hdr_seq = (uint16_t)sendreq->req_send.req_base.req_sequence;
hdr->hdr_rndv.hdr_msg_length = sendreq->req_send.req_bytes_packed;
hdr->hdr_rndv.hdr_src_req.pval = sendreq;
#ifdef PML_BFO
#if PML_BFO
MCA_PML_BFO_CHECK_FOR_RNDV_RESTART(hdr, sendreq, "RNDV");
#endif
@ -942,7 +942,7 @@ int mca_pml_bfo_send_request_start_rndv( mca_pml_bfo_send_request_t* sendreq,
if( OPAL_LIKELY( 1 == rc ) ) {
mca_pml_bfo_rndv_completion_request( bml_btl, sendreq, size );
}
#ifdef PML_BFO
#if PML_BFO
if (des->des_flags & MCA_BTL_DES_SEND_ALWAYS_CALLBACK) {
sendreq->req_events++;
}
@ -1059,7 +1059,7 @@ mca_pml_bfo_send_request_schedule_once(mca_pml_bfo_send_request_t* sendreq)
mca_bml_base_btl_t* bml_btl;
assert(range->range_send_length != 0);
#ifdef PML_BFO
#if PML_BFO
MCA_PML_BFO_CHECK_FOR_REMOVED_BTL(sendreq, range);
#endif
@ -1170,7 +1170,7 @@ cannot_pack:
range = get_next_send_range(sendreq, range);
prev_bytes_remaining = 0;
}
#ifdef PML_BFO
#if PML_BFO
if (des->des_flags & MCA_BTL_DES_SEND_ALWAYS_CALLBACK) {
sendreq->req_events++;
}
@ -1201,7 +1201,7 @@ static void mca_pml_bfo_put_completion( mca_btl_base_module_t* btl,
/* check completion status */
if( OPAL_UNLIKELY(OMPI_SUCCESS != status) ) {
#ifdef PML_BFO
#if PML_BFO
sendreq->req_error++;
#else
/* TSW - FIX */
@ -1209,7 +1209,7 @@ static void mca_pml_bfo_put_completion( mca_btl_base_module_t* btl,
orte_errmgr.abort(-1, NULL);
#endif
}
#ifdef PML_BFO
#if PML_BFO
sendreq->req_events--;
MCA_PML_BFO_PUT_COMPLETION_SENDREQ_ERROR_CHECK(sendreq, status, btl);
MCA_PML_BFO_CHECK_SENDREQ_EAGER_BML_BTL(bml_btl, btl, sendreq, "RDMA write");
@ -1218,7 +1218,7 @@ static void mca_pml_bfo_put_completion( mca_btl_base_module_t* btl,
mca_pml_bfo_send_fin(sendreq->req_send.req_base.req_proc,
bml_btl,
frag->rdma_hdr.hdr_rdma.hdr_des,
#ifdef PML_BFO
#if PML_BFO
des->order, 0, (uint16_t)sendreq->req_send.req_base.req_sequence,
sendreq->req_restartseq, sendreq->req_send.req_base.req_comm->c_contextid,
sendreq->req_send.req_base.req_comm->c_my_rank);
@ -1269,7 +1269,7 @@ int mca_pml_bfo_send_request_put_frag( mca_pml_bfo_rdma_frag_t* frag )
/* tell receiver to unregister memory */
mca_pml_bfo_send_fin(sendreq->req_send.req_base.req_proc,
bml_btl, frag->rdma_hdr.hdr_rdma.hdr_des,
#ifdef PML_BFO
#if PML_BFO
MCA_BTL_NO_ORDER, 1, (uint16_t)sendreq->req_send.req_base.req_sequence,
sendreq->req_restartseq, sendreq->req_send.req_base.req_comm->c_contextid,
sendreq->req_send.req_base.req_comm->c_my_rank);
@ -1311,7 +1311,7 @@ int mca_pml_bfo_send_request_put_frag( mca_pml_bfo_rdma_frag_t* frag )
orte_errmgr.abort(-1, NULL);
}
}
#ifdef PML_BFO
#if PML_BFO
if (des->des_flags & MCA_BTL_DES_SEND_ALWAYS_CALLBACK) {
((mca_pml_bfo_send_request_t*)frag->rdma_req)->req_events++;
}
@ -1338,7 +1338,7 @@ void mca_pml_bfo_send_request_put( mca_pml_bfo_send_request_t* sendreq,
if(hdr->hdr_common.hdr_flags & MCA_PML_BFO_HDR_TYPE_ACK) {
OPAL_THREAD_ADD32(&sendreq->req_state, -1);
}
#ifdef PML_BFO
#if PML_BFO
MCA_PML_BFO_VERIFY_SENDREQ_REQ_STATE_VALUE(sendreq);
sendreq->req_recv = hdr->hdr_dst_req; /* only needed once, but it is OK */
#endif
@ -1369,7 +1369,7 @@ void mca_pml_bfo_send_request_put( mca_pml_bfo_send_request_t* sendreq,
}
frag->rdma_bml = mca_bml_base_btl_array_find(&bml_endpoint->btl_rdma, btl);
#ifdef PML_BFO
#if PML_BFO
MCA_PML_BFO_CHECK_FOR_REMOVED_BML(sendreq, frag, btl);
frag->rdma_btl = btl; /* in case frag ends up on pending */
#endif

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

@ -42,7 +42,7 @@ struct mca_pml_bfo_send_request_t {
mca_pml_base_send_request_t req_send;
mca_bml_base_endpoint_t* req_endpoint;
ompi_ptr_t req_recv;
#ifdef PML_BFO
#if PML_BFO
int32_t req_events; /* number of outstanding events on request */
int32_t req_restartseq; /* sequence number of restarted request */
int32_t req_restart; /* state of restarted request */
@ -249,7 +249,7 @@ send_request_pml_complete(mca_pml_bfo_send_request_t *sendreq)
MCA_PML_BFO_SEND_REQUEST_MPI_COMPLETE(sendreq, true);
}
sendreq->req_send.req_base.req_pml_complete = true;
#ifdef PML_BFO
#if PML_BFO
sendreq->req_send.req_base.req_sequence -= 100;
#endif
@ -430,7 +430,7 @@ mca_pml_bfo_send_request_start( mca_pml_bfo_send_request_t* sendreq )
sendreq->req_pending = MCA_PML_BFO_SEND_PENDING_NONE;
sendreq->req_send.req_base.req_sequence = OPAL_THREAD_ADD32(
&comm->procs[sendreq->req_send.req_base.req_peer].send_sequence,1);
#ifdef PML_BFO
#if PML_BFO
sendreq->req_restartseq = 0; /* counts up restarts */
sendreq->req_restart = 0; /* reset in case we restart again */
sendreq->req_error = 0; /* clear error state */