Merge pull request #425 from jsquyres/pr/ob1-peruse-fix

jsquyres · jsquyres · commit 16573b5bc55e · 2015-02-25T10:32:47.000-05:00
ob1: fix another PERUSE compile error
diff --git a/ompi/mca/pml/ob1/pml_ob1_sendreq.c b/ompi/mca/pml/ob1/pml_ob1_sendreq.c
@@ -15,6 +15,7 @@
  * Copyright (c) 2012      NVIDIA Corporation.  All rights reserved.
  * Copyright (c) 2012-2015 Los Alamos National Security, LLC. All rights
  *                         reserved.
+ * Copyright (c) 2015 Cisco Systems, Inc.  All rights reserved.
  * $COPYRIGHT$
  * 
  * Additional copyrights may follow
@@ -1168,7 +1169,7 @@ int mca_pml_ob1_send_request_put_frag( mca_pml_ob1_rdma_frag_t *frag )
     }
 
     PERUSE_TRACE_COMM_OMPI_EVENT( PERUSE_COMM_REQ_XFER_CONTINUE,
-                                  &(((mca_pml_ob1_send_request_t*)frag->rdma_req)->req_send.req_base), save_size, PERUSE_SEND );
+                                  &(((mca_pml_ob1_send_request_t*)frag->rdma_req)->req_send.req_base), frag->rdma_length, PERUSE_SEND );
 
     rc = mca_bml_base_put (bml_btl, frag->local_address, frag->remote_address, local_handle,
                            (mca_btl_base_registration_handle_t *) frag->remote_handle, frag->rdma_length,

Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,7 @@`
`15`	`15`	`* Copyright (c) 2012 NVIDIA Corporation. All rights reserved.`
`16`	`16`	`* Copyright (c) 2012-2015 Los Alamos National Security, LLC. All rights`
`17`	`17`	`* reserved.`
	`18`	`+ * Copyright (c) 2015 Cisco Systems, Inc. All rights reserved.`
`18`	`19`	`* $COPYRIGHT$`
`19`	`20`	`*`
`20`	`21`	`* Additional copyrights may follow`
`@@ -1168,7 +1169,7 @@ int mca_pml_ob1_send_request_put_frag( mca_pml_ob1_rdma_frag_t *frag )`
`1168`	`1169`	`}`
`1169`	`1170`
`1170`	`1171`	`PERUSE_TRACE_COMM_OMPI_EVENT( PERUSE_COMM_REQ_XFER_CONTINUE,`
`1171`		`- &(((mca_pml_ob1_send_request_t*)frag->rdma_req)->req_send.req_base), save_size, PERUSE_SEND );`
	`1172`	`+ &(((mca_pml_ob1_send_request_t*)frag->rdma_req)->req_send.req_base), frag->rdma_length, PERUSE_SEND );`
`1172`	`1173`
`1173`	`1174`	`rc = mca_bml_base_put (bml_btl, frag->local_address, frag->remote_address, local_handle,`
`1174`	`1175`	`(mca_btl_base_registration_handle_t *) frag->remote_handle, frag->rdma_length,`