SIMIX_request_name(issuer->request.call), issuer->request.call);
SIMIX_process_yield();
} else {
- SIMIX_request_pre(&issuer->request);
+ SIMIX_request_pre(&issuer->request, 0);
}
}
smx_req_t SIMIX_request_pop(void)
{
- return xbt_heap_pop(req_todo);
+ smx_req_t req = xbt_heap_pop(req_todo);
+ if(req)
+ DEBUG4("Popped request %s (%d) of %s; now %d requests waiting",
+ SIMIX_request_name(req->issuer->request.call),
+ req->issuer->request.call,
+ req->issuer->name,xbt_heap_size(req_todo));
+ return req;
}
void SIMIX_request_answer(smx_req_t req)
{
if (req->issuer != simix_global->maestro_process){
+ DEBUG2("Answer request %s (%d)", SIMIX_request_name(req->call), req->call);
req->issuer->request.call = REQ_NO_REQ;
xbt_dynar_push_as(simix_global->process_to_run, smx_process_t, req->issuer);
}
|| req->call == REQ_COMM_IRECV
|| req->call == REQ_COMM_WAIT
|| req->call == REQ_COMM_WAITANY
- || req->call == REQ_COMM_TEST;
+ || req->call == REQ_COMM_TEST
+ || req->call == REQ_COMM_TESTANY;
}
int SIMIX_request_is_enabled(smx_req_t req)
case REQ_COMM_WAIT:
/* FIXME: check also that src and dst processes are not suspended */
- if (req->comm_wait.comm->comm.src_proc
- && req->comm_wait.comm->comm.dst_proc)
- return TRUE;
- return FALSE;
+ act = req->comm_wait.comm;
+ return (act->comm.src_proc && act->comm.dst_proc);
break;
case REQ_COMM_WAITANY:
return FALSE;
break;
+ case REQ_COMM_TEST:
+ act = req->comm_test.comm;
+ return (act->comm.src_proc && act->comm.dst_proc);
+ break;
+
default:
return TRUE;
}
}
+int SIMIX_request_is_enabled_by_idx(smx_req_t req, unsigned int idx)
+{
+ smx_action_t act;
+
+ switch (req->call) {
+
+ case REQ_COMM_WAIT:
+ /* FIXME: check also that src and dst processes are not suspended */
+ act = req->comm_wait.comm;
+ return (act->comm.src_proc && act->comm.dst_proc);
+ break;
+
+ case REQ_COMM_WAITANY:
+ act = xbt_dynar_get_as(req->comm_waitany.comms, idx, smx_action_t);
+ return (act->comm.src_proc && act->comm.dst_proc);
+ break;
+
+ default:
+ return TRUE;
+ }
+}
-void SIMIX_request_pre(smx_req_t req)
+void SIMIX_request_pre(smx_req_t req, unsigned int value)
{
switch (req->call) {
case REQ_NO_REQ:
break;
case REQ_COMM_WAITANY:
- SIMIX_pre_comm_waitany(req);
+ SIMIX_pre_comm_waitany(req, value);
break;
case REQ_COMM_WAIT:
break;
case REQ_COMM_TESTANY:
- SIMIX_pre_comm_testany(req);
+ SIMIX_pre_comm_testany(req, value);
break;
case REQ_COMM_GET_REMAINS: