X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/e7d63af354e1227ed78d115a6432d5c588693a72..40803b27ba5bcb382dfcd593885313a975bafd89:/src/simix/smx_user.c

diff --git a/src/simix/smx_user.c b/src/simix/smx_user.c
index f618fdf95a..918687c279 100644
--- a/src/simix/smx_user.c
+++ b/src/simix/smx_user.c
@@ -738,23 +738,33 @@ smx_action_t simcall_comm_irecv(smx_rdv_t rdv, void *dst_buff, size_t *dst_buff_
 /**
  * \ingroup simix_comm_management
  */
-double simcall_comm_change_rate_first_action(smx_rdv_t rdv, double newrate)
+void simcall_comm_recv_bounded(smx_rdv_t rdv, void *dst_buff, size_t * dst_buff_size,
+                         int (*match_fun)(void *, void *, smx_action_t), void *data, double timeout, double rate)
 {
-  xbt_assert(rdv, "No rendez-vous point defined for change_rate_first_action");
+  xbt_assert(isfinite(timeout), "timeout is not finite!");
+  xbt_assert(rdv, "No rendez-vous point defined for recv");
 
-  smx_action_t action;
-  xbt_fifo_item_t item;
+  if (MC_is_active()) {
+    /* the model-checker wants two separate simcalls */
+    smx_action_t comm = simcall_comm_irecv_bounded(rdv, dst_buff, dst_buff_size,
+        match_fun, data, rate);
+    simcall_comm_wait(comm, timeout);
+  }
+  else {
+    simcall_BODY_comm_recv_bounded(rdv, dst_buff, dst_buff_size,
+                           match_fun, data, timeout, rate);
+  }
+}
+/**
+ * \ingroup simix_comm_management
+ */
+smx_action_t simcall_comm_irecv_bounded(smx_rdv_t rdv, void *dst_buff, size_t *dst_buff_size,
+                                  int (*match_fun)(void *, void *, smx_action_t), void *data, double rate)
+{
+  xbt_assert(rdv, "No rendez-vous point defined for irecv");
 
-  item = xbt_fifo_get_first_item(rdv->comm_fifo);
-  if (item != NULL) {
-    action = (smx_action_t) xbt_fifo_get_item_content(item);
-    if (action->comm.rate > newrate) {
-      action->comm.rate = newrate;
-      return newrate;
-    } else
-      return action->comm.rate;
-  } else
-    return -1.0;
+  return simcall_BODY_comm_irecv_bounded(rdv, dst_buff, dst_buff_size,
+                                 match_fun, data, rate);
 }
 
 
@@ -1113,15 +1123,6 @@ int simcall_file_close(smx_file_t fp)
   return simcall_BODY_file_close(fp);  
 }
 
-/**
- * \ingroup simix_file_management
- *
- */
-int simcall_file_stat(smx_file_t fd, s_file_stat_t *buf)
-{
-  return simcall_BODY_file_stat(fd, buf);
-}
-
 /**
  * \ingroup simix_file_management
  *
@@ -1151,6 +1152,12 @@ int simcall_mc_compare_snapshots(void *s1, void *s2){
   return simcall_BODY_mc_compare_snapshots(s1, s2);
 }
 
+int simcall_mc_random(void)
+{
+  return simcall_BODY_mc_random();
+}
+
+
 #endif /* HAVE_MC */
 
 /* ****************************************************************************************** */