X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/195caa24ef699efa9e51720309d94c34eff5e527..251bbe5068a2a7b23a23a4df11fc1b785dce6ff4:/src/mc/mc_global.c diff --git a/src/mc/mc_global.c b/src/mc/mc_global.c index 887aedcd02..524056e540 100644 --- a/src/mc/mc_global.c +++ b/src/mc/mc_global.c @@ -29,6 +29,8 @@ 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 = 1; char *_sg_mc_property_file = NULL; int _sg_mc_timeout = 0; int _sg_mc_hash = 0; @@ -68,6 +70,20 @@ void _mc_cfg_cb_checkpoint(const char *name, int pos) _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."); + } + _sg_mc_sparse_checkpoint = xbt_cfg_get_boolean(_sg_cfg_set, name); +} + +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."); + } + _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) { @@ -129,6 +145,7 @@ void _mc_cfg_cb_comms_determinism(const char *name, int pos) ("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); + mc_reduce_kind = e_mc_reduce_none; } void _mc_cfg_cb_send_determinism(const char *name, int pos) @@ -138,6 +155,7 @@ void _mc_cfg_cb_send_determinism(const char *name, int pos) ("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_reduce_kind = e_mc_reduce_none; } /* MC global data structures */ @@ -220,9 +238,10 @@ static void MC_init_debug_info(void) } +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); @@ -232,6 +251,11 @@ void MC_init() 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 */ @@ -249,8 +273,7 @@ void MC_init() MC_SET_STD_HEAP; - if (_sg_mc_visited > 0 - || (_sg_mc_property_file && _sg_mc_property_file[0] != '\0')) { + 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", "*"); @@ -262,12 +285,16 @@ void MC_init() MC_ignore_local_variable("ctx", "*"); MC_ignore_local_variable("self", "simcall_BODY_mc_snapshot"); - MC_ignore_local_variable("next_context", "smx_ctx_sysv_suspend_serial"); + 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"); @@ -277,6 +304,13 @@ void MC_init() MC_ignore_global_variable("maestro_stack_start"); MC_ignore_global_variable("maestro_stack_end"); MC_ignore_global_variable("smx_total_comms"); + MC_ignore_global_variable("communications_pattern"); + MC_ignore_global_variable("initial_communications_pattern"); + MC_ignore_global_variable("incomplete_communications_pattern"); + + if (MC_is_active()) { + MC_ignore_global_variable("mc_diff_info"); + } MC_ignore_heap(mc_time, simix_process_maxpid * sizeof(double)); @@ -284,7 +318,7 @@ void MC_init() xbt_swag_foreach(process, simix_global->process_list) { MC_ignore_heap(&(process->process_hookup), sizeof(process->process_hookup)); - } + } } if (raw_mem_set) @@ -479,13 +513,12 @@ void MC_replay(xbt_fifo_t stack, int start) { int raw_mem = (mmalloc_get_current_heap() == mc_heap); - int value, i = 1, count = 1; + int value, i = 1, count = 1, call = 0, j; 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 ****"); @@ -521,8 +554,12 @@ void MC_replay(xbt_fifo_t stack, int start) } if (_sg_mc_comms_determinism || _sg_mc_send_determinism) { - xbt_dynar_reset(communications_pattern); - xbt_dynar_reset(incomplete_communications_pattern); + for (j=0; jcall == SIMCALL_COMM_ISEND) - comm_pattern = 1; + call = 1; else if (req->call == SIMCALL_COMM_IRECV) - comm_pattern = 2; + call = 2; else if (req->call == SIMCALL_COMM_WAIT) - comm_pattern = 3; + call = 3; else if (req->call == SIMCALL_COMM_WAITANY) - comm_pattern = 4; + call = 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 */ ) { + if (call == 1) { /* Send */ + get_comm_pattern(communications_pattern, req, call); + } else if (call == 2) { /* Recv */ + get_comm_pattern(communications_pattern, req, call); + } else if (call == 3) { /* Wait */ current_comm = simcall_comm_wait__get__comm(req); - if (current_comm->comm.refcount == 1) { /* First wait only must be considered */ + 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 */ + } else if (call == 4) { /* WaitAny */ + 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; + call = 0; } @@ -600,8 +635,7 @@ void MC_replay(xbt_fifo_t stack, int start) MC_SET_MC_HEAP; /* Insert in dict all enabled processes */ xbt_swag_foreach(process, simix_global->process_list) { - if (MC_process_is_enabled(process) - /*&& !MC_state_process_is_done(state, process) */ ) { + 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);