-/* 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_LOG_NEW_DEFAULT_SUBCATEGORY(mc_dpor, mc,
"Logging specific to MC DPOR exploration");
+xbt_dynar_t visited_states;
+xbt_dict_t first_enabled_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_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 -1;
+
+ int raw_mem_set = (mmalloc_get_current_heap() == raw_heap);
+
+ MC_SET_RAW_MEM;
+ mc_visited_state_t new_state = visited_state_new();
+ MC_UNSET_RAW_MEM;
+
+ if(xbt_dynar_is_empty(visited_states)){
+
+ MC_SET_RAW_MEM;
+ xbt_dynar_push(visited_states, &new_state);
+ MC_UNSET_RAW_MEM;
+
+ if(raw_mem_set)
+ MC_SET_RAW_MEM;
+
+ return -1;
+
+ }else{
+
+ MC_SET_RAW_MEM;
+
+ 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_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_processes_and_bytes_not_found){
+ cursor = (start + end) / 2;
+ 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;
+ }else if(nb_processes_test > current_nb_processes){
+ end = cursor - 1;
+ }else 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--;
+ }
+ 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++;
+ }
+ }
+ }
+ }
+ }
+
+ 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 = 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);
+ }
+
+ MC_UNSET_RAW_MEM;
+
+ if(raw_mem_set)
+ MC_SET_RAW_MEM;
+
+ return -1;
+
+ }
+}
+
/**
* \brief Initialize the DPOR exploration algorithm
*/
/* Create the initial state and push it into the exploration stack */
MC_SET_RAW_MEM;
+
initial_state = MC_state_new();
+ visited_states = xbt_dynar_new(sizeof(mc_visited_state_t), visited_state_free_voidp);
+
+ first_enabled_state = xbt_dict_new_homogeneous(&xbt_free_f);
+
MC_UNSET_RAW_MEM;
XBT_DEBUG("**************************************************");
MC_wait_for_requests();
MC_SET_RAW_MEM;
-
- xbt_swag_foreach(process, simix_global->process_list){
- if(MC_process_is_enabled(process)){
- XBT_DEBUG("Process %lu enabled with simcall : %d", process->pid, (&process->simcall)->call);
- }
- }
-
+
/* Get an enabled process and insert it in the interleave set of the initial state */
xbt_swag_foreach(process, simix_global->process_list){
if(MC_process_is_enabled(process)){
MC_state_interleave_process(initial_state, process);
- break;
+ 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)
else
MC_UNSET_RAW_MEM;
-
- /* FIXME: Update Statistics
- mc_stats->state_size +=
- xbt_setset_set_size(initial_state->enabled_transitions); */
}
smx_process_t process = NULL;
xbt_fifo_item_t item = NULL;
int pos;
+ int visited_state;
+ int enabled = 0, max_depth_reached = 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) < _surf_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);
}
+
+ if(dot_output != NULL)
+ 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;
+
/* Answer the request */
SIMIX_simcall_pre(req, value); /* After this call req is no longer usefull */
next_state = MC_state_new();
- xbt_swag_foreach(process, simix_global->process_list){
- if(MC_process_is_enabled(process)){
- XBT_DEBUG("Process %lu enabled with simcall : %d", process->pid, (&process->simcall)->call);
+ 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);
+ if(mc_reduce_kind != e_mc_reduce_none)
+ break;
+ }
}
+
+ if(_sg_mc_checkpoint && ((xbt_fifo_size(mc_stack_safety) + 1) % _sg_mc_checkpoint == 0)){
+ 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);
+
}
-
- /* Get an enabled process and insert it in the interleave set of the next state */
+
+ 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)){
- MC_state_interleave_process(next_state, process);
- break;
+ 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);
}
}
- if(_surf_mc_checkpoint && ((xbt_fifo_size(mc_stack_safety) + 1) % _surf_mc_checkpoint == 0)){
- next_state->system_state = xbt_new0(s_mc_snapshot_t, 1);
- MC_take_snapshot(next_state->system_state);
- }
-
- xbt_fifo_unshift(mc_stack_safety, next_state);
MC_UNSET_RAW_MEM;
- /* FIXME: Update Statistics
- mc_stats->state_size +=
- xbt_setset_set_size(next_state->enabled_transitions);*/
+ if(dot_output != NULL)
+ xbt_free(req_str);
/* Let's loop again */
/* The interleave set is empty or the maximum depth is reached, let's back-track */
} else {
- if(xbt_fifo_size(mc_stack_safety) == _surf_mc_max_depth){
-
+ if(xbt_fifo_size(mc_stack_safety) > _sg_mc_max_depth){
+
XBT_WARN("/!\\ Max depth reached ! /!\\ ");
- if(req != NULL){
- XBT_WARN("/!\\ But, there are still processes to interleave. Model-checker will not be able to ensure the soundness of the verification from now. /!\\ ");
- XBT_WARN("Notice : the default value of max depth is 1000 but you can change it with cfg=model-check/max_depth:value.");
+
+ /* Interleave enabled processes 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);
+ enabled = (int)strtoul(xbt_dict_get_or_null(first_enabled_state, key), 0, 10);
+ xbt_free(key);
+ mc_state_t state_test = NULL;
+ xbt_fifo_item_t item = NULL;
+ int cursor = xbt_fifo_size(mc_stack_safety);
+ xbt_fifo_foreach(mc_stack_safety, item, state_test, mc_state_t){
+ if(cursor-- == enabled){
+ if(!MC_state_process_is_done(state_test, process)){
+ MC_state_interleave_process(state_test, process);
+ break;
+ }
+ }
+ }
+ }
}
+ if(MC_state_interleave_size(state) > 0){
+ max_depth_reached = 1;
+ }else{
+ /* Trash the current state, no longer needed */
+ MC_SET_RAW_MEM;
+ xbt_fifo_shift(mc_stack_safety);
+ MC_state_delete(state);
+ MC_UNSET_RAW_MEM;
+
+ max_depth_reached = 0;
+ }
+
+
}else{
XBT_DEBUG("There are no more processes to interleave.");
- }
-
- /* Trash the current state, no longer needed */
- MC_SET_RAW_MEM;
- xbt_fifo_shift(mc_stack_safety);
- MC_state_delete(state);
- MC_UNSET_RAW_MEM;
+ /* Trash the current state, no longer needed */
+ MC_SET_RAW_MEM;
+ xbt_fifo_shift(mc_stack_safety);
+ MC_state_delete(state);
+ MC_UNSET_RAW_MEM;
+ max_depth_reached = 0;
+ }
+
/* Check for deadlocks */
if(MC_deadlock_check()){
MC_show_deadlock(NULL);
(from it's predecesor state), depends on any other previous request
executed before it. If it does then add it to the interleave set of the
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){
+ if((xbt_fifo_size(mc_stack_safety) == _sg_mc_max_depth) && max_depth_reached){
+ req = MC_state_get_request(state, &value);
+ MC_state_set_executed_request(state, req, value);
+ }
+ 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_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);
+ 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);
+
+ break;
- break;
+ }else if(req->issuer == MC_state_get_internal_request(prev_state)->issuer){
+
+ 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)) {
+
+ if (MC_state_interleave_size(state) && xbt_fifo_size(mc_stack_safety) < _sg_mc_max_depth) {
/* We found a back-tracking point, let's loop */
- if(_surf_mc_checkpoint){
+ XBT_DEBUG("Back-tracking to depth %d", xbt_fifo_size(mc_stack_safety) + 1);
+ if(_sg_mc_checkpoint){
if(state->system_state != NULL){
MC_restore_snapshot(state->system_state);
xbt_fifo_unshift(mc_stack_safety, state);
- XBT_DEBUG("Back-tracking to depth %d", xbt_fifo_size(mc_stack_safety));
MC_UNSET_RAW_MEM;
}else{
pos = xbt_fifo_size(mc_stack_safety);
}
MC_restore_snapshot(restore_state->system_state);
xbt_fifo_unshift(mc_stack_safety, state);
- XBT_DEBUG("Back-tracking to depth %d", xbt_fifo_size(mc_stack_safety));
MC_UNSET_RAW_MEM;
MC_replay(mc_stack_safety, pos);
}
}else{
xbt_fifo_unshift(mc_stack_safety, state);
- XBT_DEBUG("Back-tracking to depth %d", xbt_fifo_size(mc_stack_safety));
MC_UNSET_RAW_MEM;
MC_replay(mc_stack_safety, -1);
}
+ XBT_DEBUG("Back-tracking to depth %d", xbt_fifo_size(mc_stack_safety));
break;
} else {
+ XBT_DEBUG("Delete state at depth %d",xbt_fifo_size(mc_stack_safety) + 1);
MC_state_delete(state);
}
}
