A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Revert "got a "might be clobbered by ‘longjmp’ or ‘vfork’" error when compiled"
[simgrid.git]
/
src
/
simix
/
smx_process.c
diff --git
a/src/simix/smx_process.c
b/src/simix/smx_process.c
index
d08aead
..
326f0ae
100644
(file)
--- a/
src/simix/smx_process.c
+++ b/
src/simix/smx_process.c
@@
-329,21
+329,26
@@
void SIMIX_pre_process_change_host(smx_process_t process, smx_host_t dest)
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);
- return;
+ return
NULL
;
}
process->suspended = 1;
}
process->suspended = 1;
@@
-373,7
+378,13
@@
void SIMIX_process_suspend(smx_process_t process, smx_process_t issuer)
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);
}
}
}
}
@@
-381,6
+392,9
@@
void SIMIX_process_resume(smx_process_t process, smx_process_t issuer)
{
xbt_assert((process != NULL), "Invalid parameters");
{
xbt_assert((process != NULL), "Invalid parameters");
+ if(process->context->iwannadie)
+ return;
+
process->suspended = 0;
/* If we are resuming another process, resume the action it was waiting for
process->suspended = 0;
/* If we are resuming another process, resume the action it was waiting for
@@
-410,8
+424,9
@@
void SIMIX_process_resume(smx_process_t process, smx_process_t issuer)
}
}
else {
}
}
else {
- 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);
}
}
}
}
}
}