mc_state_t mc_current_state = NULL;
char mc_replay_mode = FALSE;
double *mc_time = NULL;
+mc_comparison_times_t mc_comp_times = NULL;
+double mc_snapshot_comparison_time;
/* Safety */
static void MC_get_global_variables(char *elf_file);
void MC_do_the_modelcheck_for_real() {
+
+ MC_SET_RAW_MEM;
+ mc_comp_times = xbt_new0(s_mc_comparison_times_t, 1);
+ MC_UNSET_RAW_MEM;
+
if (!_sg_mc_property_file || _sg_mc_property_file[0]=='\0') {
if (mc_reduce_kind==e_mc_reduce_unset)
mc_reduce_kind=e_mc_reduce_dpor;
xbt_dict_t libsimgrid_location_list = MC_get_location_list(libsimgrid_path);
MC_get_local_variables(libsimgrid_path, libsimgrid_location_list, &mc_local_variables);
+ xbt_dict_free(&libsimgrid_location_list);
+ xbt_dict_free(&binary_location_list);
+
/* Get .plt section (start and end addresses) for data libsimgrid and data program comparison */
get_libsimgrid_plt_section();
get_binary_plt_section();
MC_ignore_data_bss(&end_raw_heap, sizeof(end_raw_heap));
- MC_ignore_data_bss(&nb_visited_states, sizeof(nb_visited_states));
+ MC_ignore_data_bss(&mc_comp_times, sizeof(mc_comp_times));
+ MC_ignore_data_bss(&mc_snapshot_comparison_time, sizeof(mc_snapshot_comparison_time));
/* Get global variables */
MC_get_global_variables(xbt_binary_name);
MC_ignore_stack("_throw_ctx", "*");
MC_ignore_stack("ctx", "*");
+ MC_ignore_stack("next_context", "smx_ctx_sysv_suspend_serial");
+ MC_ignore_stack("i", "smx_ctx_sysv_suspend_serial");
+
if(raw_mem_set)
MC_SET_RAW_MEM;
{
xbt_free(mc_time);
MC_memory_exit();
+ xbt_abort();
}
if(((xbt_mheap_t)std_heap)->heapinfo[region->block].type == 0){
region->fragment = -1;
+ ((xbt_mheap_t)std_heap)->heapinfo[region->block].busy_block.ignore = 1;
}else{
region->fragment = ((uintptr_t) (ADDR2UINT (address) % (BLOCKSIZE))) >> ((xbt_mheap_t)std_heap)->heapinfo[region->block].type;
+ ((xbt_mheap_t)std_heap)->heapinfo[region->block].busy_frag.ignore[region->fragment] = 1;
}
}
char *key = bprintf("%d", (int)strtoul((char *)xbt_dynar_get_as(split, 0, char *), NULL, 16));
xbt_dict_set(location_list, key, loclist, NULL);
+ xbt_free(key);
xbt_dynar_free(&split);
}
- free(line);
- free(command);
+ xbt_free(line);
+ xbt_free(command);
pclose(fp);
return location_list;
dw_frame_t res;
xbt_dict_foreach(all_variables, cursor, name, res) {
- if(offset >= res->start && offset < res->end)
+ if(offset >= res->start && offset < res->end){
+ xbt_dict_cursor_free(&cursor);
return res;
+ }
}
+ xbt_dict_cursor_free(&cursor);
return NULL;
}
xbt_str_rtrim(abstract_origin, ">");
subprogram_name = (char *)xbt_dict_get_or_null(subprograms_origin, abstract_origin);
frame = xbt_dict_get_or_null(*all_variables, subprogram_name);
+ xbt_free(abstract_origin);
}else if(strcmp(node_type, "DW_AT_name") == 0){
new_frame = 1;
- free(current_frame);
+ xbt_free(current_frame);
frame = xbt_new0(s_dw_frame_t, 1);
frame->name = strdup(xbt_dynar_get_as(split, xbt_dynar_length(split) - 1, char *));
frame->variables = xbt_dict_new_homogeneous(NULL);
xbt_str_rtrim(loc_expr, ")");
frame->frame_base = get_location(NULL, loc_expr);
xbt_dynar_free(&split2);
+ xbt_free(loc_expr);
}
}else if(strcmp(node_type, "DW_AT_MIPS_linkage_name:") == 0){
- free(frame->name);
- free(current_frame);
+ xbt_free(frame->name);
+ xbt_free(current_frame);
frame->name = strdup(xbt_dynar_get_as(split, xbt_dynar_length(split) - 1, char *));
current_frame = strdup(frame->name);
xbt_dict_set(subprograms_origin, subprogram_start, frame->name, NULL);
xbt_dict_set(*all_variables, frame->name, frame, NULL);
}
- free(subprogram_start);
+ xbt_free(subprogram_start);
if(subprogram_end != NULL){
- free(subprogram_end);
+ xbt_free(subprogram_end);
subprogram_end = NULL;
}
xbt_str_rtrim(loc_expr, ")");
var->location = get_location(NULL, loc_expr);
xbt_dynar_free(&split2);
+ xbt_free(loc_expr);
}
}
xbt_dynar_free(&split);
- free(line);
- free(command);
+ xbt_free(line);
+ xbt_free(command);
pclose(fp);
}
char *key = bprintf("%d", (int)strtoul(expr, NULL, 16));
loc->type = e_dw_loclist;
loc->location.loclist = (xbt_dynar_t)xbt_dict_get_or_null(location_list, key);
- if(loc == NULL)
+ if(loc->location.loclist == NULL)
XBT_INFO("Key not found in loclist");
+ xbt_free(key);
return loc;
}else{
}
- free(command);
- free(line);
+ xbt_free(command);
+ xbt_free(line);
pclose(fp);
}