Skip to content

Commit 023bec0

Browse files
author
Ralph Castain
authored
Merge pull request #3022 from alex-mikheev/topic/ucx_request_fix_v1.10
ompi: pml ucx: fix race when ompi request is released
2 parents 3ed52c3 + c3a6272 commit 023bec0

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

ompi/mca/pml/ucx/pml_ucx.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -326,7 +326,7 @@ static void mca_pml_ucx_waitall(void **reqs, size_t *count_p)
326326
PML_UCX_ERROR("disconnect request failed: %s",
327327
ucs_status_string(status));
328328
}
329-
ucp_request_release(reqs[i]);
329+
ucp_request_free(reqs[i]);
330330
reqs[i] = NULL;
331331
}
332332

ompi/mca/pml/ucx/pml_ucx_request.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ static int mca_pml_ucx_request_free(ompi_request_t **rptr)
2121

2222
*rptr = MPI_REQUEST_NULL;
2323
mca_pml_ucx_request_reset(req);
24-
ucp_request_release(req);
24+
ucp_request_free(req);
2525
return OMPI_SUCCESS;
2626
}
2727

@@ -75,7 +75,7 @@ void mca_pml_ucx_persistent_request_complete(mca_pml_ucx_persistent_request_t *p
7575
ompi_request_complete(&preq->ompi, true);
7676
mca_pml_ucx_persistent_request_detach(preq, tmp_req);
7777
mca_pml_ucx_request_reset(tmp_req);
78-
ucp_request_release(tmp_req);
78+
ucp_request_free(tmp_req);
7979
}
8080

8181
static inline void mca_pml_ucx_preq_completion(ompi_request_t *tmp_req)
@@ -154,7 +154,7 @@ static int mca_pml_ucx_persistent_request_free(ompi_request_t **rptr)
154154
preq->ompi.req_state = OMPI_REQUEST_INVALID;
155155
if (tmp_req != NULL) {
156156
mca_pml_ucx_persistent_request_detach(preq, tmp_req);
157-
ucp_request_release(tmp_req);
157+
ucp_request_free(tmp_req);
158158
}
159159
PML_UCX_FREELIST_RETURN(&ompi_pml_ucx.persistent_reqs, &preq->ompi.super);
160160
*rptr = MPI_REQUEST_NULL;

0 commit comments

Comments
 (0)