X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/9b8c19c2b3028ebeef9f76f159af56acd5739c6d..e0040bdd2da0584c51ac1d223bc0aaf0748be66b:/src/mc/mc_global.c diff --git a/src/mc/mc_global.c b/src/mc/mc_global.c index ab6b9bcf47..adc2241d7f 100644 --- a/src/mc/mc_global.c +++ b/src/mc/mc_global.c @@ -1,4 +1,5 @@ -/* Copyright (c) 2008-2013 Da SimGrid Team. All rights reserved. */ +/* Copyright (c) 2008-2013. The SimGrid Team. + * All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it * under the terms of the license (GNU LGPL) which comes with this package. */ @@ -7,6 +8,7 @@ #include #include #include +#include #include "simgrid/sg_config.h" #include "../surf/surf_private.h" @@ -28,13 +30,15 @@ int _sg_do_model_check = 0; int _sg_mc_checkpoint=0; char* _sg_mc_property_file=NULL; int _sg_mc_timeout=0; +int _sg_mc_hash=0; int _sg_mc_max_depth=1000; int _sg_mc_visited=0; char *_sg_mc_dot_output_file = NULL; -extern int _sg_init_status; +int user_max_depth_reached = 0; + void _mc_cfg_cb_reduce(const char *name, int pos) { - if (_sg_init_status && !_sg_do_model_check) { + if (_sg_cfg_init_status && !_sg_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(_sg_cfg_set, name); @@ -48,41 +52,48 @@ void _mc_cfg_cb_reduce(const char *name, int pos) { } void _mc_cfg_cb_checkpoint(const char *name, int pos) { - if (_sg_init_status && !_sg_do_model_check) { + if (_sg_cfg_init_status && !_sg_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."); } - _sg_mc_checkpoint = xbt_cfg_get_boolean(_sg_cfg_set, name); + _sg_mc_checkpoint = xbt_cfg_get_int(_sg_cfg_set, name); } void _mc_cfg_cb_property(const char *name, int pos) { - if (_sg_init_status && !_sg_do_model_check) { + if (_sg_cfg_init_status && !_sg_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."); } _sg_mc_property_file= xbt_cfg_get_string(_sg_cfg_set, name); } void _mc_cfg_cb_timeout(const char *name, int pos) { - if (_sg_init_status && !_sg_do_model_check) { + if (_sg_cfg_init_status && !_sg_do_model_check) { xbt_die("You are specifying a value to enable/disable timeout for wait requests 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."); } _sg_mc_timeout= xbt_cfg_get_boolean(_sg_cfg_set, name); } +void _mc_cfg_cb_hash(const char *name, int pos) { + if (_sg_cfg_init_status && !_sg_do_model_check) { + xbt_die("You are specifying a value to enable/disable the use of global hash to speedup state comparaison, but model-checking was not activated at config time (through --cfg=model-check:1). This won't work, sorry."); + } + _sg_mc_hash= xbt_cfg_get_boolean(_sg_cfg_set, name); +} + void _mc_cfg_cb_max_depth(const char *name, int pos) { - if (_sg_init_status && !_sg_do_model_check) { + if (_sg_cfg_init_status && !_sg_do_model_check) { xbt_die("You are specifying a max depth 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."); } _sg_mc_max_depth= xbt_cfg_get_int(_sg_cfg_set, name); } void _mc_cfg_cb_visited(const char *name, int pos) { - if (_sg_init_status && !_sg_do_model_check) { + if (_sg_cfg_init_status && !_sg_do_model_check) { xbt_die("You are specifying a number of stored visited states 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."); } _sg_mc_visited= xbt_cfg_get_int(_sg_cfg_set, name); } void _mc_cfg_cb_dot_output(const char *name, int pos) { - if (_sg_init_status && !_sg_do_model_check) { + if (_sg_cfg_init_status && !_sg_do_model_check) { xbt_die("You are specifying a file name for a dot output of graph state 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."); } _sg_mc_dot_output_file= xbt_cfg_get_string(_sg_cfg_set, name); @@ -92,8 +103,8 @@ void _mc_cfg_cb_dot_output(const char *name, int pos) { 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; +__thread mc_comparison_times_t mc_comp_times = NULL; +__thread double mc_snapshot_comparison_time; mc_stats_t mc_stats = NULL; /* Safety */ @@ -108,16 +119,10 @@ int compare; xbt_automaton_t _mc_property_automaton = NULL; /* Variables */ -xbt_dict_t mc_local_variables_libsimgrid = NULL; -xbt_dict_t mc_local_variables_binary = NULL; -xbt_dynar_t mc_global_variables_libsimgrid = NULL; -xbt_dynar_t mc_global_variables_binary = NULL; -xbt_dict_t mc_variables_type_libsimgrid = NULL; -xbt_dict_t mc_variables_type_binary = NULL; +mc_object_info_t mc_libsimgrid_info = NULL; +mc_object_info_t mc_binary_info = NULL; /* Ignore mechanism */ -xbt_dynar_t mc_stack_comparison_ignore; -xbt_dynar_t mc_data_bss_comparison_ignore; extern xbt_dynar_t mc_heap_comparison_ignore; extern xbt_dynar_t stacks_areas; @@ -149,7 +154,7 @@ static void dw_location_entry_free(dw_location_entry_t e){ xbt_free(e); } -static void dw_type_free(dw_type_t t){ +void dw_type_free(dw_type_t t){ xbt_free(t->name); xbt_free(t->dw_type_id); xbt_dynar_free(&(t->members)); @@ -160,20 +165,142 @@ static void dw_type_free_voidp(void *t){ dw_type_free((dw_type_t) * (void **) t); } -static void dw_variable_free(dw_variable_t v){ +void dw_variable_free(dw_variable_t v){ if(v){ xbt_free(v->name); xbt_free(v->type_origin); if(!v->global) - dw_location_free(v->address.location); + dw_location_free(v->location); xbt_free(v); } } -static void dw_variable_free_voidp(void *t){ +void dw_variable_free_voidp(void *t){ dw_variable_free((dw_variable_t) * (void **) t); } +// ***** object_info + +mc_object_info_t MC_new_object_info(void) { + mc_object_info_t res = xbt_new0(s_mc_object_info_t, 1); + res->local_variables = xbt_dict_new_homogeneous(NULL); + res->global_variables = xbt_dynar_new(sizeof(dw_variable_t), dw_variable_free_voidp); + res->types = xbt_dict_new_homogeneous(NULL); + res->types_by_name = xbt_dict_new_homogeneous(NULL); + return res; +} + + +void MC_free_object_info(mc_object_info_t* info) { + xbt_free(&(*info)->file_name); + xbt_dict_free(&(*info)->local_variables); + xbt_dynar_free(&(*info)->global_variables); + xbt_dict_free(&(*info)->types); + xbt_dict_free(&(*info)->types_by_name); + xbt_free(info); + xbt_dynar_free(&(*info)->functions_index); + *info = NULL; +} + +// ***** Helpers + +void* MC_object_base_address(mc_object_info_t info) { + void* result = info->start_exec; + if(info->start_rw!=NULL && result > (void*) info->start_rw) result = info->start_rw; + if(info->start_ro!=NULL && result > (void*) info->start_ro) result = info->start_ro; + return result; +} + +// ***** Functions index + +static int MC_compare_frame_index_items(mc_function_index_item_t a, mc_function_index_item_t b) { + if(a->low_pc < b->low_pc) + return -1; + else if(a->low_pc == b->low_pc) + return 0; + else + return 1; +} + +static void MC_make_functions_index(mc_object_info_t info) { + xbt_dynar_t index = xbt_dynar_new(sizeof(s_mc_function_index_item_t), NULL); + + // Populate the array: + dw_frame_t frame = NULL; + xbt_dict_cursor_t cursor = NULL; + const char* name = NULL; + xbt_dict_foreach(info->local_variables, cursor, name, frame) { + if(frame->low_pc==NULL) + continue; + s_mc_function_index_item_t entry; + entry.low_pc = frame->low_pc; + entry.high_pc = frame->high_pc; + entry.function = frame; + xbt_dynar_push(index, &entry); + } + + mc_function_index_item_t base = (mc_function_index_item_t) xbt_dynar_get_ptr(index, 0); + + // Sort the array by low_pc: + qsort(base, + xbt_dynar_length(index), + sizeof(s_mc_function_index_item_t), + (int (*)(const void *, const void *))MC_compare_frame_index_items); + + info->functions_index = index; +} + +mc_object_info_t MC_ip_find_object_info(void* ip) { + mc_object_info_t infos[2] = { mc_binary_info, mc_libsimgrid_info }; + size_t n = 2; + size_t i; + for(i=0; i!=n; ++i) { + if(ip >= (void*)infos[i]->start_exec && ip <= (void*)infos[i]->end_exec) { + return infos[i]; + } + } + return NULL; +} + +static dw_frame_t MC_find_function_by_ip_and_object(void* ip, mc_object_info_t info) { + xbt_dynar_t dynar = info->functions_index; + mc_function_index_item_t base = (mc_function_index_item_t) xbt_dynar_get_ptr(dynar, 0); + int i = 0; + int j = xbt_dynar_length(dynar) - 1; + while(j>=i) { + int k = i + ((j-i)/2); + if(ip < base[k].low_pc) { + j = k-1; + } else if(ip > base[k].high_pc) { + i = k+1; + } else { + return base[k].function; + } + } + return NULL; +} + +dw_frame_t MC_find_function_by_ip(void* ip) { + mc_object_info_t info = MC_ip_find_object_info(ip); + if(info==NULL) + return NULL; + else + return MC_find_function_by_ip_and_object(ip, info); +} + +/** \brief Finds informations about a given shared object/executable */ +mc_object_info_t MC_find_object_info(memory_map_t maps, char* name, int executable) { + mc_object_info_t result = MC_new_object_info(); + if(executable) + result->flags |= MC_OBJECT_INFO_EXECUTABLE; + result->file_name = xbt_strdup(name); + MC_find_object_address(maps, result); + MC_dwarf_get_variables(result); + MC_post_process_types(result); + MC_make_functions_index(result); + return result; +} + /*************************************************************************/ static dw_location_t MC_dwarf_get_location(xbt_dict_t location_list, char *expr){ @@ -312,110 +439,11 @@ static dw_location_t MC_dwarf_get_location(xbt_dict_t location_list, char *expr) } -static xbt_dict_t MC_dwarf_get_location_list(const char *elf_file){ - - char *command = bprintf("objdump -Wo %s", elf_file); - - FILE *fp = popen(command, "r"); - - if(fp == NULL){ - perror("popen for objdump failed"); - xbt_abort(); - } - - int debug = 0; /*Detect if the program has been compiled with -g */ - - xbt_dict_t location_list = xbt_dict_new_homogeneous(NULL); - char *line = NULL, *loc_expr = NULL; - ssize_t read; - size_t n = 0; - int cursor_remove; - xbt_dynar_t split = NULL; - - while ((read = xbt_getline(&line, &n, fp)) != -1) { - - /* Wipeout the new line character */ - line[read - 1] = '\0'; - - xbt_str_trim(line, NULL); - - if(n == 0) - continue; - - if(strlen(line) == 0) - continue; - - if(debug == 0){ - - if(strncmp(line, elf_file, strlen(elf_file)) == 0) - continue; - - if(strncmp(line, "Contents", 8) == 0) - continue; - - if(strncmp(line, "Offset", 6) == 0){ - debug = 1; - continue; - } - } - - if(debug == 0){ - XBT_INFO("Your program must be compiled with -g"); - xbt_abort(); - } - - xbt_dynar_t loclist = xbt_dynar_new(sizeof(dw_location_entry_t), NULL); - - xbt_str_strip_spaces(line); - split = xbt_str_split(line, " "); - - while(read != -1 && strcmp("lowpc = strtoul((char *)xbt_dynar_get_as(split, 1, char *), NULL, 16); - new_entry->highpc = strtoul((char *)xbt_dynar_get_as(split, 2, char *), NULL, 16); - - cursor_remove =0; - while(cursor_remove < 3){ - xbt_dynar_remove_at(split, 0, NULL); - cursor_remove++; - } - - loc_expr = xbt_str_join(split, " "); - xbt_str_ltrim(loc_expr, "("); - xbt_str_rtrim(loc_expr, ")"); - new_entry->location = MC_dwarf_get_location(NULL, loc_expr); - - xbt_dynar_push(loclist, &new_entry); - - xbt_dynar_free(&split); - free(loc_expr); - - read = xbt_getline(&line, &n, fp); - if(read != -1){ - line[read - 1] = '\0'; - xbt_str_strip_spaces(line); - split = xbt_str_split(line, " "); - } - - } - - - 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); - - } - - xbt_free(line); - xbt_free(command); - pclose(fp); - - return location_list; -} +/** \brief Finds a frame (DW_TAG_subprogram) from an DWARF offset in the rangd of this subprogram + * + * The offset can be an offset of a child DW_TAG_variable. + */ static dw_frame_t MC_dwarf_get_frame_by_offset(xbt_dict_t all_variables, unsigned long int offset){ xbt_dict_cursor_t cursor = NULL; @@ -466,9 +494,9 @@ static int MC_dwarf_get_variable_index(xbt_dynar_t variables, char* var, void *a end = cursor - 1; }else{ if(address){ /* global variable */ - if(var_test->address.address == address) + if(var_test->address == address) return -1; - if(var_test->address.address > address) + if(var_test->address > address) end = cursor - 1; else start = cursor + 1; @@ -479,7 +507,7 @@ static int MC_dwarf_get_variable_index(xbt_dynar_t variables, char* var, void *a } if(strcmp(var_test->name, var) == 0){ - if(address && var_test->address.address < address) + if(address && var_test->address < address) return cursor+1; else return cursor; @@ -490,746 +518,41 @@ static int MC_dwarf_get_variable_index(xbt_dynar_t variables, char* var, void *a } +void MC_dwarf_register_global_variable(mc_object_info_t info, dw_variable_t variable) { + int index = MC_dwarf_get_variable_index(info->global_variables, variable->name, variable->address); + if (index != -1) + xbt_dynar_insert_at(info->global_variables, index, &variable); + // TODO, else ? +} -static void MC_dwarf_get_variables(const char *elf_file, xbt_dict_t location_list, xbt_dict_t *local_variables, xbt_dynar_t *global_variables, xbt_dict_t *types){ - - char *command = bprintf("objdump -Wi %s", elf_file); - - FILE *fp = popen(command, "r"); - - if(fp == NULL) - perror("popen for objdump failed"); - - char *line = NULL, *origin, *abstract_origin, *current_frame = NULL, - *subprogram_name = NULL, *subprogram_start = NULL, *subprogram_end = NULL, - *node_type = NULL, *location_type = NULL, *variable_name = NULL, - *loc_expr = NULL, *name = NULL, *end =NULL, *type_origin = NULL, *global_address = NULL, - *parent_value = NULL; - - ssize_t read =0; - size_t n = 0; - int global_variable = 0, parent = 0, new_frame = 0, new_variable = 1, size = 0, - is_pointer = 0, struct_decl = 0, member_end = 0, - enumeration_size = 0, subrange = 0, union_decl = 0, offset = 0, index = 0; - - xbt_dynar_t split = NULL, split2 = NULL; - - xbt_dict_t variables_origin = xbt_dict_new_homogeneous(xbt_free); - xbt_dict_t subprograms_origin = xbt_dict_new_homogeneous(xbt_free); - - dw_frame_t variable_frame, subroutine_frame = NULL; - - e_dw_type_type type_type = -1; - - read = xbt_getline(&line, &n, fp); - - while (read != -1) { - - /* Wipeout the new line character */ - line[read - 1] = '\0'; - - if(n == 0 || strlen(line) == 0){ - read = xbt_getline(&line, &n, fp); - continue; - } - - xbt_str_ltrim(line, NULL); - xbt_str_strip_spaces(line); - - if(line[0] != '<'){ - read = xbt_getline(&line, &n, fp); - continue; - } - - xbt_dynar_free(&split); - split = xbt_str_split(line, " "); - - /* Get node type */ - node_type = xbt_dynar_get_as(split, xbt_dynar_length(split) - 1, char *); - - if(strcmp(node_type, "(DW_TAG_subprogram)") == 0){ /* New frame */ - - dw_frame_t frame = NULL; - - strtok(xbt_dynar_get_as(split, 0, char *), "<"); - subprogram_start = xbt_strdup(strtok(NULL, "<")); - xbt_str_rtrim(subprogram_start, ">:"); - - read = xbt_getline(&line, &n, fp); - - while(read != -1){ - - /* Wipeout the new line character */ - line[read - 1] = '\0'; - - if(n == 0 || strlen(line) == 0){ - read = xbt_getline(&line, &n, fp); - continue; - } - - xbt_dynar_free(&split); - xbt_str_rtrim(line, NULL); - xbt_str_strip_spaces(line); - split = xbt_str_split(line, " "); - - node_type = xbt_dynar_get_as(split, 1, char *); - - if(strncmp(node_type, "DW_AT_", 6) != 0) - break; - - if(strcmp(node_type, "DW_AT_sibling") == 0){ - - subprogram_end = xbt_strdup(xbt_dynar_get_as(split, 3, char*)); - xbt_str_ltrim(subprogram_end, "<0x"); - xbt_str_rtrim(subprogram_end, ">"); - - }else if(strcmp(node_type, "DW_AT_abstract_origin:") == 0){ /* Frame already in dict */ - - new_frame = 0; - abstract_origin = xbt_strdup(xbt_dynar_get_as(split, 2, char*)); - xbt_str_ltrim(abstract_origin, "<0x"); - xbt_str_rtrim(abstract_origin, ">"); - subprogram_name = (char *)xbt_dict_get_or_null(subprograms_origin, abstract_origin); - frame = xbt_dict_get_or_null(*local_variables, subprogram_name); - xbt_free(abstract_origin); - - }else if(strcmp(node_type, "DW_AT_name") == 0){ - - new_frame = 1; - 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_dynar_new(sizeof(dw_variable_t), dw_variable_free_voidp); - frame->frame_base = xbt_new0(s_dw_location_t, 1); - current_frame = strdup(frame->name); - - xbt_dict_set(subprograms_origin, subprogram_start, xbt_strdup(frame->name), NULL); - - }else if(strcmp(node_type, "DW_AT_frame_base") == 0){ - - location_type = xbt_dynar_get_as(split, xbt_dynar_length(split) - 1, char *); - - if(strcmp(location_type, "list)") == 0){ /* Search location in location list */ - - frame->frame_base = MC_dwarf_get_location(location_list, xbt_dynar_get_as(split, 3, char *)); - - }else{ - - xbt_str_strip_spaces(line); - split2 = xbt_str_split(line, "("); - xbt_dynar_remove_at(split2, 0, NULL); - loc_expr = xbt_str_join(split2, " "); - xbt_str_rtrim(loc_expr, ")"); - frame->frame_base = MC_dwarf_get_location(NULL, loc_expr); - xbt_dynar_free(&split2); - xbt_free(loc_expr); - - } - - }else if(strcmp(node_type, "DW_AT_low_pc") == 0){ - - if(frame != NULL) - frame->low_pc = (void *)strtoul(xbt_dynar_get_as(split, 3, char *), NULL, 16); - - }else if(strcmp(node_type, "DW_AT_high_pc") == 0){ - - if(frame != NULL) - frame->high_pc = (void *)strtoul(xbt_dynar_get_as(split, 3, char *), NULL, 16); - - }else if(strcmp(node_type, "DW_AT_MIPS_linkage_name:") == 0){ - - 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, xbt_strdup(frame->name), NULL); - - } - - read = xbt_getline(&line, &n, fp); - - } - - if(new_frame == 1){ - frame->start = strtoul(subprogram_start, NULL, 16); - if(subprogram_end != NULL) - frame->end = strtoul(subprogram_end, NULL, 16); - xbt_dict_set(*local_variables, frame->name, frame, NULL); - } - - xbt_free(subprogram_start); - xbt_free(subprogram_end); - subprogram_end = NULL; - - - }else if(strcmp(node_type, "(DW_TAG_variable)") == 0){ /* New variable */ - - dw_variable_t var = NULL; - - parent_value = strdup(xbt_dynar_get_as(split, 0, char *)); - parent_value = strtok(parent_value,"<"); - xbt_str_rtrim(parent_value, ">"); - parent = atoi(parent_value); - xbt_free(parent_value); - - if(parent == 1) - global_variable = 1; - - strtok(xbt_dynar_get_as(split, 0, char *), "<"); - origin = xbt_strdup(strtok(NULL, "<")); - xbt_str_rtrim(origin, ">:"); - - read = xbt_getline(&line, &n, fp); - - while(read != -1){ - - /* Wipeout the new line character */ - line[read - 1] = '\0'; - - if(n == 0 || strlen(line) == 0){ - read = xbt_getline(&line, &n, fp); - continue; - } - - xbt_dynar_free(&split); - xbt_str_rtrim(line, NULL); - xbt_str_strip_spaces(line); - split = xbt_str_split(line, " "); - - node_type = xbt_dynar_get_as(split, 1, char *); - - if(strncmp(node_type, "DW_AT_", 6) != 0) - break; - - if(strcmp(node_type, "DW_AT_name") == 0){ - - var = xbt_new0(s_dw_variable_t, 1); - var->name = xbt_strdup(xbt_dynar_get_as(split, xbt_dynar_length(split) - 1, char *)); - xbt_dict_set(variables_origin, origin, xbt_strdup(var->name), NULL); - - }else if(strcmp(node_type, "DW_AT_abstract_origin:") == 0){ - - new_variable = 0; - - abstract_origin = xbt_dynar_get_as(split, 2, char *); - xbt_str_ltrim(abstract_origin, "<0x"); - xbt_str_rtrim(abstract_origin, ">"); - - variable_name = (char *)xbt_dict_get_or_null(variables_origin, abstract_origin); - variable_frame = MC_dwarf_get_frame_by_offset(*local_variables, strtoul(abstract_origin, NULL, 16)); - var = MC_dwarf_get_variable_by_name(variable_frame, variable_name); - - }else if(strcmp(node_type, "DW_AT_location") == 0){ - - if(var != NULL){ - - if(!global_variable){ - - location_type = xbt_dynar_get_as(split, xbt_dynar_length(split) - 1, char *); - - if(strcmp(location_type, "list)") == 0){ /* Search location in location list */ - var->address.location = MC_dwarf_get_location(location_list, xbt_dynar_get_as(split, 3, char *)); - }else{ - xbt_str_strip_spaces(line); - split2 = xbt_str_split(line, "("); - xbt_dynar_remove_at(split2, 0, NULL); - loc_expr = xbt_str_join(split2, " "); - xbt_str_rtrim(loc_expr, ")"); - if(strncmp("DW_OP_addr", loc_expr, 10) == 0){ - global_variable = 1; - xbt_dynar_free(&split2); - split2 = xbt_str_split(loc_expr, " "); - if(strcmp(elf_file, xbt_binary_name) != 0) - var->address.address = (char *)start_text_libsimgrid + (long)((void *)strtoul(xbt_dynar_get_as(split2, xbt_dynar_length(split2) - 1, char*), NULL, 16)); - else - var->address.address = (void *)strtoul(xbt_dynar_get_as(split2, xbt_dynar_length(split2) - 1, char*), NULL, 16); - }else{ - var->address.location = MC_dwarf_get_location(NULL, loc_expr); - } - xbt_dynar_free(&split2); - xbt_free(loc_expr); - } - }else{ - global_address = xbt_strdup(xbt_dynar_get_as(split, xbt_dynar_length(split) - 1, char *)); - xbt_str_rtrim(global_address, ")"); - if(strcmp(elf_file, xbt_binary_name) != 0) - var->address.address = (char *)start_text_libsimgrid + (long)((void *)strtoul(global_address, NULL, 16)); - else - var->address.address = (void *)strtoul(global_address, NULL, 16); - xbt_free(global_address); - global_address = NULL; - } - - } - - }else if(strcmp(node_type, "DW_AT_type") == 0){ - - type_origin = xbt_strdup(xbt_dynar_get_as(split, 3, char *)); - xbt_str_ltrim(type_origin, "<0x"); - xbt_str_rtrim(type_origin, ">"); - - }else if(strcmp(node_type, "DW_AT_declaration") == 0){ - - new_variable = 0; - if(new_variable){ - dw_variable_free(var); - var = NULL; - } - - }else if(strcmp(node_type, "DW_AT_artificial") == 0){ - - new_variable = 0; - if(new_variable){ - dw_variable_free(var); - var = NULL; - } - - } - - read = xbt_getline(&line, &n, fp); - - } - - if(new_variable == 1){ - - if(!global_variable){ - variable_frame = xbt_dict_get_or_null(*local_variables, current_frame); - var->type_origin = strdup(type_origin); - var->global = 0; - index = MC_dwarf_get_variable_index(variable_frame->variables, var->name, NULL); - if(index != -1) - xbt_dynar_insert_at(variable_frame->variables, index, &var); - }else{ - var->type_origin = strdup(type_origin); - var->global = 1; - index = MC_dwarf_get_variable_index(*global_variables, var->name, var->address.address); - if(index != -1) - xbt_dynar_insert_at(*global_variables, index, &var); - } - - xbt_free(type_origin); - type_origin = NULL; - } - - global_variable = 0; - new_variable = 1; - - }else if(strcmp(node_type, "(DW_TAG_inlined_subroutine)") == 0){ - - read = xbt_getline(&line, &n, fp); - - while(read != -1){ - - /* Wipeout the new line character */ - line[read - 1] = '\0'; - - if(n == 0 || strlen(line) == 0){ - read = xbt_getline(&line, &n, fp); - continue; - } - - xbt_dynar_free(&split); - xbt_str_rtrim(line, NULL); - xbt_str_strip_spaces(line); - split = xbt_str_split(line, " "); - - if(strncmp(xbt_dynar_get_as(split, 1, char *), "DW_AT_", 6) != 0) - break; - - node_type = xbt_dynar_get_as(split, 1, char *); - - if(strcmp(node_type, "DW_AT_abstract_origin:") == 0){ - - origin = xbt_dynar_get_as(split, 2, char *); - xbt_str_ltrim(origin, "<0x"); - xbt_str_rtrim(origin, ">"); - - subprogram_name = (char *)xbt_dict_get_or_null(subprograms_origin, origin); - subroutine_frame = xbt_dict_get_or_null(*local_variables, subprogram_name); - - }else if(strcmp(node_type, "DW_AT_low_pc") == 0){ - - subroutine_frame->low_pc = (void *)strtoul(xbt_dynar_get_as(split, 3, char *), NULL, 16); - - }else if(strcmp(node_type, "DW_AT_high_pc") == 0){ - - subroutine_frame->high_pc = (void *)strtoul(xbt_dynar_get_as(split, 3, char *), NULL, 16); - } - - read = xbt_getline(&line, &n, fp); - - } - - }else if(strcmp(node_type, "(DW_TAG_base_type)") == 0 - || strcmp(node_type, "(DW_TAG_enumeration_type)") == 0 - || strcmp(node_type, "(DW_TAG_enumerator)") == 0 - || strcmp(node_type, "(DW_TAG_typedef)") == 0 - || strcmp(node_type, "(DW_TAG_const_type)") == 0 - || strcmp(node_type, "(DW_TAG_subroutine_type)") == 0 - || strcmp(node_type, "(DW_TAG_volatile_type)") == 0 - || (is_pointer = !strcmp(node_type, "(DW_TAG_pointer_type)"))){ - - if(strcmp(node_type, "(DW_TAG_base_type)") == 0) - type_type = e_dw_base_type; - else if(strcmp(node_type, "(DW_TAG_enumeration_type)") == 0) - type_type = e_dw_enumeration_type; - else if(strcmp(node_type, "(DW_TAG_enumerator)") == 0) - type_type = e_dw_enumerator; - else if(strcmp(node_type, "(DW_TAG_typedef)") == 0) - type_type = e_dw_typedef; - else if(strcmp(node_type, "(DW_TAG_const_type)") == 0) - type_type = e_dw_const_type; - else if(strcmp(node_type, "(DW_TAG_pointer_type)") == 0) - type_type = e_dw_pointer_type; - else if(strcmp(node_type, "(DW_TAG_subroutine_type)") == 0) - type_type = e_dw_subroutine_type; - else if(strcmp(node_type, "(DW_TAG_volatile_type)") == 0) - type_type = e_dw_volatile_type; - - strtok(xbt_dynar_get_as(split, 0, char *), "<"); - origin = strdup(strtok(NULL, "<")); - xbt_str_rtrim(origin, ">:"); - - read = xbt_getline(&line, &n, fp); - - while(read != -1){ - - /* Wipeout the new line character */ - line[read - 1] = '\0'; - - if(n == 0 || strlen(line) == 0){ - read = xbt_getline(&line, &n, fp); - continue; - } - - xbt_dynar_free(&split); - xbt_str_rtrim(line, NULL); - xbt_str_strip_spaces(line); - split = xbt_str_split(line, " "); - - if(strncmp(xbt_dynar_get_as(split, 1, char *), "DW_AT_", 6) != 0) - break; - - node_type = xbt_dynar_get_as(split, 1, char *); - - if(strcmp(node_type, "DW_AT_byte_size") == 0){ - size = strtol(xbt_dynar_get_as(split, xbt_dynar_length(split) - 1, char*), NULL, 10); - if(type_type == e_dw_enumeration_type) - enumeration_size = size; - }else if(strcmp(node_type, "DW_AT_name") == 0){ - end = xbt_str_join(split, " "); - xbt_dynar_free(&split); - split = xbt_str_split(end, "):"); - xbt_str_ltrim(xbt_dynar_get_as(split, xbt_dynar_length(split) - 1, char*), NULL); - name = xbt_strdup(xbt_dynar_get_as(split, xbt_dynar_length(split) - 1, char*)); - }else if(strcmp(node_type, "DW_AT_type") == 0){ - type_origin = xbt_strdup(xbt_dynar_get_as(split, 3, char *)); - xbt_str_ltrim(type_origin, "<0x"); - xbt_str_rtrim(type_origin, ">"); - } - - read = xbt_getline(&line, &n, fp); - } - - dw_type_t type = xbt_new0(s_dw_type_t, 1); - type->type = type_type; - if(name) - type->name = xbt_strdup(name); - else - type->name = xbt_strdup("undefined"); - type->is_pointer_type = is_pointer; - type->id = (void *)strtoul(origin, NULL, 16); - if(type_origin) - type->dw_type_id = xbt_strdup(type_origin); - if(type_type == e_dw_enumerator) - type->size = enumeration_size; - else - type->size = size; - type->members = NULL; - - xbt_dict_set(*types, origin, type, NULL); - - xbt_free(name); - name = NULL; - xbt_free(type_origin); - type_origin = NULL; - xbt_free(end); - end = NULL; - - is_pointer = 0; - size = 0; - xbt_free(origin); - - }else if(strcmp(node_type, "(DW_TAG_structure_type)") == 0 || strcmp(node_type, "(DW_TAG_union_type)") == 0){ - - if(strcmp(node_type, "(DW_TAG_structure_type)") == 0) - struct_decl = 1; - else - union_decl = 1; - - strtok(xbt_dynar_get_as(split, 0, char *), "<"); - origin = strdup(strtok(NULL, "<")); - xbt_str_rtrim(origin, ">:"); - - read = xbt_getline(&line, &n, fp); - - dw_type_t type = NULL; - - while(read != -1){ - - while(read != -1){ - - /* Wipeout the new line character */ - line[read - 1] = '\0'; - - if(n == 0 || strlen(line) == 0){ - read = xbt_getline(&line, &n, fp); - continue; - } - - xbt_dynar_free(&split); - xbt_str_rtrim(line, NULL); - xbt_str_strip_spaces(line); - split = xbt_str_split(line, " "); - - node_type = xbt_dynar_get_as(split, 1, char *); - - if(strncmp(node_type, "DW_AT_", 6) != 0){ - member_end = 1; - break; - } - - if(strcmp(node_type, "DW_AT_byte_size") == 0){ - size = strtol(xbt_dynar_get_as(split, xbt_dynar_length(split) - 1, char*), NULL, 10); - }else if(strcmp(node_type, "DW_AT_name") == 0){ - xbt_free(end); - end = xbt_str_join(split, " "); - xbt_dynar_free(&split); - split = xbt_str_split(end, "):"); - xbt_str_ltrim(xbt_dynar_get_as(split, xbt_dynar_length(split) - 1, char*), NULL); - name = xbt_strdup(xbt_dynar_get_as(split, xbt_dynar_length(split) - 1, char*)); - }else if(strcmp(node_type, "DW_AT_type") == 0){ - type_origin = xbt_strdup(xbt_dynar_get_as(split, 3, char *)); - xbt_str_ltrim(type_origin, "<0x"); - xbt_str_rtrim(type_origin, ">"); - }else if(strcmp(node_type, "DW_AT_data_member_location:") == 0){ - xbt_free(end); - end = xbt_str_join(split, " "); - xbt_dynar_free(&split); - split = xbt_str_split(end, "DW_OP_plus_uconst:"); - xbt_str_ltrim(xbt_dynar_get_as(split, xbt_dynar_length(split) - 1, char *), NULL); - xbt_str_rtrim(xbt_dynar_get_as(split, xbt_dynar_length(split) - 1, char *), ")"); - offset = strtol(xbt_dynar_get_as(split, xbt_dynar_length(split) - 1, char*), NULL, 10); - } - - read = xbt_getline(&line, &n, fp); - - } - - if(member_end && type){ - member_end = 0; - - dw_type_t member_type = xbt_new0(s_dw_type_t, 1); - member_type->name = xbt_strdup(name); - member_type->size = size; - member_type->is_pointer_type = is_pointer; - member_type->id = (void *)strtoul(origin, NULL, 16); - member_type->offset = offset; - if(type_origin) - member_type->dw_type_id = xbt_strdup(type_origin); - - xbt_dynar_push(type->members, &member_type); - - xbt_free(name); - name = NULL; - xbt_free(end); - end = NULL; - xbt_free(type_origin); - type_origin = NULL; - size = 0; - offset = 0; - - xbt_free(origin); - origin = NULL; - strtok(xbt_dynar_get_as(split, 0, char *), "<"); - origin = strdup(strtok(NULL, "<")); - xbt_str_rtrim(origin, ">:"); - - } - - if(struct_decl || union_decl){ - type = xbt_new0(s_dw_type_t, 1); - if(struct_decl) - type->type = e_dw_structure_type; - else - type->type = e_dw_union_type; - type->name = xbt_strdup(name); - type->size = size; - type->is_pointer_type = is_pointer; - type->id = (void *)strtoul(origin, NULL, 16); - if(type_origin) - type->dw_type_id = xbt_strdup(type_origin); - type->members = xbt_dynar_new(sizeof(dw_type_t), dw_type_free_voidp); - - xbt_dict_set(*types, origin, type, NULL); - - xbt_free(name); - name = NULL; - xbt_free(end); - end = NULL; - xbt_free(type_origin); - type_origin = NULL; - size = 0; - struct_decl = 0; - union_decl = 0; - - } - - if(strcmp(xbt_dynar_get_as(split, xbt_dynar_length(split) - 1, char *), "(DW_TAG_member)") != 0) - break; - - read = xbt_getline(&line, &n, fp); - - } - - xbt_free(origin); - origin = NULL; - - }else if(strcmp(node_type, "(DW_TAG_array_type)") == 0){ - - strtok(xbt_dynar_get_as(split, 0, char *), "<"); - origin = strdup(strtok(NULL, "<")); - xbt_str_rtrim(origin, ">:"); - - read = xbt_getline(&line, &n, fp); - - dw_type_t type = NULL; - - while(read != -1){ - - while(read != -1){ - - /* Wipeout the new line character */ - line[read - 1] = '\0'; - - if(n == 0 || strlen(line) == 0){ - read = xbt_getline(&line, &n, fp); - continue; - } - - xbt_dynar_free(&split); - xbt_str_rtrim(line, NULL); - xbt_str_strip_spaces(line); - split = xbt_str_split(line, " "); - - node_type = xbt_dynar_get_as(split, 1, char *); - - if(strncmp(node_type, "DW_AT_", 6) != 0) - break; - - if(strcmp(node_type, "DW_AT_upper_bound") == 0){ - size = strtol(xbt_dynar_get_as(split, xbt_dynar_length(split) - 1, char*), NULL, 10); - }else if(strcmp(node_type, "DW_AT_name") == 0){ - end = xbt_str_join(split, " "); - xbt_dynar_free(&split); - split = xbt_str_split(end, "):"); - xbt_str_ltrim(xbt_dynar_get_as(split, xbt_dynar_length(split) - 1, char*), NULL); - name = xbt_strdup(xbt_dynar_get_as(split, xbt_dynar_length(split) - 1, char*)); - }else if(strcmp(node_type, "DW_AT_type") == 0){ - type_origin = xbt_strdup(xbt_dynar_get_as(split, 3, char *)); - xbt_str_ltrim(type_origin, "<0x"); - xbt_str_rtrim(type_origin, ">"); - } - - read = xbt_getline(&line, &n, fp); - - } - - if(strcmp(xbt_dynar_get_as(split, xbt_dynar_length(split) - 1, char *), "(DW_TAG_subrange_type)") == 0){ - subrange = 1; - } - - if(subrange && type){ - type->size = size; - - xbt_free(name); - name = NULL; - xbt_free(end); - end = NULL; - xbt_free(type_origin); - type_origin = NULL; - size = 0; - - xbt_free(origin); - origin = NULL; - strtok(xbt_dynar_get_as(split, 0, char *), "<"); - origin = strdup(strtok(NULL, "<")); - xbt_str_rtrim(origin, ">:"); - - }else { - - type = xbt_new0(s_dw_type_t, 1); - type->type = e_dw_array_type; - type->name = xbt_strdup(name); - type->is_pointer_type = is_pointer; - type->id = (void *)strtoul(origin, NULL, 16); - if(type_origin) - type->dw_type_id = xbt_strdup(type_origin); - type->members = NULL; - - xbt_dict_set(*types, origin, type, NULL); - - xbt_free(name); - name = NULL; - xbt_free(end); - end = NULL; - xbt_free(type_origin); - type_origin = NULL; - size = 0; - } - - if(strcmp(xbt_dynar_get_as(split, xbt_dynar_length(split) - 1, char *), "(DW_TAG_subrange_type)") != 0) - break; - - read = xbt_getline(&line, &n, fp); - - } - - xbt_free(origin); - origin = NULL; - - }else{ - - read = xbt_getline(&line, &n, fp); - - } +void MC_dwarf_register_non_global_variable(mc_object_info_t info, dw_frame_t frame, dw_variable_t variable) { + xbt_assert(frame, "Frame is NULL"); + int index = MC_dwarf_get_variable_index(frame->variables, variable->name, NULL); + if (index != -1) + xbt_dynar_insert_at(frame->variables, index, &variable); + // TODO, else ? +} - } - - xbt_dynar_free(&split); - xbt_dict_free(&variables_origin); - xbt_dict_free(&subprograms_origin); - xbt_free(line); - xbt_free(command); - pclose(fp); - +void MC_dwarf_register_variable(mc_object_info_t info, dw_frame_t frame, dw_variable_t variable) { + if(variable->global) + MC_dwarf_register_global_variable(info, variable); + else if(frame==NULL) + xbt_die("No frame for this local variable"); + else + MC_dwarf_register_non_global_variable(info, frame, variable); } /******************************* Ignore mechanism *******************************/ /*********************************************************************************/ +xbt_dynar_t mc_checkpoint_ignore; + typedef struct s_mc_stack_ignore_variable{ - int in_libsimgrid; char *var_name; char *frame; }s_mc_stack_ignore_variable_t, *mc_stack_ignore_variable_t; -typedef struct s_mc_data_bss_ignore_variable{ - int in_libsimgrid; - char *name; -}s_mc_data_bss_ignore_variable_t, *mc_data_bss_ignore_variable_t; - /**************************** Free functions ******************************/ static void stack_ignore_variable_free(mc_stack_ignore_variable_t v){ @@ -1250,13 +573,12 @@ void heap_ignore_region_free_voidp(void *r){ heap_ignore_region_free((mc_heap_ignore_region_t) * (void **) r); } -static void data_bss_ignore_variable_free(mc_data_bss_ignore_variable_t v){ - xbt_free(v->name); - xbt_free(v); +static void checkpoint_ignore_region_free(mc_checkpoint_ignore_region_t r){ + xbt_free(r); } -static void data_bss_ignore_variable_free_voidp(void *v){ - data_bss_ignore_variable_free((mc_data_bss_ignore_variable_t) * (void **) v); +static void checkpoint_ignore_region_free_voidp(void *r){ + checkpoint_ignore_region_free((mc_checkpoint_ignore_region_t) * (void **) r); } /***********************************************************************/ @@ -1303,11 +625,11 @@ void MC_ignore_heap(void *address, size_t size){ if(!raw_mem_set) MC_UNSET_RAW_MEM; return; - } - if(current_region->address < address) + }else if(current_region->address < address){ start = cursor + 1; - if(current_region->address > address) - end = cursor - 1; + }else{ + end = cursor - 1; + } } if(current_region->address < address) @@ -1315,10 +637,8 @@ void MC_ignore_heap(void *address, size_t size){ else xbt_dynar_insert_at(mc_heap_comparison_ignore, cursor, ®ion); - MC_UNSET_RAW_MEM; - - if(raw_mem_set) - MC_SET_RAW_MEM; + if(!raw_mem_set) + MC_UNSET_RAW_MEM; } void MC_remove_ignore_heap(void *address, size_t size){ @@ -1339,15 +659,15 @@ void MC_remove_ignore_heap(void *address, size_t size){ if(region->address == address){ ignore_found = 1; break; - } - if(region->address < address) + }else if(region->address < address){ start = cursor + 1; - if(region->address > address){ + }else{ if((char * )region->address <= ((char *)address + size)){ ignore_found = 1; break; - }else + }else{ end = cursor - 1; + } } } @@ -1356,47 +676,31 @@ void MC_remove_ignore_heap(void *address, size_t size){ MC_remove_ignore_heap(address, size); } - MC_UNSET_RAW_MEM; - - if(raw_mem_set) - MC_SET_RAW_MEM; + if(!raw_mem_set) + MC_UNSET_RAW_MEM; } -void MC_ignore_global_variable(const char *name, ...){ +void MC_ignore_global_variable(const char *name){ int raw_mem_set = (mmalloc_get_current_heap() == raw_heap); MC_SET_RAW_MEM; - va_list ap; - va_start(ap, name); - int in_libsimgrid = va_arg(ap, int); - va_end(ap); - - xbt_dynar_t variables = NULL; - - if(in_libsimgrid == 1){ - variables = mc_global_variables_libsimgrid; - }else{ - variables = mc_global_variables_binary; - } - - if(variables){ + xbt_assert(mc_libsimgrid_info, "MC subsystem not initialized"); unsigned int cursor = 0; dw_variable_t current_var; int start = 0; - int end = xbt_dynar_length(variables) - 1; - int var_found; + int end = xbt_dynar_length(mc_libsimgrid_info->global_variables) - 1; while(start <= end){ cursor = (start + end) /2; - current_var = (dw_variable_t)xbt_dynar_get_as(variables, cursor, dw_variable_t); + current_var = (dw_variable_t)xbt_dynar_get_as(mc_libsimgrid_info->global_variables, cursor, dw_variable_t); if(strcmp(current_var->name, name) == 0){ - xbt_dynar_remove_at(variables, cursor, NULL); - var_found = 1; - break; + xbt_dynar_remove_at(mc_libsimgrid_info->global_variables, cursor, NULL); + start = 0; + end = xbt_dynar_length(mc_libsimgrid_info->global_variables) - 1; }else if(strcmp(current_var->name, name) < 0){ start = cursor + 1; }else{ @@ -1404,96 +708,29 @@ void MC_ignore_global_variable(const char *name, ...){ } } - if(var_found){ - if(in_libsimgrid == 1) - MC_ignore_global_variable(name, 1); - else - MC_ignore_global_variable(name); - } - - }else{ - - if(mc_data_bss_comparison_ignore == NULL) - mc_data_bss_comparison_ignore = xbt_dynar_new(sizeof(mc_data_bss_ignore_variable_t), data_bss_ignore_variable_free_voidp); - - mc_data_bss_ignore_variable_t var = NULL; - var = xbt_new0(s_mc_data_bss_ignore_variable_t, 1); - var->name = strdup(name); - var->in_libsimgrid = (in_libsimgrid == 1); - - if(xbt_dynar_is_empty(mc_data_bss_comparison_ignore)){ - - xbt_dynar_insert_at(mc_data_bss_comparison_ignore, 0, &var); - - }else{ - - unsigned int cursor = 0; - int start = 0; - int end = xbt_dynar_length(mc_data_bss_comparison_ignore) - 1; - mc_data_bss_ignore_variable_t current_var = NULL; - - while(start <= end){ - cursor = (start + end) / 2; - current_var = (mc_data_bss_ignore_variable_t)xbt_dynar_get_as(mc_data_bss_comparison_ignore, cursor, mc_data_bss_ignore_variable_t); - if(strcmp(current_var->name, name) == 0){ - data_bss_ignore_variable_free(var); - if(!raw_mem_set) - MC_UNSET_RAW_MEM; - return; - }else if(strcmp(current_var->name, name) < 0){ - start = cursor + 1; - }else{ - end = cursor - 1; - } - } - - if(strcmp(current_var->name, name) < 0) - xbt_dynar_insert_at(mc_data_bss_comparison_ignore, cursor + 1, &var); - else - xbt_dynar_insert_at(mc_data_bss_comparison_ignore, cursor, &var); - - } - } - - MC_UNSET_RAW_MEM; - - if(raw_mem_set) - MC_SET_RAW_MEM; + if(!raw_mem_set) + MC_UNSET_RAW_MEM; } -void MC_ignore_local_variable(const char *var_name, const char *frame_name, ...){ +void MC_ignore_local_variable(const char *var_name, const char *frame_name){ int raw_mem_set = (mmalloc_get_current_heap() == raw_heap); MC_SET_RAW_MEM; - va_list ap; - va_start(ap, frame_name); - int in_libsimgrid = va_arg(ap, int); - va_end(ap); - - xbt_dict_t variables = NULL; - - if(in_libsimgrid == 1){ - variables = mc_local_variables_libsimgrid; - }else{ - variables = mc_local_variables_binary; - } - - if(variables){ unsigned int cursor = 0; dw_variable_t current_var; int start, end; - if(strcmp(frame_name, "*") == 0){ /* Remove variable in all frames (binary and libsimgrid) */ - xbt_dict_cursor_t dict_cursor, dict_cursor2; + if(strcmp(frame_name, "*") == 0){ /* Remove variable in all frames */ + xbt_dict_cursor_t dict_cursor; char *current_frame_name; dw_frame_t frame; - xbt_dict_foreach(mc_local_variables_libsimgrid, dict_cursor, current_frame_name, frame){ + xbt_dict_foreach(mc_libsimgrid_info->local_variables, dict_cursor, current_frame_name, frame){ start = 0; end = xbt_dynar_length(frame->variables) - 1; while(start <= end){ cursor = (start + end) / 2; - current_var = (dw_variable_t)xbt_dynar_get_as(frame->variables, cursor, dw_variable_t); + current_var = (dw_variable_t)xbt_dynar_get_as(frame->variables, cursor, dw_variable_t); if(strcmp(current_var->name, var_name) == 0){ xbt_dynar_remove_at(frame->variables, cursor, NULL); start = 0; @@ -1505,12 +742,12 @@ void MC_ignore_local_variable(const char *var_name, const char *frame_name, ...) } } } - xbt_dict_foreach(mc_local_variables_binary, dict_cursor2, current_frame_name, frame){ + xbt_dict_foreach(mc_binary_info->local_variables, dict_cursor, current_frame_name, frame){ start = 0; end = xbt_dynar_length(frame->variables) - 1; while(start <= end){ cursor = (start + end) / 2; - current_var = (dw_variable_t)xbt_dynar_get_as(frame->variables, cursor, dw_variable_t); + current_var = (dw_variable_t)xbt_dynar_get_as(frame->variables, cursor, dw_variable_t); if(strcmp(current_var->name, var_name) == 0){ xbt_dynar_remove_at(frame->variables, cursor, NULL); start = 0; @@ -1523,7 +760,8 @@ void MC_ignore_local_variable(const char *var_name, const char *frame_name, ...) } } }else{ - xbt_dynar_t variables_list = ((dw_frame_t)xbt_dict_get_or_null(variables, frame_name))->variables; + xbt_dynar_t variables_list = ((dw_frame_t)xbt_dict_get_or_null( + mc_libsimgrid_info->local_variables, frame_name))->variables; start = 0; end = xbt_dynar_length(variables_list) - 1; while(start <= end){ @@ -1540,61 +778,9 @@ void MC_ignore_local_variable(const char *var_name, const char *frame_name, ...) } } } - }else{ - - if(mc_stack_comparison_ignore == NULL) - mc_stack_comparison_ignore = xbt_dynar_new(sizeof(mc_stack_ignore_variable_t), stack_ignore_variable_free_voidp); - - mc_stack_ignore_variable_t var = NULL; - var = xbt_new0(s_mc_stack_ignore_variable_t, 1); - var->in_libsimgrid = (in_libsimgrid == 1); - var->var_name = strdup(var_name); - var->frame = strdup(frame_name); - - if(xbt_dynar_is_empty(mc_stack_comparison_ignore)){ - - xbt_dynar_insert_at(mc_stack_comparison_ignore, 0, &var); - - }else{ - - unsigned int cursor = 0; - int start = 0; - int end = xbt_dynar_length(mc_stack_comparison_ignore) - 1; - mc_stack_ignore_variable_t current_var = NULL; - - while(start <= end){ - cursor = (start + end) / 2; - current_var = (mc_stack_ignore_variable_t)xbt_dynar_get_as(mc_stack_comparison_ignore, cursor, mc_stack_ignore_variable_t); - if(strcmp(current_var->frame, frame_name) == 0){ - if(strcmp(current_var->var_name, var_name) == 0){ - stack_ignore_variable_free(var); - if(!raw_mem_set) - MC_UNSET_RAW_MEM; - return; - } - if(strcmp(current_var->var_name, var_name) < 0) - start = cursor + 1; - if(strcmp(current_var->var_name, var_name) > 0) - end = cursor - 1; - } - if(strcmp(current_var->frame, frame_name) < 0) - start = cursor + 1; - if(strcmp(current_var->frame, frame_name) > 0) - end = cursor - 1; - } - if(strcmp(current_var->frame, frame_name) < 0) - xbt_dynar_insert_at(mc_stack_comparison_ignore, cursor + 1, &var); - else - xbt_dynar_insert_at(mc_stack_comparison_ignore, cursor, &var); - - } - } - - MC_UNSET_RAW_MEM; - - if(raw_mem_set) - MC_SET_RAW_MEM; + if(!raw_mem_set) + MC_UNSET_RAW_MEM; } @@ -1603,6 +789,7 @@ void MC_new_stack_area(void *stack, char *name, void* context, size_t size){ int raw_mem_set = (mmalloc_get_current_heap() == raw_heap); MC_SET_RAW_MEM; + if(stacks_areas == NULL) stacks_areas = xbt_dynar_new(sizeof(stack_region_t), NULL); @@ -1614,132 +801,92 @@ void MC_new_stack_area(void *stack, char *name, void* context, size_t size){ region->size = size; region->block = ((char*)stack - (char*)((xbt_mheap_t)std_heap)->heapbase) / BLOCKSIZE + 1; xbt_dynar_push(stacks_areas, ®ion); - - MC_UNSET_RAW_MEM; - if(raw_mem_set) - MC_SET_RAW_MEM; + if(!raw_mem_set) + MC_UNSET_RAW_MEM; } -/******************************* Initialisation of MC *******************************/ -/*********************************************************************************/ - -static void MC_dump_ignored_local_variables(void){ +void MC_ignore(void *addr, size_t size){ - if(mc_stack_comparison_ignore == NULL || xbt_dynar_is_empty(mc_stack_comparison_ignore)) - return; + int raw_mem_set= (mmalloc_get_current_heap() == raw_heap); - unsigned int cursor = 0; - mc_stack_ignore_variable_t current_var; - xbt_dict_t variables; + MC_SET_RAW_MEM; - xbt_dynar_foreach(mc_stack_comparison_ignore, cursor, current_var){ + if(mc_checkpoint_ignore == NULL) + mc_checkpoint_ignore = xbt_dynar_new(sizeof(mc_checkpoint_ignore_region_t), checkpoint_ignore_region_free_voidp); - if(current_var->in_libsimgrid == 1){ - variables = mc_local_variables_libsimgrid; - }else{ - variables = mc_local_variables_binary; - } + mc_checkpoint_ignore_region_t region = xbt_new0(s_mc_checkpoint_ignore_region_t, 1); + region->addr = addr; + region->size = size; - unsigned int cursor2 = 0; - dw_variable_t var; - int start, end; + if(xbt_dynar_is_empty(mc_checkpoint_ignore)){ + xbt_dynar_push(mc_checkpoint_ignore, ®ion); + }else{ + + unsigned int cursor = 0; + int start = 0; + int end = xbt_dynar_length(mc_checkpoint_ignore) -1; + mc_checkpoint_ignore_region_t current_region = NULL; - if(strcmp(current_var->frame, "*") == 0){ - xbt_dict_cursor_t dict_cursor; - char *frame_name; - dw_frame_t frame; - xbt_dict_foreach(variables, dict_cursor, frame_name, frame){ - start = 0; - end = xbt_dynar_length(frame->variables) - 1; - while(start <= end){ - cursor2 = (start + end) / 2; - var = (dw_variable_t)xbt_dynar_get_as(frame->variables, cursor2, dw_variable_t); - if(strcmp(var->name, current_var->var_name) == 0){ - xbt_dynar_remove_at(frame->variables, cursor2, NULL); - start = 0; - end = xbt_dynar_length(frame->variables) - 1; - }else if(strcmp(var->name, current_var->var_name) < 0){ - start = cursor2 + 1; - }else{ - end = cursor2 - 1; - } + while(start <= end){ + cursor = (start + end) / 2; + current_region = (mc_checkpoint_ignore_region_t)xbt_dynar_get_as(mc_checkpoint_ignore, cursor, mc_checkpoint_ignore_region_t); + if(current_region->addr == addr){ + if(current_region->size == size){ + checkpoint_ignore_region_free(region); + if(!raw_mem_set) + MC_UNSET_RAW_MEM; + return; + }else if(current_region->size < size){ + start = cursor + 1; + }else{ + end = cursor - 1; } + }else if(current_region->addr < addr){ + start = cursor + 1; + }else{ + end = cursor - 1; } - }else{ - xbt_dynar_t variables_list = ((dw_frame_t)xbt_dict_get_or_null(variables, current_var->frame))->variables; - start = 0; - end = xbt_dynar_length(variables_list) - 1; - while(start <= end){ - cursor2 = (start + end) / 2; - var = (dw_variable_t)xbt_dynar_get_as(variables_list, cursor2, dw_variable_t); - if(strcmp(var->name, current_var->var_name) == 0){ - xbt_dynar_remove_at(variables_list, cursor2, NULL); - start = 0; - end = xbt_dynar_length(variables_list) - 1; - }else if(strcmp(var->name, current_var->var_name) < 0){ - start = cursor2 + 1; - }else{ - end = cursor2 - 1; - } + } + + if(current_region->addr == addr){ + if(current_region->size < size){ + xbt_dynar_insert_at(mc_checkpoint_ignore, cursor + 1, ®ion); + }else{ + xbt_dynar_insert_at(mc_checkpoint_ignore, cursor, ®ion); } - } + }else if(current_region->addr < addr){ + xbt_dynar_insert_at(mc_checkpoint_ignore, cursor + 1, ®ion); + }else{ + xbt_dynar_insert_at(mc_checkpoint_ignore, cursor, ®ion); + } } - xbt_dynar_free(&mc_stack_comparison_ignore); - mc_stack_comparison_ignore = NULL; - + if(!raw_mem_set) + MC_UNSET_RAW_MEM; } -static void MC_dump_ignored_global_variables(void){ - - if(mc_data_bss_comparison_ignore == NULL || xbt_dynar_is_empty(mc_data_bss_comparison_ignore)) - return; - - unsigned int cursor = 0; - mc_data_bss_ignore_variable_t current_var; - xbt_dynar_t variables; - - unsigned int cursor2 = 0; - dw_variable_t var; - int start, end; - - xbt_dynar_foreach(mc_data_bss_comparison_ignore, cursor, current_var){ - - if(current_var->in_libsimgrid == 1){ - variables = mc_global_variables_libsimgrid; - }else{ - variables = mc_global_variables_binary; - } +/******************************* Initialisation of MC *******************************/ +/*********************************************************************************/ - cursor2 = 0; - start = 0; - end = xbt_dynar_length(variables) - 1; +static void MC_init_debug_info(); +static void MC_init_debug_info() { + XBT_INFO("Get debug information ..."); - while(start <= end){ - cursor2 = (start + end) / 2; - var = (dw_variable_t)xbt_dynar_get_as(variables, cursor2, dw_variable_t); - if(strcmp(var->name, current_var->name) == 0){ - xbt_dynar_remove_at(variables, cursor2, NULL); - return; - }else if(strcmp(var->name, current_var->name) < 0){ - start = cursor2 + 1; - }else{ - end = cursor2 - 1; - } - } - } + memory_map_t maps = MC_get_memory_map(); - xbt_dynar_free(&mc_data_bss_comparison_ignore); - mc_data_bss_comparison_ignore = NULL; - + /* Get local variables for state equality detection */ + mc_binary_info = MC_find_object_info(maps, xbt_binary_name, 1); + mc_libsimgrid_info = MC_find_object_info(maps, libsimgrid_path, 0); + MC_free_memory_map(maps); + XBT_INFO("Get debug information done !"); } void MC_init(){ int raw_mem_set = (mmalloc_get_current_heap() == raw_heap); - + compare = 0; /* Initialize the data structures that must be persistent across every @@ -1748,67 +895,51 @@ void MC_init(){ MC_SET_RAW_MEM; MC_init_memory_map_info(); - - mc_local_variables_libsimgrid = xbt_dict_new_homogeneous(NULL); - mc_local_variables_binary = xbt_dict_new_homogeneous(NULL); - mc_global_variables_libsimgrid = xbt_dynar_new(sizeof(dw_variable_t), dw_variable_free_voidp); - mc_global_variables_binary = xbt_dynar_new(sizeof(dw_variable_t), dw_variable_free_voidp); - mc_variables_type_libsimgrid = xbt_dict_new_homogeneous(NULL); - mc_variables_type_binary = xbt_dict_new_homogeneous(NULL); - - XBT_INFO("Get debug information ..."); + MC_init_debug_info(); - /* Get local variables in binary for state equality detection */ - xbt_dict_t binary_location_list = MC_dwarf_get_location_list(xbt_binary_name); - MC_dwarf_get_variables(xbt_binary_name, binary_location_list, &mc_local_variables_binary, &mc_global_variables_binary, &mc_variables_type_binary); - - /* Get local variables in libsimgrid for state equality detection */ - xbt_dict_t libsimgrid_location_list = MC_dwarf_get_location_list(libsimgrid_path); - MC_dwarf_get_variables(libsimgrid_path, libsimgrid_location_list, &mc_local_variables_libsimgrid, &mc_global_variables_libsimgrid, &mc_variables_type_libsimgrid); - - xbt_dict_free(&libsimgrid_location_list); - xbt_dict_free(&binary_location_list); - - /* Remove variables ignored before getting list of variables */ - MC_dump_ignored_local_variables(); - MC_dump_ignored_global_variables(); - - /* Get .plt section (start and end addresses) for data libsimgrid and data program comparison */ - MC_get_libsimgrid_plt_section(); - MC_get_binary_plt_section(); + /* Init parmap */ + parmap = xbt_parmap_mc_new(xbt_os_get_numcores(), XBT_PARMAP_DEFAULT); MC_UNSET_RAW_MEM; /* Ignore some variables from xbt/ex.h used by exception e for stacks comparison */ MC_ignore_local_variable("e", "*"); - MC_ignore_local_variable("__ex_cleanup", "*", 1); - MC_ignore_local_variable("__ex_mctx_en", "*", 1); - MC_ignore_local_variable("__ex_mctx_me", "*", 1); - MC_ignore_local_variable("__xbt_ex_ctx_ptr", "*", 1); - MC_ignore_local_variable("_log_ev", "*", 1); - MC_ignore_local_variable("_throw_ctx", "*", 1); - MC_ignore_local_variable("ctx", "*", 1); + MC_ignore_local_variable("__ex_cleanup", "*"); + MC_ignore_local_variable("__ex_mctx_en", "*"); + MC_ignore_local_variable("__ex_mctx_me", "*"); + MC_ignore_local_variable("__xbt_ex_ctx_ptr", "*"); + MC_ignore_local_variable("_log_ev", "*"); + MC_ignore_local_variable("_throw_ctx", "*"); + MC_ignore_local_variable("ctx", "*"); - MC_ignore_local_variable("next_context", "smx_ctx_sysv_suspend_serial", 1); - MC_ignore_local_variable("i", "smx_ctx_sysv_suspend_serial", 1); + MC_ignore_local_variable("next_context", "smx_ctx_sysv_suspend_serial"); + MC_ignore_local_variable("i", "smx_ctx_sysv_suspend_serial"); /* Ignore local variable about time used for tracing */ - MC_ignore_local_variable("start_time", "*", 1); - - MC_ignore_global_variable("mc_comp_times", 1); - MC_ignore_global_variable("mc_snapshot_comparison_time", 1); - MC_ignore_global_variable("mc_time", 1); - MC_ignore_global_variable("smpi_current_rank", 1); - MC_ignore_global_variable("smx_current_context_serial", 1); - MC_ignore_global_variable("smx_current_context_key", 1); - MC_ignore_global_variable("sysv_maestro_context", 1); - MC_ignore_global_variable("counter", 1); /* Static variable used for tracing */ + MC_ignore_local_variable("start_time", "*"); + + MC_ignore_global_variable("mc_comp_times"); + MC_ignore_global_variable("mc_snapshot_comparison_time"); + MC_ignore_global_variable("mc_time"); + MC_ignore_global_variable("smpi_current_rank"); + MC_ignore_global_variable("counter"); /* Static variable used for tracing */ + MC_ignore_global_variable("maestro_stack_start"); + MC_ignore_global_variable("maestro_stack_end"); + MC_ignore_global_variable("smx_total_comms"); + + MC_ignore_heap(&(simix_global->process_to_run), sizeof(simix_global->process_to_run)); + MC_ignore_heap(&(simix_global->process_that_ran), sizeof(simix_global->process_that_ran)); + MC_ignore_heap(simix_global->process_to_run, sizeof(*(simix_global->process_to_run))); + MC_ignore_heap(simix_global->process_that_ran, sizeof(*(simix_global->process_that_ran))); + + smx_process_t process; + xbt_swag_foreach(process, simix_global->process_list){ + MC_ignore_heap(&(process->process_hookup), sizeof(process->process_hookup)); + } if(raw_mem_set) MC_SET_RAW_MEM; - XBT_INFO("Get debug information done !"); - } static void MC_init_dot_output(){ /* FIXME : more colors */ @@ -1900,8 +1031,7 @@ void MC_modelcheck_safety(void) }else{ MC_SET_RAW_MEM; MC_init_memory_map_info(); - MC_get_libsimgrid_plt_section(); - MC_get_binary_plt_section(); + MC_init_debug_info(); MC_UNSET_RAW_MEM; } @@ -1910,7 +1040,10 @@ void MC_modelcheck_safety(void) MC_SET_RAW_MEM; /* Save the initial state */ initial_state_safety = xbt_new0(s_mc_global_t, 1); - initial_state_safety->snapshot = MC_take_snapshot(); + initial_state_safety->snapshot = MC_take_snapshot(0); + initial_state_safety->initial_communications_pattern_done = 0; + initial_state_safety->comm_deterministic = 1; + initial_state_safety->send_deterministic = 1; MC_UNSET_RAW_MEM; MC_dpor(); @@ -1965,20 +1098,21 @@ void MC_modelcheck_liveness(){ void MC_exit(void) { xbt_free(mc_time); + MC_memory_exit(); //xbt_abort(); } -int SIMIX_pre_mc_random(smx_simcall_t simcall){ +int SIMIX_pre_mc_random(smx_simcall_t simcall, int min, int max){ return simcall->mc_value; } -int MC_random(void) +int MC_random(int min, int max) { /*FIXME: return mc_current_state->executed_transition->random.value;*/ - return simcall_mc_random(); + return simcall_mc_random(min, max); } /** @@ -2033,6 +1167,7 @@ void MC_replay(xbt_fifo_t stack, int start) xbt_fifo_item_t item, start_item; mc_state_t state; smx_process_t process = NULL; + int comm_pattern = 0; XBT_DEBUG("**** Begin Replay ****"); @@ -2062,6 +1197,7 @@ void MC_replay(xbt_fifo_t stack, int start) xbt_free(key); } } + xbt_dynar_reset(communications_pattern); MC_UNSET_RAW_MEM; @@ -2091,8 +1227,22 @@ void MC_replay(xbt_fifo_t stack, int start) xbt_free(req_str); } } + + if(req->call == SIMCALL_COMM_ISEND) + comm_pattern = 1; + else if(req->call == SIMCALL_COMM_IRECV) + comm_pattern = 2; SIMIX_simcall_pre(req, value); + + MC_SET_RAW_MEM; + if(comm_pattern != 0){ + get_comm_pattern(communications_pattern, req, comm_pattern); + } + MC_UNSET_RAW_MEM; + + comm_pattern = 0; + MC_wait_for_requests(); count++; @@ -2373,6 +1523,10 @@ void MC_print_statistics(mc_stats_t stats) fprintf(dot_output, "}\n"); fclose(dot_output); } + if(initial_state_safety != NULL){ + // XBT_INFO("Communication-deterministic : %s", !initial_state_safety->comm_deterministic ? "No" : "Yes"); + // XBT_INFO("Send-deterministic : %s", !initial_state_safety->send_deterministic ? "No" : "Yes"); + } MC_UNSET_RAW_MEM; } @@ -2389,8 +1543,8 @@ void MC_assert(int prop) } } -void MC_max_depth(int max_depth){ - user_max_depth_reached = max_depth; +void MC_cut(void){ + user_max_depth_reached = 1; } void MC_process_clock_add(smx_process_t process, double amount)