XBT_DEBUG("iprobe from %p %p\n", rdv, rdv->comm_fifo);
smx_action_t this_action = SIMIX_comm_new(SIMIX_COMM_RECEIVE);
- smx_action_t other_action;
+ smx_action_t other_action=NULL;
if(rdv->permanent_receiver && xbt_fifo_size(rdv->done_comm_fifo)!=0){
//find a match in the already received fifo
+ XBT_DEBUG("first try in the perm recv mailbox \n");
+
other_action = SIMIX_fifo_probe_comm(rdv->done_comm_fifo, SIMIX_COMM_SEND, match_fun, data, this_action);
- }else{
- other_action = SIMIX_fifo_probe_comm(rdv->comm_fifo, SIMIX_COMM_SEND, match_fun, data, this_action);
}
+ // }else{
+ if(!other_action){
+ XBT_DEBUG("second try in the other mailbox");
+ other_action = SIMIX_fifo_probe_comm(rdv->comm_fifo, SIMIX_COMM_SEND, match_fun, data, this_action);
+ }
+// }
if(other_action)other_action->comm.refcount--;
SIMIX_comm_destroy(this_action);
static int match_recv(void* a, void* b, smx_action_t ignored) {
MPI_Request ref = (MPI_Request)a;
MPI_Request req = (MPI_Request)b;
+ XBT_DEBUG("Trying to match a recv of src %d against %d, tag %d against %d",ref->src,req->src, ref->tag, req->tag);
xbt_assert(ref, "Cannot match recv against null reference");
xbt_assert(req, "Cannot match recv against null request");
static int match_send(void* a, void* b,smx_action_t ignored) {
MPI_Request ref = (MPI_Request)a;
MPI_Request req = (MPI_Request)b;
-
+ XBT_DEBUG("Trying to match a send of src %d against %d, tag %d against %d",ref->src,req->src, ref->tag, req->tag);
xbt_assert(ref, "Cannot match send against null reference");
xbt_assert(req, "Cannot match send against null request");
return (req->src == MPI_ANY_SOURCE || req->src == ref->src)
int tag, MPI_Comm comm)
{
MPI_Request request;
-
request = smpi_mpi_isend(buf, count, datatype, dst, tag, comm);
smpi_mpi_wait(&request, MPI_STATUS_IGNORE);
}
}
int smpi_mpi_test(MPI_Request * request, MPI_Status * status) {
-int flag;
-
- if ((*request)->action == NULL)
- flag = 1;
- else
+ int flag;
+ if ((*request)->action == NULL)
+ flag = 1;
+ else
flag = simcall_comm_test((*request)->action);
- if(flag) {
- finish_wait(request, status);
- }
- return flag;
+ if(flag) {
+ finish_wait(request, status);
+ }
+ return flag;
}
int smpi_mpi_testany(int count, MPI_Request requests[], int *index,
int flag=1;
int i;
for(i=0; i<count; i++)
- if (smpi_mpi_test(&requests[i], &status[i])!=1)
+ if(requests[i]!= MPI_REQUEST_NULL)
+ if (smpi_mpi_test(&requests[i], &status[i])!=1)
flag=0;
return flag;
int flag=0;
//FIXME find another wait to avoid busy waiting ?
// the issue here is that we have to wait on a nonexistent comm
- MPI_Request request;
while(flag==0){
- request = smpi_mpi_iprobe(source, tag, comm, &flag, status);
+ smpi_mpi_iprobe(source, tag, comm, &flag, status);
XBT_DEBUG("Busy Waiting on probing : %d", flag);
if(!flag) {
- smpi_mpi_request_free(&request);
simcall_process_sleep(0.0001);
}
}
}
-MPI_Request smpi_mpi_iprobe(int source, int tag, MPI_Comm comm, int* flag, MPI_Status* status){
+void smpi_mpi_iprobe(int source, int tag, MPI_Comm comm, int* flag, MPI_Status* status){
MPI_Request request =build_request(NULL, 0, MPI_CHAR, source, smpi_comm_rank(comm), tag,
comm, NON_PERSISTENT | RECV);
// behave like a receive, but don't do it
// We have to test both mailboxes as we don't know if we will receive one one or another
if (xbt_cfg_get_int(_surf_cfg_set, "smpi/async_small_thres")>0){
mailbox = smpi_process_mailbox_small();
+ XBT_DEBUG("trying to probe the perm recv mailbox");
request->action = simcall_comm_iprobe(mailbox, request->src, request->tag, &match_recv, (void*)request);
-
}
if (request->action==NULL){
mailbox = smpi_process_mailbox();
+ XBT_DEBUG("trying to probe the other mailbox");
request->action = simcall_comm_iprobe(mailbox, request->src, request->tag, &match_recv, (void*)request);
}
}
}
else *flag=false;
+ smpi_mpi_request_free(&request);
- return request;
+ return;
}
void smpi_mpi_wait(MPI_Request * request, MPI_Status * status)
smpi_mpi_startall(size - 1, requests);
for(src = 0; src < size - 1; src++) {
index = smpi_mpi_waitany(size - 1, requests, MPI_STATUS_IGNORE);
- XBT_VERB("finished waiting any request with index %d", index);
+ XBT_DEBUG("finished waiting any request with index %d", index);
if(index == MPI_UNDEFINED) {
break;
}