X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/d098dd9e12ee321b061421f535b2b56ce7691673..124b3dee9ed0b4342bc495061c2a5167a9fc6318:/src/mc/mc_global.cpp diff --git a/src/mc/mc_global.cpp b/src/mc/mc_global.cpp index b1e8b480d2..898da3f27b 100644 --- a/src/mc/mc_global.cpp +++ b/src/mc/mc_global.cpp @@ -5,33 +5,29 @@ * under the terms of the license (GNU LGPL) which comes with this package. */ #include - #include #include #include -#include + +#include #include "mc_base.h" -#ifndef _XBT_WIN32 +#include "mc/mc.h" + +#ifndef _WIN32 #include #include #include #endif -#include "simgrid/sg_config.h" -#include "src/surf/surf_private.h" -#include "src/simix/smx_private.h" -#include "xbt/fifo.h" -#include "xbt/automaton.h" -#include "xbt/dict.h" -#include "mc_record.h" +#include +#include + +#include "src/simix/smx_process_private.h" #ifdef HAVE_MC #include -#include -#include "src/xbt/mmalloc/mmprivate.h" -#include "src/mc/mc_object_info.h" #include "src/mc/mc_comm_pattern.h" #include "src/mc/mc_request.h" #include "src/mc/mc_safety.h" @@ -41,6 +37,7 @@ #include "src/mc/mc_unw.h" #include "src/mc/mc_smx.h" #endif + #include "src/mc/mc_record.h" #include "src/mc/mc_protocol.h" #include "src/mc/mc_client.h" @@ -50,26 +47,41 @@ extern "C" { XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_global, mc, "Logging specific to MC (global)"); +} + e_mc_mode_t mc_mode; -double *mc_time = NULL; +namespace simgrid { +namespace mc { + +std::vector processes_time; + +} +} #ifdef HAVE_MC int user_max_depth_reached = 0; /* MC global data structures */ -mc_state_t mc_current_state = NULL; +mc_state_t mc_current_state = nullptr; char mc_replay_mode = FALSE; -mc_stats_t mc_stats = NULL; -mc_global_t initial_global_state = NULL; -xbt_fifo_t mc_stack = NULL; +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 = NULL; + +namespace simgrid { +namespace mc { + +xbt_automaton_t property_automaton = nullptr; + +} +} /* Dot output */ -FILE *dot_output = NULL; +FILE *dot_output = nullptr; const char *colors[13]; @@ -95,7 +107,7 @@ void MC_init_dot_output() dot_output = fopen(_sg_mc_dot_output_file, "w"); - if (dot_output == NULL) { + if (dot_output == nullptr) { perror("Error open dot output file"); xbt_abort(); } @@ -108,18 +120,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)); - } } } @@ -137,8 +149,7 @@ void MC_run() void MC_exit(void) { - xbt_free(mc_time); - + simgrid::mc::processes_time.clear(); MC_memory_exit(); //xbt_abort(); } @@ -154,28 +165,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; } @@ -191,7 +199,7 @@ void MC_replay(xbt_fifo_t stack) { int value, count = 1; char *req_str; - smx_simcall_t req = NULL, saved_req = NULL; + smx_simcall_t req = nullptr, saved_req = NULL; xbt_fifo_item_t item, start_item; mc_state_t state; @@ -202,7 +210,7 @@ void MC_replay(xbt_fifo_t stack) start_item = xbt_fifo_get_first_item(stack); state = (mc_state_t)xbt_fifo_get_item_content(start_item); if(state->system_state){ - MC_restore_snapshot(state->system_state); + simgrid::mc::restore_snapshot(state->system_state); if(_sg_mc_comms_determinism || _sg_mc_send_determinism) MC_restore_communications_pattern(state); return; @@ -211,7 +219,7 @@ void MC_replay(xbt_fifo_t stack) /* Restore the initial state */ - MC_restore_snapshot(initial_global_state->snapshot); + simgrid::mc::restore_snapshot(initial_global_state->snapshot); /* At the moment of taking the snapshot the raw heap was set, so restoring * it will set it back again, we have to unset it to continue */ @@ -245,7 +253,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); } @@ -255,10 +263,10 @@ 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, NULL, 1); + MC_handle_comm_pattern(call, req, value, nullptr, 1); mc_model_checker->wait_for_requests(); @@ -277,9 +285,9 @@ void MC_replay(xbt_fifo_t stack) void MC_replay_liveness(xbt_fifo_t stack) { xbt_fifo_item_t item; - mc_pair_t pair = NULL; - mc_state_t state = NULL; - smx_simcall_t req = NULL, saved_req = NULL; + simgrid::mc::Pair* pair = nullptr; + mc_state_t state = nullptr; + smx_simcall_t req = nullptr, saved_req = NULL; int value, depth = 1; char *req_str; @@ -288,22 +296,22 @@ 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){ - MC_restore_snapshot(pair->graph_state->system_state); + simgrid::mc::restore_snapshot(pair->graph_state->system_state); return; } } /* Restore the initial state */ - MC_restore_snapshot(initial_global_state->snapshot); + simgrid::mc::restore_snapshot(initial_global_state->snapshot); /* Traverse the stack from the initial state and re-execute the transitions */ for (item = xbt_fifo_get_last_item(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; @@ -311,7 +319,7 @@ void MC_replay_liveness(xbt_fifo_t stack) saved_req = MC_state_get_executed_request(state, &value); - if (saved_req != NULL) { + if (saved_req != nullptr) { /* because we got a copy of the executed request, we have to fetch the real one, pointed by the request field of the issuer process */ const smx_process_t issuer = MC_smx_simcall_get_issuer(saved_req); @@ -319,14 +327,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(); } @@ -352,7 +360,7 @@ void MC_dump_stack_safety(xbt_fifo_t stack) mc_state_t state; - while ((state = (mc_state_t) xbt_fifo_pop(stack)) != NULL) + while ((state = (mc_state_t) xbt_fifo_pop(stack)) != nullptr) MC_state_delete(state, !state->in_visited_states ? 1 : 0); } @@ -363,14 +371,14 @@ void MC_show_stack_safety(xbt_fifo_t stack) mc_state_t state; xbt_fifo_item_t item; smx_simcall_t req; - char *req_str = NULL; + char *req_str = nullptr; for (item = xbt_fifo_get_last_item(stack); item; item = xbt_fifo_get_prev_item(item)) { 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,12 +387,12 @@ void MC_show_stack_safety(xbt_fifo_t stack) void MC_show_deadlock(smx_simcall_t req) { - /*char *req_str = NULL; */ + /*char *req_str = nullptr; */ XBT_INFO("**************************"); 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:"); @@ -401,33 +409,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 = NULL; + 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)) != NULL) - 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) @@ -454,11 +466,11 @@ void MC_print_statistics(mc_stats_t stats) XBT_INFO("Visited pairs = %lu", stats->visited_pairs); } XBT_INFO("Executed transitions = %lu", stats->executed_transitions); - if ((_sg_mc_dot_output_file != NULL) && (_sg_mc_dot_output_file[0] != '\0')) { + if ((_sg_mc_dot_output_file != nullptr) && (_sg_mc_dot_output_file[0] != '\0')) { fprintf(dot_output, "}\n"); fclose(dot_output); } - if (initial_global_state != NULL && (_sg_mc_comms_determinism || _sg_mc_send_determinism)) { + if (initial_global_state != nullptr && (_sg_mc_comms_determinism || _sg_mc_send_determinism)) { XBT_INFO("Send-deterministic : %s", !initial_global_state->send_deterministic ? "No" : "Yes"); if (_sg_mc_comms_determinism) XBT_INFO("Recv-deterministic : %s", !initial_global_state->recv_deterministic ? "No" : "Yes"); @@ -471,14 +483,14 @@ void MC_print_statistics(mc_stats_t stats) void MC_automaton_load(const char *file) { - if (_mc_property_automaton == NULL) - _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) -void MC_dump_stacks(FILE* file) +static void MC_dump_stacks(FILE* file) { int nstack = 0; for (auto const& stack : mc_model_checker->process().stack_areas()) { @@ -514,19 +526,16 @@ void MC_dump_stacks(FILE* file) double MC_process_clock_get(smx_process_t process) { - if (mc_time) { - if (process != NULL) - 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 @@ -561,5 +570,3 @@ void MC_report_crash(int status) } #endif - -}