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
convert S4U to my current coding convention
[simgrid.git]
/
src
/
mc
/
mc_base.cpp
diff --git
a/src/mc/mc_base.cpp
b/src/mc/mc_base.cpp
index
01f56bf
..
d7cf4eb
100644
(file)
--- a/
src/mc/mc_base.cpp
+++ b/
src/mc/mc_base.cpp
@@
-8,17
+8,17
@@
#include <simgrid/simix.h>
#include <simgrid/simix.h>
-#include "mc_base.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/simix/smx_private.h"
#include "src/mc/mc_record.h"
#include "src/mc/mc_replay.h"
#include "mc/mc.h"
-#include "mc_protocol.h"
+#include "
src/mc/
mc_protocol.h"
#ifdef HAVE_MC
#include "src/mc/Process.hpp"
#include "src/mc/ModelChecker.hpp"
#ifdef HAVE_MC
#include "src/mc/Process.hpp"
#include "src/mc/ModelChecker.hpp"
-#include "mc_smx.h"
+#include "
src/mc/
mc_smx.h"
#endif
#ifdef HAVE_MC
#endif
#ifdef HAVE_MC
@@
-40,12
+40,7
@@
int MC_random(int min, int max)
void MC_wait_for_requests(void)
{
void MC_wait_for_requests(void)
{
-#ifdef HAVE_MC
- if (mc_mode == MC_MODE_SERVER) {
- mc_model_checker->wait_client(mc_model_checker->process());
- return;
- }
-#endif
+ assert(mc_mode != MC_MODE_SERVER);
smx_process_t process;
smx_simcall_t req;
smx_process_t process;
smx_simcall_t req;