/* 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. */
-#include "private.h"
+#include "mc_private.h"
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_dpor, mc,
"Logging specific to MC DPOR exploration");
/* Create the initial state and push it into the exploration stack */
MC_SET_RAW_MEM;
initial_state = MC_state_new();
- xbt_fifo_unshift(mc_stack, initial_state);
+ xbt_fifo_unshift(mc_stack_safety_stateless, initial_state);
MC_UNSET_RAW_MEM;
XBT_DEBUG("**************************************************");
{
char *req_str;
int value;
- smx_req_t req = NULL, prev_req = NULL;
+ smx_simcall_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) {
+ while (xbt_fifo_size(mc_stack_safety_stateless) > 0) {
/* Get current state */
state = (mc_state_t)
- xbt_fifo_get_item_content(xbt_fifo_get_first_item(mc_stack));
+ xbt_fifo_get_item_content(xbt_fifo_get_first_item(mc_stack_safety_stateless));
XBT_DEBUG("**************************************************");
XBT_DEBUG("Exploration depth=%d (state=%p)(%u interleave)",
- xbt_fifo_size(mc_stack), state,
+ xbt_fifo_size(mc_stack_safety_stateless), state,
MC_state_interleave_size(state));
/* Update statistics */
/* 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) < MAX_DEPTH &&
+ if (xbt_fifo_size(mc_stack_safety_stateless) < MAX_DEPTH &&
(req = MC_state_get_request(state, &value))) {
/* Debug information */
mc_stats->executed_transitions++;
/* Answer the request */
- SIMIX_request_pre(req, value); /* After this call req is no longer usefull */
+ SIMIX_simcall_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_state = MC_state_new();
- xbt_fifo_unshift(mc_stack, next_state);
+ xbt_fifo_unshift(mc_stack_safety_stateless, 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){
/* Trash the current state, no longer needed */
MC_SET_RAW_MEM;
- xbt_fifo_shift(mc_stack);
+ xbt_fifo_shift(mc_stack_safety_stateless);
MC_state_delete(state);
MC_UNSET_RAW_MEM;
(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) {
+ while ((state = xbt_fifo_shift(mc_stack_safety_stateless)) != NULL) {
req = MC_state_get_internal_request(state);
- xbt_fifo_foreach(mc_stack, item, prev_state, mc_state_t) {
+ xbt_fifo_foreach(mc_stack_safety_stateless, 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:");
}
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));
+ xbt_fifo_unshift(mc_stack_safety_stateless, state);
+ XBT_DEBUG("Back-tracking to depth %d", xbt_fifo_size(mc_stack_safety_stateless));
MC_UNSET_RAW_MEM;
- MC_replay(mc_stack);
+ MC_replay(mc_stack_safety_stateless);
break;
} else {
MC_state_delete(state);
}
-/********************* DPOR without replay *********************/
+/********************* DPOR stateful *********************/
mc_state_ws_t new_state_ws(mc_snapshot_t s, mc_state_t gs){
mc_state_ws_t sws = NULL;
return sws;
}
-void MC_dpor_with_restore_snapshot_init(){
+void MC_dpor_stateful_init(){
XBT_DEBUG("**************************************************");
- XBT_DEBUG("DPOR (with restore snapshot) init");
+ XBT_DEBUG("DPOR (stateful) init");
XBT_DEBUG("**************************************************");
mc_state_t initial_graph_state;
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);
+ xbt_fifo_unshift(mc_stack_safety_stateful, initial_state);
MC_UNSET_RAW_MEM;
-
- MC_dpor_with_restore_snapshot();
}
-void MC_dpor_with_restore_snapshot(){
+void MC_dpor_stateful(){
smx_process_t process = NULL;
- if(xbt_fifo_size(mc_snapshot_stack) == 0)
+ if(xbt_fifo_size(mc_stack_safety_stateful) == 0)
return;
int value;
mc_state_t next_graph_state = NULL;
- smx_req_t req = NULL, prev_req = NULL;
+ smx_simcall_t req = NULL, prev_req = NULL;
char *req_str;
xbt_fifo_item_t item = NULL;
mc_state_ws_t prev_state;
mc_state_ws_t next_state;
- while(xbt_fifo_size(mc_snapshot_stack) > 0){
+ while(xbt_fifo_size(mc_stack_safety_stateful) > 0){
- current_state = (mc_state_ws_t)xbt_fifo_get_item_content(xbt_fifo_get_first_item(mc_snapshot_stack));
+ current_state = (mc_state_ws_t)xbt_fifo_get_item_content(xbt_fifo_get_first_item(mc_stack_safety_stateful));
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));
-
+ XBT_DEBUG("Depth : %d, State : %p , %u interleave", xbt_fifo_size(mc_stack_safety_stateful),current_state, MC_state_interleave_size(current_state->graph_state));
+
+ mc_stats->visited_states++;
+ if(mc_stats->expanded_states>1100)
+ exit(0);
+ //sleep(1);
- if((xbt_fifo_size(mc_snapshot_stack) < MAX_DEPTH) && (req = MC_state_get_request(current_state->graph_state, &value))){
+ if((xbt_fifo_size(mc_stack_safety_stateful) < 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_INFO("Visited states = %lu",mc_stats->visited_states );
+ XBT_DEBUG("Execute: %s",req_str);
xbt_free(req_str);
}
MC_state_set_executed_request(current_state->graph_state, req, value);
-
+ mc_stats->executed_transitions++;
+
/* Answer the request */
- SIMIX_request_pre(req, value);
+ SIMIX_simcall_pre(req, value);
/* Wait for requests (schedules processes) */
MC_wait_for_requests();
MC_take_snapshot(next_snapshot);
next_state = new_state_ws(next_snapshot, next_graph_state);
- xbt_fifo_unshift(mc_snapshot_stack, next_state);
+ xbt_fifo_unshift(mc_stack_safety_stateful, next_state);
MC_UNSET_RAW_MEM;
/* Trash the current state, no longer needed */
MC_SET_RAW_MEM;
- xbt_fifo_shift(mc_snapshot_stack);
+ xbt_fifo_shift(mc_stack_safety_stateful);
MC_UNSET_RAW_MEM;
- while((current_state = xbt_fifo_shift(mc_snapshot_stack)) != NULL){
+ /* Check for deadlocks */
+ if(MC_deadlock_check()){
+ MC_show_deadlock_stateful(NULL);
+ return;
+ }
+
+ MC_SET_RAW_MEM;
+ while((current_state = xbt_fifo_shift(mc_stack_safety_stateful)) != NULL){
req = MC_state_get_internal_request(current_state->graph_state);
- xbt_fifo_foreach(mc_snapshot_stack, item, prev_state, mc_state_ws_t) {
+ xbt_fifo_foreach(mc_stack_safety_stateful, 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:");
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));
+ xbt_fifo_unshift(mc_stack_safety_stateful, current_state);
+ XBT_DEBUG("Back-tracking to depth %d", xbt_fifo_size(mc_stack_safety_stateful));
MC_UNSET_RAW_MEM;
break;
}
return;
}
+
+
