X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/8e8f8b64b899284cbd166542ba352cd0c44059e8..6da3f48c9f8d12591ad10f3473afd2bfbce1b15e:/src/simix/smx_user.c

diff --git a/src/simix/smx_user.c b/src/simix/smx_user.c
index f618fdf95a..d7580c39da 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);
 }
 
 
@@ -1081,63 +1091,62 @@ int simcall_sem_get_capacity(smx_sem_t sem)
  * \ingroup simix_file_management
  *
  */
-double simcall_file_read(void* ptr, size_t size, size_t nmemb, smx_file_t stream)
+double simcall_file_read(void* ptr, size_t size, size_t nmemb, smx_file_t fd)
 {
-  return simcall_BODY_file_read(ptr, size, nmemb, stream);
+  return simcall_BODY_file_read(ptr, size, nmemb, fd);
 }
 
 /**
  * \ingroup simix_file_management
  *
  */
-size_t simcall_file_write(const void* ptr, size_t size, size_t nmemb, smx_file_t stream)
+size_t simcall_file_write(const void* ptr, size_t size, size_t nmemb,
+                          smx_file_t fd)
 {
-  return simcall_BODY_file_write(ptr, size, nmemb, stream);
+  return simcall_BODY_file_write(ptr, size, nmemb, fd);
 }
 
 /**
  * \ingroup simix_file_management
  * \brief
  */
-smx_file_t simcall_file_open(const char* mount, const char* path, const char* mode)
+smx_file_t simcall_file_open(const char* mount, const char* path)
 {
-  return simcall_BODY_file_open(mount, path, mode);
+  return simcall_BODY_file_open(mount, path);
 }
 
 /**
  * \ingroup simix_file_management
  *
  */
-int simcall_file_close(smx_file_t fp)
+int simcall_file_close(smx_file_t fd)
 {
-  return simcall_BODY_file_close(fp);  
+  return simcall_BODY_file_close(fd);
 }
 
 /**
  * \ingroup simix_file_management
  *
  */
-int simcall_file_stat(smx_file_t fd, s_file_stat_t *buf)
+int simcall_file_unlink(smx_file_t fd)
 {
-  return simcall_BODY_file_stat(fd, buf);
+  return simcall_BODY_file_unlink(fd);
 }
 
 /**
  * \ingroup simix_file_management
  *
  */
-int simcall_file_unlink(smx_file_t fd)
+xbt_dict_t simcall_file_ls(const char* mount, const char* path)
 {
-  return simcall_BODY_file_unlink(fd);
+  return simcall_BODY_file_ls(mount, path);
 }
-
 /**
  * \ingroup simix_file_management
  *
  */
-xbt_dict_t simcall_file_ls(const char* mount, const char* path)
-{
-  return simcall_BODY_file_ls(mount, path);
+size_t simcall_file_get_size (smx_file_t fd){
+  return simcall_BODY_file_get_size(fd);
 }
 
 #ifdef HAVE_MC
@@ -1151,6 +1160,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 */
 
 /* ****************************************************************************************** */