X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/6b188a3ca7fe91cf125a08229fb4fe51eee26e6d..b7c05078f9a89dba063df2fc7edea55ae1d6a3ed:/src/mc/mc_global.c diff --git a/src/mc/mc_global.c b/src/mc/mc_global.c index 3dcbfc8ced..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" @@ -34,6 +34,10 @@ 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); + + /** * \brief Initialize the model-checker data structures */ @@ -95,7 +99,7 @@ void MC_init_safety_stateful(void){ } -void MC_init_liveness(xbt_automaton_t a, char *prgm){ +static void MC_init_liveness(xbt_automaton_t a, char *prgm){ XBT_DEBUG("Start init mc"); @@ -174,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_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); } } } @@ -194,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; } @@ -213,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; @@ -236,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)){ @@ -246,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 */ @@ -260,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; @@ -291,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 */ @@ -303,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(); } @@ -333,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 */ @@ -345,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(); } @@ -383,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); @@ -398,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("**************************"); @@ -412,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("**************************"); @@ -444,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); @@ -464,7 +468,7 @@ 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); @@ -543,7 +547,7 @@ void MC_assert_stateful(int prop) } -void MC_assert_pair(int prop){ +static void MC_assert_pair(int prop){ if (MC_IS_ENABLED && !prop) { XBT_INFO("**************************"); XBT_INFO("*** PROPERTY NOT VALID ***"); @@ -568,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; + } + + } + +}