X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/1ee68a7d44ca89e57734578a1aa91c11ddb27de1..124b3dee9ed0b4342bc495061c2a5167a9fc6318:/src/mc/mc_global.cpp diff --git a/src/mc/mc_global.cpp b/src/mc/mc_global.cpp index d6e4ca154a..898da3f27b 100644 --- a/src/mc/mc_global.cpp +++ b/src/mc/mc_global.cpp @@ -1,83 +1,94 @@ -/* Copyright (c) 2008-2014. The SimGrid Team. +/* Copyright (c) 2008-2015. The SimGrid Team. * All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it * under the terms of the license (GNU LGPL) which comes with this package. */ -#include -#include -#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 "../surf/surf_private.h" -#include "../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 "mc_server.h" #include -#include -#include "../xbt/mmalloc/mmprivate.h" -#include "mc_object_info.h" -#include "mc_comm_pattern.h" -#include "mc_request.h" -#include "mc_safety.h" -#include "mc_memory_map.h" -#include "mc_snapshot.h" -#include "mc_liveness.h" -#include "mc_private.h" -#include "mc_unw.h" -#include "mc_smx.h" +#include "src/mc/mc_comm_pattern.h" +#include "src/mc/mc_request.h" +#include "src/mc/mc_safety.h" +#include "src/mc/mc_snapshot.h" +#include "src/mc/mc_liveness.h" +#include "src/mc/mc_private.h" +#include "src/mc/mc_unw.h" +#include "src/mc/mc_smx.h" #endif -#include "mc_record.h" -#include "mc_protocol.h" -#include "mc_client.h" + +#include "src/mc/mc_record.h" +#include "src/mc/mc_protocol.h" +#include "src/mc/mc_client.h" 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; -__thread mc_comparison_times_t mc_comp_times = NULL; -__thread double mc_snapshot_comparison_time; -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]; /******************************* Initialisation of MC *******************************/ /*********************************************************************************/ -static void MC_init_dot_output() +void MC_init_dot_output() { /* FIXME : more colors */ colors[0] = "blue"; @@ -96,7 +107,7 @@ static 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(); } @@ -109,98 +120,21 @@ static void MC_init_dot_output() #ifdef HAVE_MC void MC_init() { - MC_init_pid(getpid(), -1); -} - -void MC_init_pid(pid_t pid, int socket) -{ - /* Initialize the data structures that must be persistent across every - iteration of the model-checker (in RAW memory) */ - - xbt_mheap_t heap = mmalloc_set_current_heap(mc_heap); - mc_model_checker = new simgrid::mc::ModelChecker(pid, socket); - - // It's not useful anymore: - if (0 && mc_mode == MC_MODE_SERVER) { - unsigned long maxpid; - MC_process_read_variable(&mc_model_checker->process(), "simix_process_maxpid", - &maxpid, sizeof(maxpid)); - simix_process_maxpid = maxpid; - } - - mmalloc_set_current_heap(std_heap); - mc_time = xbt_new0(double, MC_smx_get_maxpid()); - mmalloc_set_current_heap(mc_heap); - - mc_comp_times = xbt_new0(s_mc_comparison_times_t, 1); - - /* Initialize statistics */ - mc_stats = xbt_new0(s_mc_stats_t, 1); - mc_stats->state_size = 1; - - if ((_sg_mc_dot_output_file != NULL) && (_sg_mc_dot_output_file[0] != '\0')) - MC_init_dot_output(); - - /* Init parmap */ - //parmap = xbt_parmap_mc_new(xbt_os_get_numcores(), XBT_PARMAP_DEFAULT); - - mmalloc_set_current_heap(std_heap); + simgrid::mc::processes_time.resize(simix_process_maxpid); if (_sg_mc_visited > 0 || _sg_mc_liveness || _sg_mc_termination || mc_mode == MC_MODE_SERVER) { - /* Ignore some variables from xbt/ex.h used by exception e for stacks comparison */ - MC_ignore_local_variable("e", "*"); - MC_ignore_local_variable("__ex_cleanup", "*"); - MC_ignore_local_variable("__ex_mctx_en", "*"); - MC_ignore_local_variable("__ex_mctx_me", "*"); - MC_ignore_local_variable("__xbt_ex_ctx_ptr", "*"); - MC_ignore_local_variable("_log_ev", "*"); - MC_ignore_local_variable("_throw_ctx", "*"); - MC_ignore_local_variable("ctx", "*"); - - MC_ignore_local_variable("self", "simcall_BODY_mc_snapshot"); - MC_ignore_local_variable("next_cont" - "ext", "smx_ctx_sysv_suspend_serial"); - MC_ignore_local_variable("i", "smx_ctx_sysv_suspend_serial"); - - /* Ignore local variable about time used for tracing */ - MC_ignore_local_variable("start_time", "*"); - - /* Main MC state: */ - MC_ignore_global_variable("mc_model_checker"); - MC_ignore_global_variable("initial_communications_pattern"); - MC_ignore_global_variable("incomplete_communications_pattern"); - MC_ignore_global_variable("nb_comm_pattern"); - - /* MC __thread variables: */ - MC_ignore_global_variable("mc_diff_info"); - MC_ignore_global_variable("mc_comp_times"); - MC_ignore_global_variable("mc_snapshot_comparison_time"); - - /* This MC state is used in MC replay as well: */ - MC_ignore_global_variable("mc_time"); - - /* Static variable used for tracing */ - MC_ignore_global_variable("counter"); - - /* SIMIX */ - MC_ignore_global_variable("smx_total_comms"); - - if (mc_mode == MC_MODE_CLIENT) { - /* Those requests are handled on the client side and propagated by message - * to the server: */ - - MC_ignore_heap(mc_time, MC_smx_get_maxpid() * sizeof(double)); - - smx_process_t process; - xbt_swag_foreach(process, simix_global->process_list) { - MC_ignore_heap(&(process->process_hookup), sizeof(process->process_hookup)); - } - } + /* Those requests are handled on the client side and propagated by message + * to the server: */ - } + MC_ignore_heap(simgrid::mc::processes_time.data(), + simix_process_maxpid * sizeof(double)); - mmalloc_set_current_heap(heap); + smx_process_t process; + xbt_swag_foreach(process, simix_global->process_list) + MC_ignore_heap(&(process->process_hookup), sizeof(process->process_hookup)); + } } + #endif /******************************* Core of MC *******************************/ @@ -215,8 +149,7 @@ void MC_run() void MC_exit(void) { - xbt_free(mc_time); - + simgrid::mc::processes_time.clear(); MC_memory_exit(); //xbt_abort(); } @@ -226,35 +159,31 @@ int MC_deadlock_check() { if (mc_mode == MC_MODE_SERVER) { int res; - if ((res = MC_protocol_send_simple_message(mc_model_checker->process().socket, - MC_MESSAGE_DEADLOCK_CHECK))) + 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_receive_message(mc_model_checker->process().socket, &message, sizeof(message), 0); + 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; - MC_EACH_SIMIX_PROCESS(process, - 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; } @@ -268,11 +197,9 @@ int MC_deadlock_check() */ void MC_replay(xbt_fifo_t stack) { - xbt_mheap_t heap = mmalloc_set_current_heap(mc_heap); - 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; @@ -283,24 +210,20 @@ 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); - mmalloc_set_current_heap(std_heap); return; } } /* 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 */ - mmalloc_set_current_heap(std_heap); start_item = xbt_fifo_get_last_item(stack); - - mmalloc_set_current_heap(mc_heap); if (_sg_mc_comms_determinism || _sg_mc_send_determinism) { // int n = xbt_dynar_length(incomplete_communications_pattern); @@ -313,8 +236,6 @@ void MC_replay(xbt_fifo_t stack) } } - mmalloc_set_current_heap(std_heap); - /* Traverse the stack from the state at position start and re-execute the transitions */ for (item = start_item; item != xbt_fifo_get_first_item(stack); @@ -332,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); } @@ -342,14 +263,12 @@ 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); - mmalloc_set_current_heap(mc_heap); if (_sg_mc_comms_determinism || _sg_mc_send_determinism) - MC_handle_comm_pattern(call, req, value, NULL, 1); - mmalloc_set_current_heap(std_heap); + MC_handle_comm_pattern(call, req, value, nullptr, 1); - MC_wait_for_requests(); + mc_model_checker->wait_for_requests(); count++; } @@ -361,18 +280,14 @@ void MC_replay(xbt_fifo_t stack) } XBT_DEBUG("**** End Replay ****"); - mmalloc_set_current_heap(heap); } void MC_replay_liveness(xbt_fifo_t stack) { - - initial_global_state->raw_mem_set = (mmalloc_get_current_heap() == mc_heap); - 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; @@ -381,28 +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); - mmalloc_set_current_heap(std_heap); + simgrid::mc::restore_snapshot(pair->graph_state->system_state); return; } } /* Restore the initial state */ - 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 */ - if (!initial_global_state->raw_mem_set) - mmalloc_set_current_heap(std_heap); + 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; @@ -410,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); @@ -418,15 +327,15 @@ 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); - MC_wait_for_requests(); + simgrid::mc::handle_simcall(req, value); + mc_model_checker->wait_for_requests(); } /* Update statistics */ @@ -438,12 +347,6 @@ void MC_replay_liveness(xbt_fifo_t stack) } XBT_DEBUG("**** End Replay ****"); - - if (initial_global_state->raw_mem_set) - mmalloc_set_current_heap(mc_heap); - else - mmalloc_set_current_heap(std_heap); - } /** @@ -453,51 +356,43 @@ void MC_replay_liveness(xbt_fifo_t stack) */ void MC_dump_stack_safety(xbt_fifo_t stack) { - xbt_mheap_t heap = mmalloc_set_current_heap(mc_heap); - MC_show_stack_safety(stack); mc_state_t state; - - mmalloc_set_current_heap(mc_heap); - 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); - mmalloc_set_current_heap(heap); } void MC_show_stack_safety(xbt_fifo_t stack) { - xbt_mheap_t heap = mmalloc_set_current_heap(mc_heap); - int value; 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 ? (state = (mc_state_t) (xbt_fifo_get_item_content(item))) - : (NULL)); item = xbt_fifo_get_prev_item(item)) { + 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); } } - - mmalloc_set_current_heap(heap); } 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:"); @@ -514,35 +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 ? (pair = (mc_pair_t) (xbt_fifo_get_item_content(item))) : (NULL)); - item = xbt_fifo_get_prev_item(item)) { + item; item = xbt_fifo_get_prev_item(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) { - xbt_mheap_t heap = mmalloc_set_current_heap(mc_heap); - mc_pair_t pair; - while ((pair = (mc_pair_t) xbt_fifo_pop(stack)) != NULL) - MC_pair_delete(pair); - mmalloc_set_current_heap(heap); + simgrid::mc::Pair* pair; + while ((pair = (simgrid::mc::Pair*) xbt_fifo_pop(stack)) != nullptr) + delete pair; +} + +} } void MC_print_statistics(mc_stats_t stats) @@ -569,90 +466,37 @@ void MC_print_statistics(mc_stats_t stats) XBT_INFO("Visited pairs = %lu", stats->visited_pairs); } XBT_INFO("Executed transitions = %lu", stats->executed_transitions); - xbt_mheap_t heap = mmalloc_set_current_heap(mc_heap); - 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"); } - mmalloc_set_current_heap(heap); + if (getenv("SIMGRID_MC_SYSTEM_STATISTICS")){ + int ret=system("free"); + if(ret!=0)XBT_WARN("system call did not return 0, but %d",ret); + } } void MC_automaton_load(const char *file) { - xbt_mheap_t heap = mmalloc_set_current_heap(mc_heap); - - if (_mc_property_automaton == NULL) - _mc_property_automaton = xbt_automaton_new(); - - xbt_automaton_load(_mc_property_automaton, file); - mmalloc_set_current_heap(heap); -} - -static void register_symbol(xbt_automaton_propositional_symbol_t symbol) -{ - if (mc_mode != MC_MODE_CLIENT) - return; - s_mc_register_symbol_message_t message; - message.type = MC_MESSAGE_REGISTER_SYMBOL; - const char* name = xbt_automaton_propositional_symbol_get_name(symbol); - if (strlen(name) + 1 > sizeof(message.name)) - xbt_die("Symbol is too long"); - strncpy(message.name, name, sizeof(message.name)); - message.callback = xbt_automaton_propositional_symbol_get_callback(symbol); - message.data = xbt_automaton_propositional_symbol_get_data(symbol); - MC_client_send_message(&message, sizeof(message)); -} - -void MC_automaton_new_propositional_symbol(const char *id, int(*fct)(void)) -{ - xbt_mheap_t heap = mmalloc_set_current_heap(mc_heap); - - 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_propositional_symbol_t symbol = xbt_automaton_propositional_symbol_new(_mc_property_automaton, id, fct); - register_symbol(symbol); - mmalloc_set_current_heap(heap); -} - -void MC_automaton_new_propositional_symbol_pointer(const char *id, int* value) -{ - xbt_mheap_t heap = mmalloc_set_current_heap(mc_heap); - if (_mc_property_automaton == NULL) - _mc_property_automaton = xbt_automaton_new(); - xbt_automaton_propositional_symbol_t symbol = xbt_automaton_propositional_symbol_new_pointer(_mc_property_automaton, id, value); - register_symbol(symbol); - mmalloc_set_current_heap(heap); -} - -void MC_automaton_new_propositional_symbol_callback(const char* id, - xbt_automaton_propositional_symbol_callback_type callback, - void* data, xbt_automaton_propositional_symbol_free_function_type free_function) -{ - xbt_mheap_t heap = mmalloc_set_current_heap(mc_heap); - if (_mc_property_automaton == NULL) - _mc_property_automaton = xbt_automaton_new(); - xbt_automaton_propositional_symbol_t symbol = xbt_automaton_propositional_symbol_new_callback( - _mc_property_automaton, id, callback, data, free_function); - register_symbol(symbol); - mmalloc_set_current_heap(heap); + 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) { - xbt_mheap_t heap = mmalloc_set_current_heap(mc_heap); - int nstack = 0; - stack_region_t current_stack; - unsigned cursor; - xbt_dynar_foreach(stacks_areas, cursor, current_stack) { - unw_context_t * context = (unw_context_t *)current_stack->context; + for (auto const& stack : mc_model_checker->process().stack_areas()) { + + xbt_die("Fix cross-process access to the context"); + unw_context_t * context = (unw_context_t *)stack.context; fprintf(file, "Stack %i:\n", nstack); int nframe = 0; @@ -668,7 +512,7 @@ void MC_dump_stacks(FILE* file) unw_get_reg(&c, UNW_X86_64_RIP, &rip); unw_get_reg(&c, UNW_X86_64_RSP, &rsp); fprintf(file, " %i: %s (RIP=0x%" PRIx64 " RSP=0x%" PRIx64 ")\n", - nframe, name, rip, rsp); + nframe, name, (std::uint64_t) rip, (std::uint64_t) rsp); #else fprintf(file, " %i: %s\n", nframe, name); #endif @@ -677,25 +521,21 @@ void MC_dump_stacks(FILE* file) ++nstack; } - mmalloc_set_current_heap(heap); } #endif 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 @@ -710,11 +550,23 @@ void MC_report_assertion_error(void) MC_print_statistics(mc_stats); } -void MC_invalidate_cache(void) +void MC_report_crash(int status) { - if (mc_model_checker) - mc_model_checker->process().cache_flags = 0; + XBT_INFO("**************************"); + XBT_INFO("** CRASH IN THE PROGRAM **"); + XBT_INFO("**************************"); + if (WIFSIGNALED(status)) + XBT_INFO("From signal: %s", strsignal(WTERMSIG(status))); + else if (WIFEXITED(status)) + XBT_INFO("From exit: %i", WEXITSTATUS(status)); + if (WCOREDUMP(status)) + XBT_INFO("A core dump was generated by the system."); + else + XBT_INFO("No core dump was generated by the system."); + XBT_INFO("Counter-example execution trace:"); + MC_record_dump_path(mc_stack); + MC_dump_stack_safety(mc_stack); + MC_print_statistics(mc_stats); } -#endif -} +#endif