X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/15c81e44412415173de220954a453019c68714cd..7e9b6e88f6c2daa87a9f5370596e5acc7f73fc6a:/src/mc/mc_global.c diff --git a/src/mc/mc_global.c b/src/mc/mc_global.c index a1953a4c6d..f55b44fe1f 100644 --- a/src/mc/mc_global.c +++ b/src/mc/mc_global.c @@ -1,14 +1,20 @@ +/* Copyright (c) 2008-2012 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. */ + #include #include #include #include #include "../surf/surf_private.h" -#include "../simix/private.h" +#include "../simix/smx_private.h" #include "xbt/fifo.h" -#include "private.h" - +#include "mc_private.h" +#include "xbt/automaton/automaton_create.h" +XBT_LOG_NEW_CATEGORY(mc, "All MC categories"); XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_global, mc, "Logging specific to MC (global)"); @@ -32,9 +38,8 @@ 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_init_liveness(xbt_automaton_t a); static void MC_assert_pair(int prop); @@ -75,7 +80,7 @@ void MC_init_safety_stateless(void) void MC_init_safety_stateful(void){ - /* Check if MC is already initialized */ + /* Check if MC is already initialized */ if (initial_snapshot) return; @@ -99,7 +104,7 @@ void MC_init_safety_stateful(void){ } -static void MC_init_liveness(xbt_automaton_t a, char *prgm){ +static void MC_init_liveness(xbt_automaton_t a){ XBT_DEBUG("Start init mc"); @@ -115,13 +120,12 @@ static void MC_init_liveness(xbt_automaton_t a, char *prgm){ XBT_DEBUG("Creating stack"); - /* Create exploration stack */ + /* Create exploration stack */ mc_stack_liveness = xbt_fifo_new(); MC_UNSET_RAW_MEM; automaton = a; - prog_name = strdup(prgm); MC_ddfs_init(); @@ -144,8 +148,8 @@ void MC_modelcheck_stateful(void) } -void MC_modelcheck_liveness(xbt_automaton_t a, char *prgm){ - MC_init_liveness(a, prgm); +void MC_modelcheck_liveness(xbt_automaton_t a){ + MC_init_liveness(a); MC_exit_liveness(); } @@ -178,15 +182,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); } } } @@ -198,8 +202,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; } @@ -212,12 +216,12 @@ int MC_deadlock_check() * \brief Re-executes from the initial state all the transitions indicated by * a given model-checker stack. * \param stack The stack with the transitions to execute. -*/ + */ 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; @@ -240,7 +244,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)){ @@ -250,7 +254,7 @@ void MC_replay(xbt_fifo_t stack) } } - SIMIX_request_pre(req, value); + SIMIX_simcall_pre(req, value); MC_wait_for_requests(); /* Update statistics */ @@ -264,7 +268,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; @@ -289,26 +293,26 @@ void MC_replay_liveness(xbt_fifo_t stack, int all_stack) if(pair->requests > 0){ - saved_req = MC_state_get_executed_request(state, &value); - //XBT_DEBUG("SavedReq->call %u", saved_req->call); + saved_req = MC_state_get_executed_request(state, &value); + //XBT_DEBUG("SavedReq->call %u", saved_req->call); - 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; - //XBT_DEBUG("Req->call %u", req->call); - - /* Debug information */ - 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); - } - - } + 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)){ + req_str = MC_request_to_string(req, value); + XBT_DEBUG("Replay (depth = %d) : %s (%p)", depth, req_str, state); + xbt_free(req_str); + } + + } - SIMIX_request_pre(req, value); - MC_wait_for_requests(); + SIMIX_simcall_pre(req, value); + MC_wait_for_requests(); } depth++; @@ -323,34 +327,34 @@ void MC_replay_liveness(xbt_fifo_t stack, int all_stack) /* 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)) { + 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); state = (mc_state_t) pair->graph_state; if(pair->requests > 0){ - saved_req = MC_state_get_executed_request(state, &value); - //XBT_DEBUG("SavedReq->call %u", saved_req->call); + saved_req = MC_state_get_executed_request(state, &value); + //XBT_DEBUG("SavedReq->call %u", saved_req->call); - 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; - //XBT_DEBUG("Req->call %u", req->call); - - /* Debug information */ - 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); - } - - } + 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)){ + req_str = MC_request_to_string(req, value); + XBT_DEBUG("Replay (depth = %d) : %s (%p)", depth, req_str, state); + xbt_free(req_str); + } + + } - SIMIX_request_pre(req, value); - MC_wait_for_requests(); + SIMIX_simcall_pre(req, value); + MC_wait_for_requests(); } depth++; @@ -368,7 +372,7 @@ void MC_replay_liveness(xbt_fifo_t stack, int all_stack) * \brief Dumps the contents of a model-checker's stack and shows the actual * execution trace * \param stack The stack to dump -*/ + */ void MC_dump_stack_safety_stateless(xbt_fifo_t stack) { mc_state_t state; @@ -387,7 +391,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); @@ -402,7 +406,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("**************************"); @@ -410,13 +414,13 @@ void MC_show_deadlock(smx_req_t req) 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_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("**************************"); @@ -424,8 +428,8 @@ void MC_show_deadlock_stateful(smx_req_t req) 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_show_stack_safety_stateful(mc_stack_safety_stateful); } @@ -437,7 +441,7 @@ void MC_dump_stack_safety_stateful(xbt_fifo_t stack) MC_show_stack_safety_stateful(stack); /*MC_SET_RAW_MEM; - while ((state = (mc_state_t) xbt_fifo_pop(stack)) != NULL) + while ((state = (mc_state_t) xbt_fifo_pop(stack)) != NULL) MC_state_delete(state); MC_UNSET_RAW_MEM;*/ } @@ -448,7 +452,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); @@ -468,7 +472,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); @@ -477,11 +481,11 @@ void MC_show_stack_liveness(xbt_fifo_t stack){ req = MC_state_get_executed_request(pair->graph_state, &value); if(req){ if(pair->requests>0){ - req_str = MC_request_to_string(req, value); - XBT_INFO("%s", req_str); - xbt_free(req_str); + req_str = MC_request_to_string(req, value); + XBT_INFO("%s", req_str); + xbt_free(req_str); }else{ - XBT_INFO("End of system requests but evolution in Büchi automaton"); + XBT_INFO("End of system requests but evolution in Büchi automaton"); } } } @@ -499,14 +503,14 @@ 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("State space size ~= %lu", stats->state_size); XBT_INFO("Expanded states = %lu", stats->expanded_states); XBT_INFO("Visited states = %lu", stats->visited_states); XBT_INFO("Executed transitions = %lu", stats->executed_transitions); XBT_INFO("Expanded / Visited = %lf", - (double) stats->visited_states / stats->expanded_states); + (double) stats->visited_states / stats->expanded_states); /*XBT_INFO("Exploration coverage = %lf", - (double)stats->expanded_states / stats->state_size); */ + (double)stats->expanded_states / stats->state_size); */ } void MC_print_statistics_pairs(mc_stats_pair_t stats) @@ -515,14 +519,14 @@ void MC_print_statistics_pairs(mc_stats_pair_t stats) 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); + (double) stats->visited_pairs / stats->expanded_pairs); /*XBT_INFO("Exploration coverage = %lf", - (double)stats->expanded_states / stats->state_size); */ + (double)stats->expanded_states / stats->state_size); */ } void MC_assert(int prop) { - if (MC_IS_ENABLED && !prop) { + if (MC_IS_ENABLED && !prop){ XBT_INFO("**************************"); XBT_INFO("*** PROPERTY NOT VALID ***"); XBT_INFO("**************************"); @@ -572,3 +576,42 @@ 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 : %u", 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; + } + + } + +} + +xbt_automaton_t MC_create_automaton(const char *file){ + MC_SET_RAW_MEM; + xbt_automaton_t a = xbt_create_automaton(file); + MC_UNSET_RAW_MEM; + return a; +}