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
further tidy the includes in MC
[simgrid.git]
/
src
/
mc
/
checker
/
simgrid_mc.cpp
diff --git
a/src/mc/checker/simgrid_mc.cpp
b/src/mc/checker/simgrid_mc.cpp
index 1b57a3f97fb2c56aa2d5a2183240af9066ec91e3..0a713b85500fca4995846c687997baf962a63699 100644
(file)
--- a/
src/mc/checker/simgrid_mc.cpp
+++ b/
src/mc/checker/simgrid_mc.cpp
@@
-1,62
+1,42
@@
-/* Copyright (c) 2015-201
7
. The SimGrid Team.
+/* Copyright (c) 2015-201
9
. 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. */
* 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. */
-#include <exception>
-
-#include <cstdlib>
-#include <cstdio>
-#include <cstring>
-
-#include <utility>
-
-#include <unistd.h>
-
-#include <xbt/log.h>
-
-#include "simgrid/sg_config.h"
-#include "src/xbt_modinter.h"
-
+#include "simgrid/sg_config.hpp"
#include "src/mc/Session.hpp"
#include "src/mc/checker/Checker.hpp"
#include "src/mc/Session.hpp"
#include "src/mc/checker/Checker.hpp"
-#include "src/mc/mc_base.h"
-#include "src/mc/mc_comm_pattern.hpp"
-#include "src/mc/mc_exit.h"
-#include "src/mc/mc_private.h"
-#include "src/mc/mc_safety.h"
-#include "src/mc/remote/mc_protocol.h"
+#include "src/mc/mc_config.hpp"
+#include "src/mc/mc_exit.hpp"
+
+#include <cstring>
+#include <memory>
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_main, mc, "Entry point for simgrid-mc");
static inline
char** argvdup(int argc, char** argv)
{
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_main, mc, "Entry point for simgrid-mc");
static inline
char** argvdup(int argc, char** argv)
{
- char** argv_copy =
xbt_new(char*, argc+1)
;
+ char** argv_copy =
new char*[argc + 1]
;
std::memcpy(argv_copy, argv, sizeof(char*) * argc);
argv_copy[argc] = nullptr;
return argv_copy;
}
std::memcpy(argv_copy, argv, sizeof(char*) * argc);
argv_copy[argc] = nullptr;
return argv_copy;
}
-static
-std::unique_ptr<simgrid::mc::Checker> createChecker(simgrid::mc::Session& session)
+static std::unique_ptr<simgrid::mc::Checker> createChecker(simgrid::mc::Session& session)
{
if (_sg_mc_comms_determinism || _sg_mc_send_determinism)
{
if (_sg_mc_comms_determinism || _sg_mc_send_determinism)
- return std::unique_ptr<simgrid::mc::Checker>(
- simgrid::mc::createCommunicationDeterminismChecker(session));
- else if (_sg_mc_property_file == nullptr || _sg_mc_property_file[0] == '\0')
- return std::unique_ptr<simgrid::mc::Checker>(
- simgrid::mc::createSafetyChecker(session));
+ return std::unique_ptr<simgrid::mc::Checker>(simgrid::mc::createCommunicationDeterminismChecker(session));
+ else if (_sg_mc_property_file.get().empty())
+ return std::unique_ptr<simgrid::mc::Checker>(simgrid::mc::createSafetyChecker(session));
else
else
- return std::unique_ptr<simgrid::mc::Checker>(
- simgrid::mc::createLivenessChecker(session));
+ return std::unique_ptr<simgrid::mc::Checker>(simgrid::mc::createLivenessChecker(session));
}
int main(int argc, char** argv)
{
using simgrid::mc::Session;
}
int main(int argc, char** argv)
{
using simgrid::mc::Session;
- XBT_LOG_CONNECT(mc_main);
try {
if (argc < 2)
try {
if (argc < 2)
@@
-74,18
+54,18
@@
int main(int argc, char** argv)
std::unique_ptr<Session> session =
std::unique_ptr<Session>(Session::spawnvp(argv_copy[1], argv_copy+1));
std::unique_ptr<Session> session =
std::unique_ptr<Session>(Session::spawnvp(argv_copy[1], argv_copy+1));
-
free(argv_copy)
;
+
delete[] argv_copy
;
simgrid::mc::session = session.get();
std::unique_ptr<simgrid::mc::Checker> checker = createChecker(*session);
int res = SIMGRID_MC_EXIT_SUCCESS;
try {
checker->run();
simgrid::mc::session = session.get();
std::unique_ptr<simgrid::mc::Checker> checker = createChecker(*session);
int res = SIMGRID_MC_EXIT_SUCCESS;
try {
checker->run();
- } catch (
simgrid::mc::DeadlockError& de
) {
+ } catch (
const simgrid::mc::DeadlockError&
) {
res = SIMGRID_MC_EXIT_DEADLOCK;
res = SIMGRID_MC_EXIT_DEADLOCK;
- } catch (
simgrid::mc::TerminationError& te
) {
+ } catch (
const simgrid::mc::TerminationError&
) {
res = SIMGRID_MC_EXIT_NON_TERMINATION;
res = SIMGRID_MC_EXIT_NON_TERMINATION;
- } catch (
simgrid::mc::LivenessError& le
) {
+ } catch (
const simgrid::mc::LivenessError&
) {
res = SIMGRID_MC_EXIT_LIVENESS;
}
checker = nullptr;
res = SIMGRID_MC_EXIT_LIVENESS;
}
checker = nullptr;