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
Merge branch 'master' of git+ssh://scm.gforge.inria.fr//gitroot/simgrid/simgrid
[simgrid.git]
/
src
/
mc
/
mc_base.cpp
diff --git
a/src/mc/mc_base.cpp
b/src/mc/mc_base.cpp
index
d7cf4eb
..
5b61d7b
100644
(file)
--- a/
src/mc/mc_base.cpp
+++ b/
src/mc/mc_base.cpp
@@
-4,13
+4,18
@@
/* 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 <assert.h>
+#include <cassert>
+
+#include <simgrid_config.h>
+
+#include <xbt/log.h>
+#include <xbt/asserts.h>
+#include <xbt/dynar.h>
#include <simgrid/simix.h>
#include "src/mc/mc_base.h"
#include "src/simix/smx_private.h"
#include <simgrid/simix.h>
#include "src/mc/mc_base.h"
#include "src/simix/smx_private.h"
-#include "src/mc/mc_record.h"
#include "src/mc/mc_replay.h"
#include "mc/mc.h"
#include "src/mc/mc_protocol.h"
#include "src/mc/mc_replay.h"
#include "mc/mc.h"
#include "src/mc/mc_protocol.h"
@@
-88,9
+93,9
@@
int MC_request_is_enabled(smx_simcall_t req)
return TRUE;
} else {
/* On the other hand if it hasn't a timeout, check if the comm is ready.*/
return TRUE;
} else {
/* On the other hand if it hasn't a timeout, check if the comm is ready.*/
- if (act->comm.detached && act->comm.src_proc ==
NULL
+ if (act->comm.detached && act->comm.src_proc ==
nullptr
&& act->comm.type == SIMIX_COMM_READY)
&& act->comm.type == SIMIX_COMM_READY)
- return (act->comm.dst_proc !=
NULL
);
+ return (act->comm.dst_proc !=
nullptr
);
}
return (act->comm.src_proc && act->comm.dst_proc);
}
return (act->comm.src_proc && act->comm.dst_proc);
@@
-148,7
+153,7
@@
int MC_request_is_enabled(smx_simcall_t req)
mutex = &temp_mutex;
}
#endif
mutex = &temp_mutex;
}
#endif
- if(mutex->owner ==
NULL
)
+ if(mutex->owner ==
nullptr
)
return TRUE;
else
#ifdef HAVE_MC
return TRUE;
else
#ifdef HAVE_MC
@@
-223,7
+228,7
@@
void MC_simcall_handle(smx_simcall_t req, int value)
}
unsigned i;
}
unsigned i;
- mc_smx_process_info_t pi =
NULL
;
+ mc_smx_process_info_t pi =
nullptr
;
xbt_dynar_foreach_ptr(mc_model_checker->process().smx_process_infos, i, pi) {
if (req == &pi->copy.simcall) {
xbt_dynar_foreach_ptr(mc_model_checker->process().smx_process_infos, i, pi) {
if (req == &pi->copy.simcall) {