X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/a8bb181a027fd7884c43fae87ea0440a4ce6fd86..2bcb5dd3317c733c31c288ae79e72fb28863d936:/src/mc/compare.cpp?ds=sidebyside diff --git a/src/mc/compare.cpp b/src/mc/compare.cpp index 5d60d7678c..e7b5ada5ea 100644 --- a/src/mc/compare.cpp +++ b/src/mc/compare.cpp @@ -1,15 +1,15 @@ -/* Copyright (c) 2008-2016. The SimGrid Team. - * All rights reserved. */ +/* Copyright (c) 2008-2016. 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. */ -/** \file mc_compare.cpp Memory snapshooting and comparison */ +/** \file compare.cpp Memory snapshooting and comparison */ #include #include #include +#include #include #include @@ -48,6 +48,10 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_compare, xbt, namespace simgrid { namespace mc { +struct HeapLocation; +typedef std::array HeapLocationPair; +typedef std::set HeapLocationPairs; +struct HeapArea; struct ProcessComparisonState; struct StateComparator; @@ -55,7 +59,7 @@ static int compare_heap_area( StateComparator& state, int process_index, const void *area1, const void* area2, Snapshot* snapshot1, Snapshot* snapshot2, - xbt_dynar_t previous, Type* type, int pointer_level); + HeapLocationPairs* previous, Type* type, int pointer_level); } } @@ -71,11 +75,29 @@ namespace mc { struct HeapLocation { int block = 0; int fragment = 0; + HeapLocation() {} HeapLocation(int block, int fragment = 0) : block(block), fragment(fragment) {} + + bool operator==(HeapLocation const& that) const + { + return block == that.block && fragment == that.fragment; + } + bool operator<(HeapLocation const& that) const + { + return std::make_pair(block, fragment) + < std::make_pair(that.block, that.fragment); + } }; -typedef std::array HeapLocationPair; +static inline +HeapLocationPair makeHeapLocationPair(int block1, int fragment1, int block2, int fragment2) +{ + return simgrid::mc::HeapLocationPair{{ + simgrid::mc::HeapLocation(block1, fragment1), + simgrid::mc::HeapLocation(block2, fragment2) + }}; +} struct HeapArea : public HeapLocation { bool valid = false; @@ -172,7 +194,6 @@ struct StateComparator { /** Check whether two blocks are known to be matching * - * @param state State used * @param b1 Block of state 1 * @param b2 Block of state 2 * @return if the blocks are known to be matching @@ -185,7 +206,6 @@ struct StateComparator { /** Check whether two fragments are known to be matching * - * @param state State used * @param b1 Block of state 1 * @param f1 Fragment of state 1 * @param b2 Block of state 2 @@ -200,7 +220,7 @@ struct StateComparator { && this->equals_to2_(b2, f2).fragment == f1; } - void match_equals(xbt_dynar_t list); + void match_equals(HeapLocationPairs* list); }; } @@ -208,35 +228,6 @@ struct StateComparator { /************************************************************************************/ -static int is_new_heap_area_pair(xbt_dynar_t list, int block1, int fragment1, - int block2, int fragment2) -{ - - unsigned int cursor = 0; - simgrid::mc::HeapLocationPair* current_pair; - xbt_dynar_foreach(list, cursor, current_pair) - if ((*current_pair)[0].block == block1 - && (*current_pair)[1].block == block2 - && (*current_pair)[0].fragment == fragment1 - && (*current_pair)[1].fragment == fragment2) - return 0; - return 1; -} - -static int add_heap_area_pair(xbt_dynar_t list, int block1, int fragment1, - int block2, int fragment2) -{ - if (!is_new_heap_area_pair(list, block1, fragment1, block2, fragment2)) - return 0; - simgrid::mc::HeapLocationPair* pair = xbt_new0(simgrid::mc::HeapLocationPair, 1); - (*pair)[0].block = block1; - (*pair)[0].fragment = fragment1; - (*pair)[1].block = block2; - (*pair)[1].fragment = fragment2; - xbt_dynar_push(list, &pair); - return 1; -} - static ssize_t heap_comparison_ignore_size( std::vector* ignore_list, const void *address) @@ -278,22 +269,19 @@ static bool is_block_stack(int block) namespace simgrid { namespace mc { -void StateComparator::match_equals(xbt_dynar_t list) +void StateComparator::match_equals(HeapLocationPairs* list) { - unsigned int cursor = 0; - simgrid::mc::HeapLocationPair* current_pair; - - xbt_dynar_foreach(list, cursor, current_pair) { - if ((*current_pair)[0].fragment != -1) { - this->equals_to1_((*current_pair)[0].block, (*current_pair)[0].fragment) = - simgrid::mc::HeapArea((*current_pair)[1].block, (*current_pair)[1].fragment); - this->equals_to2_((*current_pair)[1].block, (*current_pair)[1].fragment) = - simgrid::mc::HeapArea((*current_pair)[0].block, (*current_pair)[0].fragment); + for (auto const& pair : *list) { + if (pair[0].fragment != -1) { + this->equals_to1_(pair[0].block, pair[0].fragment) = + simgrid::mc::HeapArea(pair[1].block, pair[1].fragment); + this->equals_to2_(pair[1].block, pair[1].fragment) = + simgrid::mc::HeapArea(pair[0].block, pair[0].fragment); } else { - this->equals_to1_((*current_pair)[0].block, 0) = - simgrid::mc::HeapArea((*current_pair)[1].block, (*current_pair)[1].fragment); - this->equals_to2_((*current_pair)[1].block, 0) = - simgrid::mc::HeapArea((*current_pair)[0].block, (*current_pair)[0].fragment); + this->equals_to1_(pair[0].block, 0) = + simgrid::mc::HeapArea(pair[1].block, pair[1].fragment); + this->equals_to2_(pair[1].block, 0) = + simgrid::mc::HeapArea(pair[0].block, pair[0].fragment); } } } @@ -604,7 +592,7 @@ int mmalloc_compare_heap( } if (i1 == state.heaplimit) - XBT_DEBUG("Number of blocks/fragments not found in heap1 : %d", nb_diff1); + XBT_DEBUG("Number of blocks/fragments not found in heap1: %d", nb_diff1); for (i=1; i < state.heaplimit; i++) { const malloc_info* heapinfo2 = (const malloc_info*) MC_region_read( @@ -633,7 +621,7 @@ int mmalloc_compare_heap( } if (i1 == state.heaplimit) - XBT_DEBUG("Number of blocks/fragments not found in heap2 : %d", nb_diff2); + XBT_DEBUG("Number of blocks/fragments not found in heap2: %d", nb_diff2); return nb_diff1 > 0 || nb_diff2 > 0; } @@ -654,7 +642,7 @@ static int compare_heap_area_without_type( const void *real_area1, const void *real_area2, simgrid::mc::Snapshot* snapshot1, simgrid::mc::Snapshot* snapshot2, - xbt_dynar_t previous, int size, + HeapLocationPairs* previous, int size, int check_ignore) { simgrid::mc::Process* process = &mc_model_checker->process(); @@ -738,7 +726,7 @@ static int compare_heap_area_with_type( const void *real_area1, const void *real_area2, simgrid::mc::Snapshot* snapshot1, simgrid::mc::Snapshot* snapshot2, - xbt_dynar_t previous, simgrid::mc::Type* type, + HeapLocationPairs* previous, simgrid::mc::Type* type, int area_size, int check_ignore, int pointer_level) { @@ -987,7 +975,7 @@ static simgrid::mc::Type* get_offset_type(void *real_base_address, simgrid::mc:: return nullptr; default: - /* FIXME : other cases ? */ + /* FIXME: other cases ? */ return nullptr; } @@ -1009,7 +997,7 @@ int compare_heap_area(simgrid::mc::StateComparator& state, int process_index, const void *area1, const void *area2, simgrid::mc::Snapshot* snapshot1, simgrid::mc::Snapshot* snapshot2, - xbt_dynar_t previous, + HeapLocationPairs* previous, simgrid::mc::Type* type, int pointer_level) { simgrid::mc::Process* process = &mc_model_checker->process(); @@ -1025,7 +1013,7 @@ int compare_heap_area(simgrid::mc::StateComparator& state, int process_index, int new_size1 = -1, new_size2 = -1; simgrid::mc::Type *new_type1 = nullptr, *new_type2 = nullptr; - int match_pairs = 0; + bool match_pairs = false; // This is the address of std_heap->heapinfo in the application process: void* heapinfo_address = &((xbt_mheap_t) process->heap_address)->heapinfo; @@ -1037,10 +1025,10 @@ int compare_heap_area(simgrid::mc::StateComparator& state, int process_index, malloc_info heapinfo_temp1, heapinfo_temp2; + simgrid::mc::HeapLocationPairs current; if (previous == nullptr) { - previous = xbt_dynar_new(sizeof(simgrid::mc::HeapLocationPair*), [](void *d) { - xbt_free((simgrid::mc::HeapLocationPair*) * (void **) d); }); - match_pairs = 1; + previous = ¤t; + match_pairs = true; } // Get block number: @@ -1053,11 +1041,10 @@ int compare_heap_area(simgrid::mc::StateComparator& state, int process_index, // If either block is a stack block: if (is_block_stack((int) block1) && is_block_stack((int) block2)) { - add_heap_area_pair(previous, block1, -1, block2, -1); - if (match_pairs) { + previous->insert(simgrid::mc::makeHeapLocationPair( + block1, -1, block2, -1)); + if (match_pairs) state.match_equals(previous); - xbt_dynar_free(&previous); - } return 0; } @@ -1066,8 +1053,6 @@ int compare_heap_area(simgrid::mc::StateComparator& state, int process_index, || (block1 > (ssize_t) state.processStates[0].heapsize) || (block1 < 1) || ((char *) area2 < (char *) state.std_heap_copy.heapbase) || (block2 > (ssize_t) state.processStates[1].heapsize) || (block2 < 1)) { - if (match_pairs) - xbt_dynar_free(&previous); return 1; } @@ -1107,10 +1092,8 @@ int compare_heap_area(simgrid::mc::StateComparator& state, int process_index, if ((heapinfo1->type == MMALLOC_TYPE_FREE || heapinfo1->type==MMALLOC_TYPE_HEAPINFO) && (heapinfo2->type == MMALLOC_TYPE_FREE || heapinfo2->type ==MMALLOC_TYPE_HEAPINFO)) { /* Free block */ - if (match_pairs) { + if (match_pairs) state.match_equals(previous); - xbt_dynar_free(&previous); - } return 0; } @@ -1126,10 +1109,8 @@ int compare_heap_area(simgrid::mc::StateComparator& state, int process_index, if (state.equals_to1_(block1, 0).valid && state.equals_to2_(block2, 0).valid && state.blocksEqual(block1, block2)) { - if (match_pairs) { + if (match_pairs) state.match_equals(previous); - xbt_dynar_free(&previous); - } return 0; } @@ -1137,31 +1118,21 @@ int compare_heap_area(simgrid::mc::StateComparator& state, int process_index, if (type_size != (ssize_t) heapinfo1->busy_block.busy_size && type_size != (ssize_t) heapinfo2->busy_block.busy_size && (type->name.empty() || type->name == "struct s_smx_context")) { - if (match_pairs) { + if (match_pairs) state.match_equals(previous); - xbt_dynar_free(&previous); - } return -1; } } - if (heapinfo1->busy_block.size != heapinfo2->busy_block.size) { - if (match_pairs) - xbt_dynar_free(&previous); + if (heapinfo1->busy_block.size != heapinfo2->busy_block.size) return 1; - } - - if (heapinfo1->busy_block.busy_size != heapinfo2->busy_block.busy_size) { - if (match_pairs) - xbt_dynar_free(&previous); + if (heapinfo1->busy_block.busy_size != heapinfo2->busy_block.busy_size) return 1; - } - if (!add_heap_area_pair(previous, block1, -1, block2, -1)) { - if (match_pairs) { + if (!previous->insert(simgrid::mc::makeHeapLocationPair( + block1, -1, block2, -1)).second) { + if (match_pairs) state.match_equals(previous); - xbt_dynar_free(&previous); - } return 0; } @@ -1175,10 +1146,8 @@ int compare_heap_area(simgrid::mc::StateComparator& state, int process_index, state.types2_(block2, 0) = type; if (size <= 0) { - if (match_pairs) { + if (match_pairs) state.match_equals(previous); - xbt_dynar_free(&previous); - } return 0; } @@ -1209,19 +1178,15 @@ int compare_heap_area(simgrid::mc::StateComparator& state, int process_index, if (type_size != -1) { if (heapinfo1->busy_frag.frag_size[frag1] == -1 || heapinfo2->busy_frag.frag_size[frag2] == -1) { - if (match_pairs) { + if (match_pairs) state.match_equals(previous); - xbt_dynar_free(&previous); - } return -1; } // ? if (type_size != heapinfo1->busy_frag.frag_size[frag1] || type_size != heapinfo2->busy_frag.frag_size[frag2]) { - if (match_pairs) { + if (match_pairs) state.match_equals(previous); - xbt_dynar_free(&previous); - } return -1; } } @@ -1230,10 +1195,8 @@ int compare_heap_area(simgrid::mc::StateComparator& state, int process_index, if (state.equals_to1_(block1, frag1).valid && state.equals_to2_(block2, frag2).valid) { if (offset1==offset2 && state.fragmentsEqual(block1, frag1, block2, frag2)) { - if (match_pairs) { + if (match_pairs) state.match_equals(previous); - xbt_dynar_free(&previous); - } return 0; } } @@ -1241,16 +1204,11 @@ int compare_heap_area(simgrid::mc::StateComparator& state, int process_index, if (heapinfo1->busy_frag.frag_size[frag1] != heapinfo2->busy_frag.frag_size[frag2]) { if (type_size == -1) { - if (match_pairs) { + if (match_pairs) state.match_equals(previous); - xbt_dynar_free(&previous); - } return -1; - } else { - if (match_pairs) - xbt_dynar_free(&previous); + } else return 1; - } } // Size of the fragment: @@ -1298,10 +1256,8 @@ int compare_heap_area(simgrid::mc::StateComparator& state, int process_index, get_offset_type(real_addr_frag2, state.types2_(block2, frag2), offset2, size, snapshot2, process_index); } else { - if (match_pairs) { + if (match_pairs) state.match_equals(previous); - xbt_dynar_free(&previous); - } return -1; } @@ -1318,10 +1274,8 @@ int compare_heap_area(simgrid::mc::StateComparator& state, int process_index, new_size2 = type->byte_size; } else { - if (match_pairs) { + if (match_pairs) state.match_equals(previous); - xbt_dynar_free(&previous); - } return -1; } } @@ -1332,19 +1286,16 @@ int compare_heap_area(simgrid::mc::StateComparator& state, int process_index, } if (offset1 == 0 && offset2 == 0 - && !add_heap_area_pair(previous, block1, frag1, block2, frag2)) { - if (match_pairs) { + && !previous->insert(simgrid::mc::makeHeapLocationPair( + block1, frag1, block2, frag2)).second) { + if (match_pairs) state.match_equals(previous); - xbt_dynar_free(&previous); - } return 0; } if (size <= 0) { - if (match_pairs) { + if (match_pairs) state.match_equals(previous); - xbt_dynar_free(&previous); - } return 0; } @@ -1353,11 +1304,8 @@ int compare_heap_area(simgrid::mc::StateComparator& state, int process_index, heapinfo1->busy_frag.ignore[frag1])) check_ignore = heapinfo1->busy_frag.ignore[frag1]; - } else { - if (match_pairs) - xbt_dynar_free(&previous); + } else return 1; - } /* Start comparison */ @@ -1371,17 +1319,11 @@ int compare_heap_area(simgrid::mc::StateComparator& state, int process_index, 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); + if (res_compare == 1) return res_compare; - } - if (match_pairs) { + if (match_pairs) state.match_equals(previous); - xbt_dynar_free(&previous); - } - return 0; } @@ -1541,7 +1483,7 @@ static int compare_areas_with_type(simgrid::mc::StateComparator& state, return -1; break; default: - XBT_VERB("Unknown case : %d", type->type); + XBT_VERB("Unknown case: %d", type->type); break; } @@ -1692,13 +1634,12 @@ int snapshot_compare(int num1, simgrid::mc::Snapshot* s1, int num2, simgrid::mc: if (_sg_mc_hash) { hash_result = (s1->hash != s2->hash); if (hash_result) { - XBT_VERB("(%d - %d) Different hash : 0x%" PRIx64 "--0x%" PRIx64, num1, - num2, s1->hash, s2->hash); + XBT_VERB("(%d - %d) Different hash: 0x%" PRIx64 "--0x%" PRIx64, num1, num2, s1->hash, s2->hash); #ifndef MC_DEBUG return 1; #endif } else - XBT_VERB("(%d - %d) Same hash : 0x%" PRIx64, num1, num2, s1->hash); + XBT_VERB("(%d - %d) Same hash: 0x%" PRIx64, num1, num2, s1->hash); } /* Compare enabled processes */ @@ -1717,14 +1658,12 @@ int snapshot_compare(int num1, simgrid::mc::Snapshot* s1, int num2, simgrid::mc: size_used2 = s2->stack_sizes[i]; if (size_used1 != size_used2) { #ifdef MC_DEBUG - XBT_DEBUG("(%d - %d) Different size used in stacks : %zu - %zu", num1, - num2, size_used1, size_used2); + XBT_DEBUG("(%d - %d) Different size used in stacks: %zu - %zu", num1, num2, size_used1, size_used2); errors++; is_diff = 1; #else #ifdef MC_VERBOSE - XBT_VERB("(%d - %d) Different size used in stacks : %zu - %zu", num1, - num2, size_used1, size_used2); + XBT_VERB("(%d - %d) Different size used in stacks: %zu - %zu", num1, num2, size_used1, size_used2); #endif return 1; #endif @@ -1758,15 +1697,13 @@ int snapshot_compare(int num1, simgrid::mc::Snapshot* s1, int num2, simgrid::mc: } /* Stacks comparison */ - unsigned cursor = 0; int diff_local = 0; #ifdef MC_DEBUG is_diff = 0; #endif - mc_snapshot_stack_t stack1, stack2; - while (cursor < s1->stacks.size()) { - stack1 = &s1->stacks[cursor]; - stack2 = &s2->stacks[cursor]; + for (unsigned int cursor = 0; cursor < s1->stacks.size(); cursor++) { + mc_snapshot_stack_t stack1 = &s1->stacks[cursor]; + mc_snapshot_stack_t stack2 = &s2->stacks[cursor]; if (stack1->process_index != stack2->process_index) { diff_local = 1; @@ -1791,7 +1728,6 @@ int snapshot_compare(int num1, simgrid::mc::Snapshot* s1, int num2, simgrid::mc: return 1; #endif } - cursor++; } size_t regions_count = s1->snapshot_regions.size(); @@ -1845,7 +1781,6 @@ int snapshot_compare(int num1, simgrid::mc::Snapshot* s1, int num2, simgrid::mc: #ifdef MC_VERBOSE XBT_VERB("(%d - %d) Different heap (mmalloc_compare)", num1, num2); #endif - return 1; #endif }