&& r1->comm_irecv.rdv != r2->comm_irecv.rdv)
return FALSE;
- /* If any of the request is a timeout wait, and it reached
- * this point, it won't be dependent with any other request. */
if(r1->call == REQ_COMM_WAIT && (r2->call == REQ_COMM_WAIT || r2->call == REQ_COMM_TEST)
&& (r1->comm_wait.comm->comm.src_proc == NULL
|| r1->comm_wait.comm->comm.dst_proc == NULL))
args = bprintf("comm=%p", act);
}else{
type = bprintf("Test TRUE");
- args = bprintf("comm=%p [%s -> %s]", act,
- act->comm.src_proc ? act->comm.src_proc->name : "",
- act->comm.dst_proc ? act->comm.dst_proc->name : "");
+ args = bprintf("comm=%p [(%lu)%s -> (%lu)%s]", act,
+ act->comm.src_proc ? act->comm.src_proc->pid : 0,
+ act->comm.src_proc ? act->comm.src_proc->name : "",
+ act->comm.dst_proc ? act->comm.dst_proc->pid : 0,
+ act->comm.dst_proc ? act->comm.dst_proc->name : "");
}
break;
case REQ_COMM_WAITANY:
type = bprintf("WaitAny");
- args = bprintf("-");
- /* FIXME: improve output */
+ args = bprintf("comm=%p (%d of %lu)", xbt_dynar_get_as(req->comm_waitany.comms, value, smx_action_t),
+ value+1, xbt_dynar_length(req->comm_waitany.comms));
break;
case REQ_COMM_TESTANY:
- type = bprintf("TestAny");
- args = bprintf("-");
- /* FIXME: improve output */
- break;
+ if(value == -1){
+ type = bprintf("TestAny FALSE");
+ args = bprintf("-");
+ }else{
+ type = bprintf("TestAny");
+ args = bprintf("(%d of %lu)", value+1, xbt_dynar_length(req->comm_testany.comms));
+ }
+ break;
default:
THROW_UNIMPLEMENTED;
return (act->comm.src_proc && act->comm.dst_proc);
break;
+ case REQ_COMM_TESTANY:
+ act = xbt_dynar_get_as(req->comm_testany.comms, idx, smx_action_t);
+ return (act->comm.src_proc && act->comm.dst_proc);
+ break;
+
default:
return TRUE;
}
{
smx_process_t process = NULL;
mc_procstate_t procstate = NULL;
-
+ unsigned int start_count;
xbt_swag_foreach(process, simix_global->process_list){
procstate = &state->proc_status[process->pid];
break;
case REQ_COMM_TESTANY:
+ start_count = procstate->interleave_count;
*value = -1;
- if(MC_request_testany_fail(&process->request)){
- procstate->state = MC_DONE;
- return &process->request;
- }
-
while(procstate->interleave_count < xbt_dynar_length(process->request.comm_testany.comms)){
if(MC_request_is_enabled_by_idx(&process->request, procstate->interleave_count++)){
*value = procstate->interleave_count - 1;
if(procstate->interleave_count >= xbt_dynar_length(process->request.comm_testany.comms))
procstate->state = MC_DONE;
- if(*value != -1)
+ if(*value != -1 || start_count == 0)
return &process->request;
break;