#include "src/mc/mc_config.hpp"
#include "src/mc/mc_exit.hpp"
#include "src/mc/mc_private.hpp"
-#include "src/mc/remote/RemoteClient.hpp"
+#include "src/mc/remote/RemoteSimulation.hpp"
#include "xbt/automaton.hpp"
#include "xbt/system_error.hpp"
namespace simgrid {
namespace mc {
-ModelChecker::ModelChecker(std::unique_ptr<RemoteClient> process) : process_(std::move(process)) {}
+ModelChecker::ModelChecker(std::unique_ptr<RemoteSimulation> remote_simulation, int sockfd)
+ : checker_side_(sockfd), remote_simulation_(std::move(remote_simulation))
+{
+}
void ModelChecker::start()
{
- event_loop_.start(process_->get_channel().get_socket(), [](evutil_socket_t sig, short events, void* arg) {
- ((ModelChecker*)arg)->handle_events(sig, events);
+ checker_side_.start([](evutil_socket_t sig, short events, void* arg) {
+ auto mc = static_cast<simgrid::mc::ModelChecker*>(arg);
+ if (events == EV_READ) {
+ char buffer[MC_MESSAGE_LENGTH];
+ ssize_t size = mc->checker_side_.get_channel().receive(buffer, sizeof(buffer), false);
+ if (size == -1 && errno != EAGAIN)
+ throw simgrid::xbt::errno_error();
+
+ if (not mc->handle_message(buffer, size))
+ mc->checker_side_.break_loop();
+ } else if (events == EV_SIGNAL) {
+ if (sig == SIGCHLD)
+ mc->handle_waitpid();
+ } else {
+ xbt_die("Unexpected event");
+ }
});
XBT_DEBUG("Waiting for the model-checked process");
int status;
// The model-checked process SIGSTOP itself to signal it's ready:
- const pid_t pid = process_->pid();
+ const pid_t pid = remote_simulation_->pid();
pid_t res = waitpid(pid, &status, WAITPID_CHECKED_FLAGS);
if (res < 0 || not WIFSTOPPED(status) || WSTOPSIG(status) != SIGSTOP)
xbt_die("Could not wait model-checked process");
- process_->init();
+ remote_simulation_->init();
if (not _sg_mc_dot_output_file.get().empty())
MC_init_dot_output();
void ModelChecker::setup_ignore()
{
- RemoteClient& process = this->process();
+ const RemoteSimulation& process = this->get_remote_simulation();
for (std::pair<const char*, const char*> const& var :
ignored_local_variables)
process.ignore_local_variable(var.first, var.second);
void ModelChecker::shutdown()
{
- XBT_DEBUG("Shuting down model-checker");
+ XBT_DEBUG("Shutting down model-checker");
- RemoteClient* process = &this->process();
+ RemoteSimulation* process = &this->get_remote_simulation();
if (process->running()) {
XBT_DEBUG("Killing process");
kill(process->pid(), SIGKILL);
}
}
-void ModelChecker::resume(RemoteClient& process)
+void ModelChecker::resume(RemoteSimulation& process)
{
- int res = process.get_channel().send(MC_MESSAGE_CONTINUE);
+ int res = checker_side_.get_channel().send(MC_MESSAGE_CONTINUE);
if (res)
throw xbt::errno_error();
process.clear_cache();
XBT_INFO("Stack trace not displayed because you passed --log=no_loc");
} else {
XBT_INFO("Stack trace:");
- mc_model_checker->process().dump_stack();
+ mc_model_checker->get_remote_simulation().dump_stack();
}
}
case MC_MESSAGE_IGNORE_HEAP:
{
s_mc_message_ignore_heap_t message;
- xbt_assert(size == sizeof(message), "Broken messsage");
+ xbt_assert(size == sizeof(message), "Broken message");
memcpy(&message, buffer, sizeof(message));
IgnoredHeapRegion region;
region.fragment = message.fragment;
region.address = message.address;
region.size = message.size;
- process().ignore_heap(region);
+ get_remote_simulation().ignore_heap(region);
break;
}
case MC_MESSAGE_UNIGNORE_HEAP:
{
s_mc_message_ignore_memory_t message;
- xbt_assert(size == sizeof(message), "Broken messsage");
+ xbt_assert(size == sizeof(message), "Broken message");
memcpy(&message, buffer, sizeof(message));
- process().unignore_heap((void*)(std::uintptr_t)message.addr, message.size);
+ get_remote_simulation().unignore_heap((void*)(std::uintptr_t)message.addr, message.size);
break;
}
case MC_MESSAGE_IGNORE_MEMORY:
{
s_mc_message_ignore_memory_t message;
- xbt_assert(size == sizeof(message), "Broken messsage");
+ xbt_assert(size == sizeof(message), "Broken message");
memcpy(&message, buffer, sizeof(message));
- this->process().ignore_region(message.addr, message.size);
+ this->get_remote_simulation().ignore_region(message.addr, message.size);
break;
}
case MC_MESSAGE_STACK_REGION:
{
s_mc_message_stack_region_t message;
- xbt_assert(size == sizeof(message), "Broken messsage");
+ xbt_assert(size == sizeof(message), "Broken message");
memcpy(&message, buffer, sizeof(message));
- this->process().stack_areas().push_back(message.stack_region);
+ this->get_remote_simulation().stack_areas().push_back(message.stack_region);
}
break;
if (property_automaton == nullptr)
property_automaton = xbt_automaton_new();
- RemoteClient* process = &this->process();
+ RemoteSimulation* process = &this->get_remote_simulation();
RemotePtr<int> address = remote((int*)message.data);
xbt::add_proposition(property_automaton, message.name, [process, address]() { return process->read(address); });
void ModelChecker::exit(int status)
{
// TODO, terminate the model checker politely instead of exiting rudely
- if (process().running())
- kill(process().pid(), SIGKILL);
+ if (get_remote_simulation().running())
+ kill(get_remote_simulation().pid(), SIGKILL);
::exit(status);
}
-void ModelChecker::handle_events(int sig, short events)
-{
- if (events == EV_READ) {
- char buffer[MC_MESSAGE_LENGTH];
- ssize_t size = process_->get_channel().receive(buffer, sizeof(buffer), false);
- if (size == -1 && errno != EAGAIN)
- throw simgrid::xbt::errno_error();
-
- if (not handle_message(buffer, size))
- event_loop_.break_loop();
- }
- else if (events == EV_SIGNAL) {
- if (sig == SIGCHLD)
- this->handle_waitpid();
- }
- else {
- xbt_die("Unexpected event");
- }
-}
-
void ModelChecker::handle_waitpid()
{
XBT_DEBUG("Check for wait event");
if (pid == -1) {
if (errno == ECHILD) {
// No more children:
- xbt_assert(not this->process().running(), "Inconsistent state");
+ xbt_assert(not this->get_remote_simulation().running(), "Inconsistent state");
break;
} else {
XBT_ERROR("Could not wait for pid");
}
}
- if (pid == this->process().pid()) {
+ if (pid == this->get_remote_simulation().pid()) {
// From PTRACE_O_TRACEEXIT:
#ifdef __linux__
if (status>>8 == (SIGTRAP | (PTRACE_EVENT_EXIT<<8))) {
- xbt_assert(ptrace(PTRACE_GETEVENTMSG, this->process().pid(), 0, &status) != -1, "Could not get exit status");
+ xbt_assert(ptrace(PTRACE_GETEVENTMSG, remote_simulation_->pid(), 0, &status) != -1,
+ "Could not get exit status");
if (WIFSIGNALED(status)) {
MC_report_crash(status);
mc_model_checker->exit(SIMGRID_MC_EXIT_PROGRAM_CRASH);
XBT_DEBUG("Stopped with signal %i", (int) WSTOPSIG(status));
errno = 0;
#ifdef __linux__
- ptrace(PTRACE_CONT, this->process().pid(), 0, WSTOPSIG(status));
+ ptrace(PTRACE_CONT, remote_simulation_->pid(), 0, WSTOPSIG(status));
#elif defined BSD
- ptrace(PT_CONTINUE, this->process().pid(), (caddr_t)1, WSTOPSIG(status));
+ ptrace(PT_CONTINUE, remote_simulation_->pid(), (caddr_t)1, WSTOPSIG(status));
#endif
xbt_assert(errno == 0, "Could not PTRACE_CONT");
}
mc_model_checker->exit(SIMGRID_MC_EXIT_PROGRAM_CRASH);
} else if (WIFEXITED(status)) {
XBT_DEBUG("Child process is over");
- this->process().terminate();
+ this->get_remote_simulation().terminate();
}
}
}
void ModelChecker::wait_for_requests()
{
- this->resume(process());
- if (this->process().running())
- event_loop_.dispatch();
+ this->resume(get_remote_simulation());
+ if (this->get_remote_simulation().running())
+ checker_side_.dispatch();
}
void ModelChecker::handle_simcall(Transition const& transition)
m.type = MC_MESSAGE_SIMCALL_HANDLE;
m.pid = transition.pid_;
m.value = transition.argument_;
- this->process_->get_channel().send(m);
- this->process_->clear_cache();
- if (this->process_->running())
- event_loop_.dispatch();
+ checker_side_.get_channel().send(m);
+ this->remote_simulation_->clear_cache();
+ if (this->remote_simulation_->running())
+ checker_side_.dispatch();
}
bool ModelChecker::checkDeadlock()
{
- int res = this->process().get_channel().send(MC_MESSAGE_DEADLOCK_CHECK);
+ int res = checker_side_.get_channel().send(MC_MESSAGE_DEADLOCK_CHECK);
xbt_assert(res == 0, "Could not check deadlock state");
s_mc_message_int_t message;
- ssize_t s = mc_model_checker->process().get_channel().receive(message);
+ ssize_t s = checker_side_.get_channel().receive(message);
xbt_assert(s != -1, "Could not receive message");
xbt_assert(s == sizeof(message) && message.type == MC_MESSAGE_DEADLOCK_CHECK_REPLY,
"Received unexpected message %s (%i, size=%i) "
