Merge pull request #3099 from artpol84/fix_ucx_req/v2.x

hppritcha · web-flow · commit e4798fbd596f · 2017-03-06T13:13:09.000-07:00
ompi/pml/ucx: Fix uninitialized UCX request field.
diff --git a/ompi/mca/pml/ucx/pml_ucx_request.c b/ompi/mca/pml/ucx/pml_ucx_request.c
@@ -165,7 +165,8 @@ static int mca_pml_ucx_persistent_request_free(ompi_request_t **rptr)
         mca_pml_ucx_persistent_request_detach(preq, tmp_req);
         ucp_request_free(tmp_req);
     }
-    if (MCA_PML_BASE_SEND_BUFFERED == preq->send.mode) {
+    if ((preq->flags & MCA_PML_UCX_REQUEST_FLAG_SEND) &&
+         (MCA_PML_BASE_SEND_BUFFERED == preq->send.mode)) {
         OBJ_RELEASE(preq->ompi_datatype);
     }
     PML_UCX_FREELIST_RETURN(&ompi_pml_ucx.persistent_reqs, &preq->ompi.super);

Original file line number	Diff line number	Diff line change
`@@ -165,7 +165,8 @@ static int mca_pml_ucx_persistent_request_free(ompi_request_t **rptr)`
`165`	`165`	`mca_pml_ucx_persistent_request_detach(preq, tmp_req);`
`166`	`166`	`ucp_request_free(tmp_req);`
`167`	`167`	`}`
`168`		`- if (MCA_PML_BASE_SEND_BUFFERED == preq->send.mode) {`
	`168`	`+ if ((preq->flags & MCA_PML_UCX_REQUEST_FLAG_SEND) &&`
	`169`	`+ (MCA_PML_BASE_SEND_BUFFERED == preq->send.mode)) {`
`169`	`170`	`OBJ_RELEASE(preq->ompi_datatype);`
`170`	`171`	`}`
`171`	`172`	`PML_UCX_FREELIST_RETURN(&ompi_pml_ucx.persistent_reqs, &preq->ompi.super);`