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
[mc] Remove remaining bits of parmap in MC (not used)
[simgrid.git]
/
src
/
mc
/
ModelChecker.cpp
diff --git
a/src/mc/ModelChecker.cpp
b/src/mc/ModelChecker.cpp
index
be6f39b
..
4489b84
100644
(file)
--- a/
src/mc/ModelChecker.cpp
+++ b/
src/mc/ModelChecker.cpp
@@
-19,6
+19,7
@@
#include <xbt/log.h>
#include <xbt/automaton.h>
#include <xbt/automaton.hpp>
#include <xbt/log.h>
#include <xbt/automaton.h>
#include <xbt/automaton.hpp>
+#include <xbt/system_error.hpp>
#include "simgrid/sg_config.h"
#include "simgrid/sg_config.h"
@@
-31,12
+32,8
@@
#include "src/mc/mc_exit.h"
#include "src/mc/mc_liveness.h"
#include "src/mc/mc_exit.h"
#include "src/mc/mc_liveness.h"
-extern "C" {
-
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_ModelChecker, mc, "ModelChecker");
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_ModelChecker, mc, "ModelChecker");
-}
-
::simgrid::mc::ModelChecker* mc_model_checker = nullptr;
using simgrid::mc::remote;
::simgrid::mc::ModelChecker* mc_model_checker = nullptr;
using simgrid::mc::remote;
@@
-48,13
+45,13
@@
using simgrid::mc::remote;
namespace simgrid {
namespace mc {
namespace simgrid {
namespace mc {
-ModelChecker::ModelChecker(pid_t pid, int socket) :
- pid_(pid), socket_(socket),
+ModelChecker::ModelChecker(std::unique_ptr<Process> process) :
hostnames_(xbt_dict_new()),
page_store_(500),
hostnames_(xbt_dict_new()),
page_store_(500),
+ process_(std::move(process)),
parent_snapshot_(nullptr)
{
parent_snapshot_(nullptr)
{
- process_ = std::unique_ptr<Process>(new Process(pid_, socket_));
+
}
ModelChecker::~ModelChecker()
}
ModelChecker::~ModelChecker()
@@
-76,12
+73,14
@@
const char* ModelChecker::get_host_name(const char* hostname)
void ModelChecker::start()
{
void ModelChecker::start()
{
+ const pid_t pid = process_->pid();
+
// Block SIGCHLD (this will be handled with accept/signalfd):
sigset_t set;
sigemptyset(&set);
sigaddset(&set, SIGCHLD);
if (sigprocmask(SIG_BLOCK, &set, nullptr) == -1)
// Block SIGCHLD (this will be handled with accept/signalfd):
sigset_t set;
sigemptyset(&set);
sigaddset(&set, SIGCHLD);
if (sigprocmask(SIG_BLOCK, &set, nullptr) == -1)
- throw s
td::system_error(errno, std::system_category()
);
+ throw s
imgrid::xbt::errno_error(errno
);
sigset_t full_set;
sigfillset(&full_set);
sigset_t full_set;
sigfillset(&full_set);
@@
-89,13
+88,13
@@
void ModelChecker::start()
// Prepare data for poll:
struct pollfd* socket_pollfd = &fds_[SOCKET_FD_INDEX];
// Prepare data for poll:
struct pollfd* socket_pollfd = &fds_[SOCKET_FD_INDEX];
- socket_pollfd->fd =
socket_
;
+ socket_pollfd->fd =
process_->getChannel().getSocket()
;
socket_pollfd->events = POLLIN;
socket_pollfd->revents = 0;
int signal_fd = signalfd(-1, &set, 0);
if (signal_fd == -1)
socket_pollfd->events = POLLIN;
socket_pollfd->revents = 0;
int signal_fd = signalfd(-1, &set, 0);
if (signal_fd == -1)
- throw s
td::system_error(errno, std::system_category()
);
+ throw s
imgrid::xbt::errno_error(errno
);
struct pollfd* signalfd_pollfd = &fds_[SIGNAL_FD_INDEX];
signalfd_pollfd->fd = signal_fd;
struct pollfd* signalfd_pollfd = &fds_[SIGNAL_FD_INDEX];
signalfd_pollfd->fd = signal_fd;
@@
-106,13
+105,11
@@
void ModelChecker::start()
int status;
// The model-checked process SIGSTOP itself to signal it's ready:
int status;
// The model-checked process SIGSTOP itself to signal it's ready:
- pid_t res = waitpid(pid
_
, &status, __WALL);
+ pid_t res = waitpid(pid, &status, __WALL);
if (res < 0 || !WIFSTOPPED(status) || WSTOPSIG(status) != SIGSTOP)
xbt_die("Could not wait model-checked process");
if (res < 0 || !WIFSTOPPED(status) || WSTOPSIG(status) != SIGSTOP)
xbt_die("Could not wait model-checked process");
-
- // TODO, avoid direct dependency on sg_cfg
- process_->privatized(sg_cfg_get_boolean("smpi/privatize_global_variables"));
+ process_->init();
/* Initialize statistics */
mc_stats = xbt_new0(s_mc_stats_t, 1);
/* Initialize statistics */
mc_stats = xbt_new0(s_mc_stats_t, 1);
@@
-121,13
+118,10
@@
void ModelChecker::start()
if ((_sg_mc_dot_output_file != nullptr) && (_sg_mc_dot_output_file[0] != '\0'))
MC_init_dot_output();
if ((_sg_mc_dot_output_file != nullptr) && (_sg_mc_dot_output_file[0] != '\0'))
MC_init_dot_output();
- /* Init parmap */
- //parmap = xbt_parmap_mc_new(xbt_os_get_numcores(), XBT_PARMAP_DEFAULT);
-
setup_ignore();
setup_ignore();
- ptrace(PTRACE_SETOPTIONS, pid
_
, nullptr, PTRACE_O_TRACEEXIT);
- ptrace(PTRACE_CONT, pid
_
, 0, 0);
+ ptrace(PTRACE_SETOPTIONS, pid, nullptr, PTRACE_O_TRACEEXIT);
+ ptrace(PTRACE_CONT, pid, 0, 0);
}
static const std::pair<const char*, const char*> ignored_local_variables[] = {
}
static const std::pair<const char*, const char*> ignored_local_variables[] = {
@@
-176,10
+170,10
@@
void ModelChecker::shutdown()
void ModelChecker::resume(simgrid::mc::Process& process)
{
void ModelChecker::resume(simgrid::mc::Process& process)
{
- int res = process.
send_message
(MC_MESSAGE_CONTINUE);
+ int res = process.
getChannel().send
(MC_MESSAGE_CONTINUE);
if (res)
if (res)
- throw s
td::system_error(res, std::system_category()
);
- process.c
ache_flags = (mc_process_cache_flags_t) 0
;
+ throw s
imgrid::xbt::errno_error(res
);
+ process.c
lear_cache()
;
}
static
}
static
@@
-189,7
+183,7
@@
void throw_socket_error(int fd)
socklen_t errlen = sizeof(error);
if (getsockopt(fd, SOL_SOCKET, SO_ERROR, (void *)&error, &errlen) == -1)
error = errno;
socklen_t errlen = sizeof(error);
if (getsockopt(fd, SOL_SOCKET, SO_ERROR, (void *)&error, &errlen) == -1)
error = errno;
- throw s
td::system_error(error, std::system_category()
);
+ throw s
imgrid::xbt::errno_error(errno
);
}
bool ModelChecker::handle_message(char* buffer, ssize_t size)
}
bool ModelChecker::handle_message(char* buffer, ssize_t size)
@@
-258,13
+252,13
@@
bool ModelChecker::handle_message(char* buffer, ssize_t size)
xbt_die("Support for client-side function proposition is not implemented.");
XBT_DEBUG("Received symbol: %s", message.name);
xbt_die("Support for client-side function proposition is not implemented.");
XBT_DEBUG("Received symbol: %s", message.name);
- if (
_mc_
property_automaton == nullptr)
-
_mc_
property_automaton = xbt_automaton_new();
+ if (
simgrid::mc::
property_automaton == nullptr)
+
simgrid::mc::
property_automaton = xbt_automaton_new();
simgrid::mc::Process* process = &this->process();
simgrid::mc::Process* process = &this->process();
- simgrid::mc::
remote_p
tr<int> address
+ simgrid::mc::
RemoteP
tr<int> address
= simgrid::mc::remote((int*) message.data);
= simgrid::mc::remote((int*) message.data);
- simgrid::xbt::add_proposition(
_mc_
property_automaton,
+ simgrid::xbt::add_proposition(
simgrid::mc::
property_automaton,
message.name,
[process, address]() { return process->read(address); }
);
message.name,
[process, address]() { return process->read(address); }
);
@@
-277,7
+271,7
@@
bool ModelChecker::handle_message(char* buffer, ssize_t size)
case MC_MESSAGE_ASSERTION_FAILED:
MC_report_assertion_error();
case MC_MESSAGE_ASSERTION_FAILED:
MC_report_assertion_error();
-
::
exit(SIMGRID_MC_EXIT_SAFETY);
+
this->
exit(SIMGRID_MC_EXIT_SAFETY);
break;
default:
break;
default:
@@
-287,6
+281,15
@@
bool ModelChecker::handle_message(char* buffer, ssize_t size)
return true;
}
return true;
}
+/** Terminate the model-checker aplication */
+void ModelChecker::exit(int status)
+{
+ // TODO, terminate the model checker politely instead of exiting rudel
+ if (process().running())
+ kill(process().pid(), SIGKILL);
+ ::exit(status);
+}
+
bool ModelChecker::handle_events()
{
char buffer[MC_MESSAGE_LENGTH];
bool ModelChecker::handle_events()
{
char buffer[MC_MESSAGE_LENGTH];
@@
-298,20
+301,19
@@
bool ModelChecker::handle_events()
case EINTR:
continue;
default:
case EINTR:
continue;
default:
- throw s
td::system_error(errno, std::system_category()
);
+ throw s
imgrid::xbt::errno_error(errno
);
}
}
if (socket_pollfd->revents) {
if (socket_pollfd->revents & POLLIN) {
}
}
if (socket_pollfd->revents) {
if (socket_pollfd->revents & POLLIN) {
- ssize_t size =
MC_receive_message(socket_pollfd->fd, buffer, sizeof(buffer), MSG_DONTWAIT
);
+ ssize_t size =
process_->getChannel().receive(buffer, sizeof(buffer), false
);
if (size == -1 && errno != EAGAIN)
if (size == -1 && errno != EAGAIN)
- throw s
td::system_error(errno, std::system_category()
);
+ throw s
imgrid::xbt::errno_error(errno
);
return handle_message(buffer, size);
}
return handle_message(buffer, size);
}
- if (socket_pollfd->revents & POLLERR)
{
+ if (socket_pollfd->revents & POLLERR)
throw_socket_error(socket_pollfd->fd);
throw_socket_error(socket_pollfd->fd);
- }
if (socket_pollfd->revents & POLLHUP)
xbt_die("Socket hang up?");
}
if (socket_pollfd->revents & POLLHUP)
xbt_die("Socket hang up?");
}
@@
-321,9
+323,8
@@
bool ModelChecker::handle_events()
this->handle_signals();
return true;
}
this->handle_signals();
return true;
}
- if (signalfd_pollfd->revents & POLLERR)
{
+ if (signalfd_pollfd->revents & POLLERR)
throw_socket_error(signalfd_pollfd->fd);
throw_socket_error(signalfd_pollfd->fd);
- }
if (signalfd_pollfd->revents & POLLHUP)
xbt_die("Signalfd hang up?");
}
if (signalfd_pollfd->revents & POLLHUP)
xbt_die("Signalfd hang up?");
}
@@
-347,7
+348,7
@@
void ModelChecker::handle_signals()
if (errno == EINTR)
continue;
else
if (errno == EINTR)
continue;
else
- throw s
td::system_error(errno, std::system_category()
);
+ throw s
imgrid::xbt::errno_error(errno
);
} else if (size != sizeof(info))
return throw std::runtime_error(
"Bad communication with model-checked application");
} else if (size != sizeof(info))
return throw std::runtime_error(
"Bad communication with model-checked application");
@@
-372,7
+373,7
@@
void ModelChecker::handle_waitpid()
break;
} else {
XBT_ERROR("Could not wait for pid");
break;
} else {
XBT_ERROR("Could not wait for pid");
- throw s
td::system_error(errno, std::system_category()
);
+ throw s
imgrid::xbt::errno_error(errno
);
}
}
}
}
@@
-380,18
+381,18
@@
void ModelChecker::handle_waitpid()
// From PTRACE_O_TRACEEXIT:
if (status>>8 == (SIGTRAP | (PTRACE_EVENT_EXIT<<8))) {
// From PTRACE_O_TRACEEXIT:
if (status>>8 == (SIGTRAP | (PTRACE_EVENT_EXIT<<8))) {
- if (ptrace(PTRACE_GETEVENTMSG,
pid_
, 0, &status) == -1)
+ if (ptrace(PTRACE_GETEVENTMSG,
this->process().pid()
, 0, &status) == -1)
xbt_die("Could not get exit status");
if (WIFSIGNALED(status)) {
MC_report_crash(status);
xbt_die("Could not get exit status");
if (WIFSIGNALED(status)) {
MC_report_crash(status);
-
::
exit(SIMGRID_MC_EXIT_PROGRAM_CRASH);
+
mc_model_checker->
exit(SIMGRID_MC_EXIT_PROGRAM_CRASH);
}
}
// We don't care about signals, just reinject them:
if (WIFSTOPPED(status)) {
XBT_DEBUG("Stopped with signal %i", (int) WSTOPSIG(status));
}
}
// We don't care about signals, just reinject them:
if (WIFSTOPPED(status)) {
XBT_DEBUG("Stopped with signal %i", (int) WSTOPSIG(status));
- if (ptrace(PTRACE_CONT,
pid_
, 0, WSTOPSIG(status)) == -1)
+ if (ptrace(PTRACE_CONT,
this->process().pid()
, 0, WSTOPSIG(status)) == -1)
xbt_die("Could not PTRACE_CONT");
}
xbt_die("Could not PTRACE_CONT");
}
@@
-417,10
+418,9
@@
void ModelChecker::on_signal(const struct signalfd_siginfo* info)
void ModelChecker::wait_client(simgrid::mc::Process& process)
{
this->resume(process);
void ModelChecker::wait_client(simgrid::mc::Process& process)
{
this->resume(process);
- while (this->process().running())
{
+ while (this->process().running())
if (!this->handle_events())
return;
if (!this->handle_events())
return;
- }
}
void ModelChecker::simcall_handle(simgrid::mc::Process& process, unsigned long pid, int value)
}
void ModelChecker::simcall_handle(simgrid::mc::Process& process, unsigned long pid, int value)
@@
-430,12
+430,11
@@
void ModelChecker::simcall_handle(simgrid::mc::Process& process, unsigned long p
m.type = MC_MESSAGE_SIMCALL_HANDLE;
m.pid = pid;
m.value = value;
m.type = MC_MESSAGE_SIMCALL_HANDLE;
m.pid = pid;
m.value = value;
- process.
send_message
(m);
- process.c
ache_flags = (mc_process_cache_flags_t) 0
;
- while (process.running())
{
+ process.
getChannel().send
(m);
+ process.c
lear_cache()
;
+ while (process.running())
if (!this->handle_events())
return;
if (!this->handle_events())
return;
- }
}
}
}
}