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
[trace] merging instr_variables.c into instr_interface.c (code re-organization)
[simgrid.git]
/
src
/
msg
/
msg_mailbox.c
diff --git
a/src/msg/msg_mailbox.c
b/src/msg/msg_mailbox.c
index
c4fb1ea
..
fad007c
100644
(file)
--- a/
src/msg/msg_mailbox.c
+++ b/
src/msg/msg_mailbox.c
@@
-13,7
+13,7
@@
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(msg_mailbox, msg,
msg_mailbox_t MSG_mailbox_new(const char *alias)
{
msg_mailbox_t MSG_mailbox_new(const char *alias)
{
- return SIMIX_req_rdv_create(alias
? xbt_strdup(alias) : NULL
);
+ return SIMIX_req_rdv_create(alias);
}
void MSG_mailbox_free(void *mailbox)
}
void MSG_mailbox_free(void *mailbox)
@@
-33,7
+33,7
@@
m_task_t MSG_mailbox_get_head(msg_mailbox_t mailbox)
if (!comm)
return NULL;
if (!comm)
return NULL;
- return (m_task_t) SIMIX_req_comm_get_data(comm);
+ return (m_task_t) SIMIX_req_comm_get_
src_
data(comm);
}
int
}
int
@@
-95,8
+95,9
@@
MSG_mailbox_get_task_ext(msg_mailbox_t mailbox, m_task_t * task,
/* Try to receive it by calling SIMIX network layer */
TRY {
/* Try to receive it by calling SIMIX network layer */
TRY {
- comm = SIMIX_req_comm_irecv(mailbox, task, NULL);
+ comm = SIMIX_req_comm_irecv(mailbox, task, NULL
, NULL, NULL
);
SIMIX_req_comm_wait(comm, timeout);
SIMIX_req_comm_wait(comm, timeout);
+ SIMIX_req_comm_destroy(comm);
DEBUG2("Got task %s from %p",(*task)->name,mailbox);
(*task)->simdata->refcount--;
}
DEBUG2("Got task %s from %p",(*task)->name,mailbox);
(*task)->simdata->refcount--;
}
@@
-161,8
+162,12
@@
MSG_mailbox_put_with_timeout(msg_mailbox_t mailbox, m_task_t task,
/* Try to send it by calling SIMIX network layer */
TRY {
t_simdata->comm = SIMIX_req_comm_isend(mailbox, t_simdata->message_size,
/* Try to send it by calling SIMIX network layer */
TRY {
t_simdata->comm = SIMIX_req_comm_isend(mailbox, t_simdata->message_size,
- t_simdata->rate, task, sizeof(void *), task);
+ t_simdata->rate, task, sizeof(void *), NULL, task);
+#ifdef HAVE_TRACING
+ SIMIX_req_set_category(t_simdata->comm, task->category);
+#endif
SIMIX_req_comm_wait(t_simdata->comm, timeout);
SIMIX_req_comm_wait(t_simdata->comm, timeout);
+ SIMIX_req_comm_destroy(t_simdata->comm);
}
CATCH(e) {
}
CATCH(e) {