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
Push Takahiro Patch and fix cloud.tesh - Adrien
[simgrid.git]
/
src
/
msg
/
msg_mailbox.c
diff --git
a/src/msg/msg_mailbox.c
b/src/msg/msg_mailbox.c
index
557b26a
..
fce4953
100644
(file)
--- a/
src/msg/msg_mailbox.c
+++ b/
src/msg/msg_mailbox.c
@@
-130,12
+130,11
@@
MSG_mailbox_get_task_ext_bounded(msg_mailbox_t mailbox, msg_task_t * task,
/* Try to receive it by calling SIMIX network layer */
TRY {
/* Try to receive it by calling SIMIX network layer */
TRY {
- simcall_comm_recv(mailbox, task, NULL, NULL, NULL, timeout, rate);
+ simcall_comm_recv(mailbox, task, NULL, NULL, NULL,
NULL,
timeout, rate);
XBT_DEBUG("Got task %s from %p",(*task)->name,mailbox);
XBT_DEBUG("Got task %s from %p",(*task)->name,mailbox);
- simdata_task_t simdata = (*task)->simdata;
- if (msg_global->debug_multiple_use && simdata->isused!=0)
- xbt_ex_free(*(xbt_ex_t*)simdata->isused);
- simdata->isused = 0;
+ if (msg_global->debug_multiple_use && (*task)->simdata->isused!=0)
+ xbt_ex_free(*(xbt_ex_t*)(*task)->simdata->isused);
+ (*task)->simdata->isused = 0;
}
CATCH(e) {
switch (e.category) {
}
CATCH(e) {
switch (e.category) {
@@
-208,9
+207,9
@@
MSG_mailbox_put_with_timeout(msg_mailbox_t mailbox, msg_task_t task,
/* Try to send it by calling SIMIX network layer */
TRY {
smx_action_t comm = NULL; /* MC needs the comm to be set to NULL during the simix call */
/* Try to send it by calling SIMIX network layer */
TRY {
smx_action_t comm = NULL; /* MC needs the comm to be set to NULL during the simix call */
- comm = simcall_comm_isend(
mailbox,
t_simdata->message_size,
+ comm = simcall_comm_isend(
SIMIX_process_self(), mailbox,
t_simdata->message_size,
t_simdata->rate, task, sizeof(void *),
t_simdata->rate, task, sizeof(void *),
- NULL, NULL, task, 0);
+ NULL, NULL,
NULL,
task, 0);
#ifdef HAVE_TRACING
if (TRACE_is_enabled()) {
simcall_set_category(comm, task->category);
#ifdef HAVE_TRACING
if (TRACE_is_enabled()) {
simcall_set_category(comm, task->category);