Allow MSG_process_cleanup(p) to be called by other processes than p

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

diff --git a/src/simix/smx_smurf.c b/src/simix/smx_smurf.c
index 6b0d817..fb7d994 100644 (file)
--- a/src/simix/smx_smurf.c
+++ b/src/simix/smx_smurf.c
@@ -12,7 +12,7 @@ static xbt_swag_t *req_lists;
 void SIMIX_request_init(void)
 {
   s_smx_req_t req;
-  int i, nthreads = SIMIX_context_get_parallel_threads();
+  int i, nthreads = SIMIX_context_get_nthreads();
 
   req_lists = xbt_new0(xbt_swag_t, nthreads);
   for(i=0; i < nthreads; i++)
@@ -22,7 +22,7 @@ void SIMIX_request_init(void)
 
 void SIMIX_request_destroy(void)
 {
-  int i, nthreads = SIMIX_context_get_parallel_threads();
+  int i, nthreads = SIMIX_context_get_nthreads();
 
   for(i=0; i < nthreads; i++)
     xbt_swag_free(req_lists[i]);
@@ -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 {
@@ -68,11 +68,11 @@ smx_req_t SIMIX_request_pop(void)
 {
   int i;
   smx_req_t req = NULL;
-  int nthreads = SIMIX_context_get_parallel_threads();
+  int nthreads = SIMIX_context_get_nthreads();
 
   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);
   }
@@ -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,
@@ -169,30 +201,6 @@ void SIMIX_request_pre(smx_req_t req, int value)
       SIMIX_request_answer(req);
       break;
 
-    case REQ_COMM_GET_SRC_BUFF:
-      req->comm_get_src_buff.result =
-          SIMIX_comm_get_src_buff(req->comm_get_src_buff.comm);
-      SIMIX_request_answer(req);
-      break;
-
-    case REQ_COMM_GET_DST_BUFF:
-      req->comm_get_dst_buff.result =
-          SIMIX_comm_get_dst_buff(req->comm_get_dst_buff.comm);
-      SIMIX_request_answer(req);
-      break;
-
-    case REQ_COMM_GET_SRC_BUFF_SIZE:
-      req->comm_get_src_buff_size.result =
-          SIMIX_comm_get_src_buff_size(req->comm_get_src_buff_size.comm);
-      SIMIX_request_answer(req);
-      break;
-
-    case REQ_COMM_GET_DST_BUFF_SIZE:
-      req->comm_get_dst_buff_size.result =
-          SIMIX_comm_get_dst_buff_size(req->comm_get_dst_buff_size.comm);
-      SIMIX_request_answer(req);
-      break;
-
     case REQ_COMM_GET_SRC_PROC:
       req->comm_get_src_proc.result =
           SIMIX_comm_get_src_proc(req->comm_get_src_proc.comm);
@@ -358,6 +366,11 @@ void SIMIX_request_pre(smx_req_t req, int value)
       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(
          req->process_change_host.process,