X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/1ee68a7d44ca89e57734578a1aa91c11ddb27de1..bae076147bfc88ce8607f15761149f42d0443585:/src/mc/mc_global.cpp diff --git a/src/mc/mc_global.cpp b/src/mc/mc_global.cpp index d6e4ca154a..86039ca696 100644 --- a/src/mc/mc_global.cpp +++ b/src/mc/mc_global.cpp @@ -1,9 +1,11 @@ -/* 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 @@ -29,7 +31,7 @@ #include #include #include "../xbt/mmalloc/mmprivate.h" -#include "mc_object_info.h" +#include "mc_dwarf.hpp" #include "mc_comm_pattern.h" #include "mc_request.h" #include "mc_safety.h" @@ -39,6 +41,7 @@ #include "mc_private.h" #include "mc_unw.h" #include "mc_smx.h" +#include "mcer_ignore.h" #endif #include "mc_record.h" #include "mc_protocol.h" @@ -109,28 +112,24 @@ static void MC_init_dot_output() #ifdef HAVE_MC void MC_init() { - MC_init_pid(getpid(), -1); -} + mc_time = xbt_new0(double, simix_process_maxpid); -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) */ + 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: */ - xbt_mheap_t heap = mmalloc_set_current_heap(mc_heap); - mc_model_checker = new simgrid::mc::ModelChecker(pid, socket); + MC_ignore_heap(mc_time, simix_process_maxpid * sizeof(double)); - // 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; + smx_process_t process; + xbt_swag_foreach(process, simix_global->process_list) { + MC_ignore_heap(&(process->process_hookup), sizeof(process->process_hookup)); + } } +} - mmalloc_set_current_heap(std_heap); - mc_time = xbt_new0(double, MC_smx_get_maxpid()); - mmalloc_set_current_heap(mc_heap); +void MC_init_model_checker(pid_t pid, int socket) +{ + mc_model_checker = new simgrid::mc::ModelChecker(pid, socket); mc_comp_times = xbt_new0(s_mc_comparison_times_t, 1); @@ -144,62 +143,29 @@ void MC_init_pid(pid_t pid, int socket) /* Init parmap */ //parmap = xbt_parmap_mc_new(xbt_os_get_numcores(), XBT_PARMAP_DEFAULT); - mmalloc_set_current_heap(std_heap); - - 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)); - } - } - - } - - mmalloc_set_current_heap(heap); + /* 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", "*"); + + /* Static variable used for tracing */ + MCer_ignore_global_variable("counter"); + + /* SIMIX */ + MCer_ignore_global_variable("smx_total_comms"); } #endif @@ -226,11 +192,10 @@ 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) { @@ -249,12 +214,12 @@ int MC_deadlock_check() smx_process_t process; if (xbt_swag_size(simix_global->process_list)) { deadlock = TRUE; - MC_EACH_SIMIX_PROCESS(process, + xbt_swag_foreach(process, simix_global->process_list) { if (MC_process_is_enabled(process)) { deadlock = FALSE; break; } - ); + } } return deadlock; } @@ -268,8 +233,6 @@ 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; @@ -286,7 +249,6 @@ void MC_replay(xbt_fifo_t stack) 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; } } @@ -296,11 +258,8 @@ void MC_replay(xbt_fifo_t stack) 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 +272,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); @@ -344,10 +301,8 @@ void MC_replay(xbt_fifo_t stack) MC_simcall_handle(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_wait_for_requests(); @@ -361,14 +316,10 @@ 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; @@ -384,7 +335,6 @@ void MC_replay_liveness(xbt_fifo_t stack) pair = (mc_pair_t) 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); return; } } @@ -392,11 +342,6 @@ void MC_replay_liveness(xbt_fifo_t stack) /* 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); - /* 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); @@ -438,12 +383,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,23 +392,17 @@ 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) 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; @@ -477,8 +410,8 @@ void MC_show_stack_safety(xbt_fifo_t stack) char *req_str = NULL; 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); @@ -486,8 +419,6 @@ void MC_show_stack_safety(xbt_fifo_t stack) xbt_free(req_str); } } - - mmalloc_set_current_heap(heap); } void MC_show_deadlock(smx_simcall_t req) @@ -524,8 +455,8 @@ void MC_show_stack_liveness(xbt_fifo_t stack) char *req_str = NULL; 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 = (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); @@ -538,11 +469,9 @@ void MC_show_stack_liveness(xbt_fifo_t stack) void MC_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); } void MC_print_statistics(mc_stats_t stats) @@ -569,7 +498,6 @@ 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')) { fprintf(dot_output, "}\n"); fclose(dot_output); @@ -579,75 +507,19 @@ void MC_print_statistics(mc_stats_t stats) if (_sg_mc_comms_determinism) XBT_INFO("Recv-deterministic : %s", !initial_global_state->recv_deterministic ? "No" : "Yes"); } - mmalloc_set_current_heap(heap); } 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(); - - 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); } // TODO, fix cross-process access (this function is not used) 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; @@ -677,7 +549,6 @@ void MC_dump_stacks(FILE* file) ++nstack; } - mmalloc_set_current_heap(heap); } #endif