A process that suspends himself did not create any surf action. When
processing the simcall, the maestro only set the process as suspended
and did not answer the simcall. Likewise a resume would simply wake up
the process. A problem with this is that if the corresponding host ever
went down, the suspended process would never have realized.
For the moment, just die whenever a process is suspended and it is not
waiting on an action that can be be suspended. The consequence is that
there is no reason to wake up a process that did not have any waiting
action. Again, DIE if this ever happens for the moment.
void SIMIX_pre_process_suspend(smx_simcall_t simcall)
{
smx_process_t process = simcall->process_suspend.process;
void SIMIX_pre_process_suspend(smx_simcall_t simcall)
{
smx_process_t process = simcall->process_suspend.process;
- SIMIX_process_suspend(process, simcall->issuer);
+ smx_action_t action_suspend =
+ SIMIX_process_suspend(process, simcall->issuer);
if (process != simcall->issuer) {
SIMIX_simcall_answer(simcall);
if (process != simcall->issuer) {
SIMIX_simcall_answer(simcall);
+ } else {
+ xbt_fifo_push(action_suspend->simcalls, simcall);
+ process->waiting_action = action_suspend;
+ SIMIX_host_execution_suspend(process->waiting_action);
}
/* If we are suspending ourselves, then just do not finish the simcall now */
}
}
/* If we are suspending ourselves, then just do not finish the simcall now */
}
-void SIMIX_process_suspend(smx_process_t process, smx_process_t issuer)
+smx_action_t SIMIX_process_suspend(smx_process_t process, smx_process_t issuer)
{
xbt_assert((process != NULL), "Invalid parameters");
if (process->suspended) {
XBT_DEBUG("Process '%s' is already suspended", process->name);
{
xbt_assert((process != NULL), "Invalid parameters");
if (process->suspended) {
XBT_DEBUG("Process '%s' is already suspended", process->name);
}
process->suspended = 1;
}
process->suspended = 1;
xbt_die("Internal error in SIMIX_process_suspend: unexpected action type %d",
(int)process->waiting_action->type);
}
xbt_die("Internal error in SIMIX_process_suspend: unexpected action type %d",
(int)process->waiting_action->type);
}
+ return NULL;
+ } else {
+ DIE_IMPOSSIBLE;
+ return NULL;
+ } else {
+ return SIMIX_host_execute("suspend", process->smx_host, 0.0, 1.0);
- if(!xbt_dynar_member(simix_global->process_to_run, &(process)))
- xbt_dynar_push_as(simix_global->process_to_run, smx_process_t, process);
+ DIE_IMPOSSIBLE;
+// if(!xbt_dynar_member(simix_global->process_to_run, &(process)))
+// xbt_dynar_push_as(simix_global->process_to_run, smx_process_t, process);
smx_host_t dest);
void SIMIX_pre_process_change_host(smx_process_t process, smx_host_t host);
void SIMIX_pre_process_suspend(smx_simcall_t simcall);
smx_host_t dest);
void SIMIX_pre_process_change_host(smx_process_t process, smx_host_t host);
void SIMIX_pre_process_suspend(smx_simcall_t simcall);
-void SIMIX_process_suspend(smx_process_t process, smx_process_t issuer);
+smx_action_t SIMIX_process_suspend(smx_process_t process, smx_process_t issuer);
void SIMIX_process_resume(smx_process_t process, smx_process_t issuer);
void* SIMIX_process_get_data(smx_process_t process);
void SIMIX_process_set_data(smx_process_t process, void *data);
void SIMIX_process_resume(smx_process_t process, smx_process_t issuer);
void* SIMIX_process_get_data(smx_process_t process);
void SIMIX_process_set_data(smx_process_t process, void *data);