X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/bdd25e7e320fa5d4f826cbb89bad6cfff45e0c21..7f06482332409f552ac19d126fa69520ade79fcb:/src/mc/mc_global.c diff --git a/src/mc/mc_global.c b/src/mc/mc_global.c index b74447e645..9805ce20e1 100644 --- a/src/mc/mc_global.c +++ b/src/mc/mc_global.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2008-2012 Da SimGrid Team. All rights reserved. */ +/* Copyright (c) 2008-2013 Da 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. */ @@ -51,7 +51,7 @@ void _mc_cfg_cb_checkpoint(const char *name, int pos) { if (_sg_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); + _sg_mc_checkpoint = xbt_cfg_get_boolean(_sg_cfg_set, name); } void _mc_cfg_cb_property(const char *name, int pos) { if (_sg_init_status && !_sg_do_model_check) { @@ -64,7 +64,7 @@ void _mc_cfg_cb_timeout(const char *name, int pos) { if (_sg_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_int(_sg_cfg_set, name); + _sg_mc_timeout= xbt_cfg_get_boolean(_sg_cfg_set, name); } void _mc_cfg_cb_max_depth(const char *name, int pos) { @@ -95,16 +95,15 @@ char mc_replay_mode = FALSE; double *mc_time = NULL; mc_comparison_times_t mc_comp_times = NULL; double mc_snapshot_comparison_time; +mc_stats_t mc_stats = NULL; /* Safety */ xbt_fifo_t mc_stack_safety = NULL; -mc_stats_t mc_stats = NULL; mc_global_t initial_state_safety = NULL; /* Liveness */ -mc_stats_pair_t mc_stats_pair = NULL; xbt_fifo_t mc_stack_liveness = NULL; mc_global_t initial_state_liveness = NULL; int compare; @@ -139,9 +138,6 @@ void MC_do_the_modelcheck_for_real() { mc_comp_times = xbt_new0(s_mc_comparison_times_t, 1); MC_UNSET_RAW_MEM; - if((_sg_mc_dot_output_file != NULL) && (_sg_mc_dot_output_file[0]!='\0')) - MC_init_dot_output(); - 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; @@ -169,13 +165,6 @@ void MC_init(){ int raw_mem_set = (mmalloc_get_current_heap() == raw_heap); - mc_time = xbt_new0(double, simix_process_maxpid); - - /* mc_time refers to clock for each process -> ignore it for heap comparison */ - int i; - for(i = 0; i ignore it for heap comparison */ + MC_ignore_heap(mc_time, simix_process_maxpid * sizeof(double)); + /* Initialize the data structures that must be persistent across every iteration of the model-checker (in RAW memory) */ @@ -273,6 +269,9 @@ void MC_modelcheck_safety(void) /* Create exploration stack */ mc_stack_safety = xbt_fifo_new(); + if((_sg_mc_dot_output_file != NULL) && (_sg_mc_dot_output_file[0]!='\0')) + MC_init_dot_output(); + MC_UNSET_RAW_MEM; if(_sg_mc_visited > 0){ @@ -306,23 +305,33 @@ void MC_modelcheck_liveness(){ int raw_mem_set = (mmalloc_get_current_heap() == raw_heap); MC_init(); + + mc_time = xbt_new0(double, simix_process_maxpid); + + /* mc_time refers to clock for each process -> ignore it for heap comparison */ + MC_ignore_heap(mc_time, simix_process_maxpid * sizeof(double)); MC_SET_RAW_MEM; - + /* Initialize statistics */ - mc_stats_pair = xbt_new0(s_mc_stats_pair_t, 1); + mc_stats = xbt_new0(s_mc_stats_t, 1); + mc_stats->state_size = 1; /* Create exploration stack */ mc_stack_liveness = xbt_fifo_new(); + /* Create the initial state */ initial_state_liveness = xbt_new0(s_mc_global_t, 1); + if((_sg_mc_dot_output_file != NULL) && (_sg_mc_dot_output_file[0]!='\0')) + MC_init_dot_output(); + MC_UNSET_RAW_MEM; MC_ddfs_init(); /* We're done */ - MC_print_statistics_pairs(mc_stats_pair); + MC_print_statistics(mc_stats); xbt_free(mc_time); if(raw_mem_set) @@ -333,13 +342,6 @@ void MC_modelcheck_liveness(){ void MC_exit(void) { - MC_SET_RAW_MEM; - if((_sg_mc_dot_output_file != NULL) && (_sg_mc_dot_output_file[0]!='\0')){ - fprintf(dot_output, "}\n"); - fclose(dot_output); - } - MC_UNSET_RAW_MEM; - xbt_free(mc_time); MC_memory_exit(); xbt_abort(); @@ -403,11 +405,12 @@ void MC_replay(xbt_fifo_t stack, int start) { int raw_mem = (mmalloc_get_current_heap() == raw_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; XBT_DEBUG("**** Begin Replay ****"); @@ -427,6 +430,19 @@ void MC_replay(xbt_fifo_t stack, int start) } } + MC_SET_RAW_MEM; + 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); + } + } + MC_UNSET_RAW_MEM; + + /* 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); @@ -435,6 +451,12 @@ 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); + MC_SET_RAW_MEM; + char *key = bprintf("%lu", saved_req->issuer->pid); + xbt_dict_remove(first_enabled_state, key); + xbt_free(key); + MC_UNSET_RAW_MEM; + 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 */ @@ -447,14 +469,32 @@ void MC_replay(xbt_fifo_t stack, int start) xbt_free(req_str); } } - + SIMIX_simcall_pre(req, value); MC_wait_for_requests(); + + count++; + + MC_SET_RAW_MEM; + /* 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)*/){ + 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_UNSET_RAW_MEM; /* Update statistics */ mc_stats->visited_states++; mc_stats->executed_transitions++; + } + XBT_DEBUG("**** End Replay ****"); if(raw_mem) @@ -475,7 +515,7 @@ void MC_replay_liveness(xbt_fifo_t stack, int all_stack) 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 ****"); @@ -494,7 +534,7 @@ void MC_replay_liveness(xbt_fifo_t stack, int all_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){ @@ -524,7 +564,8 @@ void MC_replay_liveness(xbt_fifo_t stack, int all_stack) depth++; /* Update statistics */ - mc_stats_pair->visited_pairs++; + mc_stats->visited_pairs++; + mc_stats->executed_transitions++; item = xbt_fifo_get_prev_item(item); } @@ -536,7 +577,7 @@ void MC_replay_liveness(xbt_fifo_t stack, int all_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){ @@ -566,7 +607,8 @@ void MC_replay_liveness(xbt_fifo_t stack, int all_stack) depth++; /* Update statistics */ - mc_stats_pair->visited_pairs++; + mc_stats->visited_pairs++; + mc_stats->executed_transitions++; } } @@ -647,13 +689,13 @@ void MC_show_deadlock(smx_simcall_t req) 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){ @@ -672,11 +714,11 @@ void MC_dump_stack_liveness(xbt_fifo_t stack){ int raw_mem_set = (mmalloc_get_current_heap() == raw_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) - pair_stateless_free(pair); + while ((pair = (mc_pair_t) xbt_fifo_pop(stack)) != NULL) + MC_pair_delete(pair); MC_UNSET_RAW_MEM; if(raw_mem_set) @@ -687,26 +729,20 @@ void MC_dump_stack_liveness(xbt_fifo_t stack){ 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); - - if(mmalloc_get_current_heap() == raw_heap) - MC_UNSET_RAW_MEM; + MC_SET_RAW_MEM; + if((_sg_mc_dot_output_file != NULL) && (_sg_mc_dot_output_file[0]!='\0')){ + fprintf(dot_output, "}\n"); + fclose(dot_output); + } + MC_UNSET_RAW_MEM; } void MC_assert(int prop) @@ -730,7 +766,7 @@ static void MC_assert_pair(int prop){ //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); + MC_print_statistics(mc_stats); xbt_abort(); } } @@ -779,7 +815,7 @@ void MC_automaton_new_propositional_symbol(const char* id, void* fct) { if (_mc_property_automaton == NULL) _mc_property_automaton = xbt_automaton_new(); - xbt_new_propositional_symbol(_mc_property_automaton,id,fct); + xbt_automaton_propositional_symbol_new(_mc_property_automaton,id,fct); MC_UNSET_RAW_MEM; @@ -813,10 +849,10 @@ void MC_ignore_heap(void *address, size_t size){ if(((xbt_mheap_t)std_heap)->heapinfo[region->block].type == 0){ region->fragment = -1; - ((xbt_mheap_t)std_heap)->heapinfo[region->block].busy_block.ignore = 1; + ((xbt_mheap_t)std_heap)->heapinfo[region->block].busy_block.ignore++; }else{ region->fragment = ((uintptr_t) (ADDR2UINT (address) % (BLOCKSIZE))) >> ((xbt_mheap_t)std_heap)->heapinfo[region->block].type; - ((xbt_mheap_t)std_heap)->heapinfo[region->block].busy_frag.ignore[region->fragment] = 1; + ((xbt_mheap_t)std_heap)->heapinfo[region->block].busy_frag.ignore[region->fragment]++; } if(mc_heap_comparison_ignore == NULL){ @@ -828,7 +864,7 @@ void MC_ignore_heap(void *address, size_t size){ } unsigned int cursor = 0; - mc_heap_ignore_region_t current_region; + mc_heap_ignore_region_t current_region = NULL; int start = 0; int end = xbt_dynar_length(mc_heap_comparison_ignore) - 1; @@ -863,7 +899,7 @@ void MC_remove_ignore_heap(void *address, size_t size){ int raw_mem_set = (mmalloc_get_current_heap() == raw_heap); MC_SET_RAW_MEM; - + unsigned int cursor = 0; int start = 0; int end = xbt_dynar_length(mc_heap_comparison_ignore) - 1; @@ -900,6 +936,14 @@ void MC_remove_ignore_heap(void *address, size_t size){ } +void data_bss_ignore_variable_free(mc_data_bss_ignore_variable_t v){ + xbt_free(v); +} + +void data_bss_ignore_variable_free_voidp(void *v){ + data_bss_ignore_variable_free((mc_data_bss_ignore_variable_t) * (void **) v); +} + void MC_ignore_data_bss(void *address, size_t size){ int raw_mem_set = (mmalloc_get_current_heap() == raw_heap); @@ -907,7 +951,7 @@ void MC_ignore_data_bss(void *address, size_t size){ MC_SET_RAW_MEM; if(mc_data_bss_comparison_ignore == NULL) - mc_data_bss_comparison_ignore = xbt_dynar_new(sizeof(mc_data_bss_ignore_variable_t), NULL); + mc_data_bss_comparison_ignore = xbt_dynar_new(sizeof(mc_data_bss_ignore_variable_t), data_bss_ignore_variable_free_voidp); mc_data_bss_ignore_variable_t var = NULL; var = xbt_new0(s_mc_data_bss_ignore_variable_t, 1); @@ -929,6 +973,7 @@ void MC_ignore_data_bss(void *address, size_t size){ cursor = (start + end) / 2; current_var = (mc_data_bss_ignore_variable_t)xbt_dynar_get_as(mc_data_bss_comparison_ignore, cursor, mc_data_bss_ignore_variable_t); if(current_var->address == address){ + data_bss_ignore_variable_free(var); MC_UNSET_RAW_MEM; if(raw_mem_set) MC_SET_RAW_MEM; @@ -1005,7 +1050,15 @@ static size_t data_bss_ignore_size(void *address){ return 0; } +void stack_ignore_variable_free(mc_stack_ignore_variable_t v){ + xbt_free(v->var_name); + xbt_free(v->frame); + xbt_free(v); +} +void stack_ignore_variable_free_voidp(void *v){ + stack_ignore_variable_free((mc_stack_ignore_variable_t) * (void **) v); +} void MC_ignore_stack(const char *var_name, const char *frame_name){ @@ -1014,15 +1067,15 @@ void MC_ignore_stack(const char *var_name, const char *frame_name){ MC_SET_RAW_MEM; if(mc_stack_comparison_ignore == NULL) - mc_stack_comparison_ignore = xbt_dynar_new(sizeof(mc_stack_ignore_variable_t), NULL); - + mc_stack_comparison_ignore = xbt_dynar_new(sizeof(mc_stack_ignore_variable_t), stack_ignore_variable_free_voidp); + + mc_stack_ignore_variable_t var = NULL; + var = xbt_new0(s_mc_stack_ignore_variable_t, 1); + var->var_name = strdup(var_name); + var->frame = strdup(frame_name); + if(xbt_dynar_is_empty(mc_stack_comparison_ignore)){ - mc_stack_ignore_variable_t var = NULL; - var = xbt_new0(s_mc_stack_ignore_variable_t, 1); - var->var_name = strdup(var_name); - var->frame = strdup(frame_name); - xbt_dynar_insert_at(mc_stack_comparison_ignore, 0, &var); }else{ @@ -1037,6 +1090,7 @@ void MC_ignore_stack(const char *var_name, const char *frame_name){ current_var = (mc_stack_ignore_variable_t)xbt_dynar_get_as(mc_stack_comparison_ignore, cursor, mc_stack_ignore_variable_t); if(strcmp(current_var->frame, frame_name) == 0){ if(strcmp(current_var->var_name, var_name) == 0){ + stack_ignore_variable_free(var); MC_UNSET_RAW_MEM; if(raw_mem_set) MC_SET_RAW_MEM; @@ -1053,11 +1107,6 @@ void MC_ignore_stack(const char *var_name, const char *frame_name){ end = cursor - 1; } - mc_stack_ignore_variable_t var = NULL; - var = xbt_new0(s_mc_stack_ignore_variable_t, 1); - var->var_name = strdup(var_name); - var->frame = strdup(frame_name); - if(strcmp(current_var->frame, frame_name) < 0) xbt_dynar_insert_at(mc_stack_comparison_ignore, cursor + 1, &var); else