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:Adrien.Gougeon/simgrid
[simgrid.git]
/
src
/
mc
/
Session.cpp
diff --git
a/src/mc/Session.cpp
b/src/mc/Session.cpp
index
f3f1daf
..
d29fbeb
100644
(file)
--- a/
src/mc/Session.cpp
+++ b/
src/mc/Session.cpp
@@
-15,6
+15,8
@@
#include "xbt/log.h"
#include "xbt/system_error.hpp"
#include "xbt/log.h"
#include "xbt/system_error.hpp"
+#include <memory>
+
#include <fcntl.h>
#ifdef __linux__
#include <sys/prctl.h>
#include <fcntl.h>
#ifdef __linux__
#include <sys/prctl.h>
@@
-25,7
+27,7
@@
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_Session, mc, "Model-checker session");
namespace simgrid {
namespace mc {
namespace simgrid {
namespace mc {
-
static void run_child_process(int socket, const std::function<void()>&
code)
+
template <class Code> void run_child_process(int socket, Code
code)
{
/* On startup, simix_global_init() calls simgrid::mc::Client::initialize(), which checks whether the MC_ENV_SOCKET_FD
* env variable is set. If so, MC mode is assumed, and the client is setup from its side
{
/* On startup, simix_global_init() calls simgrid::mc::Client::initialize(), which checks whether the MC_ENV_SOCKET_FD
* env variable is set. If so, MC mode is assumed, and the client is setup from its side
@@
-64,7
+66,7
@@
Session::Session(const std::function<void()>& code)
"Please use the dlopen privatization schema when model-checking SMPI code");
#endif
"Please use the dlopen privatization schema when model-checking SMPI code");
#endif
- // Create a AF_LOCAL socketpair used for exchanging messages
+ // Create a
n
AF_LOCAL socketpair used for exchanging messages
// between the model-checker process (ourselves) and the model-checked
// process:
int sockets[2];
// between the model-checker process (ourselves) and the model-checked
// process:
int sockets[2];
@@
-85,8
+87,8
@@
Session::Session(const std::function<void()>& code)
xbt_assert(mc_model_checker == nullptr, "Did you manage to start the MC twice in this process?");
xbt_assert(mc_model_checker == nullptr, "Did you manage to start the MC twice in this process?");
- auto process = std::
unique_ptr<simgrid::mc::RemoteClientMemory>(new simgrid::mc::RemoteClientMemory(pid)
);
- model_checker_
.reset(new simgrid::mc::ModelChecker(std::move(process), sockets[1])
);
+ auto process = std::
make_unique<simgrid::mc::RemoteSimulation>(pid
);
+ model_checker_
= std::make_unique<simgrid::mc::ModelChecker>(std::move(process), sockets[1]
);
mc_model_checker = model_checker_.get();
model_checker_->start();
mc_model_checker = model_checker_.get();
model_checker_->start();
@@
-105,18
+107,18
@@
void Session::initialize()
initial_snapshot_ = std::make_shared<simgrid::mc::Snapshot>(0);
}
initial_snapshot_ = std::make_shared<simgrid::mc::Snapshot>(0);
}
-void Session::execute(Transition const& transition)
+void Session::execute(Transition const& transition)
const
{
model_checker_->handle_simcall(transition);
model_checker_->wait_for_requests();
}
{
model_checker_->handle_simcall(transition);
model_checker_->wait_for_requests();
}
-void Session::restore_initial_state()
+void Session::restore_initial_state()
const
{
{
- this->initial_snapshot_->restore(&model_checker_->
process
());
+ this->initial_snapshot_->restore(&model_checker_->
get_remote_simulation
());
}
}
-void Session::log_state()
+void Session::log_state()
const
{
model_checker_->getChecker()->log_state();
{
model_checker_->getChecker()->log_state();
@@
-141,7
+143,7
@@
void Session::close()
}
}
}
}
-bool Session::actor_is_enabled(aid_t pid)
+bool Session::actor_is_enabled(aid_t pid)
const
{
s_mc_message_actor_enabled_t msg{MC_MESSAGE_ACTOR_ENABLED, pid};
model_checker_->channel().send(msg);
{
s_mc_message_actor_enabled_t msg{MC_MESSAGE_ACTOR_ENABLED, pid};
model_checker_->channel().send(msg);