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
Merge branch 'master' into vmtrace
[simgrid.git]
/
src
/
simix
/
smx_process.c
diff --git
a/src/simix/smx_process.c
b/src/simix/smx_process.c
index
1a050b2
..
434f87a
100644
(file)
--- a/
src/simix/smx_process.c
+++ b/
src/simix/smx_process.c
@@
-248,6
+248,7
@@
void SIMIX_process_create(smx_process_t *process,
(*process)->data = data;
(*process)->comms = xbt_fifo_new();
(*process)->simcall.issuer = *process;
(*process)->data = data;
(*process)->comms = xbt_fifo_new();
(*process)->simcall.issuer = *process;
+
/* Process data for auto-restart */
(*process)->auto_restart = auto_restart;
(*process)->code = code;
/* Process data for auto-restart */
(*process)->auto_restart = auto_restart;
(*process)->code = code;
@@
-634,7
+635,7
@@
void SIMIX_pre_process_sleep(smx_simcall_t simcall, double duration)
{
if (MC_is_active()) {
MC_process_clock_add(simcall->issuer, duration);
{
if (MC_is_active()) {
MC_process_clock_add(simcall->issuer, duration);
- simcall
->process_sleep.result = SIMIX_DONE
;
+ simcall
_process_sleep__set__result(simcall, SIMIX_DONE)
;
SIMIX_simcall_answer(simcall);
return;
}
SIMIX_simcall_answer(simcall);
return;
}
@@
-697,7
+698,7
@@
void SIMIX_post_process_sleep(smx_action_t action)
workstation.get_state(simcall->issuer->smx_host->host) != SURF_RESOURCE_ON) {
simcall->issuer->context->iwannadie = 1;
}
workstation.get_state(simcall->issuer->smx_host->host) != SURF_RESOURCE_ON) {
simcall->issuer->context->iwannadie = 1;
}
- simcall
->process_sleep.result = state
;
+ simcall
_process_sleep__set__result(simcall, state)
;
simcall->issuer->waiting_action = NULL;
SIMIX_simcall_answer(simcall);
simcall->issuer->waiting_action = NULL;
SIMIX_simcall_answer(simcall);