#include "msg_mailbox.h"
#include "msg_private.h"
+
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(msg_mailbox, msg,
"Logging specific to MSG (mailbox)");
m_host_t host)
{
return simcall_rdv_comm_count_by_host(mailbox,
- host->simdata->smx_host);
+ host->smx_host);
}
msg_mailbox_t MSG_mailbox_get_by_alias(const char *alias)
return mailbox;
}
-msg_mailbox_t MSG_mailbox_get_by_channel(m_host_t host,
- m_channel_t channel)
-{
- XBT_WARN("DEPRECATED! Now use MSG_mailbox_get_by_alias");
- xbt_assert((host != NULL), "Invalid host");
- xbt_assert((channel >= 0)
- && (channel < msg_global->max_channel), "Invalid channel %d",
- channel);
-
- return host->simdata->mailboxes[(size_t) channel];
-}
-
MSG_error_t
MSG_mailbox_get_task_ext(msg_mailbox_t mailbox, m_task_t * task,
m_host_t host, double timeout)
if (host)
THROW_UNIMPLEMENTED;
- CHECK_HOST();
#ifdef HAVE_TRACING
TRACE_msg_task_get_start();
volatile double start_time = MSG_get_clock();
}
CATCH(e) {
switch (e.category) {
- case host_error:
- ret = MSG_HOST_FAILURE;
- break;
case network_error:
ret = MSG_TRANSFER_FAILURE;
break;
xbt_ex_t e;
MSG_error_t ret = MSG_OK;
simdata_task_t t_simdata = NULL;
- m_process_t process = MSG_process_self();
+ msg_process_t process = MSG_process_self();
simdata_process_t p_simdata = SIMIX_process_self_get_data(process);
- CHECK_HOST();
#ifdef HAVE_TRACING
int call_end = TRACE_msg_task_put_start(task); //must be after CHECK_HOST()
"This task is still being used somewhere else. You cannot send it now. Go fix your code!");
t_simdata->isused=1;
+ t_simdata->comm = NULL;
msg_global->sent_msg++;
CATCH(e) {
switch (e.category) {
- case host_error:
- ret = MSG_HOST_FAILURE;
- break;
case network_error:
ret = MSG_TRANSFER_FAILURE;
break;
t_simdata->isused = 0;
}
- t_simdata->comm = NULL;
+
p_simdata->waiting_task = NULL;
#ifdef HAVE_TRACING
if (call_end)
#endif
MSG_RETURN(ret);
}
+
+#ifdef MSG_USE_DEPRECATED
+msg_mailbox_t MSG_mailbox_get_by_channel(m_host_t host,
+ m_channel_t channel)
+{
+ XBT_WARN("DEPRECATED! Now use MSG_mailbox_get_by_alias");
+ xbt_assert((host != NULL), "Invalid host");
+ xbt_assert((channel >= 0)
+ && (channel < msg_global->max_channel), "Invalid channel %d",
+ channel);
+
+ return host->mailboxes[(size_t) channel];
+}
+#endif