xbt_fifo_unshift(mc_stack, initial_state);
MC_UNSET_RAW_MEM;
- DEBUG0("**************************************************");
- DEBUG0("Initial state");
+ XBT_DEBUG("**************************************************");
+ XBT_DEBUG("Initial state");
/* Wait for requests (schedules processes) */
MC_wait_for_requests();
MC_SET_RAW_MEM;
/* Get an enabled process and insert it in the interleave set of the initial state */
xbt_swag_foreach(process, simix_global->process_list){
- if(SIMIX_process_is_enabled(process)){
- xbt_setset_set_insert(initial_state->interleave, process);
+ if(MC_process_is_enabled(process)){
+ MC_state_interleave_process(initial_state, process);
break;
}
}
void MC_dpor(void)
{
char *req_str;
- smx_req_t req = NULL;
+ int value;
+ smx_req_t req = NULL, prev_req = NULL;
mc_state_t state = NULL, prev_state = NULL, next_state = NULL;
smx_process_t process = NULL;
xbt_fifo_item_t item = NULL;
while (xbt_fifo_size(mc_stack) > 0) {
- DEBUG0("**************************************************");
-
/* Get current state */
state = (mc_state_t)
xbt_fifo_get_item_content(xbt_fifo_get_first_item(mc_stack));
- /* If there are processes to interleave and the maximun depth has not been reached
+ XBT_DEBUG("**************************************************");
+ XBT_DEBUG("Exploration depth=%d (state=%p)(%u interleave)",
+ xbt_fifo_size(mc_stack), state,
+ MC_state_interleave_size(state));
+
+ /* 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_setset_set_size(state->interleave) > 0
- && xbt_fifo_size(mc_stack) < MAX_DEPTH) {
+ if (xbt_fifo_size(mc_stack) < MAX_DEPTH &&
+ (req = MC_state_get_request(state, &value))) {
- DEBUG3("Exploration detph=%d (state=%p)(%d interleave)",
- xbt_fifo_size(mc_stack), state,
- xbt_setset_set_size(state->interleave));
+ /* Debug information */
+ if(XBT_LOG_ISENABLED(mc_dpor, xbt_log_priority_debug)){
+ req_str = MC_request_to_string(req, value);
+ XBT_DEBUG("Execute: %s", req_str);
+ xbt_free(req_str);
+ }
- /* Update statistics */
- mc_stats->visited_states++;
+ MC_state_set_executed_request(state, req, value);
mc_stats->executed_transitions++;
+ /* Answer the request */
+ SIMIX_request_pre(req, value); /* After this call req is no longer usefull */
+
+ /* Wait for requests (schedules processes) */
+ MC_wait_for_requests();
+
+ /* Create the new expanded state */
MC_SET_RAW_MEM;
- /* Choose a request to execute from the the current state */
- req = MC_state_get_request(state);
+ next_state = MC_state_new();
+ xbt_fifo_unshift(mc_stack, next_state);
+
+ /* 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);
+ break;
+ }
+ }
MC_UNSET_RAW_MEM;
- if(req){
- /* Answer the request */
- /* Debug information */
- if(XBT_LOG_ISENABLED(mc_dpor, xbt_log_priority_debug)){
- req_str = MC_request_to_string(req);
- DEBUG1("Execute: %s", req_str);
- xbt_free(req_str);
+ /* FIXME: Update Statistics
+ mc_stats->state_size +=
+ xbt_setset_set_size(next_state->enabled_transitions);*/
+
+ /* Let's loop again */
+
+ /* The interleave set is empty or the maximum depth is reached, let's back-track */
+ } 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);
+ MC_state_delete(state);
+ MC_UNSET_RAW_MEM;
+
+ /* Check for deadlocks */
+ if(MC_deadlock_check()){
+ MC_show_deadlock(NULL);
+ return;
+ }
+
+ MC_SET_RAW_MEM;
+ /* Traverse the stack backwards until a state with a non empty interleave
+ set is found, deleting all the states that have it empty in the way.
+ For each deleted state, check if the request that has generated it
+ (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)) != NULL) {
+ req = MC_state_get_internal_request(state);
+ xbt_fifo_foreach(mc_stack, 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);
+
+ break;
+ }
}
+ if (MC_state_interleave_size(state)) {
+ /* We found a back-tracking point, let's loop */
+ xbt_fifo_unshift(mc_stack, state);
+ XBT_DEBUG("Back-tracking to depth %d", xbt_fifo_size(mc_stack));
+ MC_UNSET_RAW_MEM;
+ MC_replay(mc_stack);
+ break;
+ } else {
+ MC_state_delete(state);
+ }
+ }
+ MC_UNSET_RAW_MEM;
+ }
+ }
+ MC_UNSET_RAW_MEM;
+ return;
+}
+
+
+/********************* DPOR without replay *********************/
+
+mc_state_ws_t new_state_ws(mc_snapshot_t s, mc_state_t gs){
+ mc_state_ws_t sws = NULL;
+ sws = xbt_new0(s_mc_state_ws_t, 1);
+ sws->system_state = s;
+ sws->graph_state = gs;
+ return sws;
+}
+
+void MC_dpor_with_restore_snapshot_init(){
+
+ XBT_DEBUG("**************************************************");
+ XBT_DEBUG("DPOR (with restore snapshot) init");
+ XBT_DEBUG("**************************************************");
+
+ mc_state_t initial_graph_state;
+ smx_process_t process;
+ mc_snapshot_t initial_system_snapshot;
+ mc_state_ws_t initial_state ;
+
+ MC_wait_for_requests();
- SIMIX_request_pre(req);
+ MC_SET_RAW_MEM;
+
+ initial_system_snapshot = xbt_new0(s_mc_snapshot_t, 1);
+
+ initial_graph_state = MC_state_new();
+ xbt_swag_foreach(process, simix_global->process_list){
+ if(MC_process_is_enabled(process)){
+ MC_state_interleave_process(initial_graph_state, process);
+ break;
+ }
+ }
+
+ MC_take_snapshot(initial_system_snapshot);
+
+ initial_state = new_state_ws(initial_system_snapshot, initial_graph_state);
+ xbt_fifo_unshift(mc_snapshot_stack, initial_state);
+
+ MC_UNSET_RAW_MEM;
+
+ MC_dpor_with_restore_snapshot();
+
+}
+
+void MC_dpor_with_restore_snapshot(){
+
+ smx_process_t process = NULL;
+
+ if(xbt_fifo_size(mc_snapshot_stack) == 0)
+ return;
+
+ int value;
+ mc_state_t next_graph_state = NULL;
+ smx_req_t req = NULL, prev_req = NULL;
+ char *req_str;
+ xbt_fifo_item_t item = NULL;
+
+ mc_snapshot_t next_snapshot;
+ mc_state_ws_t current_state;
+ mc_state_ws_t prev_state;
+ mc_state_ws_t next_state;
+
+ while(xbt_fifo_size(mc_snapshot_stack) > 0){
+
+ current_state = (mc_state_ws_t)xbt_fifo_get_item_content(xbt_fifo_get_first_item(mc_snapshot_stack));
+
+
+ XBT_DEBUG("**************************************************");
+ XBT_DEBUG("Depth : %d, State : %p , %u interleave", xbt_fifo_size(mc_snapshot_stack),current_state, MC_state_interleave_size(current_state->graph_state));
+
+
+ if((xbt_fifo_size(mc_snapshot_stack) < MAX_DEPTH) && (req = MC_state_get_request(current_state->graph_state, &value))){
+
+ /* Debug information */
+ if(XBT_LOG_ISENABLED(mc_dpor, xbt_log_priority_debug)){
+ req_str = MC_request_to_string(req, value);
+ XBT_DEBUG("Execute: %s", req_str);
+ xbt_free(req_str);
+ }
+
+ MC_state_set_executed_request(current_state->graph_state, req, value);
+
+ /* Answer the request */
+ SIMIX_request_pre(req, value);
+
+ /* Wait for requests (schedules processes) */
+ MC_wait_for_requests();
+
+ /* Create the new expanded graph_state */
+ MC_SET_RAW_MEM;
+
+ next_graph_state = MC_state_new();
+
+ /* Get an enabled process and insert it in the interleave set of the next graph_state */
+ xbt_swag_foreach(process, simix_global->process_list){
+ if(MC_process_is_enabled(process)){
+ MC_state_interleave_process(next_graph_state, process);
+ break;
+ }
+ }
+
+ next_snapshot = xbt_new0(s_mc_snapshot_t, 1);
+ MC_take_snapshot(next_snapshot);
+
+ next_state = new_state_ws(next_snapshot, next_graph_state);
+ xbt_fifo_unshift(mc_snapshot_stack, next_state);
+
+ MC_UNSET_RAW_MEM;
+
+ }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_snapshot_stack);
+ MC_UNSET_RAW_MEM;
- MC_state_set_executed_request(state, req);
-
- /* Wait for requests (schedules processes) */
- MC_wait_for_requests();
+ while((current_state = xbt_fifo_shift(mc_snapshot_stack)) != NULL){
+ req = MC_state_get_internal_request(current_state->graph_state);
+ xbt_fifo_foreach(mc_snapshot_stack, item, prev_state, mc_state_ws_t) {
+ if(MC_request_depend(req, MC_state_get_internal_request(prev_state->graph_state))){
+ if(XBT_LOG_ISENABLED(mc_dpor, xbt_log_priority_debug)){
+ XBT_DEBUG("Dependent Transitions:");
+ prev_req = MC_state_get_executed_request(prev_state->graph_state, &value);
+ req_str = MC_request_to_string(prev_req, value);
+ XBT_DEBUG("%s (state=%p)", req_str, prev_state->graph_state);
+ xbt_free(req_str);
+ prev_req = MC_state_get_executed_request(current_state->graph_state, &value);
+ req_str = MC_request_to_string(prev_req, value);
+ XBT_DEBUG("%s (state=%p)", req_str, current_state->graph_state);
+ xbt_free(req_str);
+ }
- /* Create the new expanded state */
- MC_SET_RAW_MEM;
- next_state = MC_state_new();
- xbt_fifo_unshift(mc_stack, next_state);
-
+ if(!MC_state_process_is_done(prev_state->graph_state, req->issuer)){
+ MC_state_interleave_process(prev_state->graph_state, req->issuer);
+
+ } else {
+ XBT_DEBUG("Process %p is in done set", req->issuer);
+ }
- /* Get an enabled process and insert it in the interleave set of the next state */
- xbt_swag_foreach(process, simix_global->process_list){
- if(SIMIX_process_is_enabled(process)){
- xbt_setset_set_insert(next_state->interleave, process);
break;
}
}
- MC_UNSET_RAW_MEM;
-
- /* FIXME: Update Statistics
- mc_stats->state_size +=
- xbt_setset_set_size(next_state->enabled_transitions);*/
+
+ if(MC_state_interleave_size(current_state->graph_state)){
+ MC_restore_snapshot(current_state->system_state);
+ xbt_fifo_unshift(mc_snapshot_stack, current_state);
+ XBT_DEBUG("Back-tracking to depth %d", xbt_fifo_size(mc_snapshot_stack));
+ MC_UNSET_RAW_MEM;
+ break;
+ }
}
- /* Let's loop again */
- /* The interleave set is empty or the maximum depth is reached, let's back-track */
- } else {
- DEBUG0("There are no more processes to interleave.");
+ MC_UNSET_RAW_MEM;
- /* Check for deadlocks */
+ }
+ }
+ MC_UNSET_RAW_MEM;
+ return;
+}
+
+
+
+/************ DPOR 2 (invisible and independant transitions) ************/
+
+
+void MC_dpor2_init(xbt_automaton_t a)
+{
+ mc_pair_t initial_pair = NULL;
+ mc_state_t initial_graph_state = NULL;
+ mc_snapshot_t initial_system_state = NULL;
+ xbt_state_t initial_automaton_state = NULL;
+ smx_process_t process;
+
+
+ MC_SET_RAW_MEM;
+ initial_graph_state = MC_state_new();
+ MC_UNSET_RAW_MEM;
+
+ /* Wait for requests (schedules processes) */
+ MC_wait_for_requests();
+
+ MC_SET_RAW_MEM;
+ xbt_swag_foreach(process, simix_global->process_list){
+ if(MC_process_is_enabled(process)){
+ MC_state_interleave_process(initial_graph_state, process);
+ break;
+ }
+ }
+ MC_UNSET_RAW_MEM;
+
+ unsigned int cursor = 0;
+ unsigned int cursor2 = 0;
+ xbt_state_t automaton_state = NULL;
+ int res;
+ xbt_transition_t transition_succ;
+
+ xbt_dynar_foreach(a->states, cursor, automaton_state){
+ if(automaton_state->type == -1){
+ xbt_dynar_foreach(automaton_state->out, cursor2, transition_succ){
+ res = MC_automaton_evaluate_label(a, transition_succ->label);
+ if((res == 1) || (res == 2)){
+ initial_automaton_state = transition_succ->dst;
+ break;
+ }
+ }
+ }
+
+ if(xbt_fifo_size(mc_snapshot_stack) > 0)
+ break;
+ }
+
+ if(xbt_fifo_size(mc_snapshot_stack) == 0){
+ cursor = 0;
+ xbt_dynar_foreach(a->states, cursor, automaton_state){
+ if(automaton_state->type == -1){
+ initial_automaton_state = automaton_state;
+ break;
+ }
+ }
+ }
+
+ MC_SET_RAW_MEM;
+ initial_system_state = xbt_new0(s_mc_snapshot_t, 1);
+ MC_take_snapshot(initial_system_state);
+ initial_pair = new_pair(initial_system_state, initial_graph_state, initial_automaton_state);
+ xbt_fifo_unshift(mc_snapshot_stack, initial_pair);
+ MC_UNSET_RAW_MEM;
+
+ XBT_DEBUG("**************************************************");
+ XBT_DEBUG("Initial pair");
+
+ MC_dpor2(a, 0);
+
+}
+
+
+void MC_dpor2(xbt_automaton_t a, int search_cycle)
+{
+ char *req_str;
+ int value;
+ smx_req_t req = NULL, prev_req = NULL;
+ mc_state_t next_graph_state = NULL;
+ mc_snapshot_t next_system_state = NULL;
+ xbt_state_t next_automaton_state = NULL;
+ xbt_transition_t transition_succ;
+ unsigned int cursor;
+ int res;
+ mc_pair_t pair = NULL, next_pair = NULL, prev_pair = NULL;
+ smx_process_t process = NULL;
+ xbt_fifo_item_t item = NULL;
+
+ while (xbt_fifo_size(mc_snapshot_stack) > 0) {
+
+ /* Get current pair */
+ pair = (mc_pair_t)
+ xbt_fifo_get_item_content(xbt_fifo_get_first_item(mc_snapshot_stack));
+
+ XBT_DEBUG("**************************************************");
+ XBT_DEBUG("Exploration depth=%d (pair=%p)(%u interleave)",
+ xbt_fifo_size(mc_snapshot_stack), pair,
+ MC_state_interleave_size(pair->graph_state));
+
+ /* Update statistics */
+ mc_stats_pair->visited_pairs++;
+
+ /* Test acceptance pair and acceptance cycle*/
+
+ if(pair->automaton_state->type == 1){
+ if(search_cycle == 0){
+ set_pair_reached(pair);
+ XBT_DEBUG("Acceptance pair : graph=%p, automaton=%p(%s)", pair->graph_state, pair->automaton_state, pair->automaton_state->id);
+ }else{
+ if(reached(pair) == 1){
+ XBT_INFO("*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*");
+ XBT_INFO("| ACCEPTANCE CYCLE |");
+ XBT_INFO("*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*");
+ XBT_INFO("Counter-example that violates formula :");
+ MC_show_snapshot_stack(mc_snapshot_stack);
+ MC_dump_snapshot_stack(mc_snapshot_stack);
+ MC_print_statistics_pairs(mc_stats_pair);
+ exit(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_snapshot_stack) < MAX_DEPTH &&
+ (req = MC_state_get_request(pair->graph_state, &value))) {
+
+ /* Debug information */
+ if(XBT_LOG_ISENABLED(mc_dpor, xbt_log_priority_debug)){
+ req_str = MC_request_to_string(req, value);
+ XBT_DEBUG("Execute: %s", req_str);
+ xbt_free(req_str);
+ }
+
+ MC_state_set_executed_request(pair->graph_state, req, value);
+ //mc_stats_pairs->executed_transitions++;
+
+ /* Answer the request */
+ SIMIX_request_pre(req, value); /* After this call req is no longer usefull */
+
+ /* Wait for requests (schedules processes) */
+ MC_wait_for_requests();
+
+ /* Create the new expanded state */
+ MC_SET_RAW_MEM;
+ next_graph_state = MC_state_new();
+
+ /* Get an enabled process and insert it in the interleave set of the next state */
xbt_swag_foreach(process, simix_global->process_list){
- /* FIXME: use REQ_NO_REQ instead of NULL for comparison */
- if(&process->request && !SIMIX_request_is_enabled(&process->request)){
- MC_show_deadlock(&process->request);
- return;
+ if(MC_process_is_enabled(process)){
+ MC_state_interleave_process(next_graph_state, process);
+ break;
}
- }
+ }
- /*
- INFO0("*********************************");
- MC_show_stack(mc_stack); */
+ next_system_state = xbt_new0(s_mc_snapshot_t, 1);
+ MC_take_snapshot(next_system_state);
+ MC_UNSET_RAW_MEM;
+
+ cursor = 0;
+ xbt_dynar_foreach(pair->automaton_state->out, cursor, transition_succ){
+ res = MC_automaton_evaluate_label(a, transition_succ->label);
+ if((res == 1) || (res == 2)){ // enabled transition in automaton
+ next_automaton_state = transition_succ->dst;
+ break;
+ }
+ }
+
+ if(next_automaton_state == NULL){
+ next_automaton_state = pair->automaton_state;
+ }
+
+ MC_SET_RAW_MEM;
+ next_pair = new_pair(next_system_state, next_graph_state, next_automaton_state);
+ xbt_fifo_unshift(mc_snapshot_stack, next_pair);
+ MC_UNSET_RAW_MEM;
+
+ /* Let's loop again */
+
+ /* The interleave set is empty or the maximum depth is reached, let's back-track */
+ } 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);
- MC_state_delete(state);
+ xbt_fifo_shift(mc_snapshot_stack);
+ //MC_state_delete(state);
+ MC_UNSET_RAW_MEM;
+ /* Check for deadlocks */
+ if(MC_deadlock_check()){
+ MC_show_deadlock(NULL);
+ return;
+ }
+
+ MC_SET_RAW_MEM;
/* Traverse the stack backwards until a state with a non empty interleave
set is found, deleting all the states that have it empty in the way.
For each deleted state, check if the request that has generated it
(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)) != NULL) {
- req = MC_state_get_executed_request(state);
- xbt_fifo_foreach(mc_stack, item, prev_state, mc_state_t) {
- if(MC_request_depend(req, MC_state_get_executed_request(prev_state))){
+ while ((pair = xbt_fifo_shift(mc_snapshot_stack)) != NULL) {
+ req = MC_state_get_internal_request(pair->graph_state);
+ xbt_fifo_foreach(mc_snapshot_stack, item, prev_pair, mc_pair_t) {
+ if(MC_request_depend(req, MC_state_get_internal_request(prev_pair->graph_state))){
if(XBT_LOG_ISENABLED(mc_dpor, xbt_log_priority_debug)){
- DEBUG0("Dependent Transitions:");
- req_str = MC_request_to_string(MC_state_get_executed_request(prev_state));
- DEBUG1("%s", req_str);
+ XBT_DEBUG("Dependent Transitions:");
+ prev_req = MC_state_get_executed_request(prev_pair->graph_state, &value);
+ req_str = MC_request_to_string(prev_req, value);
+ XBT_DEBUG("%s (pair=%p)", req_str, prev_pair);
xbt_free(req_str);
- req_str = MC_request_to_string(req);
- DEBUG1("%s", req_str);
+ prev_req = MC_state_get_executed_request(pair->graph_state, &value);
+ req_str = MC_request_to_string(prev_req, value);
+ XBT_DEBUG("%s (pair=%p)", req_str, pair);
xbt_free(req_str);
}
- xbt_setset_set_insert(prev_state->interleave, req->issuer);
+
+ if(!MC_state_process_is_done(prev_pair->graph_state, req->issuer))
+ MC_state_interleave_process(prev_pair->graph_state, req->issuer);
+ else
+ XBT_DEBUG("Process %p is in done set", req->issuer);
+
break;
}
}
- if (xbt_setset_set_size(state->interleave) > 0) {
+ if (MC_state_interleave_size(pair->graph_state)) {
/* We found a back-tracking point, let's loop */
- xbt_fifo_unshift(mc_stack, state);
- DEBUG1("Back-tracking to depth %d", xbt_fifo_size(mc_stack));
+ MC_restore_snapshot(pair->system_state);
+ xbt_fifo_unshift(mc_snapshot_stack, pair);
+ XBT_DEBUG("Back-tracking to depth %d", xbt_fifo_size(mc_snapshot_stack));
MC_UNSET_RAW_MEM;
- MC_replay(mc_stack);
break;
} else {
- MC_state_delete(state);
+ //MC_state_delete(state);
}
}
MC_UNSET_RAW_MEM;
