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' of scm.gforge.inria.fr:/gitroot/simgrid/simgrid into gforge
[simgrid.git]
/
src
/
simix
/
smx_smurf.c
diff --git
a/src/simix/smx_smurf.c
b/src/simix/smx_smurf.c
index
fb7d994
..
840166a
100644
(file)
--- a/
src/simix/smx_smurf.c
+++ b/
src/simix/smx_smurf.c
@@
-94,8
+94,8
@@
void SIMIX_request_answer(smx_req_t req)
void SIMIX_request_pre(smx_req_t req, int value)
{
void SIMIX_request_pre(smx_req_t req, int value)
{
- switch (req->call) {
+ switch (req->call) {
case REQ_COMM_TEST:
SIMIX_pre_comm_test(req);
break;
case REQ_COMM_TEST:
SIMIX_pre_comm_test(req);
break;
@@
-362,7
+362,12
@@
void SIMIX_request_pre(smx_req_t req, int value)
break;
case REQ_PROCESS_KILL:
break;
case REQ_PROCESS_KILL:
- SIMIX_process_kill(req->process_kill.process, req->issuer);
+ SIMIX_process_kill(req->process_kill.process);
+ SIMIX_request_answer(req);
+ break;
+
+ case REQ_PROCESS_KILLALL:
+ SIMIX_process_killall(req->issuer);
SIMIX_request_answer(req);
break;
SIMIX_request_answer(req);
break;
@@
-372,9
+377,8
@@
void SIMIX_request_pre(smx_req_t req, int value)
break;
case REQ_PROCESS_CHANGE_HOST:
break;
case REQ_PROCESS_CHANGE_HOST:
- SIMIX_process_change_host(
+ SIMIX_pr
e_pr
ocess_change_host(
req->process_change_host.process,
req->process_change_host.process,
- req->process_change_host.source,
req->process_change_host.dest);
SIMIX_request_answer(req);
break;
req->process_change_host.dest);
SIMIX_request_answer(req);
break;
@@
-530,7
+534,7
@@
void SIMIX_request_pre(smx_req_t req, int value)
break;
case REQ_NO_REQ:
break;
case REQ_NO_REQ:
- THROW
2
(arg_error,0,"Asked to do the noop syscall on %s@%s",
+ THROW
F
(arg_error,0,"Asked to do the noop syscall on %s@%s",
SIMIX_process_get_name(req->issuer),
SIMIX_host_get_name(SIMIX_process_get_host(req->issuer))
);
SIMIX_process_get_name(req->issuer),
SIMIX_host_get_name(SIMIX_process_get_host(req->issuer))
);