X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/1d86c2a6dd868b8634423c5f1be55b992709fc75..96920215fe6b67ec41f9e9dee856b5157a67f6d2:/src/simix/smx_smurf.c

diff --git a/src/simix/smx_smurf.c b/src/simix/smx_smurf.c
index 2f02a9fd4f..840166ae69 100644
--- a/src/simix/smx_smurf.c
+++ b/src/simix/smx_smurf.c
@@ -52,11 +52,11 @@ void SIMIX_request_push()
 
     xbt_swag_insert_at_tail(&issuer->request, req_table);
 
-    DEBUG3("Pushed request %s (%d) of %s",
+    XBT_DEBUG("Pushed request %s (%d) of %s",
         SIMIX_request_name(issuer->request.call), issuer->request.call,
         issuer->name);
 
-    DEBUG3("Yield process '%s' on request of type %s (%d)", issuer->name,
+    XBT_DEBUG("Yield process '%s' on request of type %s (%d)", issuer->name,
         SIMIX_request_name(issuer->request.call), issuer->request.call);
     SIMIX_process_yield();
   } else {
@@ -72,7 +72,7 @@ smx_req_t SIMIX_request_pop(void)
 
   for(i=0; i < nthreads; i++){
     if((req = xbt_swag_extract(req_lists[i]))){
-      DEBUG3("Popped request %s (%d) of %s",
+      XBT_DEBUG("Popped request %s (%d) of %s",
           SIMIX_request_name(req->issuer->request.call),
           req->issuer->request.call,
           req->issuer->name);
@@ -86,7 +86,7 @@ smx_req_t SIMIX_request_pop(void)
 void SIMIX_request_answer(smx_req_t req)
 {
   if (req->issuer != simix_global->maestro_process){
-    DEBUG2("Answer request %s (%d)", SIMIX_request_name(req->call), req->call);
+    XBT_DEBUG("Answer request %s (%d)", SIMIX_request_name(req->call), req->call);
     req->issuer->request.call = REQ_NO_REQ;
     xbt_dynar_push_as(simix_global->process_to_run, smx_process_t, req->issuer);
   }
@@ -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;
@@ -105,13 +105,32 @@ void SIMIX_request_pre(smx_req_t req, int value)
       break;
 
     case REQ_COMM_WAIT:
-      SIMIX_pre_comm_wait(req, value);
+      SIMIX_pre_comm_wait(req,
+          req->comm_wait.comm,
+          req->comm_wait.timeout,
+          value);
       break;
 
     case REQ_COMM_WAITANY:
       SIMIX_pre_comm_waitany(req, value);
       break;
 
+    case REQ_COMM_SEND:
+    {
+      smx_action_t comm = SIMIX_comm_isend(
+          req->issuer,
+          req->comm_send.rdv,
+          req->comm_send.task_size,
+          req->comm_send.rate,
+          req->comm_send.src_buff,
+          req->comm_send.src_buff_size,
+          req->comm_send.match_fun,
+          req->comm_send.data,
+          0);
+      SIMIX_pre_comm_wait(req, comm, req->comm_send.timeout, 0);
+      break;
+    }
+
     case REQ_COMM_ISEND:
       req->comm_isend.result = SIMIX_comm_isend(
           req->issuer,
@@ -126,6 +145,19 @@ void SIMIX_request_pre(smx_req_t req, int value)
       SIMIX_request_answer(req);
       break;
 
+    case REQ_COMM_RECV:
+    {
+      smx_action_t comm = SIMIX_comm_irecv(
+          req->issuer,
+          req->comm_recv.rdv,
+          req->comm_recv.dst_buff,
+          req->comm_recv.dst_buff_size,
+          req->comm_recv.match_fun,
+          req->comm_recv.data);
+      SIMIX_pre_comm_wait(req, comm, req->comm_recv.timeout, 0);
+      break;
+    }
+
     case REQ_COMM_IRECV:
       req->comm_irecv.result = SIMIX_comm_irecv(
           req->issuer,
@@ -330,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;
@@ -493,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))
           );