/* This program is free software; you can redistribute it and/or modify it
* under the terms of the license (GNU LGPL) which comes with this package. */
+#include <xbt/ex.hpp>
+
#include "simgrid/msg.h"
#include "msg_private.h"
+#include "simgrid/s4u/mailbox.hpp"
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(msg_mailbox, msg, "Logging specific to MSG (mailbox)");
-msg_mailbox_t MSG_mailbox_new(const char *alias)
-{
- return simcall_mbox_create(alias);
-}
-
-int MSG_mailbox_is_empty(msg_mailbox_t mailbox)
-{
- return (NULL == simcall_mbox_get_head(mailbox));
-}
-
-msg_task_t MSG_mailbox_get_head(msg_mailbox_t mailbox)
-{
- smx_synchro_t comm = simcall_mbox_get_head(mailbox);
-
- if (!comm)
- return NULL;
-
- return (msg_task_t) simcall_comm_get_src_data(comm);
-}
-
-msg_mailbox_t MSG_mailbox_get_by_alias(const char *alias)
-{
- msg_mailbox_t mailbox = simcall_mbox_get_by_name(alias);
-
- if (!mailbox)
- mailbox = MSG_mailbox_new(alias);
-
- return mailbox;
-}
-
/** \ingroup msg_mailbox_management
* \brief Set the mailbox to receive in asynchronous mode
*
* \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);
-
- simcall_mbox_set_receiver(mailbox, SIMIX_process_self());
- XBT_VERB("%s mailbox set to receive eagerly for process %p\n",alias, SIMIX_process_self());
-}
+ simgrid::s4u::MailboxPtr mailbox = simgrid::s4u::Mailbox::byName(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);
+ 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
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)
{
- xbt_ex_t e;
msg_error_t ret = MSG_OK;
/* We no longer support getting a task from a specific host */
if (host)
XBT_WARN("Asked to write the received task in a non empty struct -- proceeding.");
/* Try to receive it by calling SIMIX network layer */
- TRY {
- simcall_comm_recv(MSG_process_self(), mailbox, task, NULL, NULL, NULL, NULL, timeout, rate);
- XBT_DEBUG("Got task %s from %p",(*task)->name,mailbox);
- if (msg_global->debug_multiple_use && (*task)->simdata->isused!=0)
- xbt_ex_free(*(xbt_ex_t*)(*task)->simdata->isused);
- (*task)->simdata->isused = 0;
+ try {
+ simcall_comm_recv(MSG_process_self(), mailbox->getImpl(), task, nullptr, nullptr, nullptr, nullptr, timeout, rate);
+ XBT_DEBUG("Got task %s from %s",(*task)->name,mailbox->getName());
+ (*task)->simdata->setNotUsed();
}
- CATCH(e) {
+ catch (xbt_ex& e) {
switch (e.category) {
case cancel_error:
ret = MSG_HOST_FAILURE;
ret = MSG_HOST_FAILURE;
break;
default:
- RETHROW;
+ throw;
}
- xbt_ex_free(e);
}
if (ret != MSG_HOST_FAILURE && ret != MSG_TRANSFER_FAILURE && ret != MSG_TIMEOUT) {