Skip to content

Retain the parent request and trigger events on it #58

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
devreal wants to merge 1 commit into
base: topic/persistent_only_in
Choose a base branch
from
Open

Retain the parent request and trigger events on it #58

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions ompi/mca/pml/ob1/pml_ob1_sendreq.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,12 @@ static int mca_pml_ob1_send_request_free(struct ompi_request_t** request)
sendreq->req_send.req_base.req_datatype);
);

/* release the parent request */
if (NULL != sendreq->req_parent) {
OBJ_RELEASE(sendreq->req_parent);
sendreq->req_parent = NULL;
}

MCA_PML_OB1_SEND_REQUEST_RETURN( sendreq );
}
*request = MPI_REQUEST_NULL;
Expand Down
21 changes: 12 additions & 9 deletions ompi/mca/pml/ob1/pml_ob1_sendreq.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ struct mca_pml_ob1_send_request_t {
opal_atomic_int32_t req_state;
opal_atomic_int32_t req_lock;
bool req_throttle_sends;
bool req_parent_complete;
opal_atomic_int32_t req_pipeline_depth;
opal_atomic_size_t req_bytes_delivered;
uint32_t req_rdma_cnt;
Expand Down Expand Up @@ -157,6 +158,7 @@ get_request_from_send_pending(mca_pml_ob1_send_pending_t *type)
persistent, \
0); /* convertor_flags */ \
(sendreq)->req_parent = NULL; \
(sendreq)->req_parent_complete = false; \
(sendreq)->req_recv.pval = NULL; \
}

Expand Down Expand Up @@ -208,17 +210,18 @@ do {
(sendreq)->req_send.req_base.req_tag; \
(sendreq)->req_send.req_base.req_ompi.req_status._ucount = \
(sendreq)->req_send.req_bytes_packed; \
if(NULL != (sendreq)->req_parent) { \
if (NULL != (sendreq)->req_parent) { \
PERUSE_TRACE_COMM_EVENT( PERUSE_COMM_REQ_COMPLETE, \
&(sendreq->req_parent->req_base), PERUSE_SEND); \
\
ompi_request_complete( &(sendreq)->req_parent->req_ompi, (with_signal) ); \
ompi_request_complete( &((sendreq)->req_send.req_base.req_ompi), false ); \
(sendreq)->req_parent = NULL; /* dissociate from parent */ \
&((sendreq)->req_parent), PERUSE_SEND); \
} else { \
PERUSE_TRACE_COMM_EVENT( PERUSE_COMM_REQ_COMPLETE, \
&(sendreq->req_send.req_base), PERUSE_SEND); \
\
&((sendreq)->req_send.req_base), PERUSE_SEND); \
} \
if(NULL != (sendreq)->req_parent && !(sendreq)->req_parent_complete) { \
ompi_request_complete( &(sendreq)->req_parent->req_ompi, (with_signal) ); \
ompi_request_complete( &(sendreq)->req_send.req_base.req_ompi, false ); \
(sendreq)->req_parent_complete = true; /* don't complete the parent again */ \
} else { \
ompi_request_complete( &((sendreq)->req_send.req_base.req_ompi), (with_signal) ); \
} \
} while(0)
Expand Down Expand Up @@ -487,7 +490,7 @@ mca_pml_ob1_send_request_start_seq (mca_pml_ob1_send_request_t* sendreq, mca_bml
bml_btl = mca_bml_base_btl_array_get_next(&endpoint->btl_eager);
rc = mca_pml_ob1_send_request_start_btl(sendreq, bml_btl);
#if OPAL_ENABLE_FT_MPI
/* this first condition to keep the optimized path with as
/* this first condition to keep the optimized path with as
* little tests as possible */
if( OPAL_LIKELY(MPI_SUCCESS == rc) ) {
return rc;
Expand Down
3 changes: 2 additions & 1 deletion ompi/mca/pml/ob1/pml_ob1_start.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,9 +72,10 @@ int mca_pml_ob1_start(size_t count, ompi_request_t** requests)
return rc;
}

/* reset the completion flag */
/* reset the completion flag and retain the parent flag */
pml_request->req_pml_complete = false;
sendreq->req_parent = pml_request;
OBJ_RETAIN(pml_request);

MCA_PML_OB1_SEND_REQUEST_START(sendreq, rc);
if(rc != OMPI_SUCCESS)
Expand Down