X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/bdb1638f0b58057107eb87995b2d447e34dc43a0..eed33b5980ef79e3f979b80564fbd5314c47902d:/src/mc/mc_dpor.c diff --git a/src/mc/mc_dpor.c b/src/mc/mc_dpor.c index 9576aada9d..c52988b0ad 100644 --- a/src/mc/mc_dpor.c +++ b/src/mc/mc_dpor.c @@ -9,7 +9,6 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_dpor, mc, "Logging specific to MC DPOR exploration"); xbt_dynar_t visited_states; -int nb_visited_states = 0; static int is_visited_state(void); static void visited_state_free(mc_safety_visited_state_t state); @@ -28,10 +27,8 @@ static void visited_state_free_voidp(void *s){ static int is_visited_state(){ - nb_visited_states++; - if(_sg_mc_visited == 0) - return 0; + return -1; int raw_mem_set = (mmalloc_get_current_heap() == raw_heap); @@ -40,7 +37,7 @@ static int is_visited_state(){ mc_safety_visited_state_t new_state = NULL; new_state = xbt_new0(s_mc_safety_visited_state_t, 1); new_state->system_state = MC_take_snapshot(); - new_state->num = nb_visited_states; + new_state->num = mc_stats->expanded_states; MC_UNSET_RAW_MEM; @@ -52,14 +49,14 @@ static int is_visited_state(){ if(raw_mem_set) MC_SET_RAW_MEM; - - return 0; + + return -1; }else{ MC_SET_RAW_MEM; - size_t current_chunks_used = mmalloc_get_chunks_used((xbt_mheap_t)(new_state->system_state)->regions[get_heap_region_index(new_state->system_state)]->data); + size_t current_bytes_used = new_state->system_state->heap_bytes_used; unsigned int cursor = 0; int previous_cursor = 0, next_cursor = 0; @@ -67,65 +64,82 @@ static int is_visited_state(){ int end = xbt_dynar_length(visited_states) - 1; mc_safety_visited_state_t state_test = NULL; - size_t chunks_used_test; - int same_chunks_not_found = 1; + size_t bytes_used_test; + int same_bytes_not_found = 1; - while(start <= end && same_chunks_not_found){ + while(start <= end && same_bytes_not_found){ cursor = (start + end) / 2; state_test = (mc_safety_visited_state_t)xbt_dynar_get_as(visited_states, cursor, mc_safety_visited_state_t); - chunks_used_test = mmalloc_get_chunks_used((xbt_mheap_t)(state_test->system_state)->regions[get_heap_region_index(state_test->system_state)]->data); - if(chunks_used_test < current_chunks_used) + bytes_used_test = state_test->system_state->heap_bytes_used; + if(bytes_used_test < current_bytes_used) start = cursor + 1; - if(chunks_used_test > current_chunks_used) + if(bytes_used_test > current_bytes_used) end = cursor - 1; - if(chunks_used_test == current_chunks_used){ - same_chunks_not_found = 0; - if(snapshot_compare(new_state->system_state, state_test->system_state, NULL, NULL) == 0){ + if(bytes_used_test == current_bytes_used){ + same_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; else MC_UNSET_RAW_MEM; - return 1; + return state_test->num; }else{ - /* Search another state with same number of chunks used */ + /* Search another state with same number of bytes used */ previous_cursor = cursor - 1; while(previous_cursor >= 0){ state_test = (mc_safety_visited_state_t)xbt_dynar_get_as(visited_states, previous_cursor, mc_safety_visited_state_t); - chunks_used_test = mmalloc_get_chunks_used((xbt_mheap_t)(state_test->system_state)->regions[get_heap_region_index(state_test->system_state)]->data); - if(chunks_used_test != current_chunks_used) + bytes_used_test = state_test->system_state->heap_bytes_used; + if(bytes_used_test != current_bytes_used) break; - if(snapshot_compare(new_state->system_state, state_test->system_state, NULL, NULL) == 0){ + 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; else MC_UNSET_RAW_MEM; - return 1; + return state_test->num; } previous_cursor--; } next_cursor = cursor + 1; while(next_cursor < xbt_dynar_length(visited_states)){ state_test = (mc_safety_visited_state_t)xbt_dynar_get_as(visited_states, next_cursor, mc_safety_visited_state_t); - chunks_used_test = mmalloc_get_chunks_used((xbt_mheap_t)(state_test->system_state)->regions[get_heap_region_index(state_test->system_state)]->data); - if(chunks_used_test != current_chunks_used) + bytes_used_test = state_test->system_state->heap_bytes_used; + if(bytes_used_test != current_bytes_used) break; - if(snapshot_compare(new_state->system_state, state_test->system_state, NULL, NULL) == 0){ + 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; else MC_UNSET_RAW_MEM; - return 1; + return state_test->num; } next_cursor++; } } } } - - if(xbt_dynar_length(visited_states) == _sg_mc_visited){ - int min = nb_visited_states; + + state_test = (mc_safety_visited_state_t)xbt_dynar_get_as(visited_states, cursor, mc_safety_visited_state_t); + bytes_used_test = state_test->system_state->heap_bytes_used; + + if(bytes_used_test < current_bytes_used) + xbt_dynar_insert_at(visited_states, cursor + 1, &new_state); + else + xbt_dynar_insert_at(visited_states, cursor, &new_state); + + if(xbt_dynar_length(visited_states) > _sg_mc_visited){ + int min = mc_stats->expanded_states; unsigned int cursor2 = 0; - unsigned int index; + unsigned int index = 0; xbt_dynar_foreach(visited_states, cursor2, state_test){ if(state_test->num < min){ index = cursor2; @@ -134,21 +148,13 @@ static int is_visited_state(){ } xbt_dynar_remove_at(visited_states, index, NULL); } - - if(cursor > 0) - cursor--; - - if(chunks_used_test < current_chunks_used) - xbt_dynar_insert_at(visited_states, cursor + 1, &new_state); - else - xbt_dynar_insert_at(visited_states, cursor, &new_state); MC_UNSET_RAW_MEM; if(raw_mem_set) MC_SET_RAW_MEM; - return 0; + return -1; } } @@ -208,14 +214,15 @@ void MC_dpor(void) { char *req_str; - int value; - smx_simcall_t req = NULL, prev_req = NULL; - s_smx_simcall_t req2; + int value, value2; + smx_simcall_t req = NULL, prev_req = NULL, req2 = NULL; + s_smx_simcall_t req3; 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; + int pos, i, interleave_size; int interleave_proc[simix_process_maxpid]; + int visited_state; while (xbt_fifo_size(mc_stack_safety) > 0) { @@ -242,10 +249,44 @@ void MC_dpor(void) XBT_DEBUG("Execute: %s", req_str); xbt_free(req_str); } + + req_str = MC_request_get_dot_output(req, value); 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); + /* Answer the request */ SIMIX_simcall_pre(req, value); /* After this call req is no longer usefull */ @@ -257,7 +298,7 @@ void MC_dpor(void) next_state = MC_state_new(); - if(!is_visited_state()){ + if((visited_state = is_visited_state()) == -1){ /* Get an enabled process and insert it in the interleave set of the next state */ xbt_swag_foreach(process, simix_global->process_list){ @@ -271,15 +312,23 @@ void MC_dpor(void) next_state->system_state = MC_take_snapshot(); } + if(dot_output != NULL) + fprintf(dot_output, "\"%d\" -> \"%d\" [%s];\n", state->num, next_state->num, req_str); + }else{ - XBT_DEBUG("State already visited !"); - + if(dot_output != NULL) + fprintf(dot_output, "\"%d\" -> \"%d\" [%s];\n", state->num, visited_state, req_str); + } + + xbt_fifo_unshift(mc_stack_safety, next_state); MC_UNSET_RAW_MEM; + xbt_free(req_str); + /* Let's loop again */ /* The interleave set is empty or the maximum depth is reached, let's back-track */ @@ -370,33 +419,7 @@ void MC_dpor(void) MC_UNSET_RAW_MEM; MC_replay(mc_stack_safety, -1); } - - MC_SET_RAW_MEM; - req2 = *req; - 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", req2.call, req2.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); - } XBT_DEBUG("Back-tracking to depth %d", xbt_fifo_size(mc_stack_safety)); - MC_UNSET_RAW_MEM; break; } else { MC_state_delete(state);