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
attempt to replace internal dynar by std::vector
[simgrid.git]
/
src
/
mc
/
simgrid_mc.cpp
diff --git
a/src/mc/simgrid_mc.cpp
b/src/mc/simgrid_mc.cpp
index
949ed65
..
a115825
100644
(file)
--- a/
src/mc/simgrid_mc.cpp
+++ b/
src/mc/simgrid_mc.cpp
@@
-24,12
+24,9
@@
#include "src/mc/mc_protocol.h"
#include "src/mc/mc_safety.h"
#include "src/mc/mc_comm_pattern.h"
#include "src/mc/mc_protocol.h"
#include "src/mc/mc_safety.h"
#include "src/mc/mc_comm_pattern.h"
-#include "src/mc/LivenessChecker.hpp"
#include "src/mc/mc_exit.h"
#include "src/mc/Session.hpp"
#include "src/mc/Checker.hpp"
#include "src/mc/mc_exit.h"
#include "src/mc/Session.hpp"
#include "src/mc/Checker.hpp"
-#include "src/mc/CommunicationDeterminismChecker.hpp"
-#include "src/mc/SafetyChecker.hpp"
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_main, mc, "Entry point for simgrid-mc");
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_main, mc, "Entry point for simgrid-mc");
@@
-45,22
+42,15
@@
char** argvdup(int argc, char** argv)
static
std::unique_ptr<simgrid::mc::Checker> createChecker(simgrid::mc::Session& session)
{
static
std::unique_ptr<simgrid::mc::Checker> createChecker(simgrid::mc::Session& session)
{
- using simgrid::mc::Session;
- using simgrid::mc::FunctionalChecker;
-
- std::function<int(Session& session)> code;
if (_sg_mc_comms_determinism || _sg_mc_send_determinism)
return std::unique_ptr<simgrid::mc::Checker>(
if (_sg_mc_comms_determinism || _sg_mc_send_determinism)
return std::unique_ptr<simgrid::mc::Checker>(
-
new simgrid::mc::
CommunicationDeterminismChecker(session));
+
simgrid::mc::create
CommunicationDeterminismChecker(session));
else if (!_sg_mc_property_file || _sg_mc_property_file[0] == '\0')
return std::unique_ptr<simgrid::mc::Checker>(
else if (!_sg_mc_property_file || _sg_mc_property_file[0] == '\0')
return std::unique_ptr<simgrid::mc::Checker>(
-
new simgrid::mc::
SafetyChecker(session));
+
simgrid::mc::create
SafetyChecker(session));
else
return std::unique_ptr<simgrid::mc::Checker>(
else
return std::unique_ptr<simgrid::mc::Checker>(
- new simgrid::mc::LivenessChecker(session));
-
- return std::unique_ptr<simgrid::mc::Checker>(
- new FunctionalChecker(session, std::move(code)));
+ simgrid::mc::createLivenessChecker(session));
}
int main(int argc, char** argv)
}
int main(int argc, char** argv)
@@
-73,7
+63,6
@@
int main(int argc, char** argv)
// Currently, we need this before sg_config_init:
_sg_do_model_check = 1;
// Currently, we need this before sg_config_init:
_sg_do_model_check = 1;
- mc_mode = MC_MODE_SERVER;
// The initialisation function can touch argv.
// We make a copy of argv before modifying it in order to pass the original
// The initialisation function can touch argv.
// We make a copy of argv before modifying it in order to pass the original
@@
-89,6
+78,7
@@
int main(int argc, char** argv)
simgrid::mc::session = session.get();
std::unique_ptr<simgrid::mc::Checker> checker = createChecker(*session);
int res = checker->run();
simgrid::mc::session = session.get();
std::unique_ptr<simgrid::mc::Checker> checker = createChecker(*session);
int res = checker->run();
+ checker = nullptr;
session->close();
return res;
}
session->close();
return res;
}