remove some useless cruft in MSG

[simgrid.git] / src / msg / msg_gos.cpp

diff --git a/src/msg/msg_gos.cpp b/src/msg/msg_gos.cpp
index 50ea058..1c39754 100644 (file)
--- a/src/msg/msg_gos.cpp
+++ b/src/msg/msg_gos.cpp
@@ -109,7 +109,7 @@ msg_error_t MSG_parallel_task_execute(msg_task_t task)
   simdata->compute = nullptr;
   TRACE_msg_task_execute_end(task);
 
-  MSG_RETURN(status);
+  return status;
 }
 
 /** \ingroup msg_task_usage
@@ -147,7 +147,7 @@ msg_error_t MSG_process_sleep(double nb_sec)
   }
 
   TRACE_msg_process_sleep_out(MSG_process_self());
-  MSG_RETURN(status);
+  return status;
 }
 
 /** \ingroup msg_task_usage
@@ -239,21 +239,8 @@ msg_error_t MSG_task_receive_with_timeout_bounded(msg_task_t * task, const char
  */
 msg_error_t MSG_task_receive_ext(msg_task_t * task, const char *alias, double timeout, msg_host_t host)
 {
-  msg_error_t ret = MSG_OK;
   XBT_DEBUG("MSG_task_receive_ext: Trying to receive a message on mailbox '%s'", alias);
-  try {
-    ret = MSG_mailbox_get_task_ext(MSG_mailbox_get_by_alias(alias), task, host, timeout);
-  }
-  catch(xbt_ex& e) {
-    switch (e.category) {
-    case cancel_error:          /* may be thrown by MSG_mailbox_get_by_alias */
-      ret = MSG_HOST_FAILURE;
-      break;
-    default:
-      throw;
-    }
-  }
-  return ret;
+  return MSG_task_receive_ext_bounded(task, alias, timeout, host, -1.0);
 }
 
 /** \ingroup msg_task_usage
@@ -273,7 +260,7 @@ msg_error_t MSG_task_receive_ext_bounded(msg_task_t * task, const char *alias, d
                                          double rate)
 {
   XBT_DEBUG("MSG_task_receive_ext: Trying to receive a message on mailbox '%s'", alias);
-  return MSG_mailbox_get_task_ext_bounded(MSG_mailbox_get_by_alias(alias), task, host, timeout, rate);
+  return MSG_mailbox_get_task_ext_bounded(simgrid::s4u::Mailbox::byName(alias), task, host, timeout, rate);
 }
 
 /* Internal function used to factorize code between MSG_task_isend_with_matching() and MSG_task_dsend(). */
@@ -283,7 +270,7 @@ static inline msg_comm_t MSG_task_isend_internal(msg_task_t task, const char *al
 {
   simdata_task_t t_simdata = nullptr;
   msg_process_t myself = SIMIX_process_self();
-  msg_mailbox_t mailbox = MSG_mailbox_get_by_alias(alias);
+  msg_mailbox_t mailbox = simgrid::s4u::Mailbox::byName(alias);
   int call_end = TRACE_msg_task_put_start(task);
 
   /* Prepare the task to send */
@@ -435,7 +422,7 @@ msg_comm_t MSG_task_irecv(msg_task_t *task, const char *name)
  */
 msg_comm_t MSG_task_irecv_bounded(msg_task_t *task, const char *name, double rate)
 {
-  msg_mailbox_t mbox = MSG_mailbox_get_by_alias(name);
+  msg_mailbox_t mbox = simgrid::s4u::Mailbox::byName(name);
 
   /* FIXME: these functions are not traceable */
   /* Sanity check */
@@ -757,7 +744,7 @@ msg_error_t MSG_task_send_with_timeout(msg_task_t task, const char *alias, doubl
   simdata_task_t t_simdata = nullptr;
   msg_process_t process = MSG_process_self();
   simdata_process_t p_simdata = (simdata_process_t) SIMIX_process_self_get_data();
-  msg_mailbox_t mailbox = MSG_mailbox_get_by_alias(alias);
+  msg_mailbox_t mailbox = simgrid::s4u::Mailbox::byName(alias);
 
   int call_end = TRACE_msg_task_put_start(task);    //must be after CHECK_HOST()
 
@@ -805,7 +792,7 @@ msg_error_t MSG_task_send_with_timeout(msg_task_t task, const char *alias, doubl
   p_simdata->waiting_task = nullptr;
   if (call_end)
     TRACE_msg_task_put_end();
-  MSG_RETURN(ret);
+  return ret;
 }
 
 /** \ingroup msg_task_usage
@@ -836,8 +823,8 @@ msg_error_t MSG_task_send_with_timeout_bounded(msg_task_t task, const char *alia
  */
 int MSG_task_listen(const char *alias)
 {
-  msg_mailbox_t mbox = MSG_mailbox_get_by_alias(alias);
-  return !MSG_mailbox_is_empty(mbox) ||
+  msg_mailbox_t mbox = simgrid::s4u::Mailbox::byName(alias);
+  return !mbox->empty() ||
     (mbox->getImpl()->permanent_receiver && !mbox->getImpl()->done_comm_queue.empty());
 }
 
@@ -851,7 +838,7 @@ int MSG_task_listen(const char *alias)
  */
 int MSG_task_listen_from(const char *alias)
 {
-  msg_mailbox_t mbox = MSG_mailbox_get_by_alias(alias);
+  msg_mailbox_t mbox = simgrid::s4u::Mailbox::byName(alias);
   simgrid::kernel::activity::Comm* comm = static_cast<simgrid::kernel::activity::Comm*>(mbox->front());
 
   if (!comm)