From 178d8ea905c8324daed7fa701aa68a0b9b88816d Mon Sep 17 00:00:00 2001 From: Tim Woodall Date: Thu, 16 Mar 2006 00:20:43 +0000 Subject: [PATCH] use consistent macros for csum This commit was SVN r9294. --- ompi/mca/pml/dr/pml_dr.h | 2 +- ompi/mca/pml/dr/pml_dr_recvfrag.c | 3 +-- ompi/mca/pml/dr/pml_dr_recvreq.h | 2 +- ompi/mca/pml/dr/pml_dr_sendreq.c | 6 +++--- 4 files changed, 6 insertions(+), 7 deletions(-) diff --git a/ompi/mca/pml/dr/pml_dr.h b/ompi/mca/pml/dr/pml_dr.h index 6a9a453841..33ebb29d56 100644 --- a/ompi/mca/pml/dr/pml_dr.h +++ b/ompi/mca/pml/dr/pml_dr.h @@ -34,6 +34,7 @@ #include "ompi/mca/pml/base/pml_base_sendreq.h" #include "ompi/mca/btl/btl.h" #include "ompi/datatype/datatype.h" +#include "ompi/datatype/datatype_internal.h" #if defined(c_plusplus) || defined(__cplusplus) extern "C" { @@ -251,6 +252,5 @@ extern int mca_pml_dr_start( MCA_BML_BASE_BTL_DES_ALLOC(bml_btl, des, \ sizeof(mca_pml_dr_hdr_t) + (sizeof(mca_btl_base_segment_t) << 4), size) -#define MCA_PML_DR_CSUM_ZERO 1 #endif diff --git a/ompi/mca/pml/dr/pml_dr_recvfrag.c b/ompi/mca/pml/dr/pml_dr_recvfrag.c index 35835a1d87..17f939ef8c 100644 --- a/ompi/mca/pml/dr/pml_dr_recvfrag.c +++ b/ompi/mca/pml/dr/pml_dr_recvfrag.c @@ -574,8 +574,7 @@ rematch: mca_pml_dr_recv_request_progress(match,btl,segments,num_segments); } else { size_t hdr_size = mca_pml_dr_hdr_size(hdr->hdr_common.hdr_type); - COMPUTE_SPECIFIC_CHECKSUM((void*)((unsigned char*)segments->seg_addr.pval + hdr_size), - segments->seg_len - hdr_size, csum); + csum = OMPI_CSUM((void*)((unsigned char*)segments->seg_addr.pval + hdr_size), segments->seg_len - hdr_size); assert(csum == hdr->hdr_csum); mca_pml_dr_recv_frag_unmatched_ack(hdr, ompi_proc, diff --git a/ompi/mca/pml/dr/pml_dr_recvreq.h b/ompi/mca/pml/dr/pml_dr_recvreq.h index 0ecfaf5084..545484d9b0 100644 --- a/ompi/mca/pml/dr/pml_dr_recvreq.h +++ b/ompi/mca/pml/dr/pml_dr_recvreq.h @@ -279,7 +279,7 @@ do { csum = request->req_recv.req_convertor.checksum; \ } else { \ bytes_delivered = 0; \ - csum = MCA_PML_DR_CSUM_ZERO; \ + csum = OMPI_CSUM_ZERO; \ } \ } while (0) diff --git a/ompi/mca/pml/dr/pml_dr_sendreq.c b/ompi/mca/pml/dr/pml_dr_sendreq.c index 0fd6401de4..edf3bc8576 100644 --- a/ompi/mca/pml/dr/pml_dr_sendreq.c +++ b/ompi/mca/pml/dr/pml_dr_sendreq.c @@ -426,7 +426,7 @@ int mca_pml_dr_send_request_start_copy( hdr->hdr_match.hdr_src = sendreq->req_send.req_base.req_comm->c_my_rank; hdr->hdr_match.hdr_tag = sendreq->req_send.req_base.req_tag; hdr->hdr_match.hdr_seq = sendreq->req_send.req_base.req_sequence; - hdr->hdr_match.hdr_csum = size > 0 ? sendreq->req_send.req_convertor.checksum : MCA_PML_DR_CSUM_ZERO; + hdr->hdr_match.hdr_csum = size > 0 ? sendreq->req_send.req_convertor.checksum : OMPI_CSUM_ZERO; hdr->hdr_match.hdr_src_ptr.pval = &sendreq->req_vfrag0; hdr->hdr_match.hdr_vid = sendreq->req_vfrag0.vf_id; hdr->hdr_common.hdr_csum = opal_csum(hdr, sizeof(mca_pml_dr_match_hdr_t)); @@ -494,7 +494,7 @@ int mca_pml_dr_send_request_start_prepare( hdr->hdr_match.hdr_src = sendreq->req_send.req_base.req_comm->c_my_rank; hdr->hdr_match.hdr_tag = sendreq->req_send.req_base.req_tag; hdr->hdr_match.hdr_seq = sendreq->req_send.req_base.req_sequence; - hdr->hdr_match.hdr_csum = size > 0 ? sendreq->req_send.req_convertor.checksum : MCA_PML_DR_CSUM_ZERO; + hdr->hdr_match.hdr_csum = size > 0 ? sendreq->req_send.req_convertor.checksum : OMPI_CSUM_ZERO; hdr->hdr_match.hdr_src_ptr.pval = &sendreq->req_vfrag0; hdr->hdr_match.hdr_vid = sendreq->req_vfrag0.vf_id; hdr->hdr_common.hdr_csum = opal_csum(hdr, sizeof(mca_pml_dr_match_hdr_t)); @@ -566,7 +566,7 @@ int mca_pml_dr_send_request_start_rndv( hdr->hdr_match.hdr_tag = sendreq->req_send.req_base.req_tag; hdr->hdr_match.hdr_seq = sendreq->req_send.req_base.req_sequence; hdr->hdr_match.hdr_src_ptr.pval = &sendreq->req_vfrag0; - hdr->hdr_match.hdr_csum = size > 0 ? sendreq->req_send.req_convertor.checksum : MCA_PML_DR_CSUM_ZERO; + hdr->hdr_match.hdr_csum = size > 0 ? sendreq->req_send.req_convertor.checksum : OMPI_CSUM_ZERO; hdr->hdr_match.hdr_vid = sendreq->req_vfrag0.vf_id; hdr->hdr_rndv.hdr_msg_length = sendreq->req_send.req_bytes_packed; hdr->hdr_common.hdr_csum = opal_csum(hdr, sizeof(mca_pml_dr_rendezvous_hdr_t));