-/* 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. */
"Logging specific to MC DPOR exploration");
xbt_dynar_t visited_states;
-int nb_visited_states = 0;
+xbt_dict_t first_enabled_state;
-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 dict_data_free(void *d){
+ xbt_free((char *)d);
+}
-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 int is_visited_state(){
+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;
+
+}
- nb_visited_states++;
+/* 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 = nb_visited_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_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->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;
- size_t chunks_used_test;
- int same_chunks_not_found = 1;
+ mc_visited_state_t state_test = NULL;
+ size_t bytes_used_test;
+ int nb_processes_test;
+ int same_processes_and_bytes_not_found = 1;
- while(start <= end && same_chunks_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);
- 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)
+ 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(chunks_used_test > current_chunks_used)
+ if(nb_processes_test > current_nb_processes)
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){
- 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 chunks 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)
- break;
- if(snapshot_compare(new_state->system_state, state_test->system_state, NULL, NULL) == 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;
+ 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);
- 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)
- break;
- if(snapshot_compare(new_state->system_state, state_test->system_state, NULL, NULL) == 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 = 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++;
- }
- }
+ }
+ }
}
}
-
- if(xbt_dynar_length(visited_states) == _sg_mc_visited){
- int min = nb_visited_states;
+
+ 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);
+ 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;
}
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;
}
}
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);
+
+ first_enabled_state = xbt_dict_new_homogeneous(&dict_data_free);
MC_UNSET_RAW_MEM;
xbt_swag_foreach(process, simix_global->process_list){
if(MC_process_is_enabled(process)){
MC_state_interleave_process(initial_state, process);
- XBT_DEBUG("Process %lu enabled with simcall %d", process->pid, process->simcall.call);
+ if(mc_reduce_kind != e_mc_reduce_none)
+ break;
}
}
xbt_fifo_unshift(mc_stack_safety, initial_state);
+ /* To ensure the soundness of DPOR, we have to keep a list of
+ processes which are still enabled at each step of the exploration.
+ If max depth is reached, we interleave them in the state in which they have
+ been enabled for the first time. */
+ xbt_swag_foreach(process, simix_global->process_list){
+ if(MC_process_is_enabled(process)){
+ char *key = bprintf("%lu", process->pid);
+ char *data = bprintf("%d", xbt_fifo_size(mc_stack_safety));
+ xbt_dict_set(first_enabled_state, key, data, NULL);
+ xbt_free(key);
+ }
+ }
+
MC_UNSET_RAW_MEM;
if(raw_mem_set)
{
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 interleave_proc[simix_process_maxpid];
+ int pos;
+ int visited_state;
+ int enabled = 0;
+
while (xbt_fifo_size(mc_stack_safety) > 0) {
/* If there are processes to interleave and the maximum depth has not been reached
then perform one step of the exploration algorithm */
- if (xbt_fifo_size(mc_stack_safety) < _sg_mc_max_depth &&
+ if (xbt_fifo_size(mc_stack_safety) <= _sg_mc_max_depth &&
(req = MC_state_get_request(state, &value))) {
/* Debug information */
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++;
+ MC_SET_RAW_MEM;
+ char *key = bprintf("%lu", req->issuer->pid);
+ xbt_dict_remove(first_enabled_state, key);
+ xbt_free(key);
+ 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){
if(MC_process_is_enabled(process)){
MC_state_interleave_process(next_state, process);
- XBT_DEBUG("Process %lu enabled with simcall %d", process->pid, process->simcall.call);
+ if(mc_reduce_kind != e_mc_reduce_none)
+ break;
}
}
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);
+
+ /* Insert in dict all enabled processes, if not included yet */
+ xbt_swag_foreach(process, simix_global->process_list){
+ if(MC_process_is_enabled(process)){
+ char *key = bprintf("%lu", process->pid);
+ if(xbt_dict_get_or_null(first_enabled_state, key) == NULL){
+ char *data = bprintf("%d", xbt_fifo_size(mc_stack_safety));
+ xbt_dict_set(first_enabled_state, key, data, NULL);
+ }
+ xbt_free(key);
+ }
+ }
+
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 */
state that executed that previous request. */
while ((state = xbt_fifo_shift(mc_stack_safety)) != NULL) {
- req = MC_state_get_internal_request(state);
- xbt_fifo_foreach(mc_stack_safety, item, prev_state, mc_state_t) {
- if(MC_request_depend(req, MC_state_get_internal_request(prev_state))){
- if(XBT_LOG_ISENABLED(mc_dpor, xbt_log_priority_debug)){
- XBT_DEBUG("Dependent Transitions:");
- prev_req = MC_state_get_executed_request(prev_state, &value);
- req_str = MC_request_to_string(prev_req, value);
- XBT_DEBUG("%s (state=%p)", req_str, prev_state);
- xbt_free(req_str);
- prev_req = MC_state_get_executed_request(state, &value);
- req_str = MC_request_to_string(prev_req, value);
- XBT_DEBUG("%s (state=%p)", req_str, state);
- xbt_free(req_str);
+ if(mc_reduce_kind != e_mc_reduce_none){
+ req = MC_state_get_internal_request(state);
+ /* If max_depth reached, check only for the last state if the request that has generated
+ it, depends on any other processes still enabled when max_depth reached */
+ if(xbt_fifo_size(mc_stack_safety) == _sg_mc_max_depth - 1){
+ req3 = *req;
+ xbt_swag_foreach(process, simix_global->process_list){
+ if(MC_process_is_enabled(process) && !MC_state_process_is_done(state, process)){
+ MC_state_interleave_process(state, process);
+ req2 = MC_state_get_request(state, &value2);
+ MC_state_set_executed_request(state, req2, value2);
+ req2 = MC_state_get_internal_request(state);
+ if(MC_request_depend(&req3, req2)){
+ if(XBT_LOG_ISENABLED(mc_dpor, xbt_log_priority_debug)){
+ XBT_DEBUG("Dependent Transitions:");
+ req_str = MC_request_to_string(&req3, value);
+ XBT_DEBUG("%s (state=%p)", req_str, state);
+ xbt_free(req_str);
+ req_str = MC_request_to_string(req2, value);
+ XBT_DEBUG("%s (state=%p)", req_str, state);
+ xbt_free(req_str);
+ }
+ MC_state_interleave_process(state, process);
+ break;
+ }
+ }
}
+ }
+ xbt_fifo_foreach(mc_stack_safety, item, prev_state, mc_state_t) {
+ if(MC_request_depend(req, MC_state_get_internal_request(prev_state))){
+ if(XBT_LOG_ISENABLED(mc_dpor, xbt_log_priority_debug)){
+ XBT_DEBUG("Dependent Transitions:");
+ prev_req = MC_state_get_executed_request(prev_state, &value);
+ req_str = MC_request_to_string(prev_req, value);
+ XBT_DEBUG("%s (state=%p)", req_str, prev_state);
+ xbt_free(req_str);
+ prev_req = MC_state_get_executed_request(state, &value);
+ req_str = MC_request_to_string(prev_req, value);
+ XBT_DEBUG("%s (state=%p)", req_str, state);
+ xbt_free(req_str);
+ }
- break;
-
- }else if(req->issuer == MC_state_get_internal_request(prev_state)->issuer){
+ if(!MC_state_process_is_done(prev_state, req->issuer))
+ MC_state_interleave_process(prev_state, req->issuer);
+ else
+ XBT_DEBUG("Process %p is in done set", req->issuer);
- XBT_DEBUG("Simcall %d and %d with same issuer", req->call, MC_state_get_internal_request(prev_state)->call);
- break;
+ break;
- }else{
+ }else if(req->issuer == MC_state_get_internal_request(prev_state)->issuer){
- MC_state_remove_interleave_process(prev_state, req->issuer);
- XBT_DEBUG("Simcall %d in process %lu independant with simcall %d process %lu", req->call, req->issuer->pid, MC_state_get_internal_request(prev_state)->call, MC_state_get_internal_request(prev_state)->issuer->pid);
+ XBT_DEBUG("Simcall %d and %d with same issuer", req->call, MC_state_get_internal_request(prev_state)->call);
+ break;
+ }
}
}
-
+
if (MC_state_interleave_size(state)) {
/* We found a back-tracking point, let's loop */
if(_sg_mc_checkpoint){
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);
