Merge pull request #5463 from hoopoepg/topic/fixed-hang-pt2pt-over-pml-ucx-v3.1

bwbarrett · web-flow · commit 8c4ad553f3d0 · 2018-07-24T08:04:47.000-07:00
PML/UCX: fixed ucp request free on persistent request completion - v3.1
diff --git a/ompi/mca/pml/ucx/pml_ucx_request.c b/ompi/mca/pml/ucx/pml_ucx_request.c
@@ -85,10 +85,10 @@ mca_pml_ucx_persistent_request_complete(mca_pml_ucx_persistent_request_t *preq,
                                         ompi_request_t *tmp_req)
 {
     preq->ompi.req_status = tmp_req->req_status;
-    ompi_request_complete(&preq->ompi, true);
-    mca_pml_ucx_persistent_request_detach(preq, tmp_req);
     mca_pml_ucx_request_reset(tmp_req);
+    mca_pml_ucx_persistent_request_detach(preq, tmp_req);
     ucp_request_free(tmp_req);
+    ompi_request_complete(&preq->ompi, true);
 }
 
 static inline void mca_pml_ucx_preq_completion(ompi_request_t *tmp_req)

Original file line number	Diff line number	Diff line change
`@@ -85,10 +85,10 @@ mca_pml_ucx_persistent_request_complete(mca_pml_ucx_persistent_request_t *preq,`
`85`	`85`	`ompi_request_t *tmp_req)`
`86`	`86`	`{`
`87`	`87`	`preq->ompi.req_status = tmp_req->req_status;`
`88`		`- ompi_request_complete(&preq->ompi, true);`
`89`		`- mca_pml_ucx_persistent_request_detach(preq, tmp_req);`
`90`	`88`	`mca_pml_ucx_request_reset(tmp_req);`
	`89`	`+ mca_pml_ucx_persistent_request_detach(preq, tmp_req);`
`91`	`90`	`ucp_request_free(tmp_req);`
	`91`	`+ ompi_request_complete(&preq->ompi, true);`
`92`	`92`	`}`
`93`	`93`
`94`	`94`	`static inline void mca_pml_ucx_preq_completion(ompi_request_t *tmp_req)`