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 framagit.org:simgrid/simgrid
[simgrid.git]
/
src
/
mc
/
explo
/
simgrid_mc.cpp
diff --git
a/src/mc/explo/simgrid_mc.cpp
b/src/mc/explo/simgrid_mc.cpp
index 00debdc8d78c808e28cac7af6657632452cbcd50..51871357ee2046d660d4148a9da68d27ed5cedfb 100644
(file)
--- a/
src/mc/explo/simgrid_mc.cpp
+++ b/
src/mc/explo/simgrid_mc.cpp
@@
-21,7
+21,7
@@
int main(int argc, char** argv)
xbt_assert(argc >= 2, "Missing arguments");
// Currently, we need this before sg_config_init:
xbt_assert(argc >= 2, "Missing arguments");
// Currently, we need this before sg_config_init:
- simgrid::mc::
cfg_do_model_check = true
;
+ simgrid::mc::
set_model_checking_mode(simgrid::mc::ModelCheckingMode::CHECKER_SIDE)
;
// The initialization function can touch argv.
// We make a copy of argv before modifying it in order to pass the original value to the model-checked application:
// The initialization function can touch argv.
// We make a copy of argv before modifying it in order to pass the original value to the model-checked application:
@@
-36,22
+36,19
@@
int main(int argc, char** argv)
std::unique_ptr<Exploration> explo;
if (_sg_mc_comms_determinism || _sg_mc_send_determinism)
std::unique_ptr<Exploration> explo;
if (_sg_mc_comms_determinism || _sg_mc_send_determinism)
- explo = std::unique_ptr<Exploration>(create_communication_determinism_checker(argv_copy, cfg_use_DPOR()));
+ explo = std::unique_ptr<Exploration>(
+ create_communication_determinism_checker(argv_copy, get_model_checking_reduction()));
else if (_sg_mc_unfolding_checker)
explo = std::unique_ptr<Exploration>(create_udpor_checker(argv_copy));
else if (_sg_mc_unfolding_checker)
explo = std::unique_ptr<Exploration>(create_udpor_checker(argv_copy));
- else if (_sg_mc_property_file.get().empty())
- explo = std::unique_ptr<Exploration>(create_dfs_exploration(argv_copy, cfg_use_DPOR()));
else
else
- explo = std::unique_ptr<Exploration>(create_
liveness_checker(argv_copy
));
+ explo = std::unique_ptr<Exploration>(create_
dfs_exploration(argv_copy, get_model_checking_reduction()
));
+ ExitStatus status;
try {
explo->run();
try {
explo->run();
- } catch (const DeadlockError&) {
- return SIMGRID_MC_EXIT_DEADLOCK;
- } catch (const TerminationError&) {
- return SIMGRID_MC_EXIT_NON_TERMINATION;
- } catch (const LivenessError&) {
- return SIMGRID_MC_EXIT_LIVENESS;
+ status = ExitStatus::SUCCESS;
+ } catch (const McError& e) {
+ status = e.value;
}
}
- return
SIMGRID_MC_EXIT_SUCCESS
;
+ return
static_cast<int>(status)
;
}
}