X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/317986722b1e90e467ac9850c9a7000130273564..36246161381665fecb9a5a074b081d8d712f94e6:/src/mc/mc_dpor.c diff --git a/src/mc/mc_dpor.c b/src/mc/mc_dpor.c index 18d6814e0b..920ee40df6 100644 --- a/src/mc/mc_dpor.c +++ b/src/mc/mc_dpor.c @@ -33,7 +33,7 @@ void MC_dpor_init() /* Get an enabled process and insert it in the interleave set of the initial state */ xbt_swag_foreach(process, simix_global->process_list){ if(SIMIX_process_is_enabled(process)){ - xbt_setset_set_insert(initial_state->interleave, process); + MC_state_interleave_process(initial_state, process); break; } } @@ -52,6 +52,7 @@ void MC_dpor_init() void MC_dpor(void) { char *req_str; + int value; smx_req_t req = NULL; mc_state_t state = NULL, prev_state = NULL, next_state = NULL; smx_process_t process = NULL; @@ -59,89 +60,76 @@ void MC_dpor(void) while (xbt_fifo_size(mc_stack) > 0) { - DEBUG0("**************************************************"); - /* Get current state */ state = (mc_state_t) xbt_fifo_get_item_content(xbt_fifo_get_first_item(mc_stack)); - /* If there are processes to interleave and the maximun depth has not been reached - then perform one step of the exploration algorithm */ - if (xbt_setset_set_size(state->interleave) > 0 - && xbt_fifo_size(mc_stack) < MAX_DEPTH) { - - DEBUG3("Exploration detph=%d (state=%p)(%d interleave)", - xbt_fifo_size(mc_stack), state, - xbt_setset_set_size(state->interleave)); + DEBUG0("**************************************************"); + DEBUG3("Exploration detph=%d (state=%p)(%u interleave)", + xbt_fifo_size(mc_stack), state, + MC_state_interleave_size(state)); - /* Update statistics */ - mc_stats->visited_states++; - mc_stats->executed_transitions++; + /* Update statistics */ + mc_stats->visited_states++; - MC_SET_RAW_MEM; - /* Choose a request to execute from the the current state */ - req = MC_state_get_request(state); - MC_UNSET_RAW_MEM; + /* If there are processes to interleave and the maximum depth has not been reached + then perform one step of the exploration algorithm */ + if (xbt_fifo_size(mc_stack) < MAX_DEPTH && + (req = MC_state_get_request(state, &value))) { + + /* Debug information */ + if(XBT_LOG_ISENABLED(mc_dpor, xbt_log_priority_debug)){ + req_str = MC_request_to_string(req); + DEBUG2("Execute: %s (%u)", req_str, value); + xbt_free(req_str); + } - if(req){ - /* Answer the request */ - /* Debug information */ - if(XBT_LOG_ISENABLED(mc_dpor, xbt_log_priority_debug)){ - req_str = MC_request_to_string(req); - DEBUG1("Execute: %s", req_str); - xbt_free(req_str); - } + MC_state_set_executed_request(state, req, value); + mc_stats->executed_transitions++; - MC_state_set_executed_request(state, req); + /* Answer the request */ + SIMIX_request_pre(req, value); /* After this call req is no longer usefull */ - SIMIX_request_pre(req); /* After this call req is no longer usefull */ - - /* Wait for requests (schedules processes) */ - MC_wait_for_requests(); + /* Wait for requests (schedules processes) */ + MC_wait_for_requests(); - /* Create the new expanded state */ - MC_SET_RAW_MEM; - next_state = MC_state_new(); - xbt_fifo_unshift(mc_stack, next_state); - + /* Create the new expanded state */ + MC_SET_RAW_MEM; + next_state = MC_state_new(); + xbt_fifo_unshift(mc_stack, next_state); - /* Get an enabled process and insert it in the interleave set of the next state */ - xbt_swag_foreach(process, simix_global->process_list){ - if(SIMIX_process_is_enabled(process)){ - xbt_setset_set_insert(next_state->interleave, process); - break; - } + /* Get an enabled process and insert it in the interleave set of the next state */ + xbt_swag_foreach(process, simix_global->process_list){ + if(SIMIX_process_is_enabled(process)){ + MC_state_interleave_process(next_state, process); + break; } - MC_UNSET_RAW_MEM; - - /* FIXME: Update Statistics - mc_stats->state_size += - xbt_setset_set_size(next_state->enabled_transitions);*/ } + MC_UNSET_RAW_MEM; + + /* FIXME: Update Statistics + mc_stats->state_size += + xbt_setset_set_size(next_state->enabled_transitions);*/ + /* Let's loop again */ /* The interleave set is empty or the maximum depth is reached, let's back-track */ } else { DEBUG0("There are no more processes to interleave."); - /* Check for deadlocks */ - xbt_swag_foreach(process, simix_global->process_list){ - /* FIXME: use REQ_NO_REQ instead of NULL for comparison */ - if(&process->request && !SIMIX_request_is_enabled(&process->request)){ - MC_show_deadlock(&process->request); - return; - } - } - - /* - INFO0("*********************************"); - MC_show_stack(mc_stack); */ - /* Trash the current state, no longer needed */ MC_SET_RAW_MEM; xbt_fifo_shift(mc_stack); MC_state_delete(state); + MC_UNSET_RAW_MEM; + + /* Check for deadlocks */ + if(MC_deadlock_check()){ + MC_show_deadlock(NULL); + return; + } + MC_SET_RAW_MEM; /* Traverse the stack backwards until a state with a non empty interleave set is found, deleting all the states that have it empty in the way. For each deleted state, check if the request that has generated it @@ -149,23 +137,28 @@ void MC_dpor(void) executed before it. If it does then add it to the interleave set of the state that executed that previous request. */ while ((state = xbt_fifo_shift(mc_stack)) != NULL) { - req = MC_state_get_executed_request(state); + req = MC_state_get_internal_request(state); xbt_fifo_foreach(mc_stack, item, prev_state, mc_state_t) { - if(MC_request_depend(req, MC_state_get_executed_request(prev_state))){ + if(MC_request_depend(req, MC_state_get_internal_request(prev_state))){ if(XBT_LOG_ISENABLED(mc_dpor, xbt_log_priority_debug)){ DEBUG0("Dependent Transitions:"); - req_str = MC_request_to_string(MC_state_get_executed_request(prev_state)); - DEBUG1("%s", req_str); + req_str = MC_request_to_string(MC_state_get_executed_request(prev_state, &value)); + DEBUG2("%s (state=%p)", req_str, prev_state); xbt_free(req_str); - req_str = MC_request_to_string(req); - DEBUG1("%s", req_str); + req_str = MC_request_to_string(MC_state_get_executed_request(state, &value)); + DEBUG2("%s (state=%p)", req_str, state); xbt_free(req_str); } - xbt_setset_set_insert(prev_state->interleave, req->issuer); + + if(!MC_state_process_is_done(prev_state, req->issuer)) + MC_state_interleave_process(prev_state, req->issuer); + else + DEBUG1("Process %p is in done set", req->issuer); + break; } } - if (xbt_setset_set_size(state->interleave) > 0) { + if (MC_state_interleave_size(state)) { /* We found a back-tracking point, let's loop */ xbt_fifo_unshift(mc_stack, state); DEBUG1("Back-tracking to depth %d", xbt_fifo_size(mc_stack));