#include "xbt/system_error.hpp"
#ifdef __linux__
-#include <sys/personality.h>
#include <sys/prctl.h>
#endif
namespace simgrid::mc {
-XBT_ATTRIB_NORETURN static void run_child_process(int socket, const std::vector<char*>& args)
+XBT_ATTRIB_NORETURN static void run_child_process(int socket, const std::vector<char*>& args, bool need_ptrace)
{
/* On startup, simix_global_init() calls simgrid::mc::Client::initialize(), which checks whether the MC_ENV_SOCKET_FD
* env variable is set. If so, MC mode is assumed, and the client is setup from its side
sigemptyset(&mask);
xbt_assert(sigprocmask(SIG_SETMASK, &mask, nullptr) >= 0, "Could not unblock signals");
xbt_assert(prctl(PR_SET_PDEATHSIG, SIGHUP) == 0, "Could not PR_SET_PDEATHSIG");
-
- // Make sure that the application process layout is not randomized, so that the info we gather is stable over re-execs
- if (personality(ADDR_NO_RANDOMIZE) == -1) {
- XBT_ERROR("Could not set the NO_RANDOMIZE personality");
- throw xbt::errno_error();
- }
#endif
// Remove CLOEXEC to pass the socket to the application
"Could not remove CLOEXEC for socket");
setenv(MC_ENV_SOCKET_FD, std::to_string(socket).c_str(), 1);
+ if (need_ptrace)
+ setenv("MC_NEED_PTRACE", "1", 1);
/* Setup the tokenizer that parses the cfg:model-check/setenv parameter */
using Tokenizer = boost::tokenizer<boost::char_separator<char>>;
socket_event_ = event_new(
base, get_channel().get_socket(), EV_READ | EV_PERSIST,
- [](evutil_socket_t sig, short events, void* arg) {
+ [](evutil_socket_t, short events, void* arg) {
auto checker = static_cast<simgrid::mc::CheckerSide*>(arg);
if (events == EV_READ) {
std::array<char, MC_MESSAGE_LENGTH> buffer;
throw simgrid::xbt::errno_error();
}
- if (not checker->handle_message(buffer.data(), size))
+ if (size == 0) // The app closed the socket. It must be dead by now.
+ checker->handle_waitpid();
+ else if (not checker->handle_message(buffer.data(), size))
checker->break_loop();
} else {
xbt_die("Unexpected event");
event_add(signal_event_, nullptr);
}
-CheckerSide::CheckerSide(const std::vector<char*>& args, bool need_memory_introspection) : running_(true)
+CheckerSide::CheckerSide(const std::vector<char*>& args, bool need_memory_info) : running_(true)
{
+ bool need_ptrace = not need_memory_info;
+
// Create an AF_LOCAL socketpair used for exchanging messages between the model-checker process (ancestor)
// and the application process (child)
int sockets[2];
if (pid_ == 0) { // Child
::close(sockets[1]);
- run_child_process(sockets[0], args);
+ run_child_process(sockets[0], args, need_ptrace);
DIE_IMPOSSIBLE;
}
channel_.reset_socket(sockets[1]);
setup_events();
- wait_application_process(pid_);
+ if (need_ptrace)
+ wait_application_process(pid_);
// Request the initial memory on need
- if (need_memory_introspection) {
+ if (need_memory_info) {
channel_.send(MessageType::INITIAL_ADDRESSES);
s_mc_message_initial_addresses_reply_t answer;
ssize_t answer_size = channel_.receive(answer);
event_free(socket_event_);
event_del(signal_event_);
event_free(signal_event_);
+
+ if (running()) {
+ errno = 0;
+ xbt_assert(kill(get_pid(), SIGKILL) == 0);
+ errno = 0;
+ waitpid(get_pid(), nullptr, 0);
+ xbt_assert(errno == 0);
+ }
+}
+
+void CheckerSide::finalize(bool terminate_asap)
+{
+ s_mc_message_int_t m = {};
+ m.type = MessageType::FINALIZE;
+ m.value = terminate_asap;
+ xbt_assert(get_channel().send(m) == 0, "Could not ask the app to finalize on need");
+
+ s_mc_message_t answer;
+ ssize_t s = get_channel().receive(answer);
+ xbt_assert(s != -1, "Could not receive answer to FINALIZE");
+ xbt_assert(s == sizeof answer, "Broken message (size=%zd; expected %zu)", s, sizeof answer);
+ xbt_assert(answer.type == MessageType::FINALIZE_REPLY,
+ "Received unexpected message %s (%i); expected MessageType::FINALIZE_REPLY (%i)", to_c_str(answer.type),
+ (int)answer.type, (int)MessageType::FINALIZE_REPLY);
}
void CheckerSide::dispatch_events() const
bool CheckerSide::handle_message(const char* buffer, ssize_t size)
{
s_mc_message_t base_message;
- xbt_assert(size >= (ssize_t)sizeof(base_message), "Broken message");
+ xbt_assert(size >= (ssize_t)sizeof(base_message), "Broken message. Got only %ld bytes.", size);
memcpy(&base_message, buffer, sizeof(base_message));
switch (base_message.type) {
s_mc_message_ignore_memory_t message;
xbt_assert(size == sizeof(message), "Broken message");
memcpy(&message, buffer, sizeof(message));
- get_remote_memory()->unignore_heap((void*)(std::uintptr_t)message.addr, message.size);
+ get_remote_memory()->unignore_heap((void*)message.addr, message.size);
} else {
XBT_INFO("Ignoring an UNIGNORE_HEAP message because we don't need to introspect memory.");
}
xbt_assert(not this->running(), "Inconsistent state");
break;
} else {
- XBT_ERROR("Could not wait for pid");
- throw simgrid::xbt::errno_error();
+ xbt_die("Could not wait for pid: %s", strerror(errno));
}
}