Commit c85f3a2d authored by Xin Wang's avatar Xin Wang

fix merge error

parent 07964c4a
......@@ -1414,24 +1414,23 @@ static void codes_exec_mpi_recv(
// printf("\n Receive op posted num bytes %llu source %d ", recv_op->num_bytes,
// recv_op->source_rank);
int found_matching_sends = rm_matching_send(s, bf, m, lp, recv_op);
int found_matching_sends = rm_matching_send(s, bf, m, lp, recv_op);
/* save the req id inserted in the completed queue for reverse computation. */
if(found_matching_sends < 0)
{
m->fwd.found_match = -1;
/* for mpi irecvs, this is a non-blocking receive so just post it and move on with the trace read. */
if(mpi_op->op_type == CODES_WK_IRECV)
{
bf->c6 = 1;
codes_issue_next_event(lp);
}
/* save the req id inserted in the completed queue for reverse computation. */
if(found_matching_sends < 0)
{
m->fwd.found_match = -1;
qlist_add(&recv_op->ql, &s->pending_recvs_queue);
/* for mpi irecvs, this is a non-blocking receive so just post it and move on with the trace read. */
if(mpi_op->op_type == CODES_WK_IRECV)
{
bf->c6 = 1;
codes_issue_next_event(lp);
return;
}
}
else
{
else
{
//bf->c6 = 1;
m->fwd.found_match = found_matching_sends;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment