X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/ab0bf820128e74dc5e7d9e6413b88bca2621a34e..6050383ef0dc59e1ca54d02bcf6bccb993593add:/src/mc/mc_global.cpp diff --git a/src/mc/mc_global.cpp b/src/mc/mc_global.cpp index da49931e86..e92fcaf53b 100644 --- a/src/mc/mc_global.cpp +++ b/src/mc/mc_global.cpp @@ -9,22 +9,21 @@ #include #include +#include + #include "mc_base.h" #include "mc/mc.h" -#ifndef _XBT_WIN32 +#ifndef _WIN32 #include #include #include #endif -#include -#include - #include "src/simix/smx_process_private.h" -#ifdef HAVE_MC +#if HAVE_MC #include #include "src/mc/mc_comm_pattern.h" #include "src/mc/mc_request.h" @@ -38,56 +37,50 @@ #include "src/mc/mc_record.h" #include "src/mc/mc_protocol.h" -#include "src/mc/mc_client.h" - -extern "C" { +#include "src/mc/Client.hpp" -XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_global, mc, - "Logging specific to MC (global)"); +XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_global, mc, "Logging specific to MC (global)"); e_mc_mode_t mc_mode; -double *mc_time = nullptr; +namespace simgrid { +namespace mc { -#ifdef HAVE_MC +std::vector processes_time; + +} +} + +#if HAVE_MC int user_max_depth_reached = 0; /* MC global data structures */ mc_state_t mc_current_state = nullptr; -char mc_replay_mode = FALSE; +char mc_replay_mode = false; mc_stats_t mc_stats = nullptr; mc_global_t initial_global_state = nullptr; xbt_fifo_t mc_stack = nullptr; /* Liveness */ -xbt_automaton_t _mc_property_automaton = nullptr; + +namespace simgrid { +namespace mc { + +xbt_automaton_t property_automaton = nullptr; + +} +} /* Dot output */ FILE *dot_output = nullptr; -const char *colors[13]; /******************************* Initialisation of MC *******************************/ /*********************************************************************************/ void MC_init_dot_output() -{ /* FIXME : more colors */ - - colors[0] = "blue"; - colors[1] = "red"; - colors[2] = "green3"; - colors[3] = "goldenrod"; - colors[4] = "brown"; - colors[5] = "purple"; - colors[6] = "magenta"; - colors[7] = "turquoise4"; - colors[8] = "gray25"; - colors[9] = "forestgreen"; - colors[10] = "hotpink"; - colors[11] = "lightblue"; - colors[12] = "tan"; - +{ dot_output = fopen(_sg_mc_dot_output_file, "w"); if (dot_output == nullptr) { @@ -100,21 +93,21 @@ void MC_init_dot_output() } -#ifdef HAVE_MC +#if HAVE_MC void MC_init() { - mc_time = xbt_new0(double, simix_process_maxpid); + simgrid::mc::processes_time.resize(simix_process_maxpid); if (_sg_mc_visited > 0 || _sg_mc_liveness || _sg_mc_termination || mc_mode == MC_MODE_SERVER) { /* Those requests are handled on the client side and propagated by message * to the server: */ - MC_ignore_heap(mc_time, simix_process_maxpid * sizeof(double)); + MC_ignore_heap(simgrid::mc::processes_time.data(), + simix_process_maxpid * sizeof(double)); smx_process_t process; - xbt_swag_foreach(process, simix_global->process_list) { + xbt_swag_foreach(process, simix_global->process_list) MC_ignore_heap(&(process->process_hookup), sizeof(process->process_hookup)); - } } } @@ -127,55 +120,16 @@ void MC_run() { mc_mode = MC_MODE_CLIENT; MC_init(); - MC_client_main_loop(); + simgrid::mc::Client::get()->mainLoop(); } void MC_exit(void) { - xbt_free(mc_time); - + simgrid::mc::processes_time.clear(); MC_memory_exit(); //xbt_abort(); } -#ifdef HAVE_MC -int MC_deadlock_check() -{ - if (mc_mode == MC_MODE_SERVER) { - int res; - if ((res = mc_model_checker->process().send_message(MC_MESSAGE_DEADLOCK_CHECK))) - xbt_die("Could not check deadlock state"); - s_mc_int_message_t message; - ssize_t s = mc_model_checker->process().receive_message(message); - if (s == -1) - xbt_die("Could not receive message"); - else if (s != sizeof(message) || message.type != MC_MESSAGE_DEADLOCK_CHECK_REPLY) { - xbt_die("%s received unexpected message %s (%i, size=%i) " - "expected MC_MESSAGE_DEADLOCK_CHECK_REPLY (%i, size=%i)", - MC_mode_name(mc_mode), - MC_message_type_name(message.type), (int) message.type, (int) s, - (int) MC_MESSAGE_DEADLOCK_CHECK_REPLY, (int) sizeof(message) - ); - } - else - return message.value; - } - - int deadlock = FALSE; - smx_process_t process; - if (xbt_swag_size(simix_global->process_list)) { - deadlock = TRUE; - xbt_swag_foreach(process, simix_global->process_list) { - if (MC_process_is_enabled(process)) { - deadlock = FALSE; - break; - } - } - } - return deadlock; -} -#endif - /** * \brief Re-executes from the state at position start all the transitions indicated by * a given model-checker stack. @@ -240,7 +194,7 @@ void MC_replay(xbt_fifo_t stack) /* Debug information */ if (XBT_LOG_ISENABLED(mc_global, xbt_log_priority_debug)) { - req_str = MC_request_to_string(req, value, MC_REQUEST_SIMIX); + req_str = simgrid::mc::request_to_string(req, value, simgrid::mc::RequestType::simix); XBT_DEBUG("Replay: %s (%p)", req_str, state); xbt_free(req_str); } @@ -250,7 +204,7 @@ void MC_replay(xbt_fifo_t stack) if (_sg_mc_comms_determinism || _sg_mc_send_determinism) call = MC_get_call_type(req); - MC_simcall_handle(req, value); + simgrid::mc::handle_simcall(req, value); if (_sg_mc_comms_determinism || _sg_mc_send_determinism) MC_handle_comm_pattern(call, req, value, nullptr, 1); @@ -272,7 +226,7 @@ void MC_replay(xbt_fifo_t stack) void MC_replay_liveness(xbt_fifo_t stack) { xbt_fifo_item_t item; - mc_pair_t pair = nullptr; + simgrid::mc::Pair* pair = nullptr; mc_state_t state = nullptr; smx_simcall_t req = nullptr, saved_req = NULL; int value, depth = 1; @@ -283,7 +237,7 @@ void MC_replay_liveness(xbt_fifo_t stack) /* Intermediate backtracking */ if(_sg_mc_checkpoint > 0) { item = xbt_fifo_get_first_item(stack); - pair = (mc_pair_t) xbt_fifo_get_item_content(item); + pair = (simgrid::mc::Pair*) xbt_fifo_get_item_content(item); if(pair->graph_state->system_state){ simgrid::mc::restore_snapshot(pair->graph_state->system_state); return; @@ -298,7 +252,7 @@ void MC_replay_liveness(xbt_fifo_t stack) item != xbt_fifo_get_first_item(stack); item = xbt_fifo_get_prev_item(item)) { - pair = (mc_pair_t) xbt_fifo_get_item_content(item); + pair = (simgrid::mc::Pair*) xbt_fifo_get_item_content(item); state = (mc_state_t) pair->graph_state; @@ -314,14 +268,14 @@ void MC_replay_liveness(xbt_fifo_t stack) /* Debug information */ if (XBT_LOG_ISENABLED(mc_global, xbt_log_priority_debug)) { - req_str = MC_request_to_string(req, value, MC_REQUEST_SIMIX); + req_str = simgrid::mc::request_to_string(req, value, simgrid::mc::RequestType::simix); XBT_DEBUG("Replay (depth = %d) : %s (%p)", depth, req_str, state); xbt_free(req_str); } } - MC_simcall_handle(req, value); + simgrid::mc::handle_simcall(req, value); mc_model_checker->wait_for_requests(); } @@ -365,7 +319,7 @@ void MC_show_stack_safety(xbt_fifo_t stack) state = (mc_state_t)xbt_fifo_get_item_content(item); req = MC_state_get_executed_request(state, &value); if (req) { - req_str = MC_request_to_string(req, value, MC_REQUEST_EXECUTED); + req_str = simgrid::mc::request_to_string(req, value, simgrid::mc::RequestType::executed); XBT_INFO("%s", req_str); xbt_free(req_str); } @@ -379,7 +333,7 @@ void MC_show_deadlock(smx_simcall_t req) XBT_INFO("*** DEAD-LOCK DETECTED ***"); XBT_INFO("**************************"); XBT_INFO("Locked request:"); - /*req_str = MC_request_to_string(req); + /*req_str = simgrid::mc::request_to_string(req); XBT_INFO("%s", req_str); xbt_free(req_str); */ XBT_INFO("Counter-example execution trace:"); @@ -396,33 +350,37 @@ void MC_show_non_termination(void){ MC_print_statistics(mc_stats); } +namespace simgrid { +namespace mc { -void MC_show_stack_liveness(xbt_fifo_t stack) +void show_stack_liveness(xbt_fifo_t stack) { int value; - mc_pair_t pair; + simgrid::mc::Pair* pair; xbt_fifo_item_t item; smx_simcall_t req; char *req_str = nullptr; for (item = xbt_fifo_get_last_item(stack); item; item = xbt_fifo_get_prev_item(item)) { - pair = (mc_pair_t) xbt_fifo_get_item_content(item); + pair = (simgrid::mc::Pair*) xbt_fifo_get_item_content(item); req = MC_state_get_executed_request(pair->graph_state, &value); if (req && req->call != SIMCALL_NONE) { - req_str = MC_request_to_string(req, value, MC_REQUEST_EXECUTED); + req_str = simgrid::mc::request_to_string(req, value, simgrid::mc::RequestType::executed); XBT_INFO("%s", req_str); xbt_free(req_str); } } } - -void MC_dump_stack_liveness(xbt_fifo_t stack) +void dump_stack_liveness(xbt_fifo_t stack) { - mc_pair_t pair; - while ((pair = (mc_pair_t) xbt_fifo_pop(stack)) != nullptr) - MC_pair_delete(pair); + simgrid::mc::Pair* pair; + while ((pair = (simgrid::mc::Pair*) xbt_fifo_pop(stack)) != nullptr) + delete pair; +} + +} } void MC_print_statistics(mc_stats_t stats) @@ -466,10 +424,10 @@ void MC_print_statistics(mc_stats_t stats) void MC_automaton_load(const char *file) { - if (_mc_property_automaton == nullptr) - _mc_property_automaton = xbt_automaton_new(); + if (simgrid::mc::property_automaton == nullptr) + simgrid::mc::property_automaton = xbt_automaton_new(); - xbt_automaton_load(_mc_property_automaton, file); + xbt_automaton_load(simgrid::mc::property_automaton, file); } // TODO, fix cross-process access (this function is not used) @@ -509,22 +467,19 @@ static void MC_dump_stacks(FILE* file) double MC_process_clock_get(smx_process_t process) { - if (mc_time) { - if (process != nullptr) - return mc_time[process->pid]; - else - return -1; - } else { + if (simgrid::mc::processes_time.empty()) return 0; - } + if (process != nullptr) + return simgrid::mc::processes_time[process->pid]; + return -1; } void MC_process_clock_add(smx_process_t process, double amount) { - mc_time[process->pid] += amount; + simgrid::mc::processes_time[process->pid] += amount; } -#ifdef HAVE_MC +#if HAVE_MC void MC_report_assertion_error(void) { XBT_INFO("**************************"); @@ -556,5 +511,3 @@ void MC_report_crash(int status) } #endif - -}