X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/ffbfdb3354cedfee2d8d6f3831ab04634bc004bd..17c6b11aff7b32922cbc2255975d8a257687045c:/src/msg/msg_mailbox.c diff --git a/src/msg/msg_mailbox.c b/src/msg/msg_mailbox.c index 4eb5053183..199b7c423f 100644 --- a/src/msg/msg_mailbox.c +++ b/src/msg/msg_mailbox.c @@ -55,18 +55,6 @@ 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) @@ -147,6 +135,7 @@ MSG_mailbox_put_with_timeout(msg_mailbox_t mailbox, m_task_t task, "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++; @@ -194,3 +183,17 @@ MSG_mailbox_put_with_timeout(msg_mailbox_t mailbox, m_task_t task, #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->simdata->mailboxes[(size_t) channel]; +} +#endif