static int is_visited_state(){
if(_sg_mc_visited == 0)
- return 0;
+ return -1;
int raw_mem_set = (mmalloc_get_current_heap() == raw_heap);
if(raw_mem_set)
MC_SET_RAW_MEM;
-
- return 0;
+
+ return -1;
}else{
MC_SET_RAW_MEM;
- size_t current_chunks_used = new_state->system_state->heap_chunks_used;
+ size_t current_bytes_used = new_state->system_state->heap_bytes_used;
unsigned int cursor = 0;
int previous_cursor = 0, next_cursor = 0;
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 = state_test->system_state->heap_chunks_used;
- 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(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 = state_test->system_state->heap_chunks_used;
- 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) == 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 = state_test->system_state->heap_chunks_used;
- 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) == 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++;
}
}
state_test = (mc_safety_visited_state_t)xbt_dynar_get_as(visited_states, cursor, mc_safety_visited_state_t);
- chunks_used_test = state_test->system_state->heap_chunks_used;
+ bytes_used_test = state_test->system_state->heap_bytes_used;
- if(chunks_used_test < current_chunks_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(raw_mem_set)
MC_SET_RAW_MEM;
- return 0;
+ return -1;
}
}
{
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) {
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; i<simix_process_maxpid; i++)
+ interleave_proc[i] = 0;
+ i=0;
+ interleave_size = MC_state_interleave_size(state);
+ while(i < interleave_size){
+ i++;
+ prev_req = MC_state_get_request(state, &value2);
+ if(prev_req != NULL){
+ MC_state_set_executed_request(state, prev_req, value2);
+ prev_req = MC_state_get_internal_request(state);
+ if(MC_request_depend(&req3, prev_req)){
+ XBT_DEBUG("Simcall %d in process %lu dependant with simcall %d in process %lu", req3.call, req3.issuer->pid, 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 */
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{
- 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 */
MC_UNSET_RAW_MEM;
MC_replay(mc_stack_safety, -1);
}
-
- MC_SET_RAW_MEM;
- req2 = *req;
- for(i=0; i<simix_process_maxpid; i++)
- interleave_proc[i] = 0;
- i=0;
- while((i < MC_state_interleave_size(state))){
- i++;
- prev_req = MC_state_get_request(state, &value);
- if(prev_req != NULL){
- MC_state_set_executed_request(state, prev_req, value);
- prev_req = MC_state_get_internal_request(state);
- if(MC_request_depend(&req2, prev_req)){
- XBT_DEBUG("Simcall %d in process %lu dependant with simcall %d in process %lu", req2.call, req2.issuer->pid, 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);
