X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/fa02213cffba5b63cb6ee145dda085a4e4401407..6f065c16d0eca6e4d75c009fc578e59c30b3f392:/src/mc/mc_global.c diff --git a/src/mc/mc_global.c b/src/mc/mc_global.c index d91af1451a..7ee4c84a39 100644 --- a/src/mc/mc_global.c +++ b/src/mc/mc_global.c @@ -1,4 +1,5 @@ -/* Copyright (c) 2008-2012 Da SimGrid Team. All rights reserved. */ +/* Copyright (c) 2008-2014. 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. */ @@ -7,206 +8,458 @@ #include #include #include +#include +#include +#include "simgrid/sg_config.h" #include "../surf/surf_private.h" #include "../simix/smx_private.h" +#include "../xbt/mmalloc/mmprivate.h" #include "xbt/fifo.h" #include "mc_private.h" #include "xbt/automaton.h" +#include "xbt/dict.h" XBT_LOG_NEW_CATEGORY(mc, "All MC categories"); XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_global, mc, "Logging specific to MC (global)"); /* Configuration support */ -e_mc_reduce_t mc_reduce_kind=e_mc_reduce_unset; - -extern int _surf_init_status; -void _mc_cfg_cb_reduce(const char *name, int pos) { - if (_surf_init_status && !_surf_do_model_check) { - xbt_die("You are specifying a reduction strategy after the initialization (through MSG_config?), but model-checking was not activated at config time (through --cfg=model-check:1). This won't work, sorry."); +e_mc_reduce_t mc_reduce_kind = e_mc_reduce_unset; + +int _sg_do_model_check = 0; +int _sg_mc_checkpoint = 0; +int _sg_mc_sparse_checkpoint = 0; +int _sg_mc_soft_dirty = 0; +char *_sg_mc_property_file = NULL; +int _sg_mc_timeout = 0; +int _sg_mc_hash = 0; +int _sg_mc_max_depth = 1000; +int _sg_mc_visited = 0; +char *_sg_mc_dot_output_file = NULL; +int _sg_mc_comms_determinism = 0; +int _sg_mc_send_determinism = 0; +int _sg_mc_safety = 0; +int _sg_mc_liveness = 0; + +int user_max_depth_reached = 0; + +void _mc_cfg_cb_reduce(const char *name, int pos) +{ + if (_sg_cfg_init_status && !_sg_do_model_check) { + xbt_die + ("You are specifying a reduction strategy after the initialization (through MSG_config?), but model-checking was not activated at config time (through --cfg=model-check:1). This won't work, sorry."); } - char *val= xbt_cfg_get_string(_surf_cfg_set, name); - if (!strcasecmp(val,"none")) { + char *val = xbt_cfg_get_string(_sg_cfg_set, name); + if (!strcasecmp(val, "none")) { mc_reduce_kind = e_mc_reduce_none; - } else if (!strcasecmp(val,"dpor")) { + } else if (!strcasecmp(val, "dpor")) { mc_reduce_kind = e_mc_reduce_dpor; } else { - xbt_die("configuration option %s can only take 'none' or 'dpor' as a value",name); + xbt_die("configuration option %s can only take 'none' or 'dpor' as a value", + name); } - xbt_cfg_set_int(_surf_cfg_set,"model-check",1); } -void _mc_cfg_cb_checkpoint(const char *name, int pos) { - if (_surf_init_status && !_surf_do_model_check) { +void _mc_cfg_cb_checkpoint(const char *name, int pos) +{ + if (_sg_cfg_init_status && !_sg_do_model_check) { + xbt_die + ("You are specifying a checkpointing value after the initialization (through MSG_config?), but model-checking was not activated at config time (through --cfg=model-check:1). This won't work, sorry."); + } + _sg_mc_checkpoint = xbt_cfg_get_int(_sg_cfg_set, name); +} + +void _mc_cfg_cb_sparse_checkpoint(const char *name, int pos) { + if (_sg_cfg_init_status && !_sg_do_model_check) { xbt_die("You are specifying a checkpointing value after the initialization (through MSG_config?), but model-checking was not activated at config time (through --cfg=model-check:1). This won't work, sorry."); } - _surf_mc_checkpoint = xbt_cfg_get_int(_surf_cfg_set, name); - xbt_cfg_set_int(_surf_cfg_set,"model-check",1); + _sg_mc_sparse_checkpoint = xbt_cfg_get_boolean(_sg_cfg_set, name); } -void _mc_cfg_cb_property(const char *name, int pos) { - if (_surf_init_status && !_surf_do_model_check) { - xbt_die("You are specifying a property after the initialization (through MSG_config?), but model-checking was not activated at config time (through --cfg=model-check:1). This won't work, sorry."); + +void _mc_cfg_cb_soft_dirty(const char *name, int pos) { + if (_sg_cfg_init_status && !_sg_do_model_check) { + xbt_die("You are specifying a soft dirty value after the initialization (through MSG_config?), but model-checking was not activated at config time (through --cfg=model-check:1). This won't work, sorry."); } - _surf_mc_property_file= xbt_cfg_get_string(_surf_cfg_set, name); - xbt_cfg_set_int(_surf_cfg_set,"model-check",1); + _sg_mc_soft_dirty = xbt_cfg_get_boolean(_sg_cfg_set, name); } +void _mc_cfg_cb_property(const char *name, int pos) +{ + if (_sg_cfg_init_status && !_sg_do_model_check) { + xbt_die + ("You are specifying a property after the initialization (through MSG_config?), but model-checking was not activated at config time (through --cfg=model-check:1). This won't work, sorry."); + } + _sg_mc_property_file = xbt_cfg_get_string(_sg_cfg_set, name); +} -/* MC global data structures */ +void _mc_cfg_cb_timeout(const char *name, int pos) +{ + if (_sg_cfg_init_status && !_sg_do_model_check) { + xbt_die + ("You are specifying a value to enable/disable timeout for wait requests after the initialization (through MSG_config?), but model-checking was not activated at config time (through --cfg=model-check:1). This won't work, sorry."); + } + _sg_mc_timeout = xbt_cfg_get_boolean(_sg_cfg_set, name); +} + +void _mc_cfg_cb_hash(const char *name, int pos) +{ + if (_sg_cfg_init_status && !_sg_do_model_check) { + xbt_die + ("You are specifying a value to enable/disable the use of global hash to speedup state comparaison, but model-checking was not activated at config time (through --cfg=model-check:1). This won't work, sorry."); + } + _sg_mc_hash = xbt_cfg_get_boolean(_sg_cfg_set, name); +} + +void _mc_cfg_cb_max_depth(const char *name, int pos) +{ + if (_sg_cfg_init_status && !_sg_do_model_check) { + xbt_die + ("You are specifying a max depth value after the initialization (through MSG_config?), but model-checking was not activated at config time (through --cfg=model-check:1). This won't work, sorry."); + } + _sg_mc_max_depth = xbt_cfg_get_int(_sg_cfg_set, name); +} + +void _mc_cfg_cb_visited(const char *name, int pos) +{ + if (_sg_cfg_init_status && !_sg_do_model_check) { + xbt_die + ("You are specifying a number of stored visited states after the initialization (through MSG_config?), but model-checking was not activated at config time (through --cfg=model-check:1). This won't work, sorry."); + } + _sg_mc_visited = xbt_cfg_get_int(_sg_cfg_set, name); +} +void _mc_cfg_cb_dot_output(const char *name, int pos) +{ + if (_sg_cfg_init_status && !_sg_do_model_check) { + xbt_die + ("You are specifying a file name for a dot output of graph state after the initialization (through MSG_config?), but model-checking was not activated at config time (through --cfg=model-check:1). This won't work, sorry."); + } + _sg_mc_dot_output_file = xbt_cfg_get_string(_sg_cfg_set, name); +} + +void _mc_cfg_cb_comms_determinism(const char *name, int pos) +{ + if (_sg_cfg_init_status && !_sg_do_model_check) { + xbt_die + ("You are specifying a value to enable/disable the detection of determinism in the communications schemes after the initialization (through MSG_config?), but model-checking was not activated at config time (through --cfg=model-check:1). This won't work, sorry."); + } + _sg_mc_comms_determinism = xbt_cfg_get_boolean(_sg_cfg_set, name); +} + +void _mc_cfg_cb_send_determinism(const char *name, int pos) +{ + if (_sg_cfg_init_status && !_sg_do_model_check) { + xbt_die + ("You are specifying a value to enable/disable the detection of send-determinism in the communications schemes after the initialization (through MSG_config?), but model-checking was not activated at config time (through --cfg=model-check:1). This won't work, sorry."); + } + _sg_mc_send_determinism = xbt_cfg_get_boolean(_sg_cfg_set, name); +} + +/* MC global data structures */ mc_state_t mc_current_state = NULL; char mc_replay_mode = FALSE; double *mc_time = NULL; -mc_snapshot_t initial_snapshot = NULL; -int raw_mem_set; - -/* Safety */ - -xbt_fifo_t mc_stack_safety = NULL; +__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; /* Liveness */ +xbt_automaton_t _mc_property_automaton = NULL; -mc_stats_pair_t mc_stats_pair = NULL; -xbt_fifo_t mc_stack_liveness = NULL; -mc_snapshot_t initial_snapshot_liveness = NULL; -int compare; -extern xbt_dynar_t mmalloc_ignore; +/* Variables */ +mc_object_info_t mc_libsimgrid_info = NULL; +mc_object_info_t mc_binary_info = NULL; -xbt_automaton_t _mc_property_automaton = NULL; +mc_object_info_t mc_object_infos[2] = { NULL, NULL }; -static void MC_assert_pair(int prop); +size_t mc_object_infos_size = 2; -void MC_do_the_modelcheck_for_real() { - if (!_surf_mc_property_file || _surf_mc_property_file[0]=='\0') { - if (mc_reduce_kind==e_mc_reduce_unset) - mc_reduce_kind=e_mc_reduce_dpor; +/* Dot output */ +FILE *dot_output = NULL; +const char *colors[13]; - XBT_INFO("Check a safety property"); - MC_modelcheck(); - } else { +/******************************* Initialisation of MC *******************************/ +/*********************************************************************************/ + +static void MC_init_dot_output() +{ /* FIXME : more colors */ - if (mc_reduce_kind==e_mc_reduce_unset) - mc_reduce_kind=e_mc_reduce_none; + 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"; - XBT_INFO("Check the liveness property %s",_surf_mc_property_file); - MC_automaton_load(_surf_mc_property_file); - MC_modelcheck_liveness(); + dot_output = fopen(_sg_mc_dot_output_file, "w"); + + if (dot_output == NULL) { + perror("Error open dot output file"); + xbt_abort(); } + + fprintf(dot_output, + "digraph graphname{\n fixedsize=true; rankdir=TB; ranksep=.25; edge [fontsize=12]; node [fontsize=10, shape=circle,width=.5 ]; graph [resolution=20, fontsize=10];\n"); + } -/** - * \brief Initialize the model-checker data structures - */ -void MC_init_safety(void) +static void MC_init_debug_info(void) { + XBT_INFO("Get debug information ..."); - raw_mem_set = (mmalloc_get_current_heap() == raw_heap); + memory_map_t maps = MC_get_memory_map(); - /* Check if MC is already initialized */ - if (initial_snapshot) - return; + /* Get local variables for state equality detection */ + mc_binary_info = MC_find_object_info(maps, xbt_binary_name, 1); + mc_object_infos[0] = mc_binary_info; + + mc_libsimgrid_info = MC_find_object_info(maps, libsimgrid_path, 0); + mc_object_infos[1] = mc_libsimgrid_info; + + // Use information of the other objects: + MC_post_process_object_info(mc_binary_info); + MC_post_process_object_info(mc_libsimgrid_info); + + MC_free_memory_map(maps); + XBT_INFO("Get debug information done !"); +} + + +mc_model_checker_t mc_model_checker = NULL; + +void MC_init() +{ + int raw_mem_set = (mmalloc_get_current_heap() == mc_heap); mc_time = xbt_new0(double, simix_process_maxpid); /* Initialize the data structures that must be persistent across every iteration of the model-checker (in RAW memory) */ - - MC_SET_RAW_MEM; + + MC_SET_MC_HEAP; + + mc_model_checker = xbt_new0(s_mc_model_checker_t, 1); + mc_model_checker->pages = mc_pages_store_new(); + mc_model_checker->fd_clear_refs = -1; + mc_model_checker->fd_pagemap = -1; + + 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; + MC_init_memory_map_info(); + MC_init_debug_info(); /* FIXME : get debug information only if liveness verification or visited state reduction */ + + 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); + + MC_SET_STD_HEAP; + + if (_sg_mc_visited > 0 || _sg_mc_liveness) { + /* 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", "*"); + + MC_ignore_global_variable("mc_model_checker"); + + // Mot of those things could be moved into mc_model_checker: + MC_ignore_global_variable("compared_pointers"); + MC_ignore_global_variable("mc_comp_times"); + MC_ignore_global_variable("mc_snapshot_comparison_time"); + MC_ignore_global_variable("mc_time"); + MC_ignore_global_variable("smpi_current_rank"); + MC_ignore_global_variable("counter"); /* Static variable used for tracing */ + MC_ignore_global_variable("maestro_stack_start"); + MC_ignore_global_variable("maestro_stack_end"); + MC_ignore_global_variable("smx_total_comms"); + + if (MC_is_active()) { + MC_ignore_global_variable("mc_diff_info"); + } + + MC_ignore_heap(mc_time, simix_process_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)); + } + } + + if (raw_mem_set) + MC_SET_MC_HEAP; + +} + +/******************************* Core of MC *******************************/ +/**************************************************************************/ + +static void MC_modelcheck_comm_determinism_init(void) +{ + + int mc_mem_set = (mmalloc_get_current_heap() == mc_heap); + + MC_init(); + + if (!mc_mem_set) + MC_SET_MC_HEAP; + /* Create exploration stack */ - mc_stack_safety = xbt_fifo_new(); + mc_stack = xbt_fifo_new(); - MC_UNSET_RAW_MEM; + MC_SET_STD_HEAP; - MC_dpor_init(); + MC_pre_modelcheck_comm_determinism(); - MC_SET_RAW_MEM; - /* Save the initial state */ - initial_snapshot = xbt_new0(s_mc_snapshot_t, 1); - MC_take_snapshot(initial_snapshot); - MC_UNSET_RAW_MEM; + MC_SET_MC_HEAP; + initial_global_state = xbt_new0(s_mc_global_t, 1); + initial_global_state->snapshot = MC_take_snapshot(0); + initial_global_state->initial_communications_pattern_done = 0; + initial_global_state->comm_deterministic = 1; + initial_global_state->send_deterministic = 1; + MC_SET_STD_HEAP; + MC_modelcheck_comm_determinism(); - if(raw_mem_set) - MC_SET_RAW_MEM; - else - MC_UNSET_RAW_MEM; - -} + if(mc_mem_set) + MC_SET_MC_HEAP; -void MC_compare(void){ - compare = 1; } - -void MC_modelcheck(void) +static void MC_modelcheck_safety_init(void) { - MC_init_safety(); - MC_dpor(); - MC_exit(); -} + int mc_mem_set = (mmalloc_get_current_heap() == mc_heap); -void MC_modelcheck_liveness(){ + _sg_mc_safety = 1; - raw_mem_set = (mmalloc_get_current_heap() == raw_heap); + MC_init(); - /* init stuff */ - XBT_DEBUG("Start init mc"); - - mc_time = xbt_new0(double, simix_process_maxpid); + if (!mc_mem_set) + MC_SET_MC_HEAP; - /* mc_time refers to clock for each process -> ignore it for heap comparison */ - int i; - for(i = 0; isnapshot = MC_take_snapshot(0); + MC_SET_STD_HEAP; + + MC_modelcheck_safety(); - XBT_DEBUG("Creating stack"); + if (mc_mem_set) + MC_SET_MC_HEAP; + + xbt_abort(); + //MC_exit(); +} + +static void MC_modelcheck_liveness_init() +{ + + int mc_mem_set = (mmalloc_get_current_heap() == mc_heap); + + _sg_mc_liveness = 1; + + MC_init(); + + if (!mc_mem_set) + MC_SET_MC_HEAP; /* Create exploration stack */ - mc_stack_liveness = xbt_fifo_new(); + mc_stack = xbt_fifo_new(); - MC_UNSET_RAW_MEM; + /* Create the initial state */ + initial_global_state = xbt_new0(s_mc_global_t, 1); + MC_SET_STD_HEAP; - MC_ddfs_init(); + MC_pre_modelcheck_liveness(); /* We're done */ - MC_print_statistics_pairs(mc_stats_pair); + MC_print_statistics(mc_stats); xbt_free(mc_time); - MC_memory_exit(); - exit(0); + + if (mc_mem_set) + MC_SET_MC_HEAP; + +} + +void MC_do_the_modelcheck_for_real() +{ + + if (_sg_mc_comms_determinism || _sg_mc_send_determinism) { + XBT_INFO("Check communication determinism"); + MC_modelcheck_comm_determinism_init(); + } else if (!_sg_mc_property_file || _sg_mc_property_file[0] == '\0') { + if (mc_reduce_kind == e_mc_reduce_unset) + mc_reduce_kind = e_mc_reduce_dpor; + XBT_INFO("Check a safety property"); + MC_modelcheck_safety_init(); + } else { + if (mc_reduce_kind == e_mc_reduce_unset) + mc_reduce_kind = e_mc_reduce_none; + XBT_INFO("Check the liveness property %s", _sg_mc_property_file); + MC_automaton_load(_sg_mc_property_file); + MC_modelcheck_liveness_init(); + } } void MC_exit(void) { - MC_print_statistics(mc_stats); xbt_free(mc_time); + MC_memory_exit(); + //xbt_abort(); +} + +int SIMIX_pre_mc_random(smx_simcall_t simcall, int min, int max) +{ + + return simcall->mc_value; } int MC_random(int min, int max) { - /*FIXME: return mc_current_state->executed_transition->random.value;*/ - return 0; + /*FIXME: return mc_current_state->executed_transition->random.value; */ + return simcall_mc_random(min, max); } /** @@ -232,11 +485,11 @@ int MC_deadlock_check() { int deadlock = FALSE; smx_process_t process; - if(xbt_swag_size(simix_global->process_list)){ + if (xbt_swag_size(simix_global->process_list)) { deadlock = TRUE; - xbt_swag_foreach(process, simix_global->process_list){ - if(process->simcall.call != SIMCALL_NONE - && MC_request_is_enabled(&process->simcall)){ + xbt_swag_foreach(process, simix_global->process_list) { + if (process->simcall.call != SIMCALL_NONE + && MC_request_is_enabled(&process->simcall)) { deadlock = FALSE; break; } @@ -253,32 +506,57 @@ int MC_deadlock_check() */ void MC_replay(xbt_fifo_t stack, int start) { - raw_mem_set = (mmalloc_get_current_heap() == raw_heap); + int raw_mem = (mmalloc_get_current_heap() == mc_heap); - int value, i = 1; + int value, i = 1, count = 1; char *req_str; smx_simcall_t req = NULL, saved_req = NULL; xbt_fifo_item_t item, start_item; mc_state_t state; + smx_process_t process = NULL; + int comm_pattern = 0; + smx_action_t current_comm; XBT_DEBUG("**** Begin Replay ****"); - if(start == -1){ + if (start == -1) { /* Restore the initial state */ - MC_restore_snapshot(initial_snapshot); + 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 */ - MC_UNSET_RAW_MEM; + MC_SET_STD_HEAP; } start_item = xbt_fifo_get_last_item(stack); - if(start != -1){ - while (i != start){ + if (start != -1) { + while (i != start) { start_item = xbt_fifo_get_prev_item(start_item); i++; } } + MC_SET_MC_HEAP; + + if ((mc_reduce_kind == e_mc_reduce_dpor) && !_sg_mc_comms_determinism && !_sg_mc_send_determinism) { + xbt_dict_reset(first_enabled_state); + xbt_swag_foreach(process, simix_global->process_list) { + if (MC_process_is_enabled(process)) { + char *key = bprintf("%lu", process->pid); + char *data = bprintf("%d", count); + xbt_dict_set(first_enabled_state, key, data, NULL); + xbt_free(key); + } + } + } + + if (_sg_mc_comms_determinism || _sg_mc_send_determinism) { + xbt_dynar_reset(communications_pattern); + xbt_dynar_reset(incomplete_communications_pattern); + } + + MC_SET_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); @@ -286,147 +564,214 @@ void MC_replay(xbt_fifo_t stack, int start) state = (mc_state_t) xbt_fifo_get_item_content(item); saved_req = MC_state_get_executed_request(state, &value); - - if(saved_req){ + + if ((mc_reduce_kind == e_mc_reduce_dpor) && !_sg_mc_comms_determinism && !_sg_mc_send_determinism) { + MC_SET_MC_HEAP; + char *key = bprintf("%lu", saved_req->issuer->pid); + xbt_dict_remove(first_enabled_state, key); + xbt_free(key); + MC_SET_STD_HEAP; + } + + if (saved_req) { /* 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 */ req = &saved_req->issuer->simcall; /* Debug information */ - if(XBT_LOG_ISENABLED(mc_global, xbt_log_priority_debug)){ + if (XBT_LOG_ISENABLED(mc_global, xbt_log_priority_debug)) { req_str = MC_request_to_string(req, value); XBT_DEBUG("Replay: %s (%p)", req_str, state); xbt_free(req_str); } + + /* TODO : handle test and testany simcalls */ + if (_sg_mc_comms_determinism || _sg_mc_send_determinism) { + if (req->call == SIMCALL_COMM_ISEND) + comm_pattern = 1; + else if (req->call == SIMCALL_COMM_IRECV) + comm_pattern = 2; + else if (req->call == SIMCALL_COMM_WAIT) + comm_pattern = 3; + else if (req->call == SIMCALL_COMM_WAITANY) + comm_pattern = 4; + } + + SIMIX_simcall_pre(req, value); + + if (_sg_mc_comms_determinism || _sg_mc_send_determinism) { + MC_SET_MC_HEAP; + if (comm_pattern == 1 || comm_pattern == 2) { + get_comm_pattern(communications_pattern, req, comm_pattern); + } else if (comm_pattern == 3 /* || comm_pattern == 4 */ ) { + current_comm = simcall_comm_wait__get__comm(req); + if (current_comm->comm.refcount == 1) { /* First wait only must be considered */ + complete_comm_pattern(communications_pattern, current_comm); + } + } else if (comm_pattern == 4 /* || comm_pattern == 4 */ ) { + current_comm = + xbt_dynar_get_as(simcall_comm_waitany__get__comms(req), value, + smx_action_t); + if (current_comm->comm.refcount == 1) { /* First wait only must be considered */ + complete_comm_pattern(communications_pattern, current_comm); + } + } + MC_SET_STD_HEAP; + comm_pattern = 0; + } + + + MC_wait_for_requests(); + + count++; + + if ((mc_reduce_kind == e_mc_reduce_dpor) && !_sg_mc_comms_determinism && !_sg_mc_send_determinism) { + MC_SET_MC_HEAP; + /* Insert in dict all enabled processes */ + xbt_swag_foreach(process, simix_global->process_list) { + if (MC_process_is_enabled(process) ) { + char *key = bprintf("%lu", process->pid); + if (xbt_dict_get_or_null(first_enabled_state, key) == NULL) { + char *data = bprintf("%d", count); + xbt_dict_set(first_enabled_state, key, data, NULL); + } + xbt_free(key); + } + } + MC_SET_STD_HEAP; + } } - - SIMIX_simcall_pre(req, value); - MC_wait_for_requests(); - + /* Update statistics */ mc_stats->visited_states++; mc_stats->executed_transitions++; + } + XBT_DEBUG("**** End Replay ****"); - if(raw_mem_set) - MC_SET_RAW_MEM; + if (raw_mem) + MC_SET_MC_HEAP; else - MC_UNSET_RAW_MEM; - + MC_SET_STD_HEAP; + } void MC_replay_liveness(xbt_fifo_t stack, int all_stack) { - raw_mem_set = (mmalloc_get_current_heap() == raw_heap); + initial_global_state->raw_mem_set = (mmalloc_get_current_heap() == mc_heap); int value; char *req_str; smx_simcall_t req = NULL, saved_req = NULL; xbt_fifo_item_t item; mc_state_t state; - mc_pair_stateless_t pair; + mc_pair_t pair; int depth = 1; XBT_DEBUG("**** Begin Replay ****"); /* Restore the initial state */ - MC_restore_snapshot(initial_snapshot_liveness); + 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 */ - MC_UNSET_RAW_MEM; + if (!initial_global_state->raw_mem_set) + MC_SET_STD_HEAP; - if(all_stack){ + if (all_stack) { item = xbt_fifo_get_last_item(stack); - while(depth <= xbt_fifo_size(stack)){ + while (depth <= xbt_fifo_size(stack)) { - pair = (mc_pair_stateless_t) xbt_fifo_get_item_content(item); + pair = (mc_pair_t) xbt_fifo_get_item_content(item); state = (mc_state_t) pair->graph_state; - if(pair->requests > 0){ - + if (pair->requests > 0) { + saved_req = MC_state_get_executed_request(state, &value); //XBT_DEBUG("SavedReq->call %u", saved_req->call); - - if(saved_req != NULL){ + + if (saved_req != NULL) { /* 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 */ req = &saved_req->issuer->simcall; //XBT_DEBUG("Req->call %u", req->call); - + /* Debug information */ - if(XBT_LOG_ISENABLED(mc_global, xbt_log_priority_debug)){ + if (XBT_LOG_ISENABLED(mc_global, xbt_log_priority_debug)) { req_str = MC_request_to_string(req, value); XBT_DEBUG("Replay (depth = %d) : %s (%p)", depth, req_str, state); xbt_free(req_str); } - + } - + SIMIX_simcall_pre(req, value); MC_wait_for_requests(); } depth++; - + /* Update statistics */ - mc_stats_pair->visited_pairs++; + mc_stats->visited_pairs++; + mc_stats->executed_transitions++; item = xbt_fifo_get_prev_item(item); } - }else{ + } else { /* 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_stateless_t) xbt_fifo_get_item_content(item); + pair = (mc_pair_t) xbt_fifo_get_item_content(item); state = (mc_state_t) pair->graph_state; - if(pair->requests > 0){ - + if (pair->requests > 0) { + saved_req = MC_state_get_executed_request(state, &value); //XBT_DEBUG("SavedReq->call %u", saved_req->call); - - if(saved_req != NULL){ + + if (saved_req != NULL) { /* 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 */ req = &saved_req->issuer->simcall; //XBT_DEBUG("Req->call %u", req->call); - + /* Debug information */ - if(XBT_LOG_ISENABLED(mc_global, xbt_log_priority_debug)){ + if (XBT_LOG_ISENABLED(mc_global, xbt_log_priority_debug)) { req_str = MC_request_to_string(req, value); XBT_DEBUG("Replay (depth = %d) : %s (%p)", depth, req_str, state); xbt_free(req_str); } - + } - + SIMIX_simcall_pre(req, value); MC_wait_for_requests(); } depth++; - + /* Update statistics */ - mc_stats_pair->visited_pairs++; + mc_stats->visited_pairs++; + mc_stats->executed_transitions++; } - } + } XBT_DEBUG("**** End Replay ****"); - if(raw_mem_set) - MC_SET_RAW_MEM; + if (initial_global_state->raw_mem_set) + MC_SET_MC_HEAP; else - MC_UNSET_RAW_MEM; - + MC_SET_STD_HEAP; + } /** @@ -436,154 +781,158 @@ void MC_replay_liveness(xbt_fifo_t stack, int all_stack) */ void MC_dump_stack_safety(xbt_fifo_t stack) { - - raw_mem_set = (mmalloc_get_current_heap() == raw_heap); + + int raw_mem_set = (mmalloc_get_current_heap() == mc_heap); MC_show_stack_safety(stack); - if(!_surf_mc_checkpoint){ + if (!_sg_mc_checkpoint) { mc_state_t state; - MC_SET_RAW_MEM; + MC_SET_MC_HEAP; while ((state = (mc_state_t) xbt_fifo_pop(stack)) != NULL) MC_state_delete(state); - MC_UNSET_RAW_MEM; + MC_SET_STD_HEAP; } - if(raw_mem_set) - MC_SET_RAW_MEM; + if (raw_mem_set) + MC_SET_MC_HEAP; else - MC_UNSET_RAW_MEM; - + MC_SET_STD_HEAP; + } void MC_show_stack_safety(xbt_fifo_t stack) { + + int raw_mem_set = (mmalloc_get_current_heap() == mc_heap); + + MC_SET_MC_HEAP; + int value; mc_state_t state; xbt_fifo_item_t item; smx_simcall_t req; 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)) { req = MC_state_get_executed_request(state, &value); - if(req){ + if (req) { req_str = MC_request_to_string(req, value); XBT_INFO("%s", req_str); xbt_free(req_str); } } + + if (!raw_mem_set) + MC_SET_STD_HEAP; } void MC_show_deadlock(smx_simcall_t req) { - /*char *req_str = NULL;*/ + /*char *req_str = NULL; */ XBT_INFO("**************************"); XBT_INFO("*** DEAD-LOCK DETECTED ***"); XBT_INFO("**************************"); XBT_INFO("Locked request:"); /*req_str = MC_request_to_string(req); - XBT_INFO("%s", req_str); - xbt_free(req_str);*/ + XBT_INFO("%s", req_str); + xbt_free(req_str); */ XBT_INFO("Counter-example execution trace:"); - MC_dump_stack_safety(mc_stack_safety); + MC_dump_stack_safety(mc_stack); + MC_print_statistics(mc_stats); } -void MC_show_stack_liveness(xbt_fifo_t stack){ +void MC_show_stack_liveness(xbt_fifo_t stack) +{ int value; - mc_pair_stateless_t pair; + mc_pair_t pair; xbt_fifo_item_t item; smx_simcall_t req; char *req_str = NULL; - + for (item = xbt_fifo_get_last_item(stack); - (item ? (pair = (mc_pair_stateless_t) (xbt_fifo_get_item_content(item))) + (item ? (pair = (mc_pair_t) (xbt_fifo_get_item_content(item))) : (NULL)); item = xbt_fifo_get_prev_item(item)) { req = MC_state_get_executed_request(pair->graph_state, &value); - if(req){ - if(pair->requests>0){ + if (req) { + if (pair->requests > 0) { req_str = MC_request_to_string(req, value); XBT_INFO("%s", req_str); xbt_free(req_str); - }else{ + } else { XBT_INFO("End of system requests but evolution in Büchi automaton"); } } } } -void MC_dump_stack_liveness(xbt_fifo_t stack){ +void MC_dump_stack_liveness(xbt_fifo_t stack) +{ - raw_mem_set = (mmalloc_get_current_heap() == raw_heap); + int raw_mem_set = (mmalloc_get_current_heap() == mc_heap); - mc_pair_stateless_t pair; + mc_pair_t pair; - MC_SET_RAW_MEM; - while ((pair = (mc_pair_stateless_t) xbt_fifo_pop(stack)) != NULL) - MC_pair_stateless_delete(pair); - MC_UNSET_RAW_MEM; + MC_SET_MC_HEAP; + while ((pair = (mc_pair_t) xbt_fifo_pop(stack)) != NULL) + MC_pair_delete(pair); + MC_SET_STD_HEAP; - if(raw_mem_set) - MC_SET_RAW_MEM; - else - MC_UNSET_RAW_MEM; + if (raw_mem_set) + MC_SET_MC_HEAP; } void MC_print_statistics(mc_stats_t stats) { - //XBT_INFO("State space size ~= %lu", stats->state_size); - XBT_INFO("Expanded states = %lu", stats->expanded_states); - XBT_INFO("Visited states = %lu", stats->visited_states); + if (stats->expanded_pairs == 0) { + XBT_INFO("Expanded states = %lu", stats->expanded_states); + XBT_INFO("Visited states = %lu", stats->visited_states); + } else { + XBT_INFO("Expanded pairs = %lu", stats->expanded_pairs); + XBT_INFO("Visited pairs = %lu", stats->visited_pairs); + } XBT_INFO("Executed transitions = %lu", stats->executed_transitions); - XBT_INFO("Expanded / Visited = %lf", - (double) stats->visited_states / stats->expanded_states); - /*XBT_INFO("Exploration coverage = %lf", - (double)stats->expanded_states / stats->state_size); */ -} - -void MC_print_statistics_pairs(mc_stats_pair_t stats) -{ - XBT_INFO("Expanded pairs = %lu", stats->expanded_pairs); - XBT_INFO("Visited pairs = %lu", stats->visited_pairs); - //XBT_INFO("Executed transitions = %lu", stats->executed_transitions); - XBT_INFO("Expanded / Visited = %lf", - (double) stats->visited_pairs / stats->expanded_pairs); - /*XBT_INFO("Exploration coverage = %lf", - (double)stats->expanded_states / stats->state_size); */ + MC_SET_MC_HEAP; + if ((_sg_mc_dot_output_file != NULL) && (_sg_mc_dot_output_file[0] != '\0')) { + fprintf(dot_output, "}\n"); + fclose(dot_output); + } + if (initial_global_state != NULL) { + if (_sg_mc_comms_determinism) + XBT_INFO("Communication-deterministic : %s", + !initial_global_state->comm_deterministic ? "No" : "Yes"); + if (_sg_mc_send_determinism) + XBT_INFO("Send-deterministic : %s", + !initial_global_state->send_deterministic ? "No" : "Yes"); + } + MC_SET_STD_HEAP; } void MC_assert(int prop) { - if (MC_IS_ENABLED && !prop){ + if (MC_is_active() && !prop) { XBT_INFO("**************************"); XBT_INFO("*** PROPERTY NOT VALID ***"); XBT_INFO("**************************"); XBT_INFO("Counter-example execution trace:"); - MC_dump_stack_safety(mc_stack_safety); + MC_dump_stack_safety(mc_stack); MC_print_statistics(mc_stats); xbt_abort(); } } -static void MC_assert_pair(int prop){ - if (MC_IS_ENABLED && !prop) { - XBT_INFO("**************************"); - XBT_INFO("*** PROPERTY NOT VALID ***"); - XBT_INFO("**************************"); - //XBT_INFO("Counter-example execution trace:"); - MC_show_stack_liveness(mc_stack_liveness); - //MC_dump_snapshot_stack(mc_snapshot_stack); - MC_print_statistics_pairs(mc_stats_pair); - xbt_abort(); - } +void MC_cut(void) +{ + user_max_depth_reached = 1; } void MC_process_clock_add(smx_process_t process, double amount) @@ -593,75 +942,50 @@ void MC_process_clock_add(smx_process_t process, double amount) double MC_process_clock_get(smx_process_t process) { - if(mc_time) - return mc_time[process->pid]; - else + if (mc_time) { + if (process != NULL) + return mc_time[process->pid]; + else + return -1; + } else { return 0; + } } -void MC_automaton_load(const char *file){ +void MC_automaton_load(const char *file) +{ - raw_mem_set = (mmalloc_get_current_heap() == raw_heap); + int raw_mem_set = (mmalloc_get_current_heap() == mc_heap); - MC_SET_RAW_MEM; + MC_SET_MC_HEAP; if (_mc_property_automaton == NULL) _mc_property_automaton = xbt_automaton_new(); - - xbt_automaton_load(_mc_property_automaton,file); - MC_UNSET_RAW_MEM; + xbt_automaton_load(_mc_property_automaton, file); - if(raw_mem_set) - MC_SET_RAW_MEM; - else - MC_UNSET_RAW_MEM; + MC_SET_STD_HEAP; + + if (raw_mem_set) + MC_SET_MC_HEAP; } -void MC_automaton_new_propositional_symbol(const char* id, void* fct) { +void MC_automaton_new_propositional_symbol(const char *id, void *fct) +{ - raw_mem_set = (mmalloc_get_current_heap() == raw_heap); + int raw_mem_set = (mmalloc_get_current_heap() == mc_heap); - MC_SET_RAW_MEM; + MC_SET_MC_HEAP; if (_mc_property_automaton == NULL) _mc_property_automaton = xbt_automaton_new(); - xbt_new_propositional_symbol(_mc_property_automaton,id,fct); - - MC_UNSET_RAW_MEM; - - if(raw_mem_set) - MC_SET_RAW_MEM; - else - MC_UNSET_RAW_MEM; - -} - -void MC_ignore_init(){ - MC_SET_RAW_MEM; - mmalloc_ignore = xbt_dynar_new(sizeof(mc_ignore_region_t), NULL); - MC_UNSET_RAW_MEM; -} - -void MC_ignore(void *address, size_t size){ + xbt_automaton_propositional_symbol_new(_mc_property_automaton, id, fct); - MC_SET_RAW_MEM; - - mc_ignore_region_t region = NULL; - region = xbt_new0(s_mc_ignore_region_t, 1); - region->address = address; - region->size = size; - - unsigned int cursor = 0; - mc_ignore_region_t current_region; - xbt_dynar_foreach(mmalloc_ignore, cursor, current_region){ - if(current_region->address > address) - break; - } + MC_SET_STD_HEAP; - xbt_dynar_insert_at(mmalloc_ignore, cursor, ®ion); + if (raw_mem_set) + MC_SET_MC_HEAP; - MC_UNSET_RAW_MEM; }