*/
void MC_dpor_init()
{
+
+ raw_mem_set = (mmalloc_get_current_heap() == raw_heap);
+
mc_state_t initial_state = NULL;
smx_process_t process;
xbt_fifo_unshift(mc_stack_safety, initial_state);
MC_UNSET_RAW_MEM;
+
+ if(raw_mem_set)
+ MC_SET_RAW_MEM;
+ else
+ MC_UNSET_RAW_MEM;
+
/* FIXME: Update Statistics
mc_stats->state_size +=
*/
void MC_dpor(void)
{
+
+ raw_mem_set = (mmalloc_get_current_heap() == raw_heap);
+
char *req_str;
int value;
smx_simcall_t req = NULL, prev_req = NULL;
}
MC_print_statistics(mc_stats);
MC_UNSET_RAW_MEM;
+
+ if(raw_mem_set)
+ MC_SET_RAW_MEM;
+ else
+ MC_UNSET_RAW_MEM;
+
+
return;
}
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_modelcheck_liveness(){
+
+ raw_mem_set = (mmalloc_get_current_heap() == raw_heap);
+
/* init stuff */
XBT_DEBUG("Start init mc");
/* 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);
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;
+
}
}
void MC_automaton_load(const char *file){
+
+ 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_automaton_load(_mc_property_automaton,file);
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;
+
}
int reached(xbt_state_t st){
+ raw_mem_set = (mmalloc_get_current_heap() == raw_heap);
+
if(xbt_dynar_is_empty(reached_pairs)){
xbt_dynar_reset(prop_ato);
xbt_free(prop_ato);
MC_UNSET_RAW_MEM;
+
+ if(raw_mem_set)
+ MC_SET_RAW_MEM;
+ else
+ MC_UNSET_RAW_MEM;
+
return 1;
}
/* }
xbt_dynar_reset(prop_ato);
xbt_free(prop_ato);
MC_UNSET_RAW_MEM;
+
+ if(raw_mem_set)
+ MC_SET_RAW_MEM;
+ else
+ MC_UNSET_RAW_MEM;
+
return 0;
}
void set_pair_reached(xbt_state_t st){
+ raw_mem_set = (mmalloc_get_current_heap() == raw_heap);
MC_SET_RAW_MEM;
xbt_dynar_push(reached_pairs, &pair);
MC_UNSET_RAW_MEM;
-
+
+ if(raw_mem_set)
+ MC_SET_RAW_MEM;
+ else
+ MC_UNSET_RAW_MEM;
+
}
int reached_hash(xbt_state_t st){
+ raw_mem_set = (mmalloc_get_current_heap() == raw_heap);
if(xbt_dynar_is_empty(reached_pairs_hash)){
xbt_dynar_reset(prop_ato);
xbt_free(prop_ato);
MC_UNSET_RAW_MEM;
+
+ if(raw_mem_set)
+ MC_SET_RAW_MEM;
+ else
+ MC_UNSET_RAW_MEM;
+
return 1;
}else{
XBT_INFO("Different snapshot");
xbt_dynar_reset(prop_ato);
xbt_free(prop_ato);
MC_UNSET_RAW_MEM;
+
+ if(raw_mem_set)
+ MC_SET_RAW_MEM;
+ else
+ MC_UNSET_RAW_MEM;
+
return 0;
}
}
void set_pair_reached_hash(xbt_state_t st){
+
+ raw_mem_set = (mmalloc_get_current_heap() == raw_heap);
MC_SET_RAW_MEM;
MC_free_snapshot(sn);
MC_UNSET_RAW_MEM;
-
+
+ if(raw_mem_set)
+ MC_SET_RAW_MEM;
+ else
+ MC_UNSET_RAW_MEM;
+
}
int visited(xbt_state_t st, int sc){
+ raw_mem_set = (mmalloc_get_current_heap() == raw_heap);
if(xbt_dynar_is_empty(visited_pairs)){
xbt_free(prop_ato);
MC_UNSET_RAW_MEM;
+ if(raw_mem_set)
+ MC_SET_RAW_MEM;
+ else
+ MC_UNSET_RAW_MEM;
+
return 1;
}else{
xbt_dynar_reset(prop_ato);
xbt_free(prop_ato);
MC_UNSET_RAW_MEM;
+
+ if(raw_mem_set)
+ MC_SET_RAW_MEM;
+ else
+ MC_UNSET_RAW_MEM;
+
return 0;
}
int visited_hash(xbt_state_t st, int sc){
+ raw_mem_set = (mmalloc_get_current_heap() == raw_heap);
if(xbt_dynar_is_empty(visited_pairs_hash)){
xbt_dynar_reset(prop_ato);
xbt_free(prop_ato);
MC_UNSET_RAW_MEM;
+
+ if(raw_mem_set)
+ MC_SET_RAW_MEM;
+ else
+ MC_UNSET_RAW_MEM;
+
return 1;
}else{
//XBT_INFO("Different snapshot");
xbt_dynar_reset(prop_ato);
xbt_free(prop_ato);
MC_UNSET_RAW_MEM;
+
+ if(raw_mem_set)
+ MC_SET_RAW_MEM;
+ else
+ MC_UNSET_RAW_MEM;
+
return 0;
}
}
void set_pair_visited_hash(xbt_state_t st, int sc){
+
+ raw_mem_set = (mmalloc_get_current_heap() == raw_heap);
MC_SET_RAW_MEM;
MC_UNSET_RAW_MEM;
+ if(raw_mem_set)
+ MC_SET_RAW_MEM;
+ else
+ MC_UNSET_RAW_MEM;
+
}
void set_pair_visited(xbt_state_t st, int sc){
+ raw_mem_set = (mmalloc_get_current_heap() == raw_heap);
MC_SET_RAW_MEM;
MC_UNSET_RAW_MEM;
+ if(raw_mem_set)
+ MC_SET_RAW_MEM;
+ else
+ MC_UNSET_RAW_MEM;
}
void MC_ddfs_init(void){
+ raw_mem_set = (mmalloc_get_current_heap() == raw_heap);
+
XBT_INFO("**************************************************");
XBT_INFO("Double-DFS init");
XBT_INFO("**************************************************");
}
}
- }
+ }
+
+ if(raw_mem_set)
+ MC_SET_RAW_MEM;
+ else
+ MC_UNSET_RAW_MEM;
+
}
void MC_ddfs(int search_cycle){
+ raw_mem_set = (mmalloc_get_current_heap() == raw_heap);
+
smx_process_t process;
mc_pair_stateless_t current_pair = NULL;
//xbt_dynar_pop(reached_pairs_hash, NULL);
}
MC_UNSET_RAW_MEM;
-
-
+
+ if(raw_mem_set)
+ MC_SET_RAW_MEM;
+ else
+ MC_UNSET_RAW_MEM;
}
};
#define MC_SET_RAW_MEM mmalloc_set_current_heap(raw_heap)
-#define MC_UNSET_RAW_MEM mmalloc_set_current_heap(std_heap)
+#define MC_UNSET_RAW_MEM mmalloc_set_current_heap(std_heap)
+
+int raw_mem_set;
/******************************* MEMORY MAPPINGS ***************************/
/* These functions and data structures implements a binary interface for */