-/* Copyright (c) 2015-2020. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2015-2021. 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 "xbt/log.h"
#include "xbt/system_error.hpp"
+#include <array>
#include <memory>
+#include <string>
#include <fcntl.h>
#ifdef __linux__
// modifying its .got.plt during snapshot.
setenv("LC_BIND_NOW", "1", 1);
- char buffer[64];
- int res = std::snprintf(buffer, sizeof(buffer), "%i", socket);
- xbt_assert((size_t)res < sizeof(buffer) && res != -1);
- setenv(MC_ENV_SOCKET_FD, buffer, 1);
+ setenv(MC_ENV_SOCKET_FD, std::to_string(socket).c_str(), 1);
code();
}
// between the model-checker process (ourselves) and the model-checked
// process:
int sockets[2];
- int res = socketpair(AF_LOCAL, SOCK_SEQPACKET | SOCK_CLOEXEC, 0, sockets);
- xbt_assert(res != -1, "Could not create socketpair");
+ xbt_assert(socketpair(AF_LOCAL, SOCK_SEQPACKET | SOCK_CLOEXEC, 0, sockets) != -1, "Could not create socketpair");
pid_t pid = fork();
xbt_assert(pid >= 0, "Could not fork model-checked process");
xbt_assert(mc_model_checker == nullptr, "Did you manage to start the MC twice in this process?");
- auto process = std::make_unique<simgrid::mc::RemoteSimulation>(pid);
+ auto process = std::make_unique<simgrid::mc::RemoteProcess>(pid);
model_checker_ = std::make_unique<simgrid::mc::ModelChecker>(std::move(process), sockets[1]);
mc_model_checker = model_checker_.get();
this->close();
}
-/** Take the initial snapshot of the application, that must be stopped. */
-void Session::initialize()
+/** The application must be stopped. */
+void Session::take_initial_snapshot()
{
xbt_assert(initial_snapshot_ == nullptr);
model_checker_->wait_for_requests();
void Session::restore_initial_state() const
{
- this->initial_snapshot_->restore(&model_checker_->get_remote_simulation());
+ this->initial_snapshot_->restore(&model_checker_->get_remote_process());
}
void Session::log_state() const
bool Session::actor_is_enabled(aid_t pid) const
{
- s_mc_message_actor_enabled_t msg{MC_MESSAGE_ACTOR_ENABLED, pid};
+ s_mc_message_actor_enabled_t msg;
+ memset(&msg, 0, sizeof msg);
+ msg.type = simgrid::mc::MessageType::ACTOR_ENABLED;
+ msg.aid = pid;
model_checker_->channel().send(msg);
- char buff[MC_MESSAGE_LENGTH];
- ssize_t received = model_checker_->channel().receive(buff, MC_MESSAGE_LENGTH, true);
+ std::array<char, MC_MESSAGE_LENGTH> buff;
+ ssize_t received = model_checker_->channel().receive(buff.data(), buff.size(), true);
xbt_assert(received == sizeof(s_mc_message_int_t), "Unexpected size in answer to ACTOR_ENABLED");
- return ((s_mc_message_int_t*)buff)->value;
+ return ((s_mc_message_int_t*)buff.data())->value;
}
-simgrid::mc::Session* session;
-
+simgrid::mc::Session* session_singleton;
}
}