X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/8449f8cd86a230453d0621072573d85c7ac611f4..b7c05078f9a89dba063df2fc7edea55ae1d6a3ed:/src/mc/mc_global.c diff --git a/src/mc/mc_global.c b/src/mc/mc_global.c index ec871c133e..7760797e1a 100644 --- a/src/mc/mc_global.c +++ b/src/mc/mc_global.c @@ -4,7 +4,7 @@ #include #include "../surf/surf_private.h" -#include "../simix/private.h" +#include "../simix/smx_private.h" #include "xbt/fifo.h" #include "private.h" @@ -27,9 +27,15 @@ mc_stats_t mc_stats = NULL; /* Liveness */ -xbt_fifo_t mc_stack_liveness_stateful = NULL; mc_stats_pair_t mc_stats_pair = NULL; -xbt_fifo_t mc_stack_liveness_stateless = NULL; +xbt_fifo_t mc_stack_liveness = NULL; +mc_snapshot_t initial_snapshot_liveness = NULL; + +xbt_automaton_t automaton; +char *prog_name; + +static void MC_init_liveness(xbt_automaton_t a, char *prgm); +static void MC_assert_pair(int prop); /** @@ -93,35 +99,7 @@ void MC_init_safety_stateful(void){ } -void MC_init_liveness_stateful(xbt_automaton_t a){ - - XBT_DEBUG("Start init mc"); - - 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; - - /* Initialize statistics */ - mc_stats_pair = xbt_new0(s_mc_stats_pair_t, 1); - //mc_stats = xbt_new0(s_mc_stats_t, 1); - - XBT_DEBUG("Creating snapshot_stack"); - - /* Create exploration stack */ - mc_stack_liveness_stateful = xbt_fifo_new(); - - - MC_UNSET_RAW_MEM; - - //MC_ddfs_stateful_init(a); - //MC_dpor2_init(a); - //MC_dpor3_init(a); -} - -void MC_init_liveness_stateless(xbt_automaton_t a, char *prgm){ +static void MC_init_liveness(xbt_automaton_t a, char *prgm){ XBT_DEBUG("Start init mc"); @@ -138,11 +116,14 @@ void MC_init_liveness_stateless(xbt_automaton_t a, char *prgm){ XBT_DEBUG("Creating stack"); /* Create exploration stack */ - mc_stack_liveness_stateless = xbt_fifo_new(); + mc_stack_liveness = xbt_fifo_new(); MC_UNSET_RAW_MEM; - MC_ddfs_stateless_init(a, prgm); + automaton = a; + prog_name = strdup(prgm); + + MC_ddfs_init(); } @@ -162,13 +143,9 @@ void MC_modelcheck_stateful(void) MC_exit(); } -void MC_modelcheck_liveness_stateful(xbt_automaton_t a){ - MC_init_liveness_stateful(a); - MC_exit_liveness(); -} -void MC_modelcheck_liveness_stateless(xbt_automaton_t a, char *prgm){ - MC_init_liveness_stateless(a, prgm); +void MC_modelcheck_liveness(xbt_automaton_t a, char *prgm){ + MC_init_liveness(a, prgm); MC_exit_liveness(); } @@ -176,7 +153,8 @@ void MC_exit_liveness(void) { MC_print_statistics_pairs(mc_stats_pair); //xbt_free(mc_time); - MC_memory_exit(); + //MC_memory_exit(); + exit(0); } @@ -200,15 +178,15 @@ int MC_random(int min, int max) void MC_wait_for_requests(void) { smx_process_t process; - smx_req_t req; + smx_simcall_t req; unsigned int iter; - while (xbt_dynar_length(simix_global->process_to_run)) { + while (!xbt_dynar_is_empty(simix_global->process_to_run)) { SIMIX_process_runall(); xbt_dynar_foreach(simix_global->process_that_ran, iter, process) { - req = &process->request; - if (req->call != REQ_NO_REQ && !MC_request_is_visible(req)) - SIMIX_request_pre(req, 0); + req = &process->simcall; + if (req->call != SIMCALL_NONE && !MC_request_is_visible(req)) + SIMIX_simcall_pre(req, 0); } } } @@ -220,8 +198,8 @@ int MC_deadlock_check() if(xbt_swag_size(simix_global->process_list)){ deadlock = TRUE; xbt_swag_foreach(process, simix_global->process_list){ - if(process->request.call != REQ_NO_REQ - && MC_request_is_enabled(&process->request)){ + if(process->simcall.call != SIMCALL_NONE + && MC_request_is_enabled(&process->simcall)){ deadlock = FALSE; break; } @@ -239,7 +217,7 @@ void MC_replay(xbt_fifo_t stack) { int value; char *req_str; - smx_req_t req = NULL, saved_req = NULL; + smx_simcall_t req = NULL, saved_req = NULL; xbt_fifo_item_t item; mc_state_t state; @@ -262,7 +240,7 @@ void MC_replay(xbt_fifo_t stack) 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->request; + req = &saved_req->issuer->simcall; /* Debug information */ if(XBT_LOG_ISENABLED(mc_global, xbt_log_priority_debug)){ @@ -272,7 +250,7 @@ void MC_replay(xbt_fifo_t stack) } } - SIMIX_request_pre(req, value); + SIMIX_simcall_pre(req, value); MC_wait_for_requests(); /* Update statistics */ @@ -286,7 +264,7 @@ void MC_replay_liveness(xbt_fifo_t stack, int all_stack) { int value; char *req_str; - smx_req_t req = NULL, saved_req = NULL; + smx_simcall_t req = NULL, saved_req = NULL; xbt_fifo_item_t item; mc_state_t state; mc_pair_stateless_t pair; @@ -295,7 +273,7 @@ void MC_replay_liveness(xbt_fifo_t stack, int all_stack) XBT_DEBUG("**** Begin Replay ****"); /* Restore the initial state */ - MC_restore_snapshot(initial_snapshot); + MC_restore_snapshot(initial_snapshot_liveness); /* 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; @@ -317,7 +295,7 @@ void MC_replay_liveness(xbt_fifo_t stack, int all_stack) 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->request; + req = &saved_req->issuer->simcall; //XBT_DEBUG("Req->call %u", req->call); /* Debug information */ @@ -329,7 +307,7 @@ void MC_replay_liveness(xbt_fifo_t stack, int all_stack) } - SIMIX_request_pre(req, value); + SIMIX_simcall_pre(req, value); MC_wait_for_requests(); } @@ -359,7 +337,7 @@ void MC_replay_liveness(xbt_fifo_t stack, int all_stack) 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->request; + req = &saved_req->issuer->simcall; //XBT_DEBUG("Req->call %u", req->call); /* Debug information */ @@ -371,7 +349,7 @@ void MC_replay_liveness(xbt_fifo_t stack, int all_stack) } - SIMIX_request_pre(req, value); + SIMIX_simcall_pre(req, value); MC_wait_for_requests(); } @@ -409,7 +387,7 @@ void MC_show_stack_safety_stateless(xbt_fifo_t stack) int value; mc_state_t state; xbt_fifo_item_t item; - smx_req_t req; + smx_simcall_t req; char *req_str = NULL; for (item = xbt_fifo_get_last_item(stack); @@ -424,7 +402,7 @@ void MC_show_stack_safety_stateless(xbt_fifo_t stack) } } -void MC_show_deadlock(smx_req_t req) +void MC_show_deadlock(smx_simcall_t req) { /*char *req_str = NULL;*/ XBT_INFO("**************************"); @@ -438,7 +416,7 @@ void MC_show_deadlock(smx_req_t req) MC_dump_stack_safety_stateless(mc_stack_safety_stateless); } -void MC_show_deadlock_stateful(smx_req_t req) +void MC_show_deadlock_stateful(smx_simcall_t req) { /*char *req_str = NULL;*/ XBT_INFO("**************************"); @@ -470,7 +448,7 @@ void MC_show_stack_safety_stateful(xbt_fifo_t stack) int value; mc_state_ws_t state; xbt_fifo_item_t item; - smx_req_t req; + smx_simcall_t req; char *req_str = NULL; for (item = xbt_fifo_get_last_item(stack); @@ -485,39 +463,12 @@ void MC_show_stack_safety_stateful(xbt_fifo_t stack) } } -void MC_show_stack_liveness_stateful(xbt_fifo_t stack){ - int value; - mc_pair_t pair; - xbt_fifo_item_t item; - smx_req_t req; - 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)) { - req = MC_state_get_executed_request(pair->graph_state, &value); - if(req){ - req_str = MC_request_to_string(req, value); - XBT_INFO("%s", req_str); - xbt_free(req_str); - } - } -} - -void MC_dump_stack_liveness_stateful(xbt_fifo_t stack){ - mc_pair_t pair; - MC_SET_RAW_MEM; - while ((pair = (mc_pair_t) xbt_fifo_pop(stack)) != NULL) - MC_pair_delete(pair); - MC_UNSET_RAW_MEM; -} - -void MC_show_stack_liveness_stateless(xbt_fifo_t stack){ +void MC_show_stack_liveness(xbt_fifo_t stack){ int value; mc_pair_stateless_t pair; xbt_fifo_item_t item; - smx_req_t req; + smx_simcall_t req; char *req_str = NULL; for (item = xbt_fifo_get_last_item(stack); @@ -536,7 +487,7 @@ void MC_show_stack_liveness_stateless(xbt_fifo_t stack){ } } -void MC_dump_stack_liveness_stateless(xbt_fifo_t stack){ +void MC_dump_stack_liveness(xbt_fifo_t stack){ mc_pair_stateless_t pair; MC_SET_RAW_MEM; @@ -595,26 +546,14 @@ void MC_assert_stateful(int prop) } } -void MC_assert_pair_stateful(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_stateful(mc_stack_liveness_stateful); - //MC_dump_snapshot_stack(mc_snapshot_stack); - MC_print_statistics_pairs(mc_stats_pair); - xbt_abort(); - } -} -void MC_assert_pair_stateless(int prop){ +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_stateless(mc_stack_liveness_stateless); + MC_show_stack_liveness(mc_stack_liveness); //MC_dump_snapshot_stack(mc_snapshot_stack); MC_print_statistics_pairs(mc_stats_pair); xbt_abort(); @@ -633,3 +572,35 @@ double MC_process_clock_get(smx_process_t process) else return 0; } + +void MC_diff(void){ + + mc_snapshot_t sn = xbt_new0(s_mc_snapshot_t, 1); + MC_take_snapshot_liveness(sn); + + int i; + + XBT_INFO("Number of regions : %d", sn->num_reg); + + for(i=0; inum_reg; i++){ + + switch(sn->regions[i]->type){ + case 0: /* heap */ + XBT_INFO("Size of heap : %zu", sn->regions[i]->size); + mmalloc_display_info_heap(sn->regions[i]->data); + break; + case 1 : /* libsimgrid */ + XBT_INFO("Size of libsimgrid : %zu", sn->regions[i]->size); + break; + case 2 : /* data program */ + XBT_INFO("Size of data program : %zu", sn->regions[i]->size); + break; + case 3 : /* stack */ + XBT_INFO("Size of stack : %zu", sn->regions[i]->size); + XBT_INFO("Start addr of stack : %p", sn->regions[i]->start_addr); + break; + } + + } + +}