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
Add some strategies and fix the semantics of Max/MinMatch
[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 c1acbba9134a94985390b8154948b0b5227e351d..4e51cdd027068ff28fcd5ed2f44d252bba9bd577 100644
(file)
--- a/
src/mc/explo/simgrid_mc.cpp
+++ b/
src/mc/explo/simgrid_mc.cpp
@@
-1,12
+1,12
@@
-/* Copyright (c) 2015-202
2
. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2015-202
3
. The SimGrid Team. All rights reserved. */
/* 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 "simgrid/sg_config.hpp"
#include "src/mc/explo/Exploration.hpp"
#include "src/mc/mc_config.hpp"
#include "src/mc/mc_exit.hpp"
#include "src/mc/explo/Exploration.hpp"
#include "src/mc/mc_config.hpp"
#include "src/mc/mc_exit.hpp"
+#include "src/simgrid/sg_config.hpp"
#if HAVE_SMPI
#include "smpi/smpi.h"
#if HAVE_SMPI
#include "smpi/smpi.h"
@@
-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:
@@
-35,23
+35,23
@@
int main(int argc, char** argv)
std::unique_ptr<Exploration> explo;
std::unique_ptr<Exploration> explo;
+#if SIMGRID_HAVE_STATEFUL_MC
if (_sg_mc_comms_determinism || _sg_mc_send_determinism)
explo = std::unique_ptr<Exploration>(create_communication_determinism_checker(argv_copy, cfg_use_DPOR()));
else if (_sg_mc_unfolding_checker)
explo = std::unique_ptr<Exploration>(create_udpor_checker(argv_copy));
if (_sg_mc_comms_determinism || _sg_mc_send_determinism)
explo = std::unique_ptr<Exploration>(create_communication_determinism_checker(argv_copy, cfg_use_DPOR()));
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 if (not _sg_mc_property_file.get().empty())
explo = std::unique_ptr<Exploration>(create_liveness_checker(argv_copy));
explo = std::unique_ptr<Exploration>(create_liveness_checker(argv_copy));
+ else
+#endif
+ explo = std::unique_ptr<Exploration>(create_dfs_exploration(argv_copy, cfg_use_DPOR()));
+ 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)
;
}
}