-/* Copyright (c) 2008-2013. Da SimGrid Team. All rights reserved. */
+/* Copyright (c) 2008-2013. The 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. */
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;
+ new_state->num = mc_stats->expanded_states;
+ new_state->other_num = -1;
return new_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)
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){
+ if(state_test->other_num == -1)
+ new_state->other_num = state_test->num;
+ else
+ new_state->other_num = state_test->other_num;
+ if(dot_output == NULL)
+ XBT_DEBUG("Next state %d already visited ! (equal to state %d)", new_state->num, state_test->num);
+ else
+ XBT_DEBUG("Next state %d already visited ! (equal to state %d (state %d in dot_output))", new_state->num, state_test->num, new_state->other_num);
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;
+ return new_state->other_num;
}else{
/* Search another state with same number of bytes used in std_heap */
previous_cursor = cursor - 1;
if(bytes_used_test != current_bytes_used)
break;
if(snapshot_compare(new_state->system_state, state_test->system_state) == 0){
+ if(state_test->other_num == -1)
+ new_state->other_num = state_test->num;
+ else
+ new_state->other_num = state_test->other_num;
+ if(dot_output == NULL)
+ XBT_DEBUG("Next state %d already visited ! (equal to state %d)", new_state->num, state_test->num);
+ else
+ XBT_DEBUG("Next state %d already visited ! (equal to state %d (state %d in dot_output))", new_state->num, state_test->num, new_state->other_num);
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);
+ xbt_dynar_insert_at(visited_states, cursor, &new_state);
if(raw_mem_set)
MC_SET_RAW_MEM;
else
MC_UNSET_RAW_MEM;
- return state_test->num;
+ return new_state->other_num;
}
previous_cursor--;
}
if(bytes_used_test != current_bytes_used)
break;
if(snapshot_compare(new_state->system_state, state_test->system_state) == 0){
+ if(state_test->other_num == -1)
+ new_state->other_num = state_test->num;
+ else
+ new_state->other_num = state_test->other_num;
+ if(dot_output == NULL)
+ XBT_DEBUG("Next state %d already visited ! (equal to state %d)", new_state->num, state_test->num);
+ else
+ XBT_DEBUG("Next state %d already visited ! (equal to state %d (state %d in dot_output))", new_state->num, state_test->num, new_state->other_num);
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;
+ return new_state->other_num;
}
next_cursor++;
}
void MC_dpor(void)
{
- char *req_str;
- int value, value2;
- smx_simcall_t req = NULL, prev_req = NULL, req2 = NULL;
- s_smx_simcall_t req3;
+ char *req_str = NULL;
+ 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;
- int visited_state;
+ int visited_state = -1;
+ int enabled = 0;
while (xbt_fifo_size(mc_stack_safety) > 0) {
xbt_fifo_get_item_content(xbt_fifo_get_first_item(mc_stack_safety));
XBT_DEBUG("**************************************************");
- XBT_DEBUG("Exploration depth=%d (state=%p)(%u interleave)",
- xbt_fifo_size(mc_stack_safety), state,
- MC_state_interleave_size(state));
-
+ XBT_DEBUG("Exploration depth=%d (state=%p, num %d)(%u interleave, user_max_depth %d)",
+ xbt_fifo_size(mc_stack_safety), state, state->num,
+ MC_state_interleave_size(state), user_max_depth_reached);
+
/* Update statistics */
mc_stats->visited_states++;
/* 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 &&
- (req = MC_state_get_request(state, &value))) {
+ if (xbt_fifo_size(mc_stack_safety) <= _sg_mc_max_depth && !user_max_depth_reached &&
+ (req = MC_state_get_request(state, &value)) && visited_state == -1) {
/* Debug information */
if(XBT_LOG_ISENABLED(mc_dpor, xbt_log_priority_debug)){
XBT_DEBUG("Execute: %s", req_str);
xbt_free(req_str);
}
-
- req_str = MC_request_get_dot_output(req, value);
+
+ MC_SET_RAW_MEM;
+ if(dot_output != NULL)
+ req_str = MC_request_get_dot_output(req, value);
+ MC_UNSET_RAW_MEM;
MC_state_set_executed_request(state, req, value);
mc_stats->executed_transitions++;
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 */
xbt_free(key);
}
}
+
+ if(dot_output != NULL)
+ xbt_free(req_str);
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 */
} else {
- if(xbt_fifo_size(mc_stack_safety) == _sg_mc_max_depth)
- XBT_WARN("/!\\ Max depth reached ! /!\\ ");
- else
- XBT_DEBUG("There are no more processes to interleave.");
+ if((xbt_fifo_size(mc_stack_safety) > _sg_mc_max_depth) || user_max_depth_reached || visited_state != -1){
+
+ if(user_max_depth_reached && visited_state == -1)
+ XBT_DEBUG("User max depth reached !");
+ else if(visited_state == -1)
+ XBT_WARN("/!\\ Max depth reached ! /!\\ ");
+
+ visited_state = -1;
+
+ /* 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) && state_test->num != state->num){
+ XBT_DEBUG("Interleave process %lu in state %d", process->pid, state_test->num);
+ MC_state_interleave_process(state_test, process);
+ break;
+ }
+ }
+ }
+ }
+ }
+
+ }else{
+
+ XBT_DEBUG("There are no more processes to interleave. (depth %d)", xbt_fifo_size(mc_stack_safety) + 1);
+
+ }
/* 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;
-
+ XBT_DEBUG("Delete state %d at depth %d", state->num, xbt_fifo_size(mc_stack_safety) + 1);
+ MC_UNSET_RAW_MEM;
+
/* Check for deadlocks */
if(MC_deadlock_check()){
MC_show_deadlock(NULL);
while ((state = xbt_fifo_shift(mc_stack_safety)) != NULL) {
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_DEBUG("%s (state=%d)", req_str, prev_state->num);
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_DEBUG("%s (state=%d)", req_str, state->num);
xbt_free(req_str);
}
XBT_DEBUG("Simcall %d and %d with same issuer", req->call, MC_state_get_internal_request(prev_state)->call);
break;
+ }else{
+
+ XBT_DEBUG("Simcall %d, process %lu (state %d) and simcall %d, process %lu (state %d) are independant", req->call, req->issuer->pid, state->num, MC_state_get_internal_request(prev_state)->call, MC_state_get_internal_request(prev_state)->issuer->pid, prev_state->num);
+
}
}
}
- 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 state %d at depth %d", state->num, xbt_fifo_size(mc_stack_safety) + 1);
if(_sg_mc_checkpoint){
if(state->system_state != NULL){
MC_restore_snapshot(state->system_state);
MC_UNSET_RAW_MEM;
MC_replay(mc_stack_safety, -1);
}
- XBT_DEBUG("Back-tracking to depth %d", xbt_fifo_size(mc_stack_safety));
+ XBT_DEBUG("Back-tracking to state %d at depth %d", state->num, xbt_fifo_size(mc_stack_safety));
break;
} else {
+ XBT_DEBUG("Delete state %d at depth %d", state->num, xbt_fifo_size(mc_stack_safety) + 1);
MC_state_delete(state);
}
}
