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
stringify (a lot)
[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
413b22d
..
277dead
100644
(file)
--- a/
src/mc/checker/simgrid_mc.cpp
+++ b/
src/mc/checker/simgrid_mc.cpp
@@
-1,4
+1,4
@@
-/* Copyright (c) 2015. The SimGrid Team.
+/* Copyright (c) 2015
-2017
. The SimGrid Team.
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
@@
-19,43
+19,41
@@
#include "simgrid/sg_config.h"
#include "src/xbt_modinter.h"
#include "simgrid/sg_config.h"
#include "src/xbt_modinter.h"
-#include "src/mc/mc_base.h"
-#include "src/mc/mc_private.h"
-#include "src/mc/mc_protocol.h"
-#include "src/mc/mc_safety.h"
-#include "src/mc/mc_comm_pattern.h"
-#include "src/mc/mc_exit.h"
#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.hpp"
+#include "src/mc/mc_private.hpp"
+#include "src/mc/mc_safety.hpp"
+#include "src/mc/remote/mc_protocol.h"
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");
+extern std::string _sg_mc_property_file;
static inline
char** argvdup(int argc, char** argv)
{
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 || _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.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)
@@
-73,7
+71,7
@@
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);
simgrid::mc::session = session.get();
std::unique_ptr<simgrid::mc::Checker> checker = createChecker(*session);