X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/3c5b31c9766da42c82473b8c9dbf5910b74f3cb0..5a298a64b7e15c10d01ae886c4d9a1940d2c5845:/src/mc/mc_server.cpp diff --git a/src/mc/mc_server.cpp b/src/mc/mc_server.cpp index cc7c5250bb..88f2bb0749 100644 --- a/src/mc/mc_server.cpp +++ b/src/mc/mc_server.cpp @@ -28,30 +28,6 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_server, mc, "MC server logic"); mc_server_t mc_server; -int MC_server_init(pid_t pid, int socket) -{ - if (mc_server) - xbt_die("MC server already present"); - mc_mode = MC_MODE_SERVER; - mc_server = new s_mc_server(pid, socket); - mc_server->start(); - return 0; -} - -void MC_server_run(void) -{ - try { - mc_server->resume(&mc_model_checker->process); - mc_server->loop(); - mc_server->shutdown(); - mc_server->exit(); - } - catch(std::exception& e) { - XBT_ERROR(e.what()); - exit(MC_SERVER_ERROR); - } -} - s_mc_server::s_mc_server(pid_t pid, int socket) { this->pid = pid; @@ -69,8 +45,6 @@ void s_mc_server::start() throw std::system_error(res, std::system_category()); XBT_DEBUG("Greeted the MC client"); - MC_init_pid(pid, socket); - // Block SIGCHLD (this will be handled with accept/signalfd): sigset_t set; sigemptyset(&set); @@ -169,6 +143,10 @@ void s_mc_server::handle_events() if (size == -1 && errno != EAGAIN) throw std::system_error(errno, std::system_category()); else switch(message.type) { + case MC_MESSAGE_IGNORE_REGION: + XBT_DEBUG("Received ignored region"); + // Ignored for now + break; default: xbt_die("Unexpected message from model-checked application"); }