From d88df53a86d773c5000b826ec020bb7de4edfb3a Mon Sep 17 00:00:00 2001 From: Ralph Castain Date: Tue, 24 Mar 2009 01:36:31 +0000 Subject: [PATCH] A touch more cleanup. Also, bring over the peruse cleanups from r20844 This commit was SVN r20849. The following SVN revision numbers were found above: r20844 --> open-mpi/ompi@daba352af4afc023381521fe9d661ec238e59536 --- ompi/mca/pml/csum/pml_csum.c | 23 ++++++++++++++--------- ompi/mca/pml/csum/pml_csum_recvreq.c | 21 ++++++++++----------- 2 files changed, 24 insertions(+), 20 deletions(-) diff --git a/ompi/mca/pml/csum/pml_csum.c b/ompi/mca/pml/csum/pml_csum.c index 7166f4e9c9..3a69f6f690 100644 --- a/ompi/mca/pml/csum/pml_csum.c +++ b/ompi/mca/pml/csum/pml_csum.c @@ -28,11 +28,23 @@ #include #include "opal/class/opal_bitmap.h" +#include "opal/util/crc.h" +#include "opal/util/output.h" + +#include "orte/mca/errmgr/errmgr.h" +#include "orte/mca/grpcomm/grpcomm.h" +#include "orte/util/name_fns.h" +#include "orte/runtime/orte_globals.h" + #include "ompi/mca/pml/pml.h" #include "ompi/mca/pml/base/base.h" #include "ompi/mca/btl/btl.h" #include "ompi/mca/pml/base/base.h" #include "ompi/mca/btl/base/base.h" +#include "ompi/mca/bml/base/base.h" +#include "ompi/runtime/ompi_cr.h" +#include "ompi/runtime/ompi_module_exchange.h" + #include "pml_csum.h" #include "pml_csum_component.h" #include "pml_csum_comm.h" @@ -41,14 +53,6 @@ #include "pml_csum_sendreq.h" #include "pml_csum_recvreq.h" #include "pml_csum_rdmafrag.h" -#include "ompi/mca/bml/base/base.h" -#include "orte/mca/errmgr/errmgr.h" -#include "orte/mca/grpcomm/grpcomm.h" -#include "orte/util/name_fns.h" -#include "orte/runtime/orte_globals.h" -#include "opal/util/crc.h" -#include "ompi/runtime/ompi_cr.h" -#include "ompi/runtime/ompi_module_exchange.h" mca_pml_csum_t mca_pml_csum = { { @@ -450,7 +454,8 @@ int mca_pml_csum_send_fin( ompi_proc_t* proc, hdr->hdr_common.hdr_csum = (do_csum ? opal_csum16(hdr, sizeof(mca_pml_csum_fin_hdr_t)) : OPAL_CSUM_ZERO); if(do_csum) { - OPAL_OUTPUT_VERBOSE((0, "%s: Sending \'FIN\' with header csum:0x%04x\n", + OPAL_OUTPUT_VERBOSE((0, mca_pml_base_output, + "%s: Sending \'FIN\' with header csum:0x%04x\n", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), hdr->hdr_common.hdr_csum)); } diff --git a/ompi/mca/pml/csum/pml_csum_recvreq.c b/ompi/mca/pml/csum/pml_csum_recvreq.c index f5143b042f..9202fade96 100644 --- a/ompi/mca/pml/csum/pml_csum_recvreq.c +++ b/ompi/mca/pml/csum/pml_csum_recvreq.c @@ -514,7 +514,6 @@ void mca_pml_csum_recv_request_progress_rget( mca_pml_csum_recv_request_t* recvr recvreq->req_recv.req_bytes_packed = hdr->hdr_rndv.hdr_msg_length; MCA_PML_CSUM_RECV_REQUEST_MATCHED(recvreq, &hdr->hdr_rndv.hdr_match); - /* if receive buffer is not contiguous we can't just RDMA read into it, so * fall back to copy in/out protocol. It is a pity because buffer on the @@ -1026,7 +1025,7 @@ void mca_pml_csum_recv_req_start(mca_pml_csum_recv_request_t *req) * the cost of the request lock. */ PERUSE_TRACE_COMM_EVENT(PERUSE_COMM_SEARCH_UNEX_Q_BEGIN, - &(req->req_recv.req_base), PERUSE_RECV); + &(req->req_recv.req_base), PERUSE_RECV); /* assign sequence number */ req->req_recv.req_base.req_sequence = comm->recv_sequence++; @@ -1057,7 +1056,7 @@ void mca_pml_csum_recv_req_start(mca_pml_csum_recv_request_t *req) if(OPAL_UNLIKELY(NULL == frag)) { PERUSE_TRACE_COMM_EVENT(PERUSE_COMM_SEARCH_UNEX_Q_END, - &(req->req_recv.req_base), PERUSE_RECV); + &(req->req_recv.req_base), PERUSE_RECV); /* We didn't find any matches. Record this irecv so we can match it when the message comes in. */ append_recv_req_to_queue(queue, req); @@ -1066,22 +1065,22 @@ void mca_pml_csum_recv_req_start(mca_pml_csum_recv_request_t *req) } else { if(OPAL_LIKELY(!IS_PROB_REQ(req))) { PERUSE_TRACE_COMM_EVENT(PERUSE_COMM_REQ_MATCH_UNEX, - &(req->req_recv.req_base), PERUSE_RECV); + &(req->req_recv.req_base), PERUSE_RECV); + hdr = (mca_pml_csum_hdr_t*)frag->segments->seg_addr.pval; PERUSE_TRACE_MSG_EVENT(PERUSE_COMM_MSG_REMOVE_FROM_UNEX_Q, - req->req_recv.req_base.req_comm, - req->req_recv.req_base.req_ompi.req_status.MPI_SOURCE, - req->req_recv.req_base.req_ompi.req_status.MPI_TAG, - PERUSE_RECV); - + req->req_recv.req_base.req_comm, + hdr->hdr_match.hdr_src, + hdr->hdr_match.hdr_tag, + PERUSE_RECV); + PERUSE_TRACE_COMM_EVENT(PERUSE_COMM_SEARCH_UNEX_Q_END, - &(req->req_recv.req_base), PERUSE_RECV); + &(req->req_recv.req_base), PERUSE_RECV); opal_list_remove_item(&proc->unexpected_frags, (opal_list_item_t*)frag); OPAL_THREAD_UNLOCK(&comm->matching_lock); - hdr = (mca_pml_csum_hdr_t*)frag->segments->seg_addr.pval; switch(hdr->hdr_common.hdr_type) { case MCA_PML_CSUM_HDR_TYPE_MATCH: mca_pml_csum_recv_request_progress_match(req, frag->btl, frag->segments,