X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/8d510dd9844ff0da71e3856a38fe067973d03e04..d9cad55dcc546b3936c278258e7f463ac70066df:/src/msg/msg_mailbox.c diff --git a/src/msg/msg_mailbox.c b/src/msg/msg_mailbox.c index 7279654fc4..dfd97d72fc 100644 --- a/src/msg/msg_mailbox.c +++ b/src/msg/msg_mailbox.c @@ -8,6 +8,7 @@ #include "msg_mailbox.h" #include "msg_private.h" + XBT_LOG_NEW_DEFAULT_SUBCATEGORY(msg_mailbox, msg, "Logging specific to MSG (mailbox)"); @@ -41,7 +42,7 @@ MSG_mailbox_get_count_host_waiting_tasks(msg_mailbox_t 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) @@ -85,9 +86,6 @@ MSG_mailbox_get_task_ext(msg_mailbox_t mailbox, m_task_t * task, } CATCH(e) { switch (e.category) { - case host_error: - ret = MSG_HOST_FAILURE; - break; case network_error: ret = MSG_TRANSFER_FAILURE; break; @@ -117,7 +115,7 @@ MSG_mailbox_put_with_timeout(msg_mailbox_t mailbox, m_task_t task, 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); #ifdef HAVE_TRACING @@ -155,9 +153,6 @@ MSG_mailbox_put_with_timeout(msg_mailbox_t mailbox, m_task_t task, CATCH(e) { switch (e.category) { - case host_error: - ret = MSG_HOST_FAILURE; - break; case network_error: ret = MSG_TRANSFER_FAILURE; break; @@ -192,6 +187,6 @@ msg_mailbox_t MSG_mailbox_get_by_channel(m_host_t host, && (channel < msg_global->max_channel), "Invalid channel %d", channel); - return host->simdata->mailboxes[(size_t) channel]; + return host->mailboxes[(size_t) channel]; } #endif