-/* Copyright (c) 2015-2016. The SimGrid Team.
+/* Copyright (c) 2015-2018. 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. */
+#include <csignal>
#include <fcntl.h>
-#include <signal.h>
#include <functional>
-#include <xbt/log.h>
-#include <xbt/system_error.hpp>
-#include <simgrid/sg_config.h>
-#include <simgrid/modelchecker.h>
+#include "xbt/log.h"
+#include "xbt/system_error.hpp"
#include <mc/mc.h>
+#include <simgrid/modelchecker.h>
+#include <simgrid/sg_config.hpp>
#include "src/mc/Session.hpp"
-#include "src/mc/mc_state.h"
-#include "src/mc/mc_private.h"
+#include "src/mc/checker/Checker.hpp"
+#include "src/mc/mc_private.hpp"
+#include "src/mc/mc_state.hpp"
+
+#include "src/smpi/include/private.hpp"
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_Session, mc, "Model-checker session");
sigset_t mask;
sigemptyset (&mask);
if (sigprocmask(SIG_SETMASK, &mask, nullptr) < 0)
- throw simgrid::xbt::errno_error(errno, "Could not unblock signals");
+ throw simgrid::xbt::errno_error("Could not unblock signals");
if (prctl(PR_SET_PDEATHSIG, SIGHUP) != 0)
- throw simgrid::xbt::errno_error(errno, "Could not PR_SET_PDEATHSIG");
+ throw simgrid::xbt::errno_error("Could not PR_SET_PDEATHSIG");
#endif
int res;
// Remove CLOEXEC in order to pass the socket to the exec-ed program:
int fdflags = fcntl(socket, F_GETFD, 0);
if (fdflags == -1 || fcntl(socket, F_SETFD, fdflags & ~FD_CLOEXEC) == -1)
- throw simgrid::xbt::errno_error(errno, "Could not remove CLOEXEC for socket");
+ throw simgrid::xbt::errno_error("Could not remove CLOEXEC for socket");
// Set environment:
setenv(MC_ENV_VARIABLE, "1", 1);
{
pid_t pid = fork();
if (pid < 0)
- throw simgrid::xbt::errno_error(errno, "Could not fork model-checked process");
+ throw simgrid::xbt::errno_error("Could not fork model-checked process");
if (pid != 0)
return pid;
Session::Session(pid_t pid, int socket)
{
- std::unique_ptr<simgrid::mc::Process> process(new simgrid::mc::Process(pid, socket));
+ std::unique_ptr<simgrid::mc::RemoteClient> process(new simgrid::mc::RemoteClient(pid, socket));
+#if HAVE_SMPI
// TODO, automatic detection of the config from the process
- process->privatized(
- xbt_cfg_get_boolean("smpi/privatize_global_variables"));
+ process->privatized(smpi_privatize_global_variables != SmpiPrivStrategies::NONE);
+#else
+ process->privatized(false);
+#endif
modelChecker_ = std::unique_ptr<ModelChecker>(
new simgrid::mc::ModelChecker(std::move(process)));
xbt_assert(mc_model_checker == nullptr);
this->close();
}
+void Session::initialize()
+{
+ xbt_assert(initialSnapshot_ == nullptr);
+ mc_model_checker->wait_for_requests();
+ initialSnapshot_ = simgrid::mc::take_snapshot(0);
+}
+
void Session::execute(Transition const& transition)
{
modelChecker_->handle_simcall(transition);
modelChecker_->wait_for_requests();
}
+void Session::restoreInitialState()
+{
+ simgrid::mc::restore_snapshot(this->initialSnapshot_);
+}
+
void Session::logState()
{
- if(_sg_mc_comms_determinism) {
- if (!simgrid::mc::initial_global_state->recv_deterministic &&
- simgrid::mc::initial_global_state->send_deterministic){
- XBT_INFO("******************************************************");
- XBT_INFO("**** Only-send-deterministic communication pattern ****");
- XBT_INFO("******************************************************");
- XBT_INFO("%s", simgrid::mc::initial_global_state->recv_diff);
- }else if(!simgrid::mc::initial_global_state->send_deterministic &&
- simgrid::mc::initial_global_state->recv_deterministic) {
- XBT_INFO("******************************************************");
- XBT_INFO("**** Only-recv-deterministic communication pattern ****");
- XBT_INFO("******************************************************");
- XBT_INFO("%s", simgrid::mc::initial_global_state->send_diff);
- }
- }
+ mc_model_checker->getChecker()->logState();
- if (mc_stats->expanded_pairs == 0) {
- XBT_INFO("Expanded states = %lu", mc_stats->expanded_states);
- XBT_INFO("Visited states = %lu", mc_stats->visited_states);
- } else {
- XBT_INFO("Expanded pairs = %lu", mc_stats->expanded_pairs);
- XBT_INFO("Visited pairs = %lu", mc_stats->visited_pairs);
- }
- XBT_INFO("Executed transitions = %lu", mc_stats->executed_transitions);
- if ((_sg_mc_dot_output_file != nullptr) && (_sg_mc_dot_output_file[0] != '\0')) {
+ if (not _sg_mc_dot_output_file.get().empty()) {
fprintf(dot_output, "}\n");
fclose(dot_output);
}
- if (simgrid::mc::initial_global_state != nullptr
- && (_sg_mc_comms_determinism || _sg_mc_send_determinism)) {
- XBT_INFO("Send-deterministic : %s",
- !simgrid::mc::initial_global_state->send_deterministic ? "No" : "Yes");
- if (_sg_mc_comms_determinism)
- XBT_INFO("Recv-deterministic : %s",
- !simgrid::mc::initial_global_state->recv_deterministic ? "No" : "Yes");
- }
if (getenv("SIMGRID_MC_SYSTEM_STATISTICS")){
int ret=system("free");
if(ret!=0)XBT_WARN("system call did not return 0, but %d",ret);
}
// static
-Session* Session::fork(std::function<void(void)> code)
+Session* Session::fork(std::function<void()> code)
{
// Create a AF_LOCAL socketpair used for exchanging messages
- // bewteen the model-checker process (ourselves) and the model-checked
+ // between the model-checker process (ourselves) and the model-checked
// process:
int res;
int sockets[2];
- res = socketpair(AF_LOCAL, SOCK_DGRAM | SOCK_CLOEXEC, 0, sockets);
+ res = socketpair(AF_LOCAL, SOCK_SEQPACKET | SOCK_CLOEXEC, 0, sockets);
if (res == -1)
- throw simgrid::xbt::errno_error(errno, "Could not create socketpair");
+ throw simgrid::xbt::errno_error("Could not create socketpair");
- pid_t pid = do_fork([&] {
+ pid_t pid = do_fork([sockets, &code] {
::close(sockets[1]);
setup_child_environment(sockets[0]);
code();
// static
Session* Session::spawnv(const char *path, char *const argv[])
{
- return Session::fork([&] {
+ return Session::fork([path, argv] {
execv(path, argv);
});
}
// static
-Session* Session::spawnvp(const char *path, char *const argv[])
+Session* Session::spawnvp(const char *file, char *const argv[])
{
- return Session::fork([&] {
- execvp(path, argv);
+ return Session::fork([file, argv] {
+ execvp(file, argv);
});
}
void Session::close()
{
+ initialSnapshot_ = nullptr;
if (modelChecker_) {
modelChecker_->shutdown();
modelChecker_ = nullptr;