/* MC global data structures */
mc_snapshot_t initial_snapshot = NULL;
xbt_fifo_t mc_stack = NULL;
-xbt_setset_t mc_setset = NULL;
mc_stats_t mc_stats = NULL;
+mc_stats_pair_t mc_stats_pair = NULL;
mc_state_t mc_current_state = NULL;
char mc_replay_mode = FALSE;
+double *mc_time = NULL;
+xbt_fifo_t mc_snapshot_stack = NULL;
/**
* \brief Initialize the model-checker data structures
*/
void MC_init(void)
{
- smx_process_t process;
-
/* Check if MC is already initialized */
if (initial_snapshot)
return;
+ mc_time = xbt_new0(double, simix_process_maxpid);
+
/* Initialize the data structures that must be persistent across every
iteration of the model-checker (in RAW memory) */
MC_SET_RAW_MEM;
/* Create exploration stack */
mc_stack = xbt_fifo_new();
- /* Create the container for the sets */
- mc_setset = xbt_setset_new(20);
+ MC_UNSET_RAW_MEM;
- /* Add the existing processes to mc's setset so they have an ID designated */
- /* FIXME: check what happen if there are processes created during the exploration */
- xbt_swag_foreach(process, simix_global->process_list){
- xbt_setset_elm_add(mc_setset, process);
- }
-
MC_dpor_init();
+ MC_SET_RAW_MEM;
/* Save the initial state */
initial_snapshot = xbt_new0(s_mc_snapshot_t, 1);
MC_take_snapshot(initial_snapshot);
MC_UNSET_RAW_MEM;
}
+void MC_init_with_automaton(xbt_automaton_t a){
+
+ XBT_DEBUG("Start init mc");
+
+ mc_time = xbt_new0(double, simix_process_maxpid);
+
+ /* Initialize the data structures that must be persistent across every
+ iteration of the model-checker (in RAW memory) */
+
+ MC_SET_RAW_MEM;
+
+ /* Initialize statistics */
+ mc_stats_pair = xbt_new0(s_mc_stats_pair_t, 1);
+ mc_stats = xbt_new0(s_mc_stats_t, 1);
+ //mc_stats_pair->pair_size = 1;
+
+ XBT_DEBUG("Creating snapshot_stack");
+
+ /* Create exploration stack */
+ mc_snapshot_stack = xbt_fifo_new();
+
+ MC_UNSET_RAW_MEM;
+
+ //MC_vddfs_with_restore_snapshot_init(a);
+ //MC_ddfs_with_restore_snapshot_init(a);
+ MC_dpor2_init(a);
+}
+
+
void MC_modelcheck(void)
{
MC_init();
MC_exit();
}
+void MC_modelcheck_with_automaton(xbt_automaton_t a){
+ MC_init_with_automaton(a);
+ MC_exit_with_automaton();
+}
+
+void MC_exit_with_automaton(void)
+{
+ MC_print_statistics_pairs(mc_stats_pair);
+ xbt_free(mc_time);
+ MC_memory_exit();
+}
+
void MC_exit(void)
{
+ MC_print_statistics(mc_stats);
+ xbt_free(mc_time);
MC_memory_exit();
}
return 0;
}
+/**
+ * \brief Schedules all the process that are ready to run
+ */
+void MC_wait_for_requests(void)
+{
+ smx_process_t process;
+ smx_req_t req;
+ unsigned int iter;
+
+ while (xbt_dynar_length(simix_global->process_to_run)) {
+ SIMIX_process_runall();
+ xbt_dynar_foreach(simix_global->process_that_ran, iter, process) {
+ req = &process->request;
+ if (req->call != REQ_NO_REQ && !MC_request_is_visible(req))
+ SIMIX_request_pre(req, 0);
+ }
+ }
+}
+
+int MC_deadlock_check()
+{
+ int deadlock = FALSE;
+ smx_process_t process;
+ if(xbt_swag_size(simix_global->process_list)){
+ deadlock = TRUE;
+ xbt_swag_foreach(process, simix_global->process_list){
+ if(process->request.call != REQ_NO_REQ
+ && MC_request_is_enabled(&process->request)){
+ deadlock = FALSE;
+ break;
+ }
+ }
+ }
+ return deadlock;
+}
+
/**
* \brief Re-executes from the initial state all the transitions indicated by
* a given model-checker stack.
*/
void MC_replay(xbt_fifo_t stack)
{
+ int value;
char *req_str;
smx_req_t req = NULL, saved_req = NULL;
xbt_fifo_item_t item;
mc_state_t state;
- DEBUG0("**** Begin Replay ****");
+ XBT_DEBUG("**** Begin Replay ****");
/* Restore the initial state */
MC_restore_snapshot(initial_snapshot);
+ /* At the moment of taking the snapshot the raw heap was set, so restoring
+ * it will set it back again, we have to unset it to continue */
+ MC_UNSET_RAW_MEM;
/* Traverse the stack from the initial state and re-execute the transitions */
for (item = xbt_fifo_get_last_item(stack);
item = xbt_fifo_get_prev_item(item)) {
state = (mc_state_t) xbt_fifo_get_item_content(item);
- saved_req = MC_state_get_executed_request(state);
+ saved_req = MC_state_get_executed_request(state, &value);
if(saved_req){
/* because we got a copy of the executed request, we have to fetch the
/* Debug information */
if(XBT_LOG_ISENABLED(mc_global, xbt_log_priority_debug)){
- req_str = MC_request_to_string(req);
- DEBUG1("Replay: %s", req_str);
+ req_str = MC_request_to_string(req, value);
+ XBT_DEBUG("Replay: %s (%p)", req_str, state);
xbt_free(req_str);
}
}
- SIMIX_request_pre(req);
+ SIMIX_request_pre(req, value);
MC_wait_for_requests();
/* Update statistics */
mc_stats->visited_states++;
mc_stats->executed_transitions++;
}
- DEBUG0("**** End Replay ****");
+ XBT_DEBUG("**** End Replay ****");
}
/**
void MC_show_stack(xbt_fifo_t stack)
{
+ int value;
mc_state_t state;
xbt_fifo_item_t item;
smx_req_t req;
for (item = xbt_fifo_get_last_item(stack);
(item ? (state = (mc_state_t) (xbt_fifo_get_item_content(item)))
: (NULL)); item = xbt_fifo_get_prev_item(item)) {
- req = MC_state_get_executed_request(state);
+ req = MC_state_get_executed_request(state, &value);
if(req){
- req_str = MC_request_to_string(req);
- INFO1("%s", req_str);
+ req_str = MC_request_to_string(req, value);
+ XBT_INFO("%s", req_str);
xbt_free(req_str);
}
}
}
-/**
- * \brief Schedules all the process that are ready to run
- */
-void MC_wait_for_requests(void)
+void MC_show_deadlock(smx_req_t req)
{
- char *req_str = NULL;
- smx_req_t req = NULL;
-
- do {
- SIMIX_context_runall(simix_global->process_to_run);
- while((req = SIMIX_request_pop())){
- if(!SIMIX_request_is_visible(req))
- SIMIX_request_pre(req);
- else if(req->call == REQ_COMM_WAITANY)
- THROW_UNIMPLEMENTED;
- else if(XBT_LOG_ISENABLED(mc_global, xbt_log_priority_debug)){
- req_str = MC_request_to_string(req);
- DEBUG1("Got: %s", req_str);
- xbt_free(req_str);
- }
- }
- } while (xbt_dynar_length(simix_global->process_to_run));
+ /*char *req_str = NULL;*/
+ XBT_INFO("**************************");
+ XBT_INFO("*** DEAD-LOCK DETECTED ***");
+ XBT_INFO("**************************");
+ XBT_INFO("Locked request:");
+ /*req_str = MC_request_to_string(req);
+ XBT_INFO("%s", req_str);
+ xbt_free(req_str);*/
+ XBT_INFO("Counter-example execution trace:");
+ MC_dump_stack(mc_stack);
}
-/****************************** Statistics ************************************/
void MC_print_statistics(mc_stats_t stats)
{
- INFO1("State space size ~= %lu", stats->state_size);
- INFO1("Expanded states = %lu", stats->expanded_states);
- INFO1("Visited states = %lu", stats->visited_states);
- INFO1("Executed transitions = %lu", stats->executed_transitions);
- INFO1("Expanded / Visited = %lf",
+ 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);
- /*INFO1("Exploration coverage = %lf",
+ /*XBT_INFO("Exploration coverage = %lf",
+ (double)stats->expanded_states / stats->state_size); */
+}
+
+void MC_print_statistics_pairs(mc_stats_pair_t stats)
+{
+ XBT_INFO("Expanded pairs = %lu", stats->expanded_pairs);
+ 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);
+ /*XBT_INFO("Exploration coverage = %lf",
(double)stats->expanded_states / stats->state_size); */
}
-/************************* Assertion Checking *********************************/
void MC_assert(int prop)
{
if (MC_IS_ENABLED && !prop) {
- INFO0("**************************");
- INFO0("*** PROPERTY NOT VALID ***");
- INFO0("**************************");
- INFO0("Counter-example execution trace:");
+ XBT_INFO("**************************");
+ XBT_INFO("*** PROPERTY NOT VALID ***");
+ XBT_INFO("**************************");
+ XBT_INFO("Counter-example execution trace:");
MC_dump_stack(mc_stack);
MC_print_statistics(mc_stats);
xbt_abort();
}
}
-void MC_show_deadlock(smx_req_t req)
+void MC_assert_pair(int prop){
+ if (MC_IS_ENABLED && !prop) {
+ XBT_INFO("**************************");
+ XBT_INFO("*** PROPERTY NOT VALID ***");
+ XBT_INFO("**************************");
+ //XBT_INFO("Counter-example execution trace:");
+ MC_show_snapshot_stack(mc_snapshot_stack);
+ //MC_dump_snapshot_stack(mc_snapshot_stack);
+ MC_print_statistics_pairs(mc_stats_pair);
+ xbt_abort();
+ }
+}
+
+void MC_process_clock_add(smx_process_t process, double amount)
{
- char *req_str = NULL;
- INFO0("**************************");
- INFO0("*** DEAD-LOCK DETECTED ***");
- INFO0("**************************");
- INFO0("Locked request:");
- req_str = MC_request_to_string(req);
- INFO1("%s", req_str);
- xbt_free(req_str);
- INFO0("Counter-example execution trace:");
- MC_dump_stack(mc_stack);
+ mc_time[process->pid] += amount;
+}
+
+double MC_process_clock_get(smx_process_t process)
+{
+ if(mc_time)
+ return mc_time[process->pid];
+ else
+ return 0;
}
