From 3b026a6cdd673b16c8c23c5c1319b12b2585adf8 Mon Sep 17 00:00:00 2001 From: Gabriel Corona Date: Mon, 6 Jan 2014 15:01:45 +0100 Subject: [PATCH] [mc] Split byte_size and element_count in mc_object_info_t --- src/include/mc/datatypes.h | 3 +- src/mc/mc_compare.c | 12 +++---- src/mc/mc_global.c | 44 +++++++++++++++++++----- src/xbt/mmalloc/mm_diff.c | 70 ++++++++++++++++++++------------------ 4 files changed, 80 insertions(+), 49 deletions(-) diff --git a/src/include/mc/datatypes.h b/src/include/mc/datatypes.h index 2d7f1c0bef..6fe65fd27a 100644 --- a/src/include/mc/datatypes.h +++ b/src/include/mc/datatypes.h @@ -57,7 +57,8 @@ typedef struct s_dw_type{ e_dw_type_type type; void *id; /* Offset in the section (in hexadecimal form) */ char *name; /* Name of the type */ - int size; /* Sometimes it si the byte size, sometimes it is the number of elements */ + int byte_size; /* Size in bytes */ + int element_count; /* Number of elements for array type */ char *dw_type_id; /* DW_AT_type */ xbt_dynar_t members; /* if DW_TAG_structure_type, DW_TAG_union_type*/ int is_pointer_type; diff --git a/src/mc/mc_compare.c b/src/mc/mc_compare.c index 618475441b..5301ebecb4 100644 --- a/src/mc/mc_compare.c +++ b/src/mc/mc_compare.c @@ -134,7 +134,7 @@ static int compare_areas_with_type(void *area1, void *area2, xbt_dict_t types, x case e_dw_base_type: case e_dw_enumeration_type: case e_dw_union_type: - return (memcmp(area1, area2, type->size) != 0); + return (memcmp(area1, area2, type->byte_size) != 0); break; case e_dw_typedef: case e_dw_volatile_type: @@ -151,32 +151,32 @@ static int compare_areas_with_type(void *area1, void *area2, xbt_dict_t types, x case e_dw_pointer_type: case e_dw_structure_type: case e_dw_union_type: - if(subtype->size == 0){ /*declaration of the type, need the complete description */ + if(subtype->byte_size == 0){ /*declaration of the type, need the complete description */ subtype = xbt_dict_get_or_null(types, get_type_description(types, subtype->name)); if(subtype == NULL){ subtype = xbt_dict_get_or_null(other_types, get_type_description(other_types, subtype->name)); switch_types = 1; } } - elm_size = subtype->size; + elm_size = subtype->byte_size; break; case e_dw_typedef: case e_dw_volatile_type: subsubtype = xbt_dict_get_or_null(types, subtype->dw_type_id); - if(subsubtype->size == 0){ /*declaration of the type, need the complete description */ + if(subsubtype->byte_size == 0){ /*declaration of the type, need the complete description */ subsubtype = xbt_dict_get_or_null(types, get_type_description(types, subsubtype->name)); if(subsubtype == NULL){ subsubtype = xbt_dict_get_or_null(other_types, get_type_description(other_types, subsubtype->name)); switch_types = 1; } } - elm_size = subsubtype->size; + elm_size = subsubtype->byte_size; break; default : return 0; break; } - for(i=0; isize; i++){ + for(i=0; ielement_count; i++){ if(switch_types) res = compare_areas_with_type((char *)area1 + (i*elm_size), (char *)area2 + (i*elm_size), other_types, types, type->dw_type_id, region_size, region_type, start_data, pointer_level); else diff --git a/src/mc/mc_global.c b/src/mc/mc_global.c index 736b0d3c57..2471803f3e 100644 --- a/src/mc/mc_global.c +++ b/src/mc/mc_global.c @@ -19,6 +19,8 @@ #include "xbt/automaton.h" #include "xbt/dict.h" +static void MC_post_process_types(mc_object_info_t info); + XBT_LOG_NEW_CATEGORY(mc, "All MC categories"); XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_global, mc, "Logging specific to MC (global)"); @@ -999,10 +1001,15 @@ void MC_dwarf_get_variables(mc_object_info_t info) { 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; + if(type_type == e_dw_enumerator) { + type->element_count = enumeration_size; + type->byte_size = size; + } + else { + type->byte_size = size; + // Not relevant: + type->element_count = -1; + } type->members = NULL; xbt_dict_set(*types, origin, type, NULL); @@ -1087,9 +1094,11 @@ void MC_dwarf_get_variables(mc_object_info_t info) { if(member_end && type){ member_end = 0; + // Why are we not simply referencing, the DW_AT_type? dw_type_t member_type = xbt_new0(s_dw_type_t, 1); member_type->name = xbt_strdup(name); - member_type->size = size; + member_type->byte_size = size; + member_type->element_count = -1; member_type->is_pointer_type = is_pointer; member_type->id = (void *)strtoul(origin, NULL, 16); member_type->offset = offset; @@ -1122,7 +1131,8 @@ void MC_dwarf_get_variables(mc_object_info_t info) { else type->type = e_dw_union_type; type->name = xbt_strdup(name); - type->size = size; + type->byte_size = size; + type->element_count = -1; type->is_pointer_type = is_pointer; type->id = (void *)strtoul(origin, NULL, 16); if(type_origin) @@ -1210,8 +1220,8 @@ void MC_dwarf_get_variables(mc_object_info_t info) { } if(subrange && type){ - type->size = size; - + type->element_count = size; + xbt_free(name); name = NULL; xbt_free(end); @@ -1236,6 +1246,9 @@ void MC_dwarf_get_variables(mc_object_info_t info) { if(type_origin) type->dw_type_id = xbt_strdup(type_origin); type->members = NULL; + + // Filled in a post processing step: + type-> byte_size = 0; xbt_dict_set(*types, origin, type, NULL); @@ -1274,8 +1287,23 @@ void MC_dwarf_get_variables(mc_object_info_t info) { xbt_dict_free(&location_list); pclose(fp); + + MC_post_process_types(info); } +static void MC_post_process_types(mc_object_info_t info) { + xbt_dict_cursor_t cursor; + char *origin; + dw_type_t type; + xbt_dict_foreach(info->types, cursor, origin, type){ + if(type->type==e_dw_array_type) { + xbt_assert(type->dw_type_id, "No base type for array %s %s", type->id, type->name); + dw_type_t subtype = xbt_dict_get_or_null(info->types, type->dw_type_id); + xbt_assert(subtype, "Unkown base type for array %s %s", type->id, type->name); + type->byte_size = type->element_count*subtype->byte_size; + } + } +} /******************************* Ignore mechanism *******************************/ /*********************************************************************************/ diff --git a/src/xbt/mmalloc/mm_diff.c b/src/xbt/mmalloc/mm_diff.c index 101b9f4ff5..d18e6ede19 100644 --- a/src/xbt/mmalloc/mm_diff.c +++ b/src/xbt/mmalloc/mm_diff.c @@ -754,7 +754,7 @@ static int compare_heap_area_without_type(void *real_area1, void *real_area2, vo } - +// area_size is either a byte_size or an elements_count?& static int compare_heap_area_with_type(void *real_area1, void *real_area2, void *area1, void *area2, xbt_dynar_t previous, xbt_dict_t all_types, xbt_dict_t other_types, char *type_id, int area_size, int check_ignore, int pointer_level){ @@ -784,18 +784,18 @@ static int compare_heap_area_with_type(void *real_area1, void *real_area2, void else return (memcmp(area1, area2, area_size) != 0); }else{ - if(area_size != -1 && type->size != area_size) + if(area_size != -1 && type->byte_size != area_size) return -1; else{ - return (memcmp(area1, area2, type->size) != 0); + return (memcmp(area1, area2, type->byte_size) != 0); } } break; case e_dw_enumeration_type: - if(area_size != -1 && type->size != area_size) + if(area_size != -1 && type->byte_size != area_size) return -1; else - return (memcmp(area1, area2, type->size) != 0); + return (memcmp(area1, area2, type->byte_size) != 0); break; case e_dw_typedef: return compare_heap_area_with_type(real_area1, real_area2, area1, area2, previous, all_types, other_types, type->dw_type_id, area_size, check_ignore, pointer_level); @@ -811,7 +811,7 @@ static int compare_heap_area_with_type(void *real_area1, void *real_area2, void case e_dw_pointer_type: case e_dw_structure_type: case e_dw_union_type: - if(subtype->size == 0){ /*declaration of the type, need the complete description */ + if(subtype->byte_size == 0){ /*declaration of the type, need the complete description */ type_desc = get_type_description(all_types, subtype->name); if(type_desc){ subtype = xbt_dict_get_or_null(all_types, type_desc); @@ -820,12 +820,13 @@ static int compare_heap_area_with_type(void *real_area1, void *real_area2, void switch_types = 1; } } - elm_size = subtype->size; + elm_size = subtype->byte_size; break; + // TODO, just remove the type indirection? case e_dw_typedef: case e_dw_volatile_type: subsubtype = xbt_dict_get_or_null(all_types, subtype->dw_type_id); - if(subsubtype->size == 0){ /*declaration of the type, need the complete description */ + if(subsubtype->byte_size == 0){ /*declaration of the type, need the complete description */ type_desc = get_type_description(all_types, subsubtype->name); if(type_desc){ subsubtype = xbt_dict_get_or_null(all_types, type_desc); @@ -834,17 +835,18 @@ static int compare_heap_area_with_type(void *real_area1, void *real_area2, void switch_types = 1; } } - elm_size = subsubtype->size; + elm_size = subsubtype->byte_size; break; default : return 0; break; } - for(i=0; isize; i++){ + for(i=0; ielement_count; i++){ + // TODO, add support for variable stride (DW_AT_byte_stride) if(switch_types) - res = compare_heap_area_with_type((char *)real_area1 + (i*elm_size), (char *)real_area2 + (i*elm_size), (char *)area1 + (i*elm_size), (char *)area2 + (i*elm_size), previous, other_types, all_types, type->dw_type_id, subtype->size, check_ignore, pointer_level); + res = compare_heap_area_with_type((char *)real_area1 + (i*elm_size), (char *)real_area2 + (i*elm_size), (char *)area1 + (i*elm_size), (char *)area2 + (i*elm_size), previous, other_types, all_types, type->dw_type_id, subtype->byte_size, check_ignore, pointer_level); else - res = compare_heap_area_with_type((char *)real_area1 + (i*elm_size), (char *)real_area2 + (i*elm_size), (char *)area1 + (i*elm_size), (char *)area2 + (i*elm_size), previous, all_types, other_types, type->dw_type_id, subtype->size, check_ignore, pointer_level); + res = compare_heap_area_with_type((char *)real_area1 + (i*elm_size), (char *)real_area2 + (i*elm_size), (char *)area1 + (i*elm_size), (char *)area2 + (i*elm_size), previous, all_types, other_types, type->dw_type_id, subtype->byte_size, check_ignore, pointer_level); if(res == 1) return res; } @@ -878,7 +880,7 @@ static int compare_heap_area_with_type(void *real_area1, void *real_area2, void } break; case e_dw_structure_type: - if(type->size == 0){ /*declaration of the structure, need the complete description */ + if(type->byte_size == 0){ /*declaration of the structure, need the complete description */ type_desc = get_type_description(all_types, type->name); if(type_desc){ type = xbt_dict_get_or_null(all_types, type_desc); @@ -887,13 +889,13 @@ static int compare_heap_area_with_type(void *real_area1, void *real_area2, void switch_types = 1; } } - if(area_size != -1 && type->size != area_size){ - if(area_size>type->size && area_size%type->size == 0){ - for(i=0; i<(area_size/type->size); i++){ + if(area_size != -1 && type->byte_size != area_size){ + if(area_size>type->byte_size && area_size%type->byte_size == 0){ + for(i=0; i<(area_size/type->byte_size); i++){ if(switch_types) - res = compare_heap_area_with_type((char *)real_area1 + (i*type->size), (char *)real_area2 + (i*type->size), (char *)area1 + (i*type->size), (char *)area2 + (i*type->size), previous, other_types, all_types, type_id, -1, check_ignore, 0); + res = compare_heap_area_with_type((char *)real_area1 + (i*type->byte_size), (char *)real_area2 + (i*type->byte_size), (char *)area1 + (i*type->byte_size), (char *)area2 + (i*type->byte_size), previous, other_types, all_types, type_id, -1, check_ignore, 0); else - res = compare_heap_area_with_type((char *)real_area1 + (i*type->size), (char *)real_area2 + (i*type->size), (char *)area1 + (i*type->size), (char *)area2 + (i*type->size), previous, all_types, other_types, type_id, -1, check_ignore, 0); + res = compare_heap_area_with_type((char *)real_area1 + (i*type->byte_size), (char *)real_area2 + (i*type->byte_size), (char *)area1 + (i*type->byte_size), (char *)area2 + (i*type->byte_size), previous, all_types, other_types, type_id, -1, check_ignore, 0); if(res == 1) return res; } @@ -914,7 +916,7 @@ static int compare_heap_area_with_type(void *real_area1, void *real_area2, void } break; case e_dw_union_type: - return compare_heap_area_without_type(real_area1, real_area2, area1, area2, previous, all_types, other_types, type->size, check_ignore); + return compare_heap_area_without_type(real_area1, real_area2, area1, area2, previous, all_types, other_types, type->byte_size, check_ignore); break; case e_dw_volatile_type: return compare_heap_area_with_type(real_area1, real_area2, area1, area2, previous, all_types, other_types, type->dw_type_id, area_size, check_ignore, pointer_level); @@ -936,7 +938,7 @@ static char* get_offset_type(char* type_id, int offset, xbt_dict_t all_types, xb char* type_desc; switch(type->type){ case e_dw_structure_type : - if(type->size == 0){ /*declaration of the structure, need the complete description */ + if(type->byte_size == 0){ /*declaration of the structure, need the complete description */ if(*switch_type == 0){ type_desc = get_type_description(all_types, type->name); if(type_desc){ @@ -956,8 +958,8 @@ static char* get_offset_type(char* type_id, int offset, xbt_dict_t all_types, xb } } - if(area_size != -1 && type->size != area_size){ - if(area_size>type->size && area_size%type->size == 0) + if(area_size != -1 && type->byte_size != area_size){ + if(area_size>type->byte_size && area_size%type->byte_size == 0) return type_id; else return NULL; @@ -1029,7 +1031,7 @@ int compare_heap_area(void *area1, void* area2, xbt_dynar_t previous, xbt_dict_t if(type_id){ type = xbt_dict_get_or_null(all_types, type_id); - if(type->size == 0){ + if(type->byte_size == 0){ if(type->dw_type_id == NULL){ type_desc = get_type_description(all_types, type->name); if(type_desc) @@ -1040,10 +1042,10 @@ int compare_heap_area(void *area1, void* area2, xbt_dynar_t previous, xbt_dict_t type = xbt_dict_get_or_null(all_types, type->dw_type_id); } } - if((type->type == e_dw_pointer_type) || ((type->type == e_dw_base_type) && (!strcmp(type->name, "char")))) + if((type->byte_size == e_dw_pointer_type) || ((type->type == e_dw_base_type) && (!strcmp(type->name, "char")))) type_size = -1; else - type_size = type->size; + type_size = type->byte_size; } if((heapinfo1[block1].type == -1) && (heapinfo2[block2].type == -1)){ /* Free block */ @@ -1209,22 +1211,22 @@ int compare_heap_area(void *area1, void* area2, xbt_dynar_t previous, xbt_dict_t if(new_type_id1 != NULL && new_type_id2 != NULL && !strcmp(new_type_id1, new_type_id2)){ if(switch_type){ type = xbt_dict_get_or_null(other_types, new_type_id1); - while(type->size == 0 && type->dw_type_id != NULL) + while(type->byte_size == 0 && type->dw_type_id != NULL) type = xbt_dict_get_or_null(other_types, type->dw_type_id); - new_size1 = type->size; + new_size1 = type->byte_size; type = xbt_dict_get_or_null(other_types, new_type_id2); - while(type->size == 0 && type->dw_type_id != NULL) + while(type->byte_size == 0 && type->dw_type_id != NULL) type = xbt_dict_get_or_null(other_types, type->dw_type_id); - new_size2 = type->size; + new_size2 = type->byte_size; }else{ type = xbt_dict_get_or_null(all_types, new_type_id1); - while(type->size == 0 && type->dw_type_id != NULL) + while(type->byte_size == 0 && type->dw_type_id != NULL) type = xbt_dict_get_or_null(all_types, type->dw_type_id); - new_size1 = type->size; + new_size1 = type->byte_size; type = xbt_dict_get_or_null(all_types, new_type_id2); - while(type->size == 0 && type->dw_type_id != NULL) + while(type->byte_size == 0 && type->dw_type_id != NULL) type = xbt_dict_get_or_null(all_types, type->dw_type_id); - new_size2 = type->size; + new_size2 = type->byte_size; } }else{ if(match_pairs){ @@ -1342,7 +1344,7 @@ char *get_type_description(xbt_dict_t types, char *type_name){ dw_type_t type; xbt_dict_foreach(types, dict_cursor, type_origin, type){ - if(type->name && (strcmp(type->name, type_name) == 0) && type->size > 0){ + if(type->name && (strcmp(type->name, type_name) == 0) && type->byte_size > 0){ xbt_dict_cursor_free(&dict_cursor); return type_origin; } -- 2.20.1