A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use msg_process_t instead of m_process_t
[simgrid.git]
/
src
/
msg
/
msg_mailbox.c
diff --git
a/src/msg/msg_mailbox.c
b/src/msg/msg_mailbox.c
index 199b7c423f23d3c19cfceaa34df1a1b39670d8bd..dfd97d72fcab73dba93aa08172eec8fe573fb70c 100644
(file)
--- a/
src/msg/msg_mailbox.c
+++ b/
src/msg/msg_mailbox.c
@@
-8,6
+8,7
@@
#include "msg_mailbox.h"
#include "msg_private.h"
#include "msg_mailbox.h"
#include "msg_private.h"
+
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(msg_mailbox, msg,
"Logging specific to MSG (mailbox)");
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,
m_host_t host)
{
return simcall_rdv_comm_count_by_host(mailbox,
- host->s
imdata->s
mx_host);
+ host->smx_host);
}
msg_mailbox_t MSG_mailbox_get_by_alias(const char *alias)
}
msg_mailbox_t MSG_mailbox_get_by_alias(const char *alias)
@@
-65,7
+66,6
@@
MSG_mailbox_get_task_ext(msg_mailbox_t mailbox, m_task_t * task,
if (host)
THROW_UNIMPLEMENTED;
if (host)
THROW_UNIMPLEMENTED;
- CHECK_HOST();
#ifdef HAVE_TRACING
TRACE_msg_task_get_start();
volatile double start_time = MSG_get_clock();
#ifdef HAVE_TRACING
TRACE_msg_task_get_start();
volatile double start_time = MSG_get_clock();
@@
-86,9
+86,6
@@
MSG_mailbox_get_task_ext(msg_mailbox_t mailbox, m_task_t * task,
}
CATCH(e) {
switch (e.category) {
}
CATCH(e) {
switch (e.category) {
- case host_error:
- ret = MSG_HOST_FAILURE;
- break;
case network_error:
ret = MSG_TRANSFER_FAILURE;
break;
case network_error:
ret = MSG_TRANSFER_FAILURE;
break;
@@
-118,9
+115,8
@@
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;
xbt_ex_t e;
MSG_error_t ret = MSG_OK;
simdata_task_t t_simdata = NULL;
- m_process_t process = MSG_process_self();
+ m
sg
_process_t process = MSG_process_self();
simdata_process_t p_simdata = SIMIX_process_self_get_data(process);
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()
#ifdef HAVE_TRACING
int call_end = TRACE_msg_task_put_start(task); //must be after CHECK_HOST()
@@
-157,9
+153,6
@@
MSG_mailbox_put_with_timeout(msg_mailbox_t mailbox, m_task_t task,
CATCH(e) {
switch (e.category) {
CATCH(e) {
switch (e.category) {
- case host_error:
- ret = MSG_HOST_FAILURE;
- break;
case network_error:
ret = MSG_TRANSFER_FAILURE;
break;
case network_error:
ret = MSG_TRANSFER_FAILURE;
break;
@@
-194,6
+187,6
@@
msg_mailbox_t MSG_mailbox_get_by_channel(m_host_t host,
&& (channel < msg_global->max_channel), "Invalid channel %d",
channel);
&& (channel < msg_global->max_channel), "Invalid channel %d",
channel);
- return host->
simdata->
mailboxes[(size_t) channel];
+ return host->mailboxes[(size_t) channel];
}
#endif
}
#endif