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
create a singleton for s4u::Engine
[simgrid.git]
/
src
/
mc
/
mc_request.cpp
diff --git
a/src/mc/mc_request.cpp
b/src/mc/mc_request.cpp
index
c0708c4
..
0e8640d
100644
(file)
--- a/
src/mc/mc_request.cpp
+++ b/
src/mc/mc_request.cpp
@@
-10,7
+10,6
@@
#include <xbt/str.h>
#include <xbt/sysdep.h>
#include <xbt/dynar.h>
#include <xbt/str.h>
#include <xbt/sysdep.h>
#include <xbt/dynar.h>
-#include <xbt/misc.h>
#include "src/mc/mc_request.h"
#include "src/mc/mc_safety.h"
#include "src/mc/mc_request.h"
#include "src/mc/mc_safety.h"
@@
-42,7
+41,7
@@
smx_synchro_t MC_get_comm(smx_simcall_t r)
}
static inline
}
static inline
-smx_
rdv
_t MC_get_rdv(smx_simcall_t r)
+smx_
mailbox
_t MC_get_rdv(smx_simcall_t r)
{
switch(r->call) {
case SIMCALL_COMM_ISEND:
{
switch(r->call) {
case SIMCALL_COMM_ISEND:
@@
-72,7
+71,7
@@
int MC_request_depend_asymmetric(smx_simcall_t r1, smx_simcall_t r2)
if ((r1->call == SIMCALL_COMM_ISEND || r1->call == SIMCALL_COMM_IRECV)
&& r2->call == SIMCALL_COMM_WAIT) {
if ((r1->call == SIMCALL_COMM_ISEND || r1->call == SIMCALL_COMM_IRECV)
&& r2->call == SIMCALL_COMM_WAIT) {
- smx_
rdv
_t rdv = MC_get_rdv(r1);
+ smx_
mailbox
_t rdv = MC_get_rdv(r1);
if (rdv != synchro2->comm.rdv_cpy
&& simcall_comm_wait__get__timeout(r2) <= 0)
if (rdv != synchro2->comm.rdv_cpy
&& simcall_comm_wait__get__timeout(r2) <= 0)