remove some useless cruft in MSG

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

diff --git a/src/msg/msg_mailbox.cpp b/src/msg/msg_mailbox.cpp
index 2119287..124c4eb 100644 (file)
--- a/src/msg/msg_mailbox.cpp
+++ b/src/msg/msg_mailbox.cpp
@@ -14,26 +14,6 @@
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(msg_mailbox, msg, "Logging specific to MSG (mailbox)");
 
-int MSG_mailbox_is_empty(msg_mailbox_t mailbox)
-{
-  return mailbox->empty();
-}
-
-msg_task_t MSG_mailbox_front(msg_mailbox_t mailbox)
-{
-  simgrid::kernel::activity::Comm* comm = static_cast<simgrid::kernel::activity::Comm*>(simcall_mbox_front(mailbox->getImpl()));
-
-  if (!comm)
-    return nullptr;
-
-  return (msg_task_t) comm->src_data;
-}
-
-msg_mailbox_t MSG_mailbox_get_by_alias(const char *alias)
-{
-  return simgrid::s4u::Mailbox::byName(alias);
-}
-
 /** \ingroup msg_mailbox_management
  * \brief Set the mailbox to receive in asynchronous mode
  *
@@ -44,29 +24,12 @@ msg_mailbox_t MSG_mailbox_get_by_alias(const char *alias)
  * \param alias The name of the mailbox
  */
 void MSG_mailbox_set_async(const char *alias){
-  msg_mailbox_t mailbox = MSG_mailbox_get_by_alias(alias);
+  simgrid::s4u::MailboxPtr mailbox = simgrid::s4u::Mailbox::byName(alias);
 
   simcall_mbox_set_receiver(mailbox->getImpl(), SIMIX_process_self());
   XBT_VERB("%s mailbox set to receive eagerly for myself\n",alias);
 }
 
-/** \ingroup msg_mailbox_management
- * \brief Get a task from a mailbox on a given host
- *
- * \param mailbox The mailbox where the task was sent
- * \param task a memory location for storing a #msg_task_t.
- * \param host a #msg_host_t host from where the task was sent
- * \param timeout a timeout
-
- * \return Returns
- * #MSG_OK if the task was successfully received,
- * #MSG_HOST_FAILURE, or #MSG_TRANSFER_FAILURE otherwise.
- */
-msg_error_t MSG_mailbox_get_task_ext(msg_mailbox_t mailbox, msg_task_t *task, msg_host_t host, double timeout)
-{
-  return MSG_mailbox_get_task_ext_bounded(mailbox, task, host, timeout, -1.0);
-}
-
 /** \ingroup msg_mailbox_management
  * \brief Get a task from a mailbox on a given host at a given rate
  *
@@ -100,7 +63,7 @@ msg_error_t MSG_mailbox_get_task_ext_bounded(msg_mailbox_t mailbox, msg_task_t *
   /* Try to receive it by calling SIMIX network layer */
   try {
     simcall_comm_recv(MSG_process_self(), mailbox->getImpl(), task, nullptr, nullptr, nullptr, nullptr, timeout, rate);
-    XBT_DEBUG("Got task %s from %p",(*task)->name,mailbox);
+    XBT_DEBUG("Got task %s from %s",(*task)->name,mailbox->getName());
     (*task)->simdata->setNotUsed();
   }
   catch (xbt_ex& e) {
@@ -125,5 +88,5 @@ msg_error_t MSG_mailbox_get_task_ext_bounded(msg_mailbox_t mailbox, msg_task_t *
   if (ret != MSG_HOST_FAILURE && ret != MSG_TRANSFER_FAILURE && ret != MSG_TIMEOUT) {
     TRACE_msg_task_get_end(start_time, *task);
   }
-  MSG_RETURN(ret);
+  return ret;
 }