#include "../simix/smx_private.h"
#include "xbt/fifo.h"
#include "mc_private.h"
-#include "xbt/automaton/automaton_create.h"
+#include "xbt/automaton.h"
XBT_LOG_NEW_CATEGORY(mc, "All MC categories");
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_global, mc,
"Logging specific to MC (global)");
+/* Configuration support */
+e_mc_reduce_t mc_reduce_kind=e_mc_reduce_unset;
+
+extern int _surf_init_status;
+void _mc_cfg_cb_reduce(const char *name, int pos) {
+ if (_surf_init_status && !_surf_do_model_check) {
+ xbt_die("You are specifying a reduction strategy after the initialization (through MSG_config?), but model-checking was not activated at config time (through --cfg=model-check:1). This won't work, sorry.");
+ }
+ char *val= xbt_cfg_get_string(_surf_cfg_set, name);
+ if (!strcasecmp(val,"none")) {
+ mc_reduce_kind = e_mc_reduce_none;
+ } else if (!strcasecmp(val,"dpor")) {
+ mc_reduce_kind = e_mc_reduce_dpor;
+ } else {
+ xbt_die("configuration option %s can only take 'none' or 'dpor' as a value",name);
+ }
+ xbt_cfg_set_int(_surf_cfg_set,"model-check",1);
+}
+
+void _mc_cfg_cb_checkpoint(const char *name, int pos) {
+ if (_surf_init_status && !_surf_do_model_check) {
+ xbt_die("You are specifying a checkpointing value after the initialization (through MSG_config?), but model-checking was not activated at config time (through --cfg=model-check:1). This won't work, sorry.");
+ }
+ _surf_mc_checkpoint = xbt_cfg_get_int(_surf_cfg_set, name);
+ xbt_cfg_set_int(_surf_cfg_set,"model-check",1);
+}
+void _mc_cfg_cb_property(const char *name, int pos) {
+ if (_surf_init_status && !_surf_do_model_check) {
+ xbt_die("You are specifying a property after the initialization (through MSG_config?), but model-checking was not activated at config time (through --cfg=model-check:1). This won't work, sorry.");
+ }
+ _surf_mc_property_file= xbt_cfg_get_string(_surf_cfg_set, name);
+ xbt_cfg_set_int(_surf_cfg_set,"model-check",1);
+}
+
+
/* MC global data structures */
mc_state_t mc_current_state = NULL;
char mc_replay_mode = FALSE;
double *mc_time = NULL;
mc_snapshot_t initial_snapshot = NULL;
+int raw_mem_set;
/* Safety */
mc_stats_pair_t mc_stats_pair = NULL;
xbt_fifo_t mc_stack_liveness = NULL;
mc_snapshot_t initial_snapshot_liveness = NULL;
+int compare;
+extern xbt_dynar_t mmalloc_ignore;
-xbt_automaton_t automaton;
+xbt_automaton_t _mc_property_automaton = NULL;
-static void MC_init_liveness(xbt_automaton_t a);
static void MC_assert_pair(int prop);
+void MC_do_the_modelcheck_for_real() {
+ if (!_surf_mc_property_file || _surf_mc_property_file[0]=='\0') {
+ if (mc_reduce_kind==e_mc_reduce_unset)
+ mc_reduce_kind=e_mc_reduce_dpor;
+
+ XBT_INFO("Check a safety property");
+ MC_modelcheck();
+
+ } else {
+
+ if (mc_reduce_kind==e_mc_reduce_unset)
+ mc_reduce_kind=e_mc_reduce_none;
+
+ XBT_INFO("Check the liveness property %s",_surf_mc_property_file);
+ MC_automaton_load(_surf_mc_property_file);
+ MC_modelcheck_liveness();
+ }
+}
/**
* \brief Initialize the model-checker data structures
void MC_init_safety(void)
{
+ raw_mem_set = (mmalloc_get_current_heap() == raw_heap);
+
/* Check if MC is already initialized */
if (initial_snapshot)
return;
/* 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_take_snapshot(initial_snapshot);
MC_UNSET_RAW_MEM;
+
+ if(raw_mem_set)
+ MC_SET_RAW_MEM;
+ else
+ MC_UNSET_RAW_MEM;
+
}
+void MC_compare(void){
+ compare = 1;
+}
-static void MC_init_liveness(xbt_automaton_t a){
+void MC_modelcheck(void)
+{
+ MC_init_safety();
+ MC_dpor();
+ MC_exit();
+}
+
+void MC_modelcheck_liveness(){
+
+ raw_mem_set = (mmalloc_get_current_heap() == raw_heap);
+
+ /* init stuff */
XBT_DEBUG("Start init mc");
mc_time = xbt_new0(double, simix_process_maxpid);
+ /* mc_time refers to clock for each process -> ignore it for heap comparison */
+ int i;
+ for(i = 0; i<simix_process_maxpid; i++)
+ MC_ignore(&(mc_time[i]), sizeof(double));
+
+ compare = 0;
+
/* Initialize the data structures that must be persistent across every
iteration of the model-checker (in RAW memory) */
MC_UNSET_RAW_MEM;
- automaton = a;
MC_ddfs_init();
-
-}
-
-
-void MC_modelcheck(void)
-{
- MC_init_safety();
- MC_dpor();
- MC_exit();
-}
-
-
-
-void MC_modelcheck_liveness(xbt_automaton_t a){
- MC_init_liveness(a);
- MC_exit_liveness();
-}
-
-void MC_exit_liveness(void)
-{
+ /* We're done */
MC_print_statistics_pairs(mc_stats_pair);
- //xbt_free(mc_time);
- //MC_memory_exit();
+ xbt_free(mc_time);
+ MC_memory_exit();
exit(0);
}
*/
void MC_replay(xbt_fifo_t stack, int start)
{
+ raw_mem_set = (mmalloc_get_current_heap() == raw_heap);
+
int value, i = 1;
char *req_str;
smx_simcall_t req = NULL, saved_req = NULL;
mc_stats->executed_transitions++;
}
XBT_DEBUG("**** End Replay ****");
+
+ if(raw_mem_set)
+ MC_SET_RAW_MEM;
+ else
+ MC_UNSET_RAW_MEM;
+
+
}
void MC_replay_liveness(xbt_fifo_t stack, int all_stack)
{
+
+ raw_mem_set = (mmalloc_get_current_heap() == raw_heap);
+
int value;
char *req_str;
smx_simcall_t req = NULL, saved_req = NULL;
}
XBT_DEBUG("**** End Replay ****");
+
+ if(raw_mem_set)
+ MC_SET_RAW_MEM;
+ else
+ MC_UNSET_RAW_MEM;
+
}
/**
*/
void MC_dump_stack_safety(xbt_fifo_t stack)
{
+
+ raw_mem_set = (mmalloc_get_current_heap() == raw_heap);
MC_show_stack_safety(stack);
- if(!_surf_do_mc_checkpoint){
+ if(!_surf_mc_checkpoint){
mc_state_t state;
MC_UNSET_RAW_MEM;
}
+
+ if(raw_mem_set)
+ MC_SET_RAW_MEM;
+ else
+ MC_UNSET_RAW_MEM;
+
}
}
void MC_dump_stack_liveness(xbt_fifo_t stack){
+
+ raw_mem_set = (mmalloc_get_current_heap() == raw_heap);
+
mc_pair_stateless_t pair;
MC_SET_RAW_MEM;
while ((pair = (mc_pair_stateless_t) xbt_fifo_pop(stack)) != NULL)
MC_pair_stateless_delete(pair);
MC_UNSET_RAW_MEM;
+
+ if(raw_mem_set)
+ MC_SET_RAW_MEM;
+ else
+ MC_UNSET_RAW_MEM;
+
}
return 0;
}
-void MC_diff(void){
+void MC_automaton_load(const char *file){
- mc_snapshot_t sn = xbt_new0(s_mc_snapshot_t, 1);
- MC_take_snapshot_liveness(sn);
+ raw_mem_set = (mmalloc_get_current_heap() == raw_heap);
- int i;
+ MC_SET_RAW_MEM;
- XBT_INFO("Number of regions : %u", sn->num_reg);
+ if (_mc_property_automaton == NULL)
+ _mc_property_automaton = xbt_automaton_new();
+
+ xbt_automaton_load(_mc_property_automaton,file);
- for(i=0; i<sn->num_reg; i++){
-
- switch(sn->regions[i]->type){
- case 0: /* heap */
- XBT_INFO("Size of heap : %zu", sn->regions[i]->size);
- mmalloc_display_info_heap(sn->regions[i]->data);
- break;
- case 1 : /* libsimgrid */
- XBT_INFO("Size of libsimgrid : %zu", sn->regions[i]->size);
- break;
- case 2 : /* data program */
- XBT_INFO("Size of data program : %zu", sn->regions[i]->size);
- break;
- case 3 : /* stack */
- XBT_INFO("Size of stack : %zu", sn->regions[i]->size);
- XBT_INFO("Start addr of stack : %p", sn->regions[i]->start_addr);
- break;
- }
+ MC_UNSET_RAW_MEM;
- }
+ if(raw_mem_set)
+ MC_SET_RAW_MEM;
+ else
+ MC_UNSET_RAW_MEM;
+
+}
+void MC_automaton_new_propositional_symbol(const char* id, void* fct) {
+
+ raw_mem_set = (mmalloc_get_current_heap() == raw_heap);
+
+ MC_SET_RAW_MEM;
+
+ if (_mc_property_automaton == NULL)
+ _mc_property_automaton = xbt_automaton_new();
+
+ xbt_new_propositional_symbol(_mc_property_automaton,id,fct);
+
+ MC_UNSET_RAW_MEM;
+
+ if(raw_mem_set)
+ MC_SET_RAW_MEM;
+ else
+ MC_UNSET_RAW_MEM;
+
+}
+
+void MC_ignore_init(){
+ MC_SET_RAW_MEM;
+ mmalloc_ignore = xbt_dynar_new(sizeof(mc_ignore_region_t), NULL);
+ MC_UNSET_RAW_MEM;
}
-xbt_automaton_t MC_create_automaton(const char *file){
+void MC_ignore(void *address, size_t size){
MC_SET_RAW_MEM;
- xbt_automaton_t a = xbt_create_automaton(file);
+ mc_ignore_region_t region = NULL;
+ region = xbt_new0(s_mc_ignore_region_t, 1);
+ region->address = address;
+ region->size = size;
+ xbt_dynar_push(mmalloc_ignore, ®ion);
MC_UNSET_RAW_MEM;
- return a;
}
