From 612734f395e57c204c6fc245ef96f46fb5c75591 Mon Sep 17 00:00:00 2001 From: Tim Woodall Date: Fri, 15 Jul 2005 16:17:33 +0000 Subject: [PATCH] set request status on start This commit was SVN r6526. --- ompi/mca/pml/ob1/pml_ob1_recvreq.h | 4 +++- ompi/mca/pml/ob1/pml_ob1_sendreq.h | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/ompi/mca/pml/ob1/pml_ob1_recvreq.h b/ompi/mca/pml/ob1/pml_ob1_recvreq.h index fe9dd85fc4..9606b4305b 100644 --- a/ompi/mca/pml/ob1/pml_ob1_recvreq.h +++ b/ompi/mca/pml/ob1/pml_ob1_recvreq.h @@ -241,7 +241,7 @@ do { bytes_received, \ bytes_delivered) \ do { \ - if(request->req_recv.req_base.req_count > 0) { \ + if(request->req_recv.req_bytes_packed > 0) { \ struct iovec iov[MCA_BTL_DES_MAX_SEGMENTS]; \ uint32_t iov_count = 0; \ size_t max_data = bytes_received; \ @@ -268,6 +268,8 @@ do { &max_data, \ &free_after); \ bytes_delivered = max_data; \ + } else { \ + bytes_delivered = 0; \ } \ } while (0) diff --git a/ompi/mca/pml/ob1/pml_ob1_sendreq.h b/ompi/mca/pml/ob1/pml_ob1_sendreq.h index 7b6d83dc42..89c6556d2b 100644 --- a/ompi/mca/pml/ob1/pml_ob1_sendreq.h +++ b/ompi/mca/pml/ob1/pml_ob1_sendreq.h @@ -170,15 +170,17 @@ OBJ_CLASS_DECLARATION(mca_pml_ob1_send_request_t); mca_pml_ob1_endpoint_t* endpoint; \ mca_pml_ob1_proc_t* proc = sendreq->req_proc; \ \ + MCA_PML_OB1_SEND_REQUEST_TSTAMPS_INIT(sendreq); \ + \ /* select next endpoint */ \ endpoint = mca_pml_ob1_ep_array_get_next(&proc->btl_eager); \ sendreq->req_lock = 0; \ - MCA_PML_OB1_SEND_REQUEST_TSTAMPS_INIT(sendreq); \ sendreq->req_pipeline_depth = 0; \ sendreq->req_bytes_delivered = 0; \ sendreq->req_chunk = NULL; \ sendreq->req_send_offset = 0; \ sendreq->req_state = MCA_PML_OB1_SR_START; \ + sendreq->req_send.req_base.req_pml_complete = false; \ sendreq->req_send.req_base.req_ompi.req_complete = false; \ sendreq->req_send.req_base.req_ompi.req_state = OMPI_REQUEST_ACTIVE; \ sendreq->req_send.req_base.req_sequence = OPAL_THREAD_ADD32(&proc->proc_sequence,1); \