X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/20bbf9b0608d4ab29fb25ab4f795001d0cdca5b5..e6ca184e99d50d0ee8fe405a83ee5277e2ecfce6:/src/mc/mc_global.cpp diff --git a/src/mc/mc_global.cpp b/src/mc/mc_global.cpp index da49931e86..0b430b53cf 100644 --- a/src/mc/mc_global.cpp +++ b/src/mc/mc_global.cpp @@ -9,11 +9,13 @@ #include #include +#include + #include "mc_base.h" #include "mc/mc.h" -#ifndef _XBT_WIN32 +#ifndef _WIN32 #include #include #include @@ -45,9 +47,17 @@ extern "C" { 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 { + +std::vector processes_time; + +} +} #ifdef HAVE_MC int user_max_depth_reached = 0; @@ -103,18 +113,18 @@ void MC_init_dot_output() #ifdef 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)); - } } } @@ -132,8 +142,7 @@ void MC_run() void MC_exit(void) { - xbt_free(mc_time); - + simgrid::mc::processes_time.clear(); MC_memory_exit(); //xbt_abort(); } @@ -149,28 +158,25 @@ int MC_deadlock_check() 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) { + 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; + 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)) { + xbt_swag_foreach(process, simix_global->process_list) + if (simgrid::mc::process_is_enabled(process)) { deadlock = FALSE; break; } - } } return deadlock; } @@ -240,7 +246,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 +256,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); @@ -314,14 +320,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 +371,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 +385,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:"); @@ -410,7 +416,7 @@ void MC_show_stack_liveness(xbt_fifo_t stack) pair = (mc_pair_t) 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); } @@ -509,19 +515,16 @@ 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 @@ -556,5 +559,3 @@ void MC_report_crash(int status) } #endif - -}