#include "../simix/smx_private.h"
#include "xbt/fifo.h"
#include "mc_private.h"
+#include "xbt/automaton/automaton_create.h"
XBT_LOG_NEW_CATEGORY(mc, "All MC categories");
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_global, mc,
mc_snapshot_t initial_snapshot_liveness = NULL;
xbt_automaton_t automaton;
-char *prog_name;
-static void MC_init_liveness(xbt_automaton_t a, char *prgm);
+static void MC_init_liveness(xbt_automaton_t a);
static void MC_assert_pair(int prop);
void MC_init_safety_stateful(void){
- /* Check if MC is already initialized */
+ /* Check if MC is already initialized */
if (initial_snapshot)
return;
}
-static void MC_init_liveness(xbt_automaton_t a, char *prgm){
+static void MC_init_liveness(xbt_automaton_t a){
XBT_DEBUG("Start init mc");
XBT_DEBUG("Creating stack");
- /* Create exploration stack */
+ /* Create exploration stack */
mc_stack_liveness = xbt_fifo_new();
MC_UNSET_RAW_MEM;
automaton = a;
- prog_name = strdup(prgm);
MC_ddfs_init();
}
-void MC_modelcheck_liveness(xbt_automaton_t a, char *prgm){
- MC_init_liveness(a, prgm);
+void MC_modelcheck_liveness(xbt_automaton_t a){
+ MC_init_liveness(a);
MC_exit_liveness();
}
xbt_dynar_foreach(simix_global->process_that_ran, iter, process) {
req = &process->simcall;
if (req->call != SIMCALL_NONE && !MC_request_is_visible(req))
- SIMIX_simcall_pre(req, 0);
+ SIMIX_simcall_pre(req, 0);
}
}
}
* \brief Re-executes from the initial state all the transitions indicated by
* a given model-checker stack.
* \param stack The stack with the transitions to execute.
-*/
+ */
void MC_replay(xbt_fifo_t stack)
{
int value;
if(pair->requests > 0){
- saved_req = MC_state_get_executed_request(state, &value);
- //XBT_DEBUG("SavedReq->call %u", saved_req->call);
+ saved_req = MC_state_get_executed_request(state, &value);
+ //XBT_DEBUG("SavedReq->call %u", saved_req->call);
- if(saved_req != NULL){
- /* because we got a copy of the executed request, we have to fetch the
- real one, pointed by the request field of the issuer process */
- req = &saved_req->issuer->simcall;
- //XBT_DEBUG("Req->call %u", req->call);
-
- /* Debug information */
- if(XBT_LOG_ISENABLED(mc_global, xbt_log_priority_debug)){
- req_str = MC_request_to_string(req, value);
- XBT_DEBUG("Replay (depth = %d) : %s (%p)", depth, req_str, state);
- xbt_free(req_str);
- }
-
- }
+ if(saved_req != NULL){
+ /* because we got a copy of the executed request, we have to fetch the
+ real one, pointed by the request field of the issuer process */
+ req = &saved_req->issuer->simcall;
+ //XBT_DEBUG("Req->call %u", req->call);
+
+ /* Debug information */
+ if(XBT_LOG_ISENABLED(mc_global, xbt_log_priority_debug)){
+ req_str = MC_request_to_string(req, value);
+ XBT_DEBUG("Replay (depth = %d) : %s (%p)", depth, req_str, state);
+ xbt_free(req_str);
+ }
+
+ }
- SIMIX_simcall_pre(req, value);
- MC_wait_for_requests();
+ SIMIX_simcall_pre(req, value);
+ MC_wait_for_requests();
}
depth++;
/* Traverse the stack from the initial state and re-execute the transitions */
for (item = xbt_fifo_get_last_item(stack);
- item != xbt_fifo_get_first_item(stack);
- item = xbt_fifo_get_prev_item(item)) {
+ item != xbt_fifo_get_first_item(stack);
+ item = xbt_fifo_get_prev_item(item)) {
pair = (mc_pair_stateless_t) xbt_fifo_get_item_content(item);
state = (mc_state_t) pair->graph_state;
if(pair->requests > 0){
- saved_req = MC_state_get_executed_request(state, &value);
- //XBT_DEBUG("SavedReq->call %u", saved_req->call);
+ saved_req = MC_state_get_executed_request(state, &value);
+ //XBT_DEBUG("SavedReq->call %u", saved_req->call);
- if(saved_req != NULL){
- /* because we got a copy of the executed request, we have to fetch the
- real one, pointed by the request field of the issuer process */
- req = &saved_req->issuer->simcall;
- //XBT_DEBUG("Req->call %u", req->call);
-
- /* Debug information */
- if(XBT_LOG_ISENABLED(mc_global, xbt_log_priority_debug)){
- req_str = MC_request_to_string(req, value);
- XBT_DEBUG("Replay (depth = %d) : %s (%p)", depth, req_str, state);
- xbt_free(req_str);
- }
-
- }
+ if(saved_req != NULL){
+ /* because we got a copy of the executed request, we have to fetch the
+ real one, pointed by the request field of the issuer process */
+ req = &saved_req->issuer->simcall;
+ //XBT_DEBUG("Req->call %u", req->call);
+
+ /* Debug information */
+ if(XBT_LOG_ISENABLED(mc_global, xbt_log_priority_debug)){
+ req_str = MC_request_to_string(req, value);
+ XBT_DEBUG("Replay (depth = %d) : %s (%p)", depth, req_str, state);
+ xbt_free(req_str);
+ }
+
+ }
- SIMIX_simcall_pre(req, value);
- MC_wait_for_requests();
+ SIMIX_simcall_pre(req, value);
+ MC_wait_for_requests();
}
depth++;
* \brief Dumps the contents of a model-checker's stack and shows the actual
* execution trace
* \param stack The stack to dump
-*/
+ */
void MC_dump_stack_safety_stateless(xbt_fifo_t stack)
{
mc_state_t state;
XBT_INFO("**************************");
XBT_INFO("Locked request:");
/*req_str = MC_request_to_string(req);
- XBT_INFO("%s", req_str);
- xbt_free(req_str);*/
+ XBT_INFO("%s", req_str);
+ xbt_free(req_str);*/
XBT_INFO("Counter-example execution trace:");
MC_dump_stack_safety_stateless(mc_stack_safety_stateless);
}
XBT_INFO("**************************");
XBT_INFO("Locked request:");
/*req_str = MC_request_to_string(req);
- XBT_INFO("%s", req_str);
- xbt_free(req_str);*/
+ XBT_INFO("%s", req_str);
+ xbt_free(req_str);*/
XBT_INFO("Counter-example execution trace:");
MC_show_stack_safety_stateful(mc_stack_safety_stateful);
}
MC_show_stack_safety_stateful(stack);
/*MC_SET_RAW_MEM;
- while ((state = (mc_state_t) xbt_fifo_pop(stack)) != NULL)
+ while ((state = (mc_state_t) xbt_fifo_pop(stack)) != NULL)
MC_state_delete(state);
MC_UNSET_RAW_MEM;*/
}
req = MC_state_get_executed_request(pair->graph_state, &value);
if(req){
if(pair->requests>0){
- req_str = MC_request_to_string(req, value);
- XBT_INFO("%s", req_str);
- xbt_free(req_str);
+ req_str = MC_request_to_string(req, value);
+ XBT_INFO("%s", req_str);
+ xbt_free(req_str);
}else{
- XBT_INFO("End of system requests but evolution in Büchi automaton");
+ XBT_INFO("End of system requests but evolution in Büchi automaton");
}
}
}
void MC_print_statistics(mc_stats_t stats)
{
- XBT_INFO("State space size ~= %lu", stats->state_size);
+ //XBT_INFO("State space size ~= %lu", stats->state_size);
XBT_INFO("Expanded states = %lu", stats->expanded_states);
XBT_INFO("Visited states = %lu", stats->visited_states);
XBT_INFO("Executed transitions = %lu", stats->executed_transitions);
XBT_INFO("Expanded / Visited = %lf",
- (double) stats->visited_states / stats->expanded_states);
+ (double) stats->visited_states / stats->expanded_states);
/*XBT_INFO("Exploration coverage = %lf",
- (double)stats->expanded_states / stats->state_size); */
+ (double)stats->expanded_states / stats->state_size); */
}
void MC_print_statistics_pairs(mc_stats_pair_t stats)
XBT_INFO("Visited pairs = %lu", stats->visited_pairs);
//XBT_INFO("Executed transitions = %lu", stats->executed_transitions);
XBT_INFO("Expanded / Visited = %lf",
- (double) stats->visited_pairs / stats->expanded_pairs);
+ (double) stats->visited_pairs / stats->expanded_pairs);
/*XBT_INFO("Exploration coverage = %lf",
- (double)stats->expanded_states / stats->state_size); */
+ (double)stats->expanded_states / stats->state_size); */
}
void MC_assert(int prop)
{
- if (MC_IS_ENABLED && !prop) {
+ if (MC_IS_ENABLED && !prop){
XBT_INFO("**************************");
XBT_INFO("*** PROPERTY NOT VALID ***");
XBT_INFO("**************************");
}
}
+
+xbt_automaton_t MC_create_automaton(const char *file){
+ MC_SET_RAW_MEM;
+ xbt_automaton_t a = xbt_create_automaton(file);
+ MC_UNSET_RAW_MEM;
+ return a;
+}