X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/3fe2ef519e92552fc1122e4f4fbaba4b00aea768..2e4d86b368af598e602c4abc229117cc5ba0b387:/src/mc/mc_dpor.c diff --git a/src/mc/mc_dpor.c b/src/mc/mc_dpor.c index aebfaa1d50..de9b988199 100644 --- a/src/mc/mc_dpor.c +++ b/src/mc/mc_dpor.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2008-2012. Da SimGrid Team. All rights reserved. */ +/* Copyright (c) 2008-2013. Da SimGrid Team. All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it * under the terms of the license (GNU LGPL) which comes with this package. */ @@ -11,10 +11,10 @@ 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(mc_visited_state_t state); static void visited_state_free_voidp(void *s); -static void visited_state_free(mc_safety_visited_state_t state){ +static void visited_state_free(mc_visited_state_t state){ if(state){ MC_free_snapshot(state->system_state); xbt_free(state); @@ -22,23 +22,34 @@ static void visited_state_free(mc_safety_visited_state_t state){ } static void visited_state_free_voidp(void *s){ - visited_state_free((mc_safety_visited_state_t) * (void **) s); + visited_state_free((mc_visited_state_t) * (void **) s); } +static mc_visited_state_t visited_state_new(){ + + mc_visited_state_t new_state = NULL; + new_state = xbt_new0(s_mc_visited_state_t, 1); + 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; + + return new_state; + +} + +/* Dichotomic search in visited_states dynar. + * States are ordered by the number of processes then the number of bytes used in std_heap */ + static int is_visited_state(){ if(_sg_mc_visited == 0) - return 0; + return -1; int raw_mem_set = (mmalloc_get_current_heap() == raw_heap); MC_SET_RAW_MEM; - - 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_visited_state_t new_state = visited_state_new(); MC_UNSET_RAW_MEM; if(xbt_dynar_is_empty(visited_states)){ @@ -56,80 +67,89 @@ static int is_visited_state(){ MC_SET_RAW_MEM; - size_t current_bytes_used = new_state->system_state->heap_bytes_used; + size_t current_bytes_used = new_state->heap_bytes_used; + int current_nb_processes = new_state->nb_processes; unsigned int cursor = 0; 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; + mc_visited_state_t state_test = NULL; size_t bytes_used_test; - int same_bytes_not_found = 1; + int nb_processes_test; + int same_processes_and_bytes_not_found = 1; - while(start <= end && same_bytes_not_found){ + while(start <= end && same_processes_and_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) + 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) start = cursor + 1; - if(bytes_used_test > current_bytes_used) + if(nb_processes_test > current_nb_processes) 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); - 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 state_test->num; - }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); - 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 state_test->num; + if(nb_processes_test == current_nb_processes){ + 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_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; + else + MC_UNSET_RAW_MEM; + return state_test->num; + }else{ + /* Search another state with same number of bytes used in std_heap */ + previous_cursor = cursor - 1; + while(previous_cursor >= 0){ + state_test = (mc_visited_state_t)xbt_dynar_get_as(visited_states, previous_cursor, mc_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); + 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 state_test->num; + } + previous_cursor--; } - 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); - 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 state_test->num; + next_cursor = cursor + 1; + while(next_cursor < xbt_dynar_length(visited_states)){ + state_test = (mc_visited_state_t)xbt_dynar_get_as(visited_states, next_cursor, mc_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); + 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 state_test->num; + } + next_cursor++; } - next_cursor++; - } - } + } + } } } - 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; + 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; if(bytes_used_test < current_bytes_used) xbt_dynar_insert_at(visited_states, cursor + 1, &new_state); @@ -174,7 +194,7 @@ void MC_dpor_init() MC_SET_RAW_MEM; initial_state = MC_state_new(); - visited_states = xbt_dynar_new(sizeof(mc_safety_visited_state_t), visited_state_free_voidp); + visited_states = xbt_dynar_new(sizeof(mc_visited_state_t), visited_state_free_voidp); MC_UNSET_RAW_MEM; @@ -249,6 +269,8 @@ 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++; @@ -310,11 +332,21 @@ 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{ + + 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 */