X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/2e4d86b368af598e602c4abc229117cc5ba0b387..5e11c7363e10af116d37c7bc039694bf56e2688d:/src/mc/mc_dpor.c diff --git a/src/mc/mc_dpor.c b/src/mc/mc_dpor.c index de9b988199..839ac05357 100644 --- a/src/mc/mc_dpor.c +++ b/src/mc/mc_dpor.c @@ -9,10 +9,7 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_dpor, mc, "Logging specific to MC DPOR exploration"); xbt_dynar_t visited_states; - -static int is_visited_state(void); -static void visited_state_free(mc_visited_state_t state); -static void visited_state_free_voidp(void *s); +xbt_dict_t first_enabled_state; static void visited_state_free(mc_visited_state_t state){ if(state){ @@ -32,7 +29,7 @@ static mc_visited_state_t visited_state_new(){ new_state->heap_bytes_used = mmalloc_get_bytes_used(std_heap); new_state->nb_processes = xbt_swag_size(simix_global->process_list); new_state->system_state = MC_take_snapshot(); - new_state->num = mc_stats->expanded_states - 1; + new_state->num = mc_stats->expanded_states; return new_state; @@ -85,11 +82,11 @@ static int is_visited_state(){ state_test = (mc_visited_state_t)xbt_dynar_get_as(visited_states, cursor, mc_visited_state_t); bytes_used_test = state_test->heap_bytes_used; nb_processes_test = state_test->nb_processes; - if(nb_processes_test < current_nb_processes) + if(nb_processes_test < current_nb_processes){ start = cursor + 1; - if(nb_processes_test > current_nb_processes) - end = cursor - 1; - if(nb_processes_test == current_nb_processes){ + }else if(nb_processes_test > current_nb_processes){ + end = cursor - 1; + }else if(nb_processes_test == current_nb_processes){ if(bytes_used_test < current_bytes_used) start = cursor + 1; if(bytes_used_test > current_bytes_used) @@ -97,8 +94,6 @@ static int is_visited_state(){ if(bytes_used_test == current_bytes_used){ same_processes_and_bytes_not_found = 0; if(snapshot_compare(new_state->system_state, state_test->system_state) == 0){ - xbt_dynar_remove_at(visited_states, cursor, NULL); - xbt_dynar_insert_at(visited_states, cursor, &new_state); XBT_DEBUG("State %d already visited ! (equal to state %d)", new_state->num, state_test->num); if(raw_mem_set) MC_SET_RAW_MEM; @@ -114,8 +109,6 @@ static int is_visited_state(){ if(bytes_used_test != current_bytes_used) break; if(snapshot_compare(new_state->system_state, state_test->system_state) == 0){ - xbt_dynar_remove_at(visited_states, previous_cursor, NULL); - xbt_dynar_insert_at(visited_states, previous_cursor, &new_state); XBT_DEBUG("State %d already visited ! (equal to state %d)", new_state->num, state_test->num); if(raw_mem_set) MC_SET_RAW_MEM; @@ -132,8 +125,6 @@ static int is_visited_state(){ if(bytes_used_test != current_bytes_used) break; if(snapshot_compare(new_state->system_state, state_test->system_state) == 0){ - xbt_dynar_remove_at(visited_states, next_cursor, NULL); - xbt_dynar_insert_at(visited_states, next_cursor, &new_state); XBT_DEBUG("State %d already visited ! (equal to state %d)", new_state->num, state_test->num); if(raw_mem_set) MC_SET_RAW_MEM; @@ -196,6 +187,8 @@ void MC_dpor_init() initial_state = MC_state_new(); visited_states = xbt_dynar_new(sizeof(mc_visited_state_t), visited_state_free_voidp); + first_enabled_state = xbt_dict_new_homogeneous(&xbt_free_f); + MC_UNSET_RAW_MEM; XBT_DEBUG("**************************************************"); @@ -210,12 +203,26 @@ void MC_dpor_init() xbt_swag_foreach(process, simix_global->process_list){ if(MC_process_is_enabled(process)){ MC_state_interleave_process(initial_state, process); - XBT_DEBUG("Process %lu enabled with simcall %d", process->pid, process->simcall.call); + if(mc_reduce_kind != e_mc_reduce_none) + break; } } xbt_fifo_unshift(mc_stack_safety, initial_state); + /* To ensure the soundness of DPOR, we have to keep a list of + processes which are still enabled at each step of the exploration. + If max depth is reached, we interleave them in the state in which they have + been enabled for the first time. */ + xbt_swag_foreach(process, simix_global->process_list){ + if(MC_process_is_enabled(process)){ + char *key = bprintf("%lu", process->pid); + char *data = bprintf("%d", xbt_fifo_size(mc_stack_safety)); + xbt_dict_set(first_enabled_state, key, data, NULL); + xbt_free(key); + } + } + MC_UNSET_RAW_MEM; if(raw_mem_set) @@ -233,16 +240,15 @@ void MC_dpor_init() void MC_dpor(void) { - char *req_str; - int value, value2; - smx_simcall_t req = NULL, prev_req = NULL, req2 = NULL; - s_smx_simcall_t req3; + char *req_str = NULL; + int value; + smx_simcall_t req = NULL, prev_req = NULL; mc_state_t state = NULL, prev_state = NULL, next_state = NULL, restore_state=NULL; smx_process_t process = NULL; xbt_fifo_item_t item = NULL; - int pos, i, interleave_size; - int interleave_proc[simix_process_maxpid]; + int pos; int visited_state; + int enabled = 0, max_depth_reached; while (xbt_fifo_size(mc_stack_safety) > 0) { @@ -251,16 +257,16 @@ void MC_dpor(void) xbt_fifo_get_item_content(xbt_fifo_get_first_item(mc_stack_safety)); XBT_DEBUG("**************************************************"); - XBT_DEBUG("Exploration depth=%d (state=%p)(%u interleave)", - xbt_fifo_size(mc_stack_safety), state, - MC_state_interleave_size(state)); + XBT_DEBUG("Exploration depth=%d (state=%p, num %d)(%u interleave, user_max_depth %d)", + xbt_fifo_size(mc_stack_safety), state, state->num, + MC_state_interleave_size(state), user_max_depth_reached); /* Update statistics */ mc_stats->visited_states++; /* 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_safety) < _sg_mc_max_depth && + if (xbt_fifo_size(mc_stack_safety) <= _sg_mc_max_depth && !user_max_depth_reached && (req = MC_state_get_request(state, &value))) { /* Debug information */ @@ -270,42 +276,19 @@ void MC_dpor(void) xbt_free(req_str); } - req_str = MC_request_get_dot_output(req, value); + MC_SET_RAW_MEM; + if(dot_output != NULL) + req_str = MC_request_get_dot_output(req, value); + MC_UNSET_RAW_MEM; MC_state_set_executed_request(state, req, value); mc_stats->executed_transitions++; - if(MC_state_interleave_size(state)){ - MC_SET_RAW_MEM; - req2 = MC_state_get_internal_request(state); - req3 = *req2; - for(i=0; ipid, prev_req->call, prev_req->issuer->pid); - interleave_proc[prev_req->issuer->pid] = 1; - }else{ - XBT_DEBUG("Simcall %d in process %lu independant with simcall %d in process %lu", req3.call, req3.issuer->pid, prev_req->call, prev_req->issuer->pid); - MC_state_remove_interleave_process(state, prev_req->issuer); - } - } - } - xbt_swag_foreach(process, simix_global->process_list){ - if(interleave_proc[process->pid] == 1) - MC_state_interleave_process(state, process); - } - MC_UNSET_RAW_MEM; - } - - MC_state_set_executed_request(state, req, value); + MC_SET_RAW_MEM; + char *key = bprintf("%lu", req->issuer->pid); + xbt_dict_remove(first_enabled_state, key); + xbt_free(key); + MC_UNSET_RAW_MEM; /* Answer the request */ SIMIX_simcall_pre(req, value); /* After this call req is no longer usefull */ @@ -324,7 +307,8 @@ void MC_dpor(void) xbt_swag_foreach(process, simix_global->process_list){ if(MC_process_is_enabled(process)){ MC_state_interleave_process(next_state, process); - XBT_DEBUG("Process %lu enabled with simcall %d", process->pid, process->simcall.call); + if(mc_reduce_kind != e_mc_reduce_none) + break; } } @@ -343,26 +327,83 @@ void MC_dpor(void) } xbt_fifo_unshift(mc_stack_safety, next_state); - MC_UNSET_RAW_MEM; - xbt_free(req_str); + /* Insert in dict all enabled processes, if not included yet */ + xbt_swag_foreach(process, simix_global->process_list){ + if(MC_process_is_enabled(process)){ + char *key = bprintf("%lu", process->pid); + if(xbt_dict_get_or_null(first_enabled_state, key) == NULL){ + char *data = bprintf("%d", xbt_fifo_size(mc_stack_safety)); + xbt_dict_set(first_enabled_state, key, data, NULL); + } + xbt_free(key); + } + } + + if(dot_output != NULL) + xbt_free(req_str); + + MC_UNSET_RAW_MEM; /* Let's loop again */ /* The interleave set is empty or the maximum depth is reached, let's back-track */ } else { + + if((xbt_fifo_size(mc_stack_safety) > _sg_mc_max_depth) || user_max_depth_reached){ - if(xbt_fifo_size(mc_stack_safety) == _sg_mc_max_depth) - XBT_WARN("/!\\ Max depth reached ! /!\\ "); - else - XBT_DEBUG("There are no more processes to interleave."); + if(user_max_depth_reached) + XBT_WARN("User max depth reached !"); + else + XBT_WARN("/!\\ Max depth reached ! /!\\ "); - /* Trash the current state, no longer needed */ - MC_SET_RAW_MEM; - xbt_fifo_shift(mc_stack_safety); - MC_state_delete(state); - MC_UNSET_RAW_MEM; + /* Interleave enabled processes in the state in which they have been enabled for the first time */ + xbt_swag_foreach(process, simix_global->process_list){ + if(MC_process_is_enabled(process)){ + char *key = bprintf("%lu", process->pid); + enabled = (int)strtoul(xbt_dict_get_or_null(first_enabled_state, key), 0, 10); + xbt_free(key); + mc_state_t state_test = NULL; + xbt_fifo_item_t item = NULL; + int cursor = xbt_fifo_size(mc_stack_safety); + xbt_fifo_foreach(mc_stack_safety, item, state_test, mc_state_t){ + if(cursor-- == enabled){ + if(!MC_state_process_is_done(state_test, process)){ + MC_state_interleave_process(state_test, process); + break; + } + } + } + } + } + + if(MC_state_interleave_size(state) > 0){ + max_depth_reached = 1; + }else{ + /* Trash the current state, no longer needed */ + MC_SET_RAW_MEM; + xbt_fifo_shift(mc_stack_safety); + MC_state_delete(state); + MC_UNSET_RAW_MEM; + max_depth_reached = 0; + } + + + }else{ + + XBT_DEBUG("There are no more processes to interleave."); + + /* Trash the current state, no longer needed */ + MC_SET_RAW_MEM; + xbt_fifo_shift(mc_stack_safety); + MC_state_delete(state); + XBT_DEBUG("Delete state %d at depth %d", state->num, xbt_fifo_size(mc_stack_safety) + 1); + MC_UNSET_RAW_MEM; + + max_depth_reached = 0; + } + /* Check for deadlocks */ if(MC_deadlock_check()){ MC_show_deadlock(NULL); @@ -378,38 +419,50 @@ void MC_dpor(void) state that executed that previous request. */ while ((state = xbt_fifo_shift(mc_stack_safety)) != NULL) { - req = MC_state_get_internal_request(state); - xbt_fifo_foreach(mc_stack_safety, item, prev_state, mc_state_t) { - if(MC_request_depend(req, MC_state_get_internal_request(prev_state))){ - if(XBT_LOG_ISENABLED(mc_dpor, xbt_log_priority_debug)){ - XBT_DEBUG("Dependent Transitions:"); - prev_req = MC_state_get_executed_request(prev_state, &value); - req_str = MC_request_to_string(prev_req, value); - XBT_DEBUG("%s (state=%p)", req_str, prev_state); - xbt_free(req_str); - prev_req = MC_state_get_executed_request(state, &value); - req_str = MC_request_to_string(prev_req, value); - XBT_DEBUG("%s (state=%p)", req_str, state); - xbt_free(req_str); - } + if(mc_reduce_kind != e_mc_reduce_none){ + if(((xbt_fifo_size(mc_stack_safety) == _sg_mc_max_depth) && max_depth_reached) || user_max_depth_reached){ + req = MC_state_get_request(state, &value); + MC_state_set_executed_request(state, req, value); + user_max_depth_reached = 0; + } + req = MC_state_get_internal_request(state); + xbt_fifo_foreach(mc_stack_safety, item, prev_state, mc_state_t) { + if(MC_request_depend(req, MC_state_get_internal_request(prev_state))){ + if(XBT_LOG_ISENABLED(mc_dpor, xbt_log_priority_debug)){ + XBT_DEBUG("Dependent Transitions:"); + prev_req = MC_state_get_executed_request(prev_state, &value); + req_str = MC_request_to_string(prev_req, value); + XBT_DEBUG("%s (state=%d)", req_str, prev_state->num); + xbt_free(req_str); + prev_req = MC_state_get_executed_request(state, &value); + req_str = MC_request_to_string(prev_req, value); + XBT_DEBUG("%s (state=%d)", req_str, state->num); + xbt_free(req_str); + } - break; + if(!MC_state_process_is_done(prev_state, req->issuer)) + MC_state_interleave_process(prev_state, req->issuer); + else + XBT_DEBUG("Process %p is in done set", req->issuer); - }else if(req->issuer == MC_state_get_internal_request(prev_state)->issuer){ + break; - XBT_DEBUG("Simcall %d and %d with same issuer", req->call, MC_state_get_internal_request(prev_state)->call); - break; + }else if(req->issuer == MC_state_get_internal_request(prev_state)->issuer){ - }else{ + XBT_DEBUG("Simcall %d and %d with same issuer", req->call, MC_state_get_internal_request(prev_state)->call); + break; - MC_state_remove_interleave_process(prev_state, req->issuer); - XBT_DEBUG("Simcall %d in process %lu independant with simcall %d process %lu", req->call, req->issuer->pid, MC_state_get_internal_request(prev_state)->call, MC_state_get_internal_request(prev_state)->issuer->pid); + }else{ + + XBT_DEBUG("Simcall %d, process %lu (state %d) and simcall %d, process %lu (state %d) are independant", req->call, req->issuer->pid, state->num, MC_state_get_internal_request(prev_state)->call, MC_state_get_internal_request(prev_state)->issuer->pid, prev_state->num); + } } } - - if (MC_state_interleave_size(state)) { + + if (MC_state_interleave_size(state) && xbt_fifo_size(mc_stack_safety) < _sg_mc_max_depth) { /* We found a back-tracking point, let's loop */ + XBT_DEBUG("Back-tracking to state %d at depth %d", state->num, xbt_fifo_size(mc_stack_safety) + 1); if(_sg_mc_checkpoint){ if(state->system_state != NULL){ MC_restore_snapshot(state->system_state); @@ -437,9 +490,10 @@ void MC_dpor(void) MC_UNSET_RAW_MEM; MC_replay(mc_stack_safety, -1); } - XBT_DEBUG("Back-tracking to depth %d", xbt_fifo_size(mc_stack_safety)); + XBT_DEBUG("Back-tracking to state %d at depth %d", state->num, xbt_fifo_size(mc_stack_safety)); break; } else { + XBT_DEBUG("Delete state %d at depth %d", state->num, xbt_fifo_size(mc_stack_safety) + 1); MC_state_delete(state); } }