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 8da00022dae55bcfcfbc4a5d5edb9e73c91f811b..51871357ee2046d660d4148a9da68d27ed5cedfb 100644
(file)
--- a/
src/mc/explo/simgrid_mc.cpp
+++ b/
src/mc/explo/simgrid_mc.cpp
@@
-1,72
+1,54
@@
-/* 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/internal_config.h"
#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"
#endif
#if HAVE_SMPI
#include "smpi/smpi.h"
#endif
-#include <cstring>
-#include <memory>
-#include <unistd.h>
+XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(mc);
-using api = simgrid::mc::Api;
-
-static inline char** argvdup(int argc, char** argv)
-{
- auto* argv_copy = new char*[argc + 1];
- std::memcpy(argv_copy, argv, sizeof(char*) * argc);
- argv_copy[argc] = nullptr;
- return argv_copy;
-}
+using namespace simgrid::mc;
int main(int argc, char** argv)
{
xbt_assert(argc >= 2, "Missing arguments");
// Currently, we need this before sg_config_init:
int main(int argc, char** argv)
{
xbt_assert(argc >= 2, "Missing arguments");
// Currently, we need this before sg_config_init:
-
_sg_do_model_check = 1
;
+
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:
-
char** argv_copy = argvdup(argc, argv)
;
+
std::vector<char*> argv_copy{argv, argv + argc + 1}
;
xbt_log_init(&argc, argv);
#if HAVE_SMPI
xbt_log_init(&argc, argv);
#if HAVE_SMPI
- smpi_init_options(); //
only performed once
+ smpi_init_options(); //
that's OK to call it twice, and we need it ASAP
#endif
sg_config_init(&argc, argv);
#endif
sg_config_init(&argc, argv);
- simgrid::mc::CheckerAlgorithm algo;
+ std::unique_ptr<Exploration> explo;
+
if (_sg_mc_comms_determinism || _sg_mc_send_determinism)
if (_sg_mc_comms_determinism || _sg_mc_send_determinism)
- algo = simgrid::mc::CheckerAlgorithm::CommDeterminism;
+ explo = std::unique_ptr<Exploration>(
+ create_communication_determinism_checker(argv_copy, get_model_checking_reduction()));
else if (_sg_mc_unfolding_checker)
else if (_sg_mc_unfolding_checker)
- algo = simgrid::mc::CheckerAlgorithm::UDPOR;
- else if (_sg_mc_property_file.get().empty())
- algo = simgrid::mc::CheckerAlgorithm::Safety;
+ explo = std::unique_ptr<Exploration>(create_udpor_checker(argv_copy));
else
else
-
algo = simgrid::mc::CheckerAlgorithm::Liveness
;
+
explo = std::unique_ptr<Exploration>(create_dfs_exploration(argv_copy, get_model_checking_reduction()))
;
- int res = SIMGRID_MC_EXIT_SUCCESS;
- auto checker = api::get().initialize(argv_copy, algo);
+ ExitStatus status;
try {
try {
- checker->run();
- } catch (const simgrid::mc::DeadlockError&) {
- res = SIMGRID_MC_EXIT_DEADLOCK;
- } catch (const simgrid::mc::TerminationError&) {
- res = SIMGRID_MC_EXIT_NON_TERMINATION;
- } catch (const simgrid::mc::LivenessError&) {
- res = SIMGRID_MC_EXIT_LIVENESS;
+ explo->run();
+ status = ExitStatus::SUCCESS;
+ } catch (const McError& e) {
+ status = e.value;
}
}
- api::get().s_close();
- delete[] argv_copy;
- // delete checker; SEGFAULT in liveness
- return res;
+ return static_cast<int>(status);
}
}