-/* 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. */
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);
}
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)){
if(raw_mem_set)
MC_SET_RAW_MEM;
- return 0;
+ return -1;
}else{
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 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);
- 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;
+ 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 1;
+ 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);
if(raw_mem_set)
MC_SET_RAW_MEM;
- return 0;
+ return -1;
}
}
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;
xbt_fifo_item_t item = NULL;
int pos, i, interleave_size;
int interleave_proc[simix_process_maxpid];
+ int visited_state;
while (xbt_fifo_size(mc_stack_safety) > 0) {
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++;
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){
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 */
