/* 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) {
MC_take_snapshot(initial_snapshot);
MC_UNSET_RAW_MEM;
-
if(raw_mem_set)
MC_SET_RAW_MEM;
else
MC_exit();
}
-void MC_modelcheck_liveness(){
-
- raw_mem_set = (mmalloc_get_current_heap() == raw_heap);
-
- /* init stuff */
- XBT_INFO("Start init mc");
+void MC_init_liveness(){
mc_time = xbt_new0(double, simix_process_maxpid);
/* Get local variables in libsimgrid for state equality detection */
xbt_dict_t libsimgrid_location_list = MC_get_location_list(ls_path);
MC_get_local_variables(ls_path, libsimgrid_location_list, &mc_local_variables);
+
+ MC_UNSET_RAW_MEM;
+
+ MC_init_memory_map_info();
+
+ /* Get .plt section (start and end addresses) for data libsimgrid and data program comparison */
+ get_libsimgrid_plt_section();
+ get_binary_plt_section();
+
+}
+
+void MC_modelcheck_liveness(){
+
+ raw_mem_set = (mmalloc_get_current_heap() == raw_heap);
+
+ MC_init_liveness();
+
+ MC_SET_RAW_MEM;
/* Initialize statistics */
mc_stats_pair = xbt_new0(s_mc_stats_pair_t, 1);
MC_SET_RAW_MEM;
while ((pair = (mc_pair_stateless_t) xbt_fifo_pop(stack)) != NULL)
- MC_pair_stateless_delete(pair);
+ pair_stateless_free(pair);
MC_UNSET_RAW_MEM;
if(raw_mem_set)
void MC_assert(int prop)
{
- if (MC_IS_ENABLED && !prop){
+ if (MC_is_active() && !prop){
XBT_INFO("**************************");
XBT_INFO("*** PROPERTY NOT VALID ***");
XBT_INFO("**************************");
}
static void MC_assert_pair(int prop){
- if (MC_IS_ENABLED && !prop) {
+ if (MC_is_active() && !prop) {
XBT_INFO("**************************");
XBT_INFO("*** PROPERTY NOT VALID ***");
XBT_INFO("**************************");
MC_UNSET_RAW_MEM;
}
-void MC_new_stack_area(void *stack, char *name){
+void MC_new_stack_area(void *stack, char *name, void* context){
+
+ MC_SET_RAW_MEM;
if(stacks_areas == NULL)
stacks_areas = xbt_dynar_new(sizeof(stack_region_t), NULL);
-
- MC_SET_RAW_MEM;
+
stack_region_t region = NULL;
region = xbt_new0(s_stack_region_t, 1);
region->address = stack;
region->process_name = strdup(name);
+ region->context = context;
xbt_dynar_push(stacks_areas, ®ion);
+
MC_UNSET_RAW_MEM;
}