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
[mc] Remove mcer_ignore.cpp
[simgrid.git]
/
src
/
mc
/
mc_base.cpp
diff --git
a/src/mc/mc_base.cpp
b/src/mc/mc_base.cpp
index
294ef16
..
5a7f2f8
100644
(file)
--- a/
src/mc/mc_base.cpp
+++ b/
src/mc/mc_base.cpp
@@
-18,7
+18,6
@@
#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 "src/mc/Server.hpp"
#include "mc_smx.h"
#endif
#include "mc_smx.h"
#endif
@@
-41,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) {
- simgrid::mc::server->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;
@@
-233,7
+227,7
@@
void MC_simcall_handle(smx_simcall_t req, int value)
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) {
-
simgrid::mc::serv
er->simcall_handle(
+
mc_model_check
er->simcall_handle(
mc_model_checker->process(), pi->copy.pid, value);
return;
}
mc_model_checker->process(), pi->copy.pid, value);
return;
}