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
Put XBT_WARN when try to use channel and not alias system.
[simgrid.git]
/
src
/
msg
/
msg_mailbox.c
diff --git
a/src/msg/msg_mailbox.c
b/src/msg/msg_mailbox.c
index
e25051c
..
8d575a6
100644
(file)
--- a/
src/msg/msg_mailbox.c
+++ b/
src/msg/msg_mailbox.c
@@
-58,6
+58,7
@@
msg_mailbox_t MSG_mailbox_get_by_alias(const char *alias)
msg_mailbox_t MSG_mailbox_get_by_channel(m_host_t host,
m_channel_t channel)
{
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",
xbt_assert((host != NULL), "Invalid host");
xbt_assert((channel >= 0)
&& (channel < msg_global->max_channel), "Invalid channel %d",
@@
-153,21
+154,16
@@
MSG_mailbox_put_with_timeout(msg_mailbox_t mailbox, m_task_t task,
/* Try to send it by calling SIMIX network layer */
TRY {
/* Try to send it by calling SIMIX network layer */
TRY {
-#ifdef HAVE_TRACING
- if (TRACE_is_enabled()) {
smx_action_t comm = SIMIX_req_comm_isend(mailbox, t_simdata->message_size,
t_simdata->rate, task, sizeof(void *),
smx_action_t comm = SIMIX_req_comm_isend(mailbox, t_simdata->message_size,
t_simdata->rate, task, sizeof(void *),
- NULL, NULL, 0);
- SIMIX_req_set_category(comm, task->category);
- SIMIX_req_comm_wait(comm, timeout);
- } else {
-#endif
- SIMIX_req_comm_send(mailbox, t_simdata->message_size,
- t_simdata->rate, task, sizeof(void*),
- NULL, NULL, timeout);
+ NULL, NULL, task, 0);
#ifdef HAVE_TRACING
#ifdef HAVE_TRACING
+ if (TRACE_is_enabled()) {
+ SIMIX_req_set_category(comm, task->category);
}
#endif
}
#endif
+ t_simdata->comm = comm;
+ SIMIX_req_comm_wait(comm, timeout);
}
CATCH(e) {
}
CATCH(e) {
@@
-190,6
+186,7
@@
MSG_mailbox_put_with_timeout(msg_mailbox_t mailbox, m_task_t task,
t_simdata->isused = 0;
}
t_simdata->isused = 0;
}
+
p_simdata->waiting_task = NULL;
#ifdef HAVE_TRACING
if (call_end)
p_simdata->waiting_task = NULL;
#ifdef HAVE_TRACING
if (call_end)