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] Move things in simgrid::mc
[simgrid.git]
/
src
/
mc
/
ModelChecker.cpp
diff --git
a/src/mc/ModelChecker.cpp
b/src/mc/ModelChecker.cpp
index
15d5d83
..
0d97a64
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"
@@
-83,7
+84,7
@@
void ModelChecker::start()
sigemptyset(&set);
sigaddset(&set, SIGCHLD);
if (sigprocmask(SIG_BLOCK, &set, nullptr) == -1)
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);
@@
-97,7
+98,7
@@
void ModelChecker::start()
int signal_fd = signalfd(-1, &set, 0);
if (signal_fd == -1)
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;
@@
-178,7
+179,7
@@
void ModelChecker::resume(simgrid::mc::Process& process)
{
int res = process.send_message(MC_MESSAGE_CONTINUE);
if (res)
{
int res = process.send_message(MC_MESSAGE_CONTINUE);
if (res)
- throw s
td::system_error(res, std::system_category()
);
+ throw s
imgrid::xbt::errno_error(res
);
process.cache_flags = (mc_process_cache_flags_t) 0;
}
process.cache_flags = (mc_process_cache_flags_t) 0;
}
@@
-189,7
+190,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)
@@
-262,7
+263,7
@@
bool ModelChecker::handle_message(char* buffer, ssize_t size)
_mc_property_automaton = xbt_automaton_new();
simgrid::mc::Process* process = &this->process();
_mc_property_automaton = xbt_automaton_new();
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::xbt::add_proposition(_mc_property_automaton,
message.name,
= simgrid::mc::remote((int*) message.data);
simgrid::xbt::add_proposition(_mc_property_automaton,
message.name,
@@
-277,7
+278,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
+288,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,7
+308,7
@@
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
);
}
}
}
}
@@
-306,12
+316,11
@@
bool ModelChecker::handle_events()
if (socket_pollfd->revents & POLLIN) {
ssize_t size = MC_receive_message(socket_pollfd->fd, buffer, sizeof(buffer), MSG_DONTWAIT);
if (size == -1 && errno != EAGAIN)
if (socket_pollfd->revents & POLLIN) {
ssize_t size = MC_receive_message(socket_pollfd->fd, buffer, sizeof(buffer), MSG_DONTWAIT);
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
+330,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
+355,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
+380,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
);
}
}
}
}
@@
-384,7
+392,7
@@
void ModelChecker::handle_waitpid()
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);
}
}
}
}
@@
-417,10
+425,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)
@@
-432,10
+439,9
@@
void ModelChecker::simcall_handle(simgrid::mc::Process& process, unsigned long p
m.value = value;
process.send_message(m);
process.cache_flags = (mc_process_cache_flags_t) 0;
m.value = value;
process.send_message(m);
process.cache_flags = (mc_process_cache_flags_t) 0;
- while (process.running())
{
+ while (process.running())
if (!this->handle_events())
return;
if (!this->handle_events())
return;
- }
}
}
}
}