Rename req_bytes_delivered to req_bytes_expected for the receive

requests to really reflect what this field means.

This commit was SVN r20971.

ompi/mca/pml/ob1/pml_ob1_recvfrag.c

@@ -2,7 +2,7 @@
  * Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
  *                         University Research and Technology
  *                         Corporation.  All rights reserved.
- * Copyright (c) 2004-2008 The University of Tennessee and The University
+ * Copyright (c) 2004-2009 The University of Tennessee and The University
  *                         of Tennessee Research Foundation.  All rights
  *                         reserved.
  * Copyright (c) 2004-2007 High Performance Computing Center Stuttgart, 
@@ -189,7 +189,7 @@ void mca_pml_ob1_recv_frag_callback_match(mca_btl_base_module_t* btl,
         match->req_recv.req_bytes_packed = bytes_received;
         
         MCA_PML_OB1_RECV_REQUEST_MATCHED(match, hdr);
-        if(match->req_bytes_delivered > 0) { 
+        if(match->req_bytes_expected > 0) { 
             struct iovec iov[2];
             uint32_t iov_count = 1;
             

ompi/mca/pml/ob1/pml_ob1_recvreq.c

@@ -2,7 +2,7 @@
  * Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
  *                         University Research and Technology
  *                         Corporation.  All rights reserved.
- * Copyright (c) 2004-2008 The University of Tennessee and The University
+ * Copyright (c) 2004-2009 The University of Tennessee and The University
  *                         of Tennessee Research Foundation.  All rights
  *                         reserved.
  * Copyright (c) 2004-2008 High Performance Computing Center Stuttgart, 
@@ -673,7 +673,7 @@ void mca_pml_ob1_recv_request_matched_probe( mca_pml_ob1_recv_request_t* recvreq
     recvreq->req_recv.req_base.req_ompi.req_status.MPI_TAG = hdr->hdr_match.hdr_tag;
     recvreq->req_recv.req_base.req_ompi.req_status.MPI_SOURCE = hdr->hdr_match.hdr_src;
     recvreq->req_bytes_received = bytes_packed;
-    recvreq->req_bytes_delivered = bytes_packed;
+    recvreq->req_bytes_expected = bytes_packed;
     recv_request_pml_complete(recvreq);
 }
 
@@ -933,7 +933,7 @@ void mca_pml_ob1_recv_req_start(mca_pml_ob1_recv_request_t *req)
     req->req_lock = 0;
     req->req_pipeline_depth = 0;
     req->req_bytes_received = 0;
-    req->req_bytes_delivered = 0;
+    req->req_bytes_expected = 0;
     /* What about req_rdma_cnt ? */
     req->req_rdma_idx = 0;
     req->req_pending = false;

ompi/mca/pml/ob1/pml_ob1_recvreq.h

@@ -2,7 +2,7 @@
  * Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
  *                         University Research and Technology
  *                         Corporation.  All rights reserved.
- * Copyright (c) 2004-2008 The University of Tennessee and The University
+ * Copyright (c) 2004-2009 The University of Tennessee and The University
  *                         of Tennessee Research Foundation.  All rights
  *                         reserved.
  * Copyright (c) 2004-2007 High Performance Computing Center Stuttgart, 
@@ -39,7 +39,7 @@ struct mca_pml_ob1_recv_request_t {
     int32_t req_lock;
     size_t  req_pipeline_depth;
     size_t  req_bytes_received;  /**< amount of data transferred into the user buffer */
-    size_t  req_bytes_delivered; /**< local size of the data as suggested by the user */
+    size_t  req_bytes_expected; /**< local size of the data as suggested by the user */
     size_t  req_rdma_offset;
     size_t  req_send_offset;
     uint32_t req_rdma_cnt;
@@ -166,7 +166,7 @@ recv_request_pml_complete(mca_pml_ob1_recv_request_t *recvreq)
         recvreq->req_recv.req_base.req_pml_complete = true;
         recvreq->req_recv.req_base.req_ompi.req_status._count =
             (int)recvreq->req_bytes_received;
-        if (recvreq->req_recv.req_bytes_packed > recvreq->req_bytes_delivered) {
+        if (recvreq->req_recv.req_bytes_packed > recvreq->req_bytes_expected) {
             recvreq->req_recv.req_base.req_ompi.req_status._count =
                 (int)recvreq->req_recv.req_bytes_packed;
             recvreq->req_recv.req_base.req_ompi.req_status.MPI_ERROR =
@@ -206,7 +206,7 @@ static inline void prepare_recv_req_converter(mca_pml_ob1_recv_request_t *req)
                 0,
                 &req->req_recv.req_base.req_convertor);
         ompi_convertor_get_unpacked_size(&req->req_recv.req_base.req_convertor,
-                &req->req_bytes_delivered);
+                                         &req->req_bytes_expected);
     }
 }
 

ompi/mca/pml/ob1/pml_ob1_sendreq.h

@@ -2,7 +2,7 @@
  * Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
  *                         University Research and Technology
  *                         Corporation.  All rights reserved.
- * Copyright (c) 2004-2008 The University of Tennessee and The University
+ * Copyright (c) 2004-2009 The University of Tennessee and The University
  *                         of Tennessee Research Foundation.  All rights
  *                         reserved.
  * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, 
@@ -148,7 +148,7 @@ get_request_from_send_pending(mca_pml_ob1_send_pending_t *type)
                                        comm,                            \
                                        sendmode,                        \
                                        persistent,                      \
-                                       0);                              \
+                                       0); /* convertor_flags */        \
         (sendreq)->req_recv.pval = NULL;                                \
     }