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 warning about clobbered variable.
[simgrid.git]
/
src
/
msg
/
msg_mailbox.c
diff --git
a/src/msg/msg_mailbox.c
b/src/msg/msg_mailbox.c
index
c45fd91
..
e25051c
100644
(file)
--- a/
src/msg/msg_mailbox.c
+++ b/
src/msg/msg_mailbox.c
@@
-6,8
+6,8
@@
/* This program is free software; you can redistribute it and/or modify it
* under the terms of the license (GNU LGPL) which comes with this package. */
/* This program is free software; you can redistribute it and/or modify it
* under the terms of the license (GNU LGPL) which comes with this package. */
-#include "mailbox.h"
-#include "msg
/
private.h"
+#include "m
sg_m
ailbox.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)");
@@
-79,7
+79,7
@@
MSG_mailbox_get_task_ext(msg_mailbox_t mailbox, m_task_t * task,
CHECK_HOST();
#ifdef HAVE_TRACING
TRACE_msg_task_get_start();
CHECK_HOST();
#ifdef HAVE_TRACING
TRACE_msg_task_get_start();
- double start_time = MSG_get_clock();
+
volatile
double start_time = MSG_get_clock();
#endif
/* Sanity check */
#endif
/* Sanity check */
@@
-130,7
+130,7
@@
MSG_mailbox_put_with_timeout(msg_mailbox_t mailbox, m_task_t task,
MSG_error_t ret = MSG_OK;
simdata_task_t t_simdata = NULL;
m_process_t process = MSG_process_self();
MSG_error_t ret = MSG_OK;
simdata_task_t t_simdata = NULL;
m_process_t process = MSG_process_self();
- simdata_process_t p_simdata = SIMIX_process_self_get_data();
+ simdata_process_t p_simdata = SIMIX_process_self_get_data(
process
);
CHECK_HOST();
#ifdef HAVE_TRACING
CHECK_HOST();
#ifdef HAVE_TRACING
@@
-140,7
+140,7
@@
MSG_mailbox_put_with_timeout(msg_mailbox_t mailbox, m_task_t task,
/* Prepare the task to send */
t_simdata = task->simdata;
t_simdata->sender = process;
/* Prepare the task to send */
t_simdata = task->simdata;
t_simdata->sender = process;
- t_simdata->source =
MSG_host_self()
;
+ t_simdata->source =
((simdata_process_t) SIMIX_process_self_get_data(process))->m_host
;
xbt_assert(t_simdata->isused == 0,
"This task is still being used somewhere else. You cannot send it now. Go fix your code!");
xbt_assert(t_simdata->isused == 0,
"This task is still being used somewhere else. You cannot send it now. Go fix your code!");