Merge branch 'master' of git+ssh://scm.gforge.inria.fr//gitroot//simgrid/simgrid

[simgrid.git] / src / simix / smx_smurf.c

diff --git a/src/simix/smx_smurf.c b/src/simix/smx_smurf.c
index d92bfdc..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)
 {
-  switch (req->call) {
 
+  switch (req->call) {
     case REQ_COMM_TEST:
       SIMIX_pre_comm_test(req);
       break;
@@ -362,14 +362,23 @@ void SIMIX_request_pre(smx_req_t req, int value)
       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;
+
+    case REQ_PROCESS_CLEANUP:
+      SIMIX_process_cleanup(req->process_cleanup.process);
       SIMIX_request_answer(req);
       break;
 
     case REQ_PROCESS_CHANGE_HOST:
-      SIMIX_process_change_host(
+      SIMIX_pre_process_change_host(
          req->process_change_host.process,
-         req->process_change_host.source,
          req->process_change_host.dest);
       SIMIX_request_answer(req);
       break;
@@ -525,7 +534,7 @@ void SIMIX_request_pre(smx_req_t req, int value)
       break;
 
     case REQ_NO_REQ:
-      THROW2(arg_error,0,"Asked to do the noop syscall on %s@%s",
+      THROWF(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))
           );