/* 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"
int MSG_mailbox_is_empty(msg_mailbox_t mailbox)
{
- return (NULL == simcall_mbox_get_head(mailbox));
+ return (nullptr == simcall_mbox_front(mailbox));
}
-msg_task_t MSG_mailbox_get_head(msg_mailbox_t mailbox)
+msg_task_t MSG_mailbox_front(msg_mailbox_t mailbox)
{
- smx_synchro_t comm = simcall_mbox_get_head(mailbox);
+ simgrid::simix::Comm* comm = static_cast<simgrid::simix::Comm*>(simcall_mbox_front(mailbox));
if (!comm)
- return NULL;
+ return nullptr;
- return (msg_task_t) simcall_comm_get_src_data(comm);
+ return (msg_task_t) comm->src_data;
}
msg_mailbox_t MSG_mailbox_get_by_alias(const char *alias)
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);
+ try {
+ simcall_comm_recv(MSG_process_self(), mailbox, task, nullptr, nullptr, nullptr, nullptr, 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;
+ (*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) {