X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/a7a65bd1066880ac5876add26720aad9634c1e0e..d013cec453ee914baf3c62275ea2042c41e7c270:/src/mc/mc_dpor.c diff --git a/src/mc/mc_dpor.c b/src/mc/mc_dpor.c index 11cc06c7c3..555144c33f 100644 --- a/src/mc/mc_dpor.c +++ b/src/mc/mc_dpor.c @@ -11,6 +11,19 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_dpor, mc, xbt_dynar_t visited_states; static int is_visited_state(void); +static void visited_state_free(mc_safety_visited_state_t state); +static void visited_state_free_voidp(void *s); + +static void visited_state_free(mc_safety_visited_state_t state){ + if(state){ + MC_free_snapshot(state->system_state); + xbt_free(state); + } +} + +static void visited_state_free_voidp(void *s){ + visited_state_free((mc_safety_visited_state_t) * (void **) s); +} static int is_visited_state(){ @@ -21,8 +34,10 @@ static int is_visited_state(){ MC_SET_RAW_MEM; - mc_snapshot_t new_state = NULL; - new_state = MC_take_snapshot(); + 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 = mc_stats->expanded_states; MC_UNSET_RAW_MEM; @@ -34,36 +49,102 @@ static int is_visited_state(){ if(raw_mem_set) MC_SET_RAW_MEM; - + return 0; }else{ MC_SET_RAW_MEM; + size_t current_bytes_used = new_state->system_state->heap_bytes_used; + unsigned int cursor = 0; - mc_snapshot_t state_test = NULL; - - xbt_dynar_foreach(visited_states, cursor, state_test){ - if(XBT_LOG_ISENABLED(mc_dpor, xbt_log_priority_debug)) - XBT_DEBUG("****** Pair visited #%d ******", cursor + 1); - if(snapshot_compare(new_state, state_test, NULL, NULL) == 0){ - if(raw_mem_set) - MC_SET_RAW_MEM; - else - MC_UNSET_RAW_MEM; - - return 1; - } + int previous_cursor = 0, next_cursor = 0; + int start = 0; + int end = xbt_dynar_length(visited_states) - 1; + + mc_safety_visited_state_t state_test = NULL; + size_t bytes_used_test; + int same_bytes_not_found = 1; + + 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); + bytes_used_test = state_test->system_state->heap_bytes_used; + if(bytes_used_test < current_bytes_used) + start = cursor + 1; + if(bytes_used_test > current_bytes_used) + end = cursor - 1; + 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); + if(raw_mem_set) + MC_SET_RAW_MEM; + else + MC_UNSET_RAW_MEM; + return 1; + }else{ + /* 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); + 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) == 0){ + xbt_dynar_remove_at(visited_states, previous_cursor, NULL); + xbt_dynar_insert_at(visited_states, previous_cursor, &new_state); + if(raw_mem_set) + MC_SET_RAW_MEM; + else + MC_UNSET_RAW_MEM; + return 1; + } + 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); + 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) == 0){ + xbt_dynar_remove_at(visited_states, next_cursor, NULL); + xbt_dynar_insert_at(visited_states, next_cursor, &new_state); + if(raw_mem_set) + MC_SET_RAW_MEM; + else + MC_UNSET_RAW_MEM; + return 1; + } + next_cursor++; + } + } + } } - if(xbt_dynar_length(visited_states) == _sg_mc_visited){ - mc_snapshot_t state_to_remove = NULL; - xbt_dynar_shift(visited_states, &state_to_remove); - MC_free_snapshot(state_to_remove); + 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 = 0; + xbt_dynar_foreach(visited_states, cursor2, state_test){ + if(state_test->num < min){ + index = cursor2; + min = state_test->num; + } + } + xbt_dynar_remove_at(visited_states, index, NULL); } - - xbt_dynar_push(visited_states, &new_state); MC_UNSET_RAW_MEM; @@ -90,7 +171,7 @@ void MC_dpor_init() MC_SET_RAW_MEM; initial_state = MC_state_new(); - visited_states = xbt_dynar_new(sizeof(mc_snapshot_t), NULL); + visited_states = xbt_dynar_new(sizeof(mc_safety_visited_state_t), visited_state_free_voidp); MC_UNSET_RAW_MEM; @@ -130,13 +211,13 @@ 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]; while (xbt_fifo_size(mc_stack_safety) > 0) { @@ -168,6 +249,38 @@ void MC_dpor(void) 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 */ @@ -292,33 +405,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);