X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/05d190ed39b43f561714b3a065dbb6dcab48b364..a08069e16c9e35b17c134b6365940df2f0bcebb3:/src/simix/libsmx.cpp

diff --git a/src/simix/libsmx.cpp b/src/simix/libsmx.cpp
index 278ce88e7c..4406c4ef27 100644
--- a/src/simix/libsmx.cpp
+++ b/src/simix/libsmx.cpp
@@ -728,79 +728,77 @@ e_smx_state_t simcall_process_sleep(double duration)
 }
 
 /**
- *  \ingroup simix_rdv_management
+ *  \ingroup simix_mbox_management
  *  \brief Creates a new rendez-vous point
  *  \param name The name of the rendez-vous point
  *  \return The created rendez-vous point
  */
-smx_mailbox_t simcall_rdv_create(const char *name)
+smx_mailbox_t simcall_mbox_create(const char *name)
 {
-  return simcall_BODY_rdv_create(name);
+  return simcall_BODY_mbox_create(name);
 }
 
 
 /**
- *  \ingroup simix_rdv_management
+ *  \ingroup simix_mbox_management
  *  \brief Destroy a rendez-vous point
- *  \param rdv The rendez-vous point to destroy
+ *  \param mbox The rendez-vous point to destroy
  */
-void simcall_rdv_destroy(smx_mailbox_t rdv)
+void simcall_mbox_destroy(smx_mailbox_t mbox)
 {
-  simcall_BODY_rdv_destroy(rdv);
+  simcall_BODY_mbox_destroy(mbox);
 }
 /**
- *  \ingroup simix_rdv_management
+ *  \ingroup simix_mbox_management
  *  \brief Returns a rendez-vous point knowing its name
  */
-smx_mailbox_t simcall_rdv_get_by_name(const char *name)
+smx_mailbox_t simcall_mbox_get_by_name(const char *name)
 {
-  xbt_assert(name != NULL, "Invalid parameter for simcall_rdv_get_by_name (name is NULL)");
-
   /* FIXME: this is a horrible loss of performance, so we hack it out by
    * skipping the simcall (for now). It works in parallel, it won't work on
    * distributed but probably we will change MSG for that. */
 
-  return SIMIX_rdv_get_by_name(name);
+  return SIMIX_mbox_get_by_name(name);
 }
 
 /**
- *  \ingroup simix_rdv_management
+ *  \ingroup simix_mbox_management
  *  \brief Counts the number of communication synchros of a given host pending
  *         on a rendez-vous point.
- *  \param rdv The rendez-vous point
+ *  \param mbox The rendez-vous point
  *  \param host The host to be counted
- *  \return The number of comm synchros pending in the rdv
+ *  \return The number of comm synchros pending in the mbox
  */
-int simcall_rdv_comm_count_by_host(smx_mailbox_t rdv, sg_host_t host)
+int simcall_mbox_comm_count_by_host(smx_mailbox_t mbox, sg_host_t host)
 {
-  return simcall_BODY_rdv_comm_count_by_host(rdv, host);
+  return simcall_BODY_mbox_comm_count_by_host(mbox, host);
 }
 
 /**
- *  \ingroup simix_rdv_management
+ *  \ingroup simix_mbox_management
  *  \brief returns the communication at the head of the rendez-vous
- *  \param rdv The rendez-vous point
+ *  \param mbox The rendez-vous point
  *  \return The communication or NULL if empty
  */
-smx_synchro_t simcall_rdv_get_head(smx_mailbox_t rdv)
+smx_synchro_t simcall_mbox_get_head(smx_mailbox_t mbox)
 {
-  return simcall_BODY_rdv_get_head(rdv);
+  return simcall_BODY_mbox_get_head(mbox);
 }
 
-void simcall_rdv_set_receiver(smx_mailbox_t rdv, smx_process_t process)
+void simcall_mbox_set_receiver(smx_mailbox_t mbox, smx_process_t process)
 {
-  simcall_BODY_rdv_set_receiver(rdv, process);
+  simcall_BODY_mbox_set_receiver(mbox, process);
 }
 
-smx_process_t simcall_rdv_get_receiver(smx_mailbox_t rdv)
+smx_process_t simcall_mbox_get_receiver(smx_mailbox_t mbox)
 {
-  return simcall_BODY_rdv_get_receiver(rdv);
+  return simcall_BODY_mbox_get_receiver(mbox);
 }
 
 /**
  * \ingroup simix_comm_management
  */
-void simcall_comm_send(smx_process_t sender, smx_mailbox_t rdv, double task_size, double rate,
+void simcall_comm_send(smx_process_t sender, smx_mailbox_t mbox, double task_size, double rate,
                          void *src_buff, size_t src_buff_size,
                          int (*match_fun)(void *, void *, smx_synchro_t),
                          void (*copy_data_fun)(smx_synchro_t, void*, size_t), void *data,
@@ -811,18 +809,18 @@ void simcall_comm_send(smx_process_t sender, smx_mailbox_t rdv, double task_size
   xbt_assert(std::isfinite(rate), "rate is not finite!");
   xbt_assert(std::isfinite(timeout), "timeout is not finite!");
 
-  xbt_assert(rdv, "No rendez-vous point defined for send");
+  xbt_assert(mbox, "No rendez-vous point defined for send");
 
   if (MC_is_active() || MC_record_replay_is_active()) {
     /* the model-checker wants two separate simcalls */
     smx_synchro_t comm = NULL; /* MC needs the comm to be set to NULL during the simcall */
-    comm = simcall_comm_isend(sender, rdv, task_size, rate,
+    comm = simcall_comm_isend(sender, mbox, task_size, rate,
         src_buff, src_buff_size, match_fun, NULL, copy_data_fun, data, 0);
     simcall_comm_wait(comm, timeout);
     comm = NULL;
   }
   else {
-    simcall_BODY_comm_send(sender, rdv, task_size, rate, src_buff, src_buff_size,
+    simcall_BODY_comm_send(sender, mbox, task_size, rate, src_buff, src_buff_size,
                          match_fun, copy_data_fun, data, timeout);
   }
 }
@@ -830,7 +828,7 @@ void simcall_comm_send(smx_process_t sender, smx_mailbox_t rdv, double task_size
 /**
  * \ingroup simix_comm_management
  */
-smx_synchro_t simcall_comm_isend(smx_process_t sender, smx_mailbox_t rdv, double task_size, double rate,
+smx_synchro_t simcall_comm_isend(smx_process_t sender, smx_mailbox_t mbox, double task_size, double rate,
                               void *src_buff, size_t src_buff_size,
                               int (*match_fun)(void *, void *, smx_synchro_t),
                               void (*clean_fun)(void *),
@@ -842,9 +840,9 @@ smx_synchro_t simcall_comm_isend(smx_process_t sender, smx_mailbox_t rdv, double
   xbt_assert(std::isfinite(task_size), "task_size is not finite!");
   xbt_assert(std::isfinite(rate), "rate is not finite!");
 
-  xbt_assert(rdv, "No rendez-vous point defined for isend");
+  xbt_assert(mbox, "No rendez-vous point defined for isend");
 
-  return simcall_BODY_comm_isend(sender, rdv, task_size, rate, src_buff,
+  return simcall_BODY_comm_isend(sender, mbox, task_size, rate, src_buff,
                                  src_buff_size, match_fun,
                                  clean_fun, copy_data_fun, data, detached);
 }
@@ -852,50 +850,50 @@ smx_synchro_t simcall_comm_isend(smx_process_t sender, smx_mailbox_t rdv, double
 /**
  * \ingroup simix_comm_management
  */
-void simcall_comm_recv(smx_process_t receiver, smx_mailbox_t rdv, void *dst_buff, size_t * dst_buff_size,
+void simcall_comm_recv(smx_process_t receiver, smx_mailbox_t mbox, void *dst_buff, size_t * dst_buff_size,
                        int (*match_fun)(void *, void *, smx_synchro_t),
                        void (*copy_data_fun)(smx_synchro_t, void*, size_t),
                        void *data, double timeout, double rate)
 {
   xbt_assert(std::isfinite(timeout), "timeout is not finite!");
-  xbt_assert(rdv, "No rendez-vous point defined for recv");
+  xbt_assert(mbox, "No rendez-vous point defined for recv");
 
   if (MC_is_active() || MC_record_replay_is_active()) {
     /* the model-checker wants two separate simcalls */
     smx_synchro_t comm = NULL; /* MC needs the comm to be set to NULL during the simcall */
-    comm = simcall_comm_irecv(receiver, rdv, dst_buff, dst_buff_size,
+    comm = simcall_comm_irecv(receiver, mbox, dst_buff, dst_buff_size,
                               match_fun, copy_data_fun, data, rate);
     simcall_comm_wait(comm, timeout);
     comm = NULL;
   }
   else {
-    simcall_BODY_comm_recv(receiver, rdv, dst_buff, dst_buff_size,
+    simcall_BODY_comm_recv(receiver, mbox, dst_buff, dst_buff_size,
                            match_fun, copy_data_fun, data, timeout, rate);
   }
 }
 /**
  * \ingroup simix_comm_management
  */
-smx_synchro_t simcall_comm_irecv(smx_process_t receiver, smx_mailbox_t rdv, void *dst_buff, size_t *dst_buff_size,
+smx_synchro_t simcall_comm_irecv(smx_process_t receiver, smx_mailbox_t mbox, void *dst_buff, size_t *dst_buff_size,
                                 int (*match_fun)(void *, void *, smx_synchro_t),
                                 void (*copy_data_fun)(smx_synchro_t, void*, size_t),
                                 void *data, double rate)
 {
-  xbt_assert(rdv, "No rendez-vous point defined for irecv");
+  xbt_assert(mbox, "No rendez-vous point defined for irecv");
 
-  return simcall_BODY_comm_irecv(receiver, rdv, dst_buff, dst_buff_size,
+  return simcall_BODY_comm_irecv(receiver, mbox, dst_buff, dst_buff_size,
                                  match_fun, copy_data_fun, data, rate);
 }
 
 /**
  * \ingroup simix_comm_management
  */
-smx_synchro_t simcall_comm_iprobe(smx_mailbox_t rdv, int type, int src, int tag,
+smx_synchro_t simcall_comm_iprobe(smx_mailbox_t mbox, int type, int src, int tag,
                                 int (*match_fun)(void *, void *, smx_synchro_t), void *data)
 {
-  xbt_assert(rdv, "No rendez-vous point defined for iprobe");
+  xbt_assert(mbox, "No rendez-vous point defined for iprobe");
 
-  return simcall_BODY_comm_iprobe(rdv, type, src, tag, match_fun, data);
+  return simcall_BODY_comm_iprobe(mbox, type, src, tag, match_fun, data);
 }
 
 /**