X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/301989b17111d6a39df60385a4c2e73fcff8cd86..4667db33a753d88cbcd186f191fb1e65f49f4bd6:/src/mc/mc_diff.cpp diff --git a/src/mc/mc_diff.cpp b/src/mc/mc_diff.cpp index 17f3569a06..6e2bb9fadf 100644 --- a/src/mc/mc_diff.cpp +++ b/src/mc/mc_diff.cpp @@ -11,6 +11,7 @@ #include "mc/mc.h" #include "xbt/mmalloc.h" #include "mc/datatypes.h" +#include "src/mc/malloc.hpp" #include "src/mc/mc_private.h" #include "src/mc/mc_snapshot.h" #include "src/mc/mc_dwarf.hpp" @@ -18,16 +19,12 @@ using simgrid::mc::remote; -extern "C" { - XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_diff, xbt, "Logging specific to mc_diff in mc"); /*********************************** Heap comparison ***********************************/ /***************************************************************************************/ -typedef char *type_name; - struct XBT_PRIVATE s_mc_diff { s_xbt_mheap_t std_heap_copy; std::size_t heaplimit; @@ -53,7 +50,7 @@ static __thread struct s_mc_diff *mc_diff_info = nullptr; static void heap_area_pair_free(heap_area_pair_t pair) { xbt_free(pair); - pair = NULL; + pair = nullptr; } static void heap_area_pair_free_voidp(void *d) @@ -64,7 +61,7 @@ static void heap_area_pair_free_voidp(void *d) static void heap_area_free(heap_area_t area) { xbt_free(area); - area = NULL; + area = nullptr; } /************************************************************************************/ @@ -86,12 +83,11 @@ static int is_new_heap_area_pair(xbt_dynar_t list, int block1, int fragment1, unsigned int cursor = 0; heap_area_pair_t current_pair; - xbt_dynar_foreach(list, cursor, current_pair) { + xbt_dynar_foreach(list, cursor, current_pair) if (current_pair->block1 == block1 && current_pair->block2 == block2 && current_pair->fragment1 == fragment1 && current_pair->fragment2 == fragment2) return 0; - } return 1; } @@ -101,7 +97,7 @@ static int add_heap_area_pair(xbt_dynar_t list, int block1, int fragment1, { if (is_new_heap_area_pair(list, block1, fragment1, block2, fragment2)) { - heap_area_pair_t pair = NULL; + heap_area_pair_t pair = nullptr; pair = xbt_new0(s_heap_area_pair_t, 1); pair->block1 = block1; pair->fragment1 = fragment1; @@ -160,7 +156,7 @@ static void match_equals(struct s_mc_diff *state, xbt_dynar_t list) unsigned int cursor = 0; heap_area_pair_t current_pair; - xbt_dynar_foreach(list, cursor, current_pair) { + xbt_dynar_foreach(list, cursor, current_pair) if (current_pair->fragment1 != -1) { @@ -178,7 +174,6 @@ static void match_equals(struct s_mc_diff *state, xbt_dynar_t list) } - } } /** Check whether two blocks are known to be matching @@ -220,18 +215,19 @@ static int equal_fragments(struct s_mc_diff *state, int b1, int f1, int b2, return 0; } -} +namespace simgrid { +namespace mc { int init_heap_information(xbt_mheap_t heap1, xbt_mheap_t heap2, std::vector* i1, std::vector* i2) { - if (mc_diff_info == NULL) { + if (mc_diff_info == nullptr) { mc_diff_info = xbt_new0(struct s_mc_diff, 1); - mc_diff_info->equals_to1 = NULL; - mc_diff_info->equals_to2 = NULL; - mc_diff_info->types1 = NULL; - mc_diff_info->types2 = NULL; + mc_diff_info->equals_to1 = nullptr; + mc_diff_info->equals_to2 = nullptr; + mc_diff_info->types1 = nullptr; + mc_diff_info->types2 = nullptr; } struct s_mc_diff *state = mc_diff_info; @@ -277,16 +273,14 @@ int init_heap_information(xbt_mheap_t heap1, xbt_mheap_t heap2, memset(state->equals_to2, 0, state->heaplimit * MAX_FRAGMENT_PER_BLOCK * sizeof(s_heap_area_t)); memset(state->types1, 0, - state->heaplimit * MAX_FRAGMENT_PER_BLOCK * sizeof(type_name *)); + state->heaplimit * MAX_FRAGMENT_PER_BLOCK * sizeof(char**)); memset(state->types2, 0, - state->heaplimit * MAX_FRAGMENT_PER_BLOCK * sizeof(type_name *)); + state->heaplimit * MAX_FRAGMENT_PER_BLOCK * sizeof(char**)); return 0; } -extern "C" { - void reset_heap_information() { @@ -385,7 +379,7 @@ int mmalloc_compare_heap(mc_snapshot_t snapshot1, mc_snapshot_t snapshot2) res_compare = compare_heap_area(simgrid::mc::ProcessIndexMissing, addr_block1, addr_block2, snapshot1, snapshot2, - NULL, NULL, 0); + nullptr, NULL, 0); if (res_compare != 1) { for (k = 1; k < heapinfo2->busy_block.size; k++) @@ -424,7 +418,7 @@ int mmalloc_compare_heap(mc_snapshot_t snapshot1, mc_snapshot_t snapshot2) res_compare = compare_heap_area(simgrid::mc::ProcessIndexMissing, addr_block1, addr_block2, snapshot1, snapshot2, - NULL, NULL, 0); + nullptr, NULL, 0); if (res_compare != 1) { for (k = 1; k < heapinfo2b->busy_block.size; k++) @@ -476,7 +470,7 @@ int mmalloc_compare_heap(mc_snapshot_t snapshot1, mc_snapshot_t snapshot2) res_compare = compare_heap_area(simgrid::mc::ProcessIndexMissing, addr_frag1, addr_frag2, snapshot1, snapshot2, - NULL, NULL, 0); + nullptr, NULL, 0); if (res_compare != 1) equal = 1; @@ -524,7 +518,7 @@ int mmalloc_compare_heap(mc_snapshot_t snapshot1, mc_snapshot_t snapshot2) res_compare = compare_heap_area(simgrid::mc::ProcessIndexMissing, addr_frag1, addr_frag2, snapshot2, snapshot2, - NULL, NULL, 0); + nullptr, NULL, 0); if (res_compare != 1) { equal = 1; @@ -714,15 +708,13 @@ static int compare_heap_area_without_type(struct s_mc_diff *state, int process_i // Both addreses are in the heap: res_compare = compare_heap_area(process_index, addr_pointed1, addr_pointed2, snapshot1, - snapshot2, previous, NULL, 0); - if (res_compare == 1) { + snapshot2, previous, nullptr, 0); + if (res_compare == 1) return res_compare; - } i = pointer_align + sizeof(void *); continue; - } else { + } else return 1; - } } @@ -770,9 +762,8 @@ top: && ((ignore1 = heap_comparison_ignore_size(state->to_ignore1, real_area1)) > 0) && ((ignore2 = heap_comparison_ignore_size(state->to_ignore2, real_area2)) - == ignore1)) { + == ignore1)) return 0; - } simgrid::mc::Type *subtype, *subsubtype; int res, elm_size; @@ -794,9 +785,8 @@ top: } else { if (area_size != -1 && type->byte_size != area_size) return -1; - else { + else return (MC_snapshot_region_memcmp(real_area1, heap_region1, real_area2, heap_region2, type->byte_size) != 0); - } } break; case DW_TAG_enumeration_type: @@ -917,9 +907,8 @@ top: if (res == 1) return res; } - } else { + } else return -1; - } } else { for(simgrid::mc::Member& member : type->members) { // TODO, optimize this? (for the offset case) @@ -932,9 +921,8 @@ top: snapshot1, snapshot2, previous, member.type, -1, check_ignore, 0); - if (res == 1) { + if (res == 1) return res; - } } } break; @@ -980,7 +968,7 @@ static simgrid::mc::Type* get_offset_type(void *real_base_address, simgrid::mc:: if (area_size > type->byte_size && area_size % type->byte_size == 0) return type; else - return NULL; + return nullptr; } else { for(simgrid::mc::Member& member : type->members) { @@ -996,12 +984,12 @@ static simgrid::mc::Type* get_offset_type(void *real_base_address, simgrid::mc:: } } - return NULL; + return nullptr; } break; default: /* FIXME : other cases ? */ - return NULL; + return nullptr; break; } } @@ -1012,7 +1000,7 @@ static simgrid::mc::Type* get_offset_type(void *real_base_address, simgrid::mc:: * @param area2 Process address for state 2 * @param snapshot1 Snapshot of state 1 * @param snapshot2 Snapshot of state 2 - * @param previous Pairs of blocks already compared on the current path (or NULL) + * @param previous Pairs of blocks already compared on the current path (or nullptr) * @param type_id Type of variable * @param pointer_level * @return 0 (same), 1 (different), -1 @@ -1034,7 +1022,7 @@ int compare_heap_area(int process_index, const void *area1, const void *area2, m int type_size = -1; int offset1 = 0, offset2 = 0; int new_size1 = -1, new_size2 = -1; - simgrid::mc::Type *new_type1 = NULL, *new_type2 = NULL; + simgrid::mc::Type *new_type1 = nullptr, *new_type2 = NULL; int match_pairs = 0; @@ -1048,7 +1036,7 @@ int compare_heap_area(int process_index, const void *area1, const void *area2, m malloc_info heapinfo_temp1, heapinfo_temp2; - if (previous == NULL) { + if (previous == nullptr) { previous = xbt_dynar_new(sizeof(heap_area_pair_t), heap_area_pair_free_voidp); match_pairs = 1; @@ -1075,9 +1063,8 @@ int compare_heap_area(int process_index, const void *area1, const void *area2, m || (block1 > (ssize_t) state->heapsize1) || (block1 < 1) || ((char *) area2 < (char *) state->std_heap_copy.heapbase) || (block2 > (ssize_t) state->heapsize2) || (block2 < 1)) { - if (match_pairs) { + if (match_pairs) xbt_dynar_free(&previous); - } return 1; } @@ -1093,7 +1080,7 @@ int compare_heap_area(int process_index, const void *area1, const void *area2, m type = type->full_type; // This assume that for "boring" types (volatile ...) byte_size is absent: - while (type->byte_size == 0 && type->subtype != NULL) + while (type->byte_size == 0 && type->subtype != nullptr) type = type->subtype; // Find type_size: @@ -1158,17 +1145,15 @@ int compare_heap_area(int process_index, const void *area1, const void *area2, m if (heapinfo1->busy_block.size != heapinfo2->busy_block.size) { - if (match_pairs) { + if (match_pairs) xbt_dynar_free(&previous); - } return 1; } if (heapinfo1->busy_block.busy_size != heapinfo2->busy_block.busy_size) { - if (match_pairs) { + if (match_pairs) xbt_dynar_free(&previous); - } return 1; } @@ -1184,12 +1169,10 @@ int compare_heap_area(int process_index, const void *area1, const void *area2, m // Remember (basic) type inference. // The current data structure only allows us to do this for the whole block. - if (type != NULL && area1 == real_addr_block1) { + if (type != nullptr && area1 == real_addr_block1) state->types1_(block1, 0) = type; - } - if (type != NULL && area2 == real_addr_block2) { + if (type != nullptr && area2 == real_addr_block2) state->types2_(block2, 0) = type; - } if (size <= 0) { if (match_pairs) { @@ -1265,9 +1248,8 @@ int compare_heap_area(int process_index, const void *area1, const void *area2, m } return -1; } else { - if (match_pairs) { + if (match_pairs) xbt_dynar_free(&previous); - } return 1; } } @@ -1277,40 +1259,39 @@ int compare_heap_area(int process_index, const void *area1, const void *area2, m // Remember (basic) type inference. // The current data structure only allows us to do this for the whole fragment. - if (type != NULL && area1 == real_addr_frag1) { + if (type != nullptr && area1 == real_addr_frag1) state->types1_(block1, frag1) = type; - } - if (type != NULL && area2 == real_addr_frag2) { + if (type != nullptr && area2 == real_addr_frag2) state->types2_(block2, frag2) = type; - } + // The type of the variable is already known: if (type) { new_type1 = type; new_type2 = type; } // Type inference from the block type. - else if (state->types1_(block1, frag1) != NULL - || state->types2_(block2, frag2) != NULL) { + else if (state->types1_(block1, frag1) != nullptr + || state->types2_(block2, frag2) != nullptr) { offset1 = (char *) area1 - (char *) real_addr_frag1; offset2 = (char *) area2 - (char *) real_addr_frag2; - if (state->types1_(block1, frag1) != NULL - && state->types2_(block2, frag2) != NULL) { + if (state->types1_(block1, frag1) != nullptr + && state->types2_(block2, frag2) != nullptr) { new_type1 = get_offset_type(real_addr_frag1, state->types1_(block1, frag1), offset1, size, snapshot1, process_index); new_type2 = get_offset_type(real_addr_frag2, state->types2_(block2, frag2), offset1, size, snapshot2, process_index); - } else if (state->types1_(block1, frag1) != NULL) { + } else if (state->types1_(block1, frag1) != nullptr) { new_type1 = get_offset_type(real_addr_frag1, state->types1_(block1, frag1), offset1, size, snapshot1, process_index); new_type2 = get_offset_type(real_addr_frag2, state->types1_(block1, frag1), offset2, size, snapshot2, process_index); - } else if (state->types2_(block2, frag2) != NULL) { + } else if (state->types2_(block2, frag2) != nullptr) { new_type1 = get_offset_type(real_addr_frag1, state->types2_(block2, frag2), offset1, size, snapshot1, process_index); @@ -1325,15 +1306,15 @@ int compare_heap_area(int process_index, const void *area1, const void *area2, m return -1; } - if (new_type1 != NULL && new_type2 != NULL && new_type1 != new_type2) { + if (new_type1 != nullptr && new_type2 != NULL && new_type1 != new_type2) { type = new_type1; - while (type->byte_size == 0 && type->subtype != NULL) + while (type->byte_size == 0 && type->subtype != nullptr) type = type->subtype; new_size1 = type->byte_size; type = new_type2; - while (type->byte_size == 0 && type->subtype != NULL) + while (type->byte_size == 0 && type->subtype != nullptr) type = type->subtype; new_size2 = type->byte_size; @@ -1351,15 +1332,14 @@ int compare_heap_area(int process_index, const void *area1, const void *area2, m size = new_size1; } - if (offset1 == 0 && offset2 == 0) { - if (!add_heap_area_pair(previous, block1, frag1, block2, frag2)) { + if (offset1 == 0 && offset2 == 0 + && !add_heap_area_pair(previous, block1, frag1, block2, frag2)) { if (match_pairs) { match_equals(state, previous); xbt_dynar_free(&previous); } return 0; } - } if (size <= 0) { if (match_pairs) { @@ -1376,25 +1356,24 @@ int compare_heap_area(int process_index, const void *area1, const void *area2, m } else { - if (match_pairs) { + if (match_pairs) xbt_dynar_free(&previous); - } return 1; } /* Start comparison */ - if (type) { + if (type) res_compare = compare_heap_area_with_type(state, process_index, area1, area2, snapshot1, snapshot2, previous, type, size, check_ignore, pointer_level); - } else { + else res_compare = compare_heap_area_without_type(state, process_index, area1, area2, snapshot1, snapshot2, previous, size, check_ignore); - } + if (res_compare == 1) { if (match_pairs) xbt_dynar_free(&previous); @@ -1439,13 +1418,13 @@ static int get_pointed_area_size(void *area, int heap) if (heapinfo[block].type == MMALLOC_TYPE_FREE || heapinfo[block].type == MMALLOC_TYPE_HEAPINFO) { /* Free block */ return -1; - } else if (heapinfo[block].type == MMALLOC_TYPE_UNFRAGMENTED) { /* Complete block */ + else if (heapinfo[block].type == MMALLOC_TYPE_UNFRAGMENTED) /* Complete block */ return (int) heapinfo[block].busy_block.busy_size; - } else { + else frag = ((uintptr_t) (ADDR2UINT(area) % (BLOCKSIZE))) >> heapinfo[block].type; return (int) heapinfo[block].busy_frag.frag_size[frag]; - } + } #ifndef max @@ -1458,7 +1437,7 @@ int mmalloc_linear_compare_heap(xbt_mheap_t heap1, xbt_mheap_t heap2) struct s_mc_diff *state = mc_diff_info; - if (heap1 == NULL && heap1 == NULL) { + if (heap1 == nullptr && heap1 == NULL) { XBT_DEBUG("Malloc descriptors null"); return 0; } @@ -1606,3 +1585,4 @@ int mmalloc_linear_compare_heap(xbt_mheap_t heap1, xbt_mheap_t heap2) #endif } +}