"Logging specific to MC DPOR exploration");
xbt_dynar_t visited_states;
-
-static int is_visited_state(void);
-static void visited_state_free(mc_visited_state_t state);
-static void visited_state_free_voidp(void *s);
+xbt_dict_t first_enabled_state;
static void visited_state_free(mc_visited_state_t state){
if(state){
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)
+ if(nb_processes_test < current_nb_processes){
start = cursor + 1;
- if(nb_processes_test > current_nb_processes)
- end = cursor - 1;
- if(nb_processes_test == current_nb_processes){
+ }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)
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("**************************************************");
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, value2;
- smx_simcall_t req = NULL, prev_req = NULL, req2 = NULL;
- s_smx_simcall_t req3;
+ int value;
+ smx_simcall_t req = NULL, prev_req = NULL;
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, interleave_size;
- int interleave_proc[simix_process_maxpid];
+ 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) < _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_free(req_str);
}
- req_str = MC_request_get_dot_output(req, value);
+ 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++;
- 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);
+ 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 */
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;
}
}
}
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);
+ 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) == _sg_mc_max_depth)
+ if(xbt_fifo_size(mc_stack_safety) > _sg_mc_max_depth){
+
XBT_WARN("/!\\ Max depth reached ! /!\\ ");
- else
+
+ /* 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);
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);
- }
-
- break;
+ 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);
+ }
- }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)) {
+
+ 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 */
+ 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_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);
}
}
