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
Fix some warnings in doc
[simgrid.git]
/
src
/
msg
/
msg_mailbox.c
diff --git
a/src/msg/msg_mailbox.c
b/src/msg/msg_mailbox.c
index
9b94299
..
8d1e7c9
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)");
@@
-26,19
+27,19
@@
int MSG_mailbox_is_empty(msg_mailbox_t mailbox)
return (NULL == simcall_rdv_get_head(mailbox));
}
return (NULL == simcall_rdv_get_head(mailbox));
}
-m_task_t MSG_mailbox_get_head(msg_mailbox_t mailbox)
+m
sg
_task_t MSG_mailbox_get_head(msg_mailbox_t mailbox)
{
smx_action_t comm = simcall_rdv_get_head(mailbox);
if (!comm)
return NULL;
{
smx_action_t comm = simcall_rdv_get_head(mailbox);
if (!comm)
return NULL;
- return (m_task_t) simcall_comm_get_src_data(comm);
+ return (m
sg
_task_t) simcall_comm_get_src_data(comm);
}
int
MSG_mailbox_get_count_host_waiting_tasks(msg_mailbox_t mailbox,
}
int
MSG_mailbox_get_count_host_waiting_tasks(msg_mailbox_t mailbox,
- m_host_t host)
+ m
sg
_host_t host)
{
return simcall_rdv_comm_count_by_host(mailbox,
host->smx_host);
{
return simcall_rdv_comm_count_by_host(mailbox,
host->smx_host);
@@
-55,12
+56,12
@@
msg_mailbox_t MSG_mailbox_get_by_alias(const char *alias)
return mailbox;
}
return mailbox;
}
-
MSG
_error_t
-MSG_mailbox_get_task_ext(msg_mailbox_t mailbox, m_task_t * task,
- m_host_t host, double timeout)
+
msg
_error_t
+MSG_mailbox_get_task_ext(msg_mailbox_t mailbox, m
sg
_task_t * task,
+ m
sg
_host_t host, double timeout)
{
xbt_ex_t e;
{
xbt_ex_t e;
-
MSG
_error_t ret = MSG_OK;
+
msg
_error_t ret = MSG_OK;
/* We no longer support getting a task from a specific host */
if (host)
THROW_UNIMPLEMENTED;
/* We no longer support getting a task from a specific host */
if (host)
THROW_UNIMPLEMENTED;
@@
-85,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;
@@
-110,14
+108,14
@@
MSG_mailbox_get_task_ext(msg_mailbox_t mailbox, m_task_t * task,
MSG_RETURN(ret);
}
MSG_RETURN(ret);
}
-
MSG
_error_t
-MSG_mailbox_put_with_timeout(msg_mailbox_t mailbox, m_task_t task,
+
msg
_error_t
+MSG_mailbox_put_with_timeout(msg_mailbox_t mailbox, m
sg
_task_t task,
double timeout)
{
xbt_ex_t e;
double timeout)
{
xbt_ex_t e;
-
MSG
_error_t ret = MSG_OK;
+
msg
_error_t ret = MSG_OK;
simdata_task_t t_simdata = NULL;
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);
#ifdef HAVE_TRACING
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) {
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;
@@
-183,7
+178,7
@@
MSG_mailbox_put_with_timeout(msg_mailbox_t mailbox, m_task_t task,
}
#ifdef MSG_USE_DEPRECATED
}
#ifdef MSG_USE_DEPRECATED
-msg_mailbox_t MSG_mailbox_get_by_channel(m_host_t host,
+msg_mailbox_t MSG_mailbox_get_by_channel(m
sg
_host_t host,
m_channel_t channel)
{
XBT_WARN("DEPRECATED! Now use MSG_mailbox_get_by_alias");
m_channel_t channel)
{
XBT_WARN("DEPRECATED! Now use MSG_mailbox_get_by_alias");
@@
-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);
&& (channel < msg_global->max_channel), "Invalid channel %d",
channel);
- return host->
simdata->
mailboxes[(size_t) channel];
+ return host->mailboxes[(size_t) channel];
}
#endif
}
#endif