From 52ff849ecbe3afca484fe2b4c7f81983a9af4209 Mon Sep 17 00:00:00 2001 From: Tim Woodall Date: Mon, 6 Dec 2004 17:43:23 +0000 Subject: [PATCH] fill in request status This commit was SVN r3711. --- src/mca/ptl/sm/src/ptl_sm.c | 3 --- src/mca/ptl/sm/src/ptl_sm_component.c | 12 ++++++++++-- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/src/mca/ptl/sm/src/ptl_sm.c b/src/mca/ptl/sm/src/ptl_sm.c index aacfa1036e..d3aadba7d5 100644 --- a/src/mca/ptl/sm/src/ptl_sm.c +++ b/src/mca/ptl/sm/src/ptl_sm.c @@ -827,14 +827,11 @@ int mca_ptl_sm_send_continue( /* pack data in payload buffer */ convertor = &sendreq->req_convertor; -#if 0 - ompi_convertor_copy(&sendreq->req_convertor, convertor); ompi_convertor_init_for_send( convertor, 0, sendreq->req_datatype, sendreq->req_count, sendreq->req_addr, offset, NULL); -#endif sm_data_ptr=send_frag->buff; /* set up the shared memory iovec */ diff --git a/src/mca/ptl/sm/src/ptl_sm_component.c b/src/mca/ptl/sm/src/ptl_sm_component.c index c938fd66b8..6a83aee02e 100644 --- a/src/mca/ptl/sm/src/ptl_sm_component.c +++ b/src/mca/ptl/sm/src/ptl_sm_component.c @@ -372,10 +372,14 @@ int mca_ptl_sm_component_progress(mca_ptl_tstamp_t tstamp) (mca_ptl_base_recv_frag_t *)header_ptr); if( frag_matched ) { /* deliver data, and ack */ + mca_ptl_base_match_header_t *hdr = &header_ptr->super.frag_base.frag_header.hdr_match; + mca_pml_base_recv_request_t *request = header_ptr->super.frag_request; + request->req_bytes_packed = hdr->hdr_msg_length; + request->req_base.req_ompi.req_status.MPI_SOURCE = hdr->hdr_src; + request->req_base.req_ompi.req_status.MPI_TAG = hdr->hdr_tag; mca_ptl_sm_matched_same_base_addr( (mca_ptl_base_module_t *)&mca_ptl_sm, (mca_ptl_base_recv_frag_t *)header_ptr); - } break; @@ -482,9 +486,13 @@ int mca_ptl_sm_component_progress(mca_ptl_tstamp_t tstamp) (mca_ptl_base_recv_frag_t *)header_ptr); if( frag_matched ) { /* deliver data, and ack */ + mca_ptl_base_match_header_t *hdr = &header_ptr->super.frag_base.frag_header.hdr_match; + mca_pml_base_recv_request_t *request = header_ptr->super.frag_request; + request->req_bytes_packed = hdr->hdr_msg_length; + request->req_base.req_ompi.req_status.MPI_SOURCE = hdr->hdr_src; + request->req_base.req_ompi.req_status.MPI_TAG = hdr->hdr_tag; mca_ptl_sm_matched((mca_ptl_base_module_t *)&mca_ptl_sm, (mca_ptl_base_recv_frag_t *)header_ptr); - } break;