X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/7a25b8e6a7aae6d40849189e58495aee0d8f726f..31b7fa457f9267af8eda2eee06aae74dd78eb412:/src/simix/smx_smurf.c

diff --git a/src/simix/smx_smurf.c b/src/simix/smx_smurf.c
index 3f2045d8af..139d06bd97 100644
--- a/src/simix/smx_smurf.c
+++ b/src/simix/smx_smurf.c
@@ -71,74 +71,154 @@ void SIMIX_request_answer(smx_req_t req)
   }
 }
 
-int SIMIX_request_is_visible(smx_req_t req)
+void SIMIX_request_pre(smx_req_t req, int value)
 {
-  return req->call == REQ_COMM_ISEND
-     || req->call == REQ_COMM_IRECV
-     || req->call == REQ_COMM_WAIT
-     || req->call == REQ_COMM_WAITANY
-     || req->call == REQ_COMM_TEST
-     || req->call == REQ_COMM_TESTANY;
-}
+  switch (req->call) {
 
-int SIMIX_request_is_enabled(smx_req_t req)
-{
-  unsigned int index = 0;
-  smx_action_t act;
+    case REQ_COMM_TEST:
+      SIMIX_pre_comm_test(req);
+      break;
 
-  switch (req->call) {
+    case REQ_COMM_TESTANY:
+      SIMIX_pre_comm_testany(req, value);
+      break;
 
     case REQ_COMM_WAIT:
-      /* FIXME: check also that src and dst processes are not suspended */
-      act = req->comm_wait.comm;
-      return (act->comm.src_proc && act->comm.dst_proc);
+      SIMIX_pre_comm_wait(req, value);
       break;
 
     case REQ_COMM_WAITANY:
-      xbt_dynar_foreach(req->comm_waitany.comms, index, act) {
-        if (act->comm.src_proc && act->comm.dst_proc){
-          return TRUE;
-        }
-      }
-      return FALSE;
+      SIMIX_pre_comm_waitany(req, value);
       break;
 
-    default:    
-      return TRUE;
-  }
-}
+    case REQ_COMM_ISEND:
+      req->comm_isend.result = SIMIX_comm_isend(
+          req->issuer,
+          req->comm_isend.rdv,
+          req->comm_isend.task_size,
+          req->comm_isend.rate,
+          req->comm_isend.src_buff,
+          req->comm_isend.src_buff_size,
+          req->comm_isend.match_fun,
+          req->comm_isend.data,
+          req->comm_isend.detached);
+      SIMIX_request_answer(req);
+      break;
 
-int SIMIX_request_is_enabled_by_idx(smx_req_t req, unsigned int idx)
-{
-  smx_action_t act;
+    case REQ_COMM_IRECV:
+      req->comm_irecv.result = SIMIX_comm_irecv(
+          req->issuer,
+          req->comm_irecv.rdv,
+          req->comm_irecv.dst_buff,
+          req->comm_irecv.dst_buff_size,
+          req->comm_irecv.match_fun,
+          req->comm_irecv.data);
+      SIMIX_request_answer(req);
+      break;
 
-  switch (req->call) {
+    case REQ_COMM_DESTROY:
+      SIMIX_comm_destroy(req->comm_destroy.comm);
+      SIMIX_request_answer(req);
+      break;
 
-    case REQ_COMM_WAIT:
-      /* FIXME: check also that src and dst processes are not suspended */
-      act = req->comm_wait.comm;
-      return (act->comm.src_proc && act->comm.dst_proc);
+    case REQ_COMM_CANCEL:
+      SIMIX_comm_cancel(req->comm_cancel.comm);
+      SIMIX_request_answer(req);
       break;
 
-    case REQ_COMM_WAITANY:
-      act = xbt_dynar_get_as(req->comm_waitany.comms, idx, smx_action_t);
-      return (act->comm.src_proc && act->comm.dst_proc);
+    case REQ_COMM_GET_REMAINS:
+      req->comm_get_remains.result =
+          SIMIX_comm_get_remains(req->comm_get_remains.comm);
+      SIMIX_request_answer(req);
       break;
 
-    default:
-      return TRUE;
-  }
-}
+    case REQ_COMM_GET_STATE:
+      req->comm_get_state.result =
+          SIMIX_comm_get_state(req->comm_get_state.comm);
+      SIMIX_request_answer(req);
+      break;
 
-void SIMIX_request_pre(smx_req_t req, unsigned int value)
-{
-  switch (req->call) {
-  case REQ_NO_REQ:
-    THROW2(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))
-        );
-    break;
+    case REQ_COMM_GET_SRC_DATA:
+      req->comm_get_src_data.result = SIMIX_comm_get_src_data(req->comm_get_src_data.comm);
+      SIMIX_request_answer(req);
+      break;
+
+    case REQ_COMM_GET_DST_DATA:
+      req->comm_get_dst_data.result = SIMIX_comm_get_dst_data(req->comm_get_dst_data.comm);
+      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);
+      SIMIX_request_answer(req);
+      break;
+
+    case REQ_COMM_GET_DST_PROC:
+      req->comm_get_dst_proc.result =
+          SIMIX_comm_get_dst_proc(req->comm_get_dst_proc.comm);
+      SIMIX_request_answer(req);
+      break;
+
+#ifdef HAVE_LATENCY_BOUND_TRACKING
+    case REQ_COMM_IS_LATENCY_BOUNDED:
+      req->comm_is_latency_bounded.result =
+          SIMIX_comm_is_latency_bounded(req->comm_is_latency_bounded.comm);
+      SIMIX_request_answer(req);
+      break;
+#endif
+
+    case REQ_RDV_CREATE:
+      req->rdv_create.result = SIMIX_rdv_create(req->rdv_create.name);
+      SIMIX_request_answer(req);
+      break;
+
+    case REQ_RDV_DESTROY:
+      SIMIX_rdv_destroy(req->rdv_destroy.rdv);
+      SIMIX_request_answer(req);
+      break;
+
+    case REQ_RDV_GEY_BY_NAME:
+      req->rdv_get_by_name.result =
+        SIMIX_rdv_get_by_name(req->rdv_get_by_name.name);
+      SIMIX_request_answer(req);
+      break;
+
+    case REQ_RDV_COMM_COUNT_BY_HOST:
+      req->rdv_comm_count_by_host.result = SIMIX_rdv_comm_count_by_host(
+          req->rdv_comm_count_by_host.rdv,
+          req->rdv_comm_count_by_host.host);
+      SIMIX_request_answer(req);
+      break;
+
+    case REQ_RDV_GET_HEAD:
+      req->rdv_get_head.result = SIMIX_rdv_get_head(req->rdv_get_head.rdv);
+      SIMIX_request_answer(req);
+      break;
 
     case REQ_HOST_GET_BY_NAME:
       req->host_get_by_name.result =
@@ -189,7 +269,8 @@ void SIMIX_request_pre(smx_req_t req, unsigned int value)
       req->host_execute.result = SIMIX_host_execute(
 	  req->host_execute.name,
 	  req->host_execute.host,
-	  req->host_execute.computation_amount);
+	  req->host_execute.computation_amount,
+	  req->host_execute.priority);
       SIMIX_request_answer(req);
       break;
 
@@ -239,7 +320,8 @@ void SIMIX_request_pre(smx_req_t req, unsigned int value)
       break;
 
     case REQ_PROCESS_CREATE:
-      req->process_create.result = SIMIX_process_create(
+      SIMIX_process_create(
+          req->process_create.process,
 	  req->process_create.name,
 	  req->process_create.code,
 	  req->process_create.data,
@@ -316,150 +398,6 @@ void SIMIX_request_pre(smx_req_t req, unsigned int value)
       SIMIX_pre_process_sleep(req);
       break;
 
-    case REQ_RDV_CREATE:
-      req->rdv_create.result = SIMIX_rdv_create(req->rdv_create.name);
-      SIMIX_request_answer(req);
-      break;
-
-    case REQ_RDV_DESTROY:
-      SIMIX_rdv_destroy(req->rdv_destroy.rdv);
-      SIMIX_request_answer(req);
-      break;
-
-    case REQ_RDV_GEY_BY_NAME:
-      req->rdv_get_by_name.result = 
-        SIMIX_rdv_get_by_name(req->rdv_get_by_name.name);
-      SIMIX_request_answer(req);
-      break;
-
-    case REQ_RDV_COMM_COUNT_BY_HOST:
-      req->rdv_comm_count_by_host.result = SIMIX_rdv_comm_count_by_host(
-	  req->rdv_comm_count_by_host.rdv,
-	  req->rdv_comm_count_by_host.host);
-      SIMIX_request_answer(req);
-      break;
-
-    case REQ_RDV_GET_HEAD:
-      req->rdv_get_head.result =	SIMIX_rdv_get_head(req->rdv_get_head.rdv);
-      SIMIX_request_answer(req);
-      break;
-
-    case REQ_COMM_ISEND:
-      req->comm_isend.result = SIMIX_comm_isend(
-	  req->issuer,
-	  req->comm_isend.rdv,
-	  req->comm_isend.task_size,
-	  req->comm_isend.rate,
-	  req->comm_isend.src_buff,
-	  req->comm_isend.src_buff_size,
-	  req->comm_isend.match_fun,
-	  req->comm_isend.data);
-      SIMIX_request_answer(req);
-      break;
-
-    case REQ_COMM_IRECV:
-      req->comm_irecv.result = SIMIX_comm_irecv(
-	  req->issuer,
-	  req->comm_irecv.rdv,
-	  req->comm_irecv.dst_buff,
-	  req->comm_irecv.dst_buff_size,
-	  req->comm_irecv.match_fun,
-	  req->comm_irecv.data);
-      SIMIX_request_answer(req);
-      break;
-
-    case REQ_COMM_DESTROY:
-      SIMIX_comm_destroy(req->comm_destroy.comm);
-      SIMIX_request_answer(req);
-      break;
-
-    case REQ_COMM_CANCEL:
-      SIMIX_comm_cancel(req->comm_cancel.comm);
-      SIMIX_request_answer(req);
-      break;
-
-    case REQ_COMM_WAITANY:
-      SIMIX_pre_comm_waitany(req, value);
-      break;
-
-    case REQ_COMM_WAIT:
-      SIMIX_pre_comm_wait(req);
-      break;
-
-    case REQ_COMM_TEST:
-      SIMIX_pre_comm_test(req);
-      break;
-
-    case REQ_COMM_TESTANY:
-      SIMIX_pre_comm_testany(req, value);
-      break;
-
-    case REQ_COMM_GET_REMAINS:
-      req->comm_get_remains.result = 
-        SIMIX_comm_get_remains(req->comm_get_remains.comm);
-      SIMIX_request_answer(req);
-      break;
-
-    case REQ_COMM_GET_STATE:
-      req->comm_get_state.result = 
-        SIMIX_comm_get_state(req->comm_get_state.comm);
-      SIMIX_request_answer(req);
-      break;
-
-    case REQ_COMM_GET_SRC_DATA:
-      req->comm_get_src_data.result = SIMIX_comm_get_src_data(req->comm_get_src_data.comm);
-      SIMIX_request_answer(req);
-      break;
-
-    case REQ_COMM_GET_DST_DATA:
-      req->comm_get_dst_data.result = SIMIX_comm_get_dst_data(req->comm_get_dst_data.comm);
-      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);
-      SIMIX_request_answer(req);
-      break;
-
-    case REQ_COMM_GET_DST_PROC:
-      req->comm_get_dst_proc.result =
-        SIMIX_comm_get_dst_proc(req->comm_get_dst_proc.comm);
-      SIMIX_request_answer(req);
-      break;
-
-#ifdef HAVE_LATENCY_BOUND_TRACKING
-    case REQ_COMM_IS_LATENCY_BOUNDED:
-      req->comm_is_latency_bounded.result =
-	SIMIX_comm_is_latency_bounded(req->comm_is_latency_bounded.comm);
-      SIMIX_request_answer(req);
-      break;
-#endif
-
 #ifdef HAVE_TRACING
     case REQ_SET_CATEGORY:
       SIMIX_set_category(
@@ -556,6 +494,13 @@ void SIMIX_request_pre(smx_req_t req, unsigned int value)
         SIMIX_sem_get_capacity(req->sem_get_capacity.sem);
       SIMIX_request_answer(req);
       break;
+
+    case REQ_NO_REQ:
+      THROW2(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))
+          );
+      break;
   }
 }