xbt_swag_remove(process, simix_global->process_list);
xbt_swag_remove(process, process->smx_host->process_list);
xbt_swag_insert(process, simix_global->process_to_destroy);
+ process->context->iwannadie = 0;
}
/**
break;
}
}
-
- xbt_dynar_push_as(simix_global->process_to_run, smx_process_t, process);
+ if(!xbt_dynar_member(simix_global->process_to_run, &(process)))
+ xbt_dynar_push_as(simix_global->process_to_run, smx_process_t, 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);
+ } 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 */
}
-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);
- return;
+ return NULL;
}
process->suspended = 1;
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);
}
}
{
xbt_assert((process != NULL), "Invalid parameters");
- if (!process->suspended) {
- XBT_DEBUG("Process '%s' is not suspended", process->name);
+ if(process->context->iwannadie)
return;
- }
process->suspended = 0;
}
}
else {
- 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);
}
}
}
}
return NULL;
}
+
+/** @brief returns a dynar containg all currently existing processes */
+xbt_dynar_t SIMIX_processes_as_dynar(void) {
+ smx_process_t proc;
+ xbt_dynar_t res = xbt_dynar_new(sizeof(smx_process_t),NULL);
+ xbt_swag_foreach(proc, simix_global->process_list) {
+ xbt_dynar_push(res,&proc);
+ }
+ return res;
+}