X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/3d12836da9798f96c230170b4c284cc34a322185..208924f0b511eb55c98c74a56a9d9e6b7430c370:/src/mc/mc_global.c diff --git a/src/mc/mc_global.c b/src/mc/mc_global.c index db1ad4f4a5..6c4c2b23be 100644 --- a/src/mc/mc_global.c +++ b/src/mc/mc_global.c @@ -1,115 +1,112 @@ +#include +#include +#include + #include "../surf/surf_private.h" #include "../simix/private.h" #include "xbt/fifo.h" #include "private.h" + XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_global, mc, - "Logging specific to MC (global)"); + "Logging specific to MC (global)"); /* MC global data structures */ mc_snapshot_t initial_snapshot = NULL; xbt_fifo_t mc_stack = NULL; -xbt_setset_t mc_setset = NULL; mc_stats_t mc_stats = NULL; mc_state_t mc_current_state = NULL; char mc_replay_mode = FALSE; - +double *mc_time = NULL; /** * \brief Initialize the model-checker data structures */ -void MC_init(int method) -{ +void MC_init(void) +{ /* Check if MC is already initialized */ - if(initial_snapshot) + if (initial_snapshot) return; - + + 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 = xbt_new0(s_mc_stats_t, 1); mc_stats->state_size = 1; - + /* Create exploration stack */ mc_stack = xbt_fifo_new(); - /* Create the container for the sets */ - mc_setset = xbt_setset_new(20); - - switch(method){ - case 0: - MC_dfs_init(); - break; - case 1: - MC_dpor_init(); - break; - default: - break; - } - - /* Save the initial state */ + MC_UNSET_RAW_MEM; + + MC_dpor_init(); + MC_SET_RAW_MEM; - initial_snapshot = xbt_new(s_mc_snapshot_t,1); + /* Save the initial state */ + initial_snapshot = xbt_new0(s_mc_snapshot_t, 1); MC_take_snapshot(initial_snapshot); MC_UNSET_RAW_MEM; } -void MC_modelcheck(int method) +void MC_modelcheck(void) { - - MC_init(method); - - switch(method){ - case 0: - MC_dfs(); - break; - case 1: - MC_dpor(); - break; - default: - break; - } - - MC_exit(method); + MC_init(); + MC_dpor(); + MC_exit(); } -void MC_exit(int method) +void MC_exit(void) { - mc_state_t state; - - switch(method){ - case 0: - //MC_dfs_exit(); - break; - case 1: - //MC_dpor_exit(); - break; - default: - break; - } - - /* Destroy MC data structures (in RAW memory) */ - MC_SET_RAW_MEM; - xbt_free(mc_stats); - - while( (state = (mc_state_t)xbt_fifo_pop(mc_stack)) != NULL ) - MC_state_delete(state); - - xbt_fifo_free(mc_stack); - xbt_setset_destroy(mc_setset); - MC_UNSET_RAW_MEM; + xbt_free(mc_time); + MC_memory_exit(); } int MC_random(int min, int max) { - MC_random_create(min,max); - SIMIX_process_yield(); + /*FIXME: return mc_current_state->executed_transition->random.value;*/ + return 0; +} - if(!mc_replay_mode) - return mc_current_state->executed_transition->current_value; - else - return mc_current_state->executed_transition->current_value - 1; +/** + * \brief Schedules all the process that are ready to run + */ +void MC_wait_for_requests(void) +{ + char *req_str = NULL; + smx_req_t req = NULL; + + do { + SIMIX_context_runall(simix_global->process_to_run); + while((req = SIMIX_request_pop())){ + if(!MC_request_is_visible(req)) + SIMIX_request_pre(req, 0); + else if(XBT_LOG_ISENABLED(mc_global, xbt_log_priority_debug)){ + req_str = MC_request_to_string(req); + DEBUG1("Got: %s", req_str); + xbt_free(req_str); + } + } + } while (xbt_dynar_length(simix_global->process_to_run)); +} + +int MC_deadlock_check() +{ + int deadlock = FALSE; + smx_process_t process; + 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)){ + deadlock = FALSE; + break; + } + } + } + return deadlock; } /** @@ -119,40 +116,48 @@ int MC_random(int min, int max) */ void MC_replay(xbt_fifo_t stack) { + int value; + char *req_str; + smx_req_t req = NULL, saved_req = NULL; xbt_fifo_item_t item; - mc_transition_t trans; + mc_state_t state; DEBUG0("**** Begin Replay ****"); /* Restore the initial state */ MC_restore_snapshot(initial_snapshot); - - mc_replay_mode = TRUE; - + /* 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; /* 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)){ - - mc_current_state = (mc_state_t) xbt_fifo_get_item_content(item); - trans = mc_current_state->executed_transition; + for (item = xbt_fifo_get_last_item(stack); + item != xbt_fifo_get_first_item(stack); + item = xbt_fifo_get_prev_item(item)) { + state = (mc_state_t) xbt_fifo_get_item_content(item); + saved_req = MC_state_get_executed_request(state, &value); + + 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; + + /* Debug information */ + if(XBT_LOG_ISENABLED(mc_global, xbt_log_priority_debug)){ + req_str = MC_request_to_string(req); + DEBUG2("Replay: %s (%p)", req_str, state); + xbt_free(req_str); + } + } + + SIMIX_request_pre(req, value); + MC_wait_for_requests(); + /* Update statistics */ mc_stats->visited_states++; mc_stats->executed_transitions++; - - DEBUG1("Executing transition %s", trans->name); - SIMIX_process_schedule(trans->process); - - /* Do all surf's related black magic tricks to keep all working */ - MC_execute_surf_actions(); - - /* Schedule every process that got enabled due to the executed transition */ - MC_schedule_enabled_processes(); } - mc_replay_mode = FALSE; DEBUG0("**** End Replay ****"); } @@ -166,140 +171,47 @@ void MC_dump_stack(xbt_fifo_t stack) mc_state_t state; MC_show_stack(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; } void MC_show_stack(xbt_fifo_t stack) { + int value; mc_state_t state; - mc_transition_t trans; xbt_fifo_item_t item; - - for(item=xbt_fifo_get_last_item(stack); - (item?(state=(mc_state_t)(xbt_fifo_get_item_content(item))):(NULL)); - item=xbt_fifo_get_prev_item(item)){ - trans = state->executed_transition; - if(trans){ - INFO1("%s", trans->name); - } - } -} - -/** - * \brief Schedules all the process that are ready to run - * As a side effect it performs some clean-up required by SIMIX - */ -void MC_schedule_enabled_processes(void) -{ - smx_process_t process; - - //SIMIX_process_empty_trash(); - - /* Schedule every process that is ready to run due to an finished action */ - while ((process = xbt_swag_extract(simix_global->process_to_run))) { - DEBUG2("Scheduling %s on %s", process->name, process->smx_host->name); - SIMIX_process_schedule(process); - } -} - -/******************************** States **************************************/ - -/** - * \brief Creates a state data structure used by the exploration algorithm - */ -mc_state_t MC_state_new(void) -{ - mc_state_t state = NULL; + smx_req_t req; + char *req_str = NULL; - state = xbt_new0(s_mc_state_t, 1); - state->created_transitions = xbt_setset_new_set(mc_setset); - state->transitions = xbt_setset_new_set(mc_setset); - state->enabled_transitions = xbt_setset_new_set(mc_setset); - state->interleave = xbt_setset_new_set(mc_setset); - state->done = xbt_setset_new_set(mc_setset); - state->executed_transition = NULL; - - mc_stats->expanded_states++; - - return state; -} -/** - * \brief Deletes a state data structure - * \param trans The state to be deleted - */ -void MC_state_delete(mc_state_t state) -{ - xbt_setset_cursor_t cursor; - mc_transition_t trans; - - xbt_setset_foreach(state->created_transitions, cursor, trans){ - MC_transition_delete(trans); + for (item = xbt_fifo_get_last_item(stack); + (item ? (state = (mc_state_t) (xbt_fifo_get_item_content(item))) + : (NULL)); item = xbt_fifo_get_prev_item(item)) { + req = MC_state_get_executed_request(state, &value); + if(req){ + req_str = MC_request_to_string(req); + INFO1("%s", req_str); + xbt_free(req_str); + } } - - xbt_setset_destroy_set(state->created_transitions); - xbt_setset_destroy_set(state->transitions); - xbt_setset_destroy_set(state->enabled_transitions); - xbt_setset_destroy_set(state->interleave); - xbt_setset_destroy_set(state->done); - - xbt_free(state); } -/************************** SURF Emulation ************************************/ - -/* Dirty hack, we manipulate surf's clock to simplify the integration of the - model-checker */ -extern double NOW; - -/** - * \brief Executes all the actions at every model - */ -void MC_execute_surf_actions(void) +void MC_show_deadlock(smx_req_t req) { - unsigned int iter; - surf_action_t action = NULL; - surf_model_t model = NULL; - smx_action_t smx_action = NULL; - - /* Execute all the actions in every model */ - xbt_dynar_foreach(model_list, iter, model){ - while ((action = xbt_swag_extract(model->states.running_action_set))){ - /* FIXME: timeouts are not calculated correctly */ - if(NOW >= action->max_duration){ - surf_action_state_set(action, SURF_ACTION_DONE); - smx_action = action->data; - DEBUG5("Resource [%s] (%d): Executing RUNNING action \"%s\" (%p) MaxDuration %lf", - model->name, xbt_swag_size(model->states.running_action_set), - smx_action->name, smx_action, action->max_duration); - - /* Copy the transfered data of the completed network actions */ - /* FIXME: be carefull it might not be an action of the network model */ - if(smx_action && smx_action->data != NULL) - SIMIX_network_copy_data((smx_comm_t)smx_action->data); - - if(smx_action) - SIMIX_action_signal_all(smx_action); - } - } - /*FIXME: check if this is always empty or not */ - while ((action = xbt_swag_extract(model->states.failed_action_set))) { - smx_action = action->data; - DEBUG4("Resource [%s] (%d): Executing FAILED action \"%s\" (%p)", - model->name, xbt_swag_size(model->states.running_action_set), - smx_action->name, smx_action); - if (smx_action) - SIMIX_action_signal_all(smx_action); - } - } - /* That's it, now go one step deeper into the model-checking process! */ - NOW += 0.5; /* FIXME: Check time increases*/ + /*char *req_str = NULL;*/ + INFO0("**************************"); + INFO0("*** DEAD-LOCK DETECTED ***"); + INFO0("**************************"); + INFO0("Locked request:"); + /*req_str = MC_request_to_string(req); + INFO1("%s", req_str); + xbt_free(req_str);*/ + INFO0("Counter-example execution trace:"); + MC_dump_stack(mc_stack); } -/****************************** Statistics ************************************/ void MC_print_statistics(mc_stats_t stats) { INFO1("State space size ~= %lu", stats->state_size); @@ -307,15 +219,14 @@ void MC_print_statistics(mc_stats_t stats) INFO1("Visited states = %lu", stats->visited_states); INFO1("Executed transitions = %lu", stats->executed_transitions); INFO1("Expanded / Visited = %lf", - (double)stats->visited_states / stats->expanded_states); + (double) stats->visited_states / stats->expanded_states); /*INFO1("Exploration coverage = %lf", - (double)stats->expanded_states / stats->state_size);*/ + (double)stats->expanded_states / stats->state_size); */ } -/************************* Assertion Checking *********************************/ void MC_assert(int prop) { - if(!prop){ + if (MC_IS_ENABLED && !prop) { INFO0("**************************"); INFO0("*** PROPERTY NOT VALID ***"); INFO0("**************************"); @@ -326,3 +237,15 @@ void MC_assert(int prop) } } +void MC_process_clock_add(smx_process_t process, double amount) +{ + mc_time[process->pid] += amount; +} + +double MC_process_clock_get(smx_process_t process) +{ + if(mc_time) + return mc_time[process->pid]; + else + return 0; +}