#include <sys/signalfd.h>
#include <xbt/log.h>
+#include <xbt/automaton.h>
+#include <xbt/automaton.hpp>
#include "ModelChecker.hpp"
#include "mc_protocol.h"
#include "mc_server.h"
#include "mc_private.h"
#include "mc_ignore.h"
+#include "mcer_ignore.h"
+#include "mc_exit.h"
+#include "mc/mc_liveness.h"
+
+using simgrid::mc::remote;
extern "C" {
mc_server_t mc_server;
-struct mc_symbol_pointer_callback
-{
- mc_process_t process;
- void* value;
-};
-
-static int mc_symbol_pointer_callback_evaluate(void* p)
-{
- struct mc_symbol_pointer_callback* callback = (struct mc_symbol_pointer_callback*) p;
- int value;
- MC_process_read(callback->process, MC_ADDRESS_SPACE_READ_FLAGS_NONE,
- &value, callback->value, sizeof(value), MC_PROCESS_INDEX_ANY);
- return value;
-}
-
s_mc_server::s_mc_server(pid_t pid, int socket)
{
this->pid = pid;
{
XBT_DEBUG("Shuting down model-checker");
- mc_process_t process = &mc_model_checker->process();
- int status = process->status;
- if (process->running) {
+ simgrid::mc::Process* process = &mc_model_checker->process();
+ int status = process->status();
+ if (process->running()) {
XBT_DEBUG("Killing process");
- kill(process->pid, SIGTERM);
- if (waitpid(process->pid, &status, 0) == -1)
+ kill(process->pid(), SIGTERM);
+ if (waitpid(process->pid(), &status, 0) == -1)
throw std::system_error(errno, std::system_category());
// TODO, handle the case when the process does not want to die with a timeout
- process->status = status;
+ process->terminate(status);
}
}
void s_mc_server::exit()
{
// Finished:
- int status = mc_model_checker->process().status;
+ int status = mc_model_checker->process().status();
if (WIFEXITED(status))
::exit(WEXITSTATUS(status));
else if (WIFSIGNALED(status)) {
// Try to uplicate the signal of the model-checked process.
// This is a temporary hack so we don't try too hard.
- kill(mc_model_checker->process().pid, WTERMSIG(status));
+ kill(mc_model_checker->process().pid(), WTERMSIG(status));
abort();
} else {
xbt_die("Unexpected status from model-checked process");
}
}
-void s_mc_server::resume(mc_process_t process)
+void s_mc_server::resume(simgrid::mc::Process* process)
{
- int socket = process->socket;
- int res = MC_protocol_send_simple_message(socket, MC_MESSAGE_CONTINUE);
+ int res = process->send_message(MC_MESSAGE_CONTINUE);
if (res)
throw std::system_error(res, std::system_category());
process->cache_flags = (mc_process_cache_flags_t) 0;
if (size != sizeof(message))
xbt_die("Broken messsage");
memcpy(&message, buffer, sizeof(message));
- MC_remove_ignore_heap(message.addr, message.size);
+ MC_heap_region_ignore_remove(
+ (void *)(std::uintptr_t) message.addr, message.size);
break;
}
if (size != sizeof(message))
xbt_die("Broken messsage");
memcpy(&message, buffer, sizeof(message));
- MC_process_ignore_memory(&mc_model_checker->process(),
+ mc_model_checker->process().ignore_region(
message.addr, message.size);
break;
}
xbt_die("Broken message");
memcpy(&message, buffer, sizeof(message));
if (message.callback)
- xbt_die("Support for callbacks/functions symbols not implemented in client/server mode.");
+ xbt_die("Support for client-side function proposition is not implemented.");
XBT_DEBUG("Received symbol: %s", message.name);
- struct mc_symbol_pointer_callback* callback = xbt_new(struct mc_symbol_pointer_callback, 1);
- callback->process = &mc_model_checker->process();
- callback->value = message.data;
+ if (_mc_property_automaton == NULL)
+ _mc_property_automaton = xbt_automaton_new();
+
+ simgrid::mc::Process* process = &mc_model_checker->process();
+ simgrid::mc::remote_ptr<int> address
+ = simgrid::mc::remote((int*) message.data);
+ simgrid::xbt::add_proposition(_mc_property_automaton,
+ message.name,
+ [process, address]() { return process->read(address); }
+ );
- MC_automaton_new_propositional_symbol_callback(message.name,
- mc_symbol_pointer_callback_evaluate, callback, free);
break;
}
case MC_MESSAGE_ASSERTION_FAILED:
MC_report_assertion_error();
- xbt_abort();
+ ::exit(SIMGRID_EXIT_SAFETY);
break;
default:
void s_mc_server::loop()
{
- while (mc_model_checker->process().running)
+ while (mc_model_checker->process().running())
this->handle_events();
}
if (pid == -1) {
if (errno == ECHILD) {
// No more children:
- if (mc_model_checker->process().running)
+ if (mc_model_checker->process().running())
xbt_die("Inconsistent state");
else
break;
}
}
- if (pid == mc_model_checker->process().pid) {
+ if (pid == mc_model_checker->process().pid()) {
if (WIFEXITED(status) || WIFSIGNALED(status)) {
XBT_DEBUG("Child process is over");
- mc_model_checker->process().status = status;
- mc_model_checker->process().running = false;
+ mc_model_checker->process().terminate(status);
}
}
}
}
}
-void MC_server_wait_client(mc_process_t process)
+void MC_server_wait_client(simgrid::mc::Process* process)
{
mc_server->resume(process);
- while (mc_model_checker->process().running) {
+ while (mc_model_checker->process().running()) {
if (!mc_server->handle_events())
return;
}
}
-void MC_server_simcall_handle(mc_process_t process, unsigned long pid, int value)
+void MC_server_simcall_handle(simgrid::mc::Process* process, unsigned long pid, int value)
{
s_mc_simcall_handle_message m;
memset(&m, 0, sizeof(m));
m.type = MC_MESSAGE_SIMCALL_HANDLE;
m.pid = pid;
m.value = value;
- MC_protocol_send(mc_model_checker->process().socket, &m, sizeof(m));
+ mc_model_checker->process().send_message(m);
process->cache_flags = (mc_process_cache_flags_t) 0;
- while (mc_model_checker->process().running) {
+ while (mc_model_checker->process().running()) {
if (!mc_server->handle_events())
return;
}