From 8962ce25b0511e5e44275e3929983a6765419434 Mon Sep 17 00:00:00 2001 From: Nathan Hjelm Date: Sun, 6 Nov 2011 20:19:14 +0000 Subject: [PATCH] fixed some compiler errors caused by seg_key changes. osc/rdma may need to be updated to use btls that use 128 bit segment keys This commit was SVN r25448. --- ompi/mca/osc/rdma/osc_rdma_component.c | 2 +- ompi/mca/osc/rdma/osc_rdma_data_move.c | 4 ++-- ompi/mca/pml/bfo/pml_bfo_recvreq.c | 3 ++- ompi/mca/pml/bfo/pml_bfo_sendreq.c | 6 ++++-- ompi/mca/pml/csum/pml_csum_recvreq.c | 3 ++- ompi/mca/pml/csum/pml_csum_sendreq.c | 6 ++++-- ompi/mca/pml/ob1/pml_ob1_recvreq.c | 3 ++- ompi/mca/pml/ob1/pml_ob1_sendreq.c | 6 ++++-- 8 files changed, 21 insertions(+), 12 deletions(-) diff --git a/ompi/mca/osc/rdma/osc_rdma_component.c b/ompi/mca/osc/rdma/osc_rdma_component.c index 3ef47c70a2..49a2bc02f3 100644 --- a/ompi/mca/osc/rdma/osc_rdma_component.c +++ b/ompi/mca/osc/rdma/osc_rdma_component.c @@ -1300,7 +1300,7 @@ setup_rdma(ompi_osc_rdma_module_t *module) peer_send_info->proc = ompi_comm_peer_lookup(module->m_comm, i); peer_send_info->bml_btl = peer_info->local_btls[j]; peer_send_info->seg_key = - peer_info->local_descriptors[j]->des_dst[0].seg_key.key64; + peer_info->local_descriptors[j]->des_dst[0].seg_key.key64[0]; ret = rdma_send_info_send(module, peer_send_info); if (OMPI_SUCCESS != ret) { diff --git a/ompi/mca/osc/rdma/osc_rdma_data_move.c b/ompi/mca/osc/rdma/osc_rdma_data_move.c index 503fd68f32..f5b116047b 100644 --- a/ompi/mca/osc/rdma/osc_rdma_data_move.c +++ b/ompi/mca/osc/rdma/osc_rdma_data_move.c @@ -193,7 +193,7 @@ ompi_osc_rdma_sendreq_rdma(ompi_osc_rdma_module_t *module, ((unsigned long)sendreq->req_target_disp * module->m_win->w_disp_unit); descriptor->des_dst[0].seg_len = sendreq->req_origin_bytes_packed; - descriptor->des_dst[0].seg_key.key64 = + descriptor->des_dst[0].seg_key.key64[0] = rdma_btl->peer_seg_key; #if 0 opal_output(0, "putting to %d: 0x%lx(%d), %d, %d", @@ -221,7 +221,7 @@ ompi_osc_rdma_sendreq_rdma(ompi_osc_rdma_module_t *module, ((unsigned long)sendreq->req_target_disp * module->m_win->w_disp_unit); descriptor->des_src[0].seg_len = sendreq->req_origin_bytes_packed; - descriptor->des_src[0].seg_key.key64 = + descriptor->des_src[0].seg_key.key64[0] = rdma_btl->peer_seg_key; descriptor->des_cbdata = sendreq; diff --git a/ompi/mca/pml/bfo/pml_bfo_recvreq.c b/ompi/mca/pml/bfo/pml_bfo_recvreq.c index 265c9b71bf..efd804ca6e 100644 --- a/ompi/mca/pml/bfo/pml_bfo_recvreq.c +++ b/ompi/mca/pml/bfo/pml_bfo_recvreq.c @@ -855,7 +855,8 @@ int mca_pml_bfo_recv_request_schedule_once( mca_pml_bfo_recv_request_t* recvreq, for( i = 0; i < dst->des_dst_cnt; i++ ) { hdr->hdr_segs[i].seg_addr.lval = ompi_ptr_ptol(dst->des_dst[i].seg_addr.pval); hdr->hdr_segs[i].seg_len = dst->des_dst[i].seg_len; - hdr->hdr_segs[i].seg_key.key64 = dst->des_dst[i].seg_key.key64; + hdr->hdr_segs[i].seg_key.key64[0] = dst->des_dst[i].seg_key.key64[0]; + hdr->hdr_segs[i].seg_key.key64[1] = dst->des_dst[i].seg_key.key64[1]; } if(!recvreq->req_ack_sent) diff --git a/ompi/mca/pml/bfo/pml_bfo_sendreq.c b/ompi/mca/pml/bfo/pml_bfo_sendreq.c index dc855fa9f9..7ade6b1e0b 100644 --- a/ompi/mca/pml/bfo/pml_bfo_sendreq.c +++ b/ompi/mca/pml/bfo/pml_bfo_sendreq.c @@ -782,7 +782,8 @@ int mca_pml_bfo_send_request_start_rdma( mca_pml_bfo_send_request_t* sendreq, for( i = 0; i < src->des_src_cnt; i++ ) { hdr->hdr_rget.hdr_segs[i].seg_addr.lval = ompi_ptr_ptol(src->des_src[i].seg_addr.pval); hdr->hdr_rget.hdr_segs[i].seg_len = src->des_src[i].seg_len; - hdr->hdr_rget.hdr_segs[i].seg_key.key64 = src->des_src[i].seg_key.key64; + hdr->hdr_rget.hdr_segs[i].seg_key.key64[0] = src->des_src[i].seg_key.key64[0]; + hdr->hdr_rget.hdr_segs[i].seg_key.key64[1] = src->des_src[i].seg_key.key64[1]; } des->des_cbfunc = mca_pml_bfo_send_ctl_completion; @@ -1355,7 +1356,8 @@ void mca_pml_bfo_send_request_put( mca_pml_bfo_send_request_t* sendreq, for( i = 0; i < hdr->hdr_seg_cnt; i++ ) { frag->rdma_segs[i].seg_addr.lval = hdr->hdr_segs[i].seg_addr.lval; frag->rdma_segs[i].seg_len = hdr->hdr_segs[i].seg_len; - frag->rdma_segs[i].seg_key.key64 = hdr->hdr_segs[i].seg_key.key64; + frag->rdma_segs[i].seg_key.key64[0] = hdr->hdr_segs[i].seg_key.key64[0]; + frag->rdma_segs[i].seg_key.key64[1] = hdr->hdr_segs[i].seg_key.key64[1]; #if OPAL_ENABLE_HETEROGENEOUS_SUPPORT if ((sendreq->req_send.req_base.req_proc->proc_arch & OPAL_ARCH_ISBIGENDIAN) != diff --git a/ompi/mca/pml/csum/pml_csum_recvreq.c b/ompi/mca/pml/csum/pml_csum_recvreq.c index 16d1135fec..83f9465b23 100644 --- a/ompi/mca/pml/csum/pml_csum_recvreq.c +++ b/ompi/mca/pml/csum/pml_csum_recvreq.c @@ -886,7 +886,8 @@ int mca_pml_csum_recv_request_schedule_once( mca_pml_csum_recv_request_t* recvre for( i = 0; i < dst->des_dst_cnt; i++ ) { hdr->hdr_segs[i].seg_addr.lval = ompi_ptr_ptol(dst->des_dst[i].seg_addr.pval); hdr->hdr_segs[i].seg_len = dst->des_dst[i].seg_len; - hdr->hdr_segs[i].seg_key.key64 = dst->des_dst[i].seg_key.key64; + hdr->hdr_segs[i].seg_key.key64[0] = dst->des_dst[i].seg_key.key64[0]; + hdr->hdr_segs[i].seg_key.key64[1] = dst->des_dst[i].seg_key.key64[1]; } if(!recvreq->req_ack_sent) diff --git a/ompi/mca/pml/csum/pml_csum_sendreq.c b/ompi/mca/pml/csum/pml_csum_sendreq.c index c69a74c254..fcced45d73 100644 --- a/ompi/mca/pml/csum/pml_csum_sendreq.c +++ b/ompi/mca/pml/csum/pml_csum_sendreq.c @@ -760,7 +760,8 @@ int mca_pml_csum_send_request_start_rdma( mca_pml_csum_send_request_t* sendreq, for( i = 0; i < src->des_src_cnt; i++ ) { hdr->hdr_rget.hdr_segs[i].seg_addr.lval = ompi_ptr_ptol(src->des_src[i].seg_addr.pval); hdr->hdr_rget.hdr_segs[i].seg_len = src->des_src[i].seg_len; - hdr->hdr_rget.hdr_segs[i].seg_key.key64 = src->des_src[i].seg_key.key64; + hdr->hdr_rget.hdr_segs[i].seg_key.key64[0] = src->des_src[i].seg_key.key64[0]; + hdr->hdr_rget.hdr_segs[i].seg_key.key64[1] = src->des_src[i].seg_key.key64[1]; } des->des_cbfunc = mca_pml_csum_send_ctl_completion; @@ -1300,7 +1301,8 @@ void mca_pml_csum_send_request_put( mca_pml_csum_send_request_t* sendreq, for( i = 0; i < hdr->hdr_seg_cnt; i++ ) { frag->rdma_segs[i].seg_addr.lval = hdr->hdr_segs[i].seg_addr.lval; frag->rdma_segs[i].seg_len = hdr->hdr_segs[i].seg_len; - frag->rdma_segs[i].seg_key.key64 = hdr->hdr_segs[i].seg_key.key64; + frag->rdma_segs[i].seg_key.key64[0] = hdr->hdr_segs[i].seg_key.key64[0]; + frag->rdma_segs[i].seg_key.key64[1] = hdr->hdr_segs[i].seg_key.key64[1]; #if OPAL_ENABLE_HETEROGENEOUS_SUPPORT if ((sendreq->req_send.req_base.req_proc->proc_arch & OPAL_ARCH_ISBIGENDIAN) != diff --git a/ompi/mca/pml/ob1/pml_ob1_recvreq.c b/ompi/mca/pml/ob1/pml_ob1_recvreq.c index 18ad34e08b..8d84fa0418 100644 --- a/ompi/mca/pml/ob1/pml_ob1_recvreq.c +++ b/ompi/mca/pml/ob1/pml_ob1_recvreq.c @@ -793,7 +793,8 @@ int mca_pml_ob1_recv_request_schedule_once( mca_pml_ob1_recv_request_t* recvreq, for( i = 0; i < dst->des_dst_cnt; i++ ) { hdr->hdr_segs[i].seg_addr.lval = ompi_ptr_ptol(dst->des_dst[i].seg_addr.pval); hdr->hdr_segs[i].seg_len = dst->des_dst[i].seg_len; - hdr->hdr_segs[i].seg_key.key64 = dst->des_dst[i].seg_key.key64; + hdr->hdr_segs[i].seg_key.key64[0] = dst->des_dst[i].seg_key.key64[0]; + hdr->hdr_segs[i].seg_key.key64[1] = dst->des_dst[i].seg_key.key64[1]; } if(!recvreq->req_ack_sent) diff --git a/ompi/mca/pml/ob1/pml_ob1_sendreq.c b/ompi/mca/pml/ob1/pml_ob1_sendreq.c index 7dacb5be72..88ddd0d152 100644 --- a/ompi/mca/pml/ob1/pml_ob1_sendreq.c +++ b/ompi/mca/pml/ob1/pml_ob1_sendreq.c @@ -706,7 +706,8 @@ int mca_pml_ob1_send_request_start_rdma( mca_pml_ob1_send_request_t* sendreq, for( i = 0; i < src->des_src_cnt; i++ ) { hdr->hdr_rget.hdr_segs[i].seg_addr.lval = ompi_ptr_ptol(src->des_src[i].seg_addr.pval); hdr->hdr_rget.hdr_segs[i].seg_len = src->des_src[i].seg_len; - hdr->hdr_rget.hdr_segs[i].seg_key.key64 = src->des_src[i].seg_key.key64; + hdr->hdr_rget.hdr_segs[i].seg_key.key64[0] = src->des_src[i].seg_key.key64[0]; + hdr->hdr_rget.hdr_segs[i].seg_key.key64[1] = src->des_src[i].seg_key.key64[1]; } des->des_cbfunc = mca_pml_ob1_send_ctl_completion; @@ -1223,7 +1224,8 @@ void mca_pml_ob1_send_request_put( mca_pml_ob1_send_request_t* sendreq, for( i = 0; i < hdr->hdr_seg_cnt; i++ ) { frag->rdma_segs[i].seg_addr.lval = hdr->hdr_segs[i].seg_addr.lval; frag->rdma_segs[i].seg_len = hdr->hdr_segs[i].seg_len; - frag->rdma_segs[i].seg_key.key64 = hdr->hdr_segs[i].seg_key.key64; + frag->rdma_segs[i].seg_key.key64[0] = hdr->hdr_segs[i].seg_key.key64[0]; + frag->rdma_segs[i].seg_key.key64[1] = hdr->hdr_segs[i].seg_key.key64[1]; #if OPAL_ENABLE_HETEROGENEOUS_SUPPORT if ((sendreq->req_send.req_base.req_proc->proc_arch & OPAL_ARCH_ISBIGENDIAN) !=