From 9a28137e0100255c9e849a39167590cb2305aa82 Mon Sep 17 00:00:00 2001 From: Martin Quinson Date: Sun, 31 Jul 2016 19:22:29 +0200 Subject: [PATCH] remove two more MSG_mailbox functions --- ChangeLog | 4 +++- include/simgrid/msg.h | 10 ---------- src/msg/msg_gos.cpp | 2 +- src/msg/msg_mailbox.cpp | 27 --------------------------- 4 files changed, 4 insertions(+), 39 deletions(-) diff --git a/ChangeLog b/ChangeLog index a2539fee48..16f3251755 100644 --- a/ChangeLog +++ b/ChangeLog @@ -15,7 +15,9 @@ SimGrid (3.14) UNRELEASED; urgency=low MSG * Remove the functions manipulating mailboxes. Use s4u::Mailbox instead - MSG_mailbox_is_empty() -> Mailbox::empty() - - MSG_mailbox_get_by_alias -> simgrid::s4u::Mailbox::byName(name) + - MSG_mailbox_front() -> Mailbox::front() + - MSG_mailbox_get_by_alias() -> simgrid::s4u::Mailbox::byName(name) + - MSG_mailbox_get_task_ext() -> MSG_task_receive_ext() -- $date Da SimGrid team diff --git a/include/simgrid/msg.h b/include/simgrid/msg.h index 6b17183240..5c73bb7beb 100644 --- a/include/simgrid/msg.h +++ b/include/simgrid/msg.h @@ -458,16 +458,6 @@ XBT_PUBLIC(const char *) MSG_task_get_category (msg_task_t task); */ XBT_PUBLIC(void) MSG_mailbox_set_async(const char *alias); -/* @brief MSG_mailbox_front - get the task at the head of a mailbox. - * Returns the task at the head of the mailbox. This function does not remove the task from the mailbox. - * @deprecated - * @param mailbox The mailbox concerned by the operation. - * @return The task at the head of the mailbox. - */ -XBT_PUBLIC(msg_task_t) MSG_mailbox_front(msg_mailbox_t mailbox); - -XBT_PUBLIC(msg_error_t) MSG_mailbox_get_task_ext(msg_mailbox_t mailbox, msg_task_t * task, msg_host_t host, - double timeout); XBT_PUBLIC(msg_error_t) MSG_mailbox_get_task_ext_bounded(msg_mailbox_t mailbox, msg_task_t *task, msg_host_t host, double timeout, double rate); diff --git a/src/msg/msg_gos.cpp b/src/msg/msg_gos.cpp index 290107067d..63703d7946 100644 --- a/src/msg/msg_gos.cpp +++ b/src/msg/msg_gos.cpp @@ -242,7 +242,7 @@ msg_error_t MSG_task_receive_ext(msg_task_t * task, const char *alias, double ti 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(simgrid::s4u::Mailbox::byName(alias), task, host, timeout); + ret = MSG_mailbox_get_task_ext_bounded(simgrid::s4u::Mailbox::byName(alias), task, host, timeout, -1.0); } catch(xbt_ex& e) { switch (e.category) { diff --git a/src/msg/msg_mailbox.cpp b/src/msg/msg_mailbox.cpp index ea4b947e9f..27fbaae27f 100644 --- a/src/msg/msg_mailbox.cpp +++ b/src/msg/msg_mailbox.cpp @@ -14,16 +14,6 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(msg_mailbox, msg, "Logging specific to MSG (mailbox)"); -msg_task_t MSG_mailbox_front(msg_mailbox_t mailbox) -{ - simgrid::kernel::activity::Comm* comm = static_cast(mailbox->front()); - - if (!comm) - return nullptr; - - return (msg_task_t) comm->src_data; -} - /** \ingroup msg_mailbox_management * \brief Set the mailbox to receive in asynchronous mode * @@ -40,23 +30,6 @@ void MSG_mailbox_set_async(const char *alias){ 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 * -- 2.20.1