X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/fd734700103914cbf09f9bb3db2aaf5a09ed768e..03e3767659028e0c414e9e60c2cbc1430fd31010:/src/mc/compare.cpp diff --git a/src/mc/compare.cpp b/src/mc/compare.cpp index ee31b803f9..a477e83ad8 100644 --- a/src/mc/compare.cpp +++ b/src/mc/compare.cpp @@ -1,10 +1,9 @@ -/* Copyright (c) 2008-2016. The SimGrid Team. - * All rights reserved. */ +/* Copyright (c) 2008-2017. 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 @@ -24,7 +23,6 @@ #include "src/internal_config.h" #include "src/xbt/mmalloc/mmprivate.h" -#include "src/xbt/ex_interface.h" #if HAVE_SMPI #include "src/smpi/private.h" @@ -94,10 +92,10 @@ struct HeapLocation { static inline HeapLocationPair makeHeapLocationPair(int block1, int fragment1, int block2, int fragment2) { - return simgrid::mc::HeapLocationPair({ + return simgrid::mc::HeapLocationPair{{ simgrid::mc::HeapLocation(block1, fragment1), simgrid::mc::HeapLocation(block2, fragment2) - }); + }}; } struct HeapArea : public HeapLocation { @@ -195,7 +193,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 @@ -208,7 +205,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 @@ -292,8 +288,8 @@ void StateComparator::match_equals(HeapLocationPairs* list) void ProcessComparisonState::initHeapInformation(xbt_mheap_t heap, std::vector* i) { - auto heaplimit = ((struct mdesc *) heap)->heaplimit; - this->heapsize = ((struct mdesc *) heap)->heapsize; + auto heaplimit = heap->heaplimit; + this->heapsize = heap->heapsize; this->to_ignore = i; this->equals_to.assign(heaplimit * MAX_FRAGMENT_PER_BLOCK, HeapArea()); this->types.assign(heaplimit * MAX_FRAGMENT_PER_BLOCK, nullptr); @@ -303,13 +299,9 @@ int StateComparator::initHeapInformation(xbt_mheap_t heap1, xbt_mheap_t heap2, std::vector* i1, std::vector* i2) { - if ((((struct mdesc *) heap1)->heaplimit != - ((struct mdesc *) heap2)->heaplimit) - || - ((((struct mdesc *) heap1)->heapsize != - ((struct mdesc *) heap2)->heapsize))) + if ((heap1->heaplimit != heap2->heaplimit) || (heap1->heapsize != heap2->heapsize)) return -1; - this->heaplimit = ((struct mdesc *) heap1)->heaplimit; + this->heaplimit = heap1->heaplimit; this->std_heap_copy = *mc_model_checker->process().get_heap(); this->processStates[0].initHeapInformation(heap1, i1); this->processStates[1].initHeapInformation(heap2, i2); @@ -340,7 +332,6 @@ int mmalloc_compare_heap( int equal, res_compare = 0; /* Check busy blocks */ - i1 = 1; malloc_info heapinfo_temp1, heapinfo_temp2; @@ -451,7 +442,6 @@ int mmalloc_compare_heap( } i2++; - } if (!equal) { @@ -513,7 +503,7 @@ int mmalloc_compare_heap( } if (heapinfo2b->type < 0) { - fprintf(stderr, "Unkown mmalloc block type.\n"); + fprintf(stderr, "Unknown mmalloc block type.\n"); abort(); } @@ -540,11 +530,9 @@ int mmalloc_compare_heap( equal = 1; break; } - } i2++; - } if (!equal) { @@ -557,13 +545,10 @@ int mmalloc_compare_heap( nb_diff1++; break; } - } i1++; - } - } /* All blocks/fragments are equal to another block/fragment ? */ @@ -595,7 +580,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( @@ -624,7 +609,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; } @@ -718,7 +703,7 @@ static int compare_heap_area_without_type( * @param snapshot1 Snapshot of state 1 * @param snapshot2 Snapshot of state 2 * @param previous - * @param type_id + * @param type * @param area_size either a byte_size or an elements_count (?) * @param check_ignore * @param pointer_level @@ -922,7 +907,6 @@ top: return compare_heap_area_without_type(state, process_index, real_area1, real_area2, snapshot1, snapshot2, previous, type->byte_size, check_ignore); - return 0; default: return 0; @@ -937,7 +921,7 @@ top: * * TODO, handle subfields ((*p).bar.foo, (*p)[5].bar…) * - * @param type_id DWARF type ID of the root address + * @param type DWARF type ID of the root address * @param area_size * @return DWARF type ID for given offset */ @@ -978,7 +962,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; } @@ -1016,7 +1000,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; @@ -1031,7 +1015,7 @@ int compare_heap_area(simgrid::mc::StateComparator& state, int process_index, simgrid::mc::HeapLocationPairs current; if (previous == nullptr) { previous = ¤t; - match_pairs = 1; + match_pairs = true; } // Get block number: @@ -1486,7 +1470,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; } @@ -1514,12 +1498,12 @@ static int compare_global_variables( // Compare the global variables separately for each simulates process: for (size_t process_index = 0; process_index < process_count; process_index++) { - int is_diff = compare_global_variables(state, - object_info, process_index, - &r1->privatized_data()[process_index], - &r2->privatized_data()[process_index], - snapshot1, snapshot2); - if (is_diff) return 1; + if (compare_global_variables(state, + object_info, process_index, + &r1->privatized_data()[process_index], + &r2->privatized_data()[process_index], + snapshot1, snapshot2)) + return 1; } return 0; } @@ -1631,51 +1615,45 @@ int snapshot_compare(int num1, simgrid::mc::Snapshot* s1, int num2, simgrid::mc: simgrid::mc::Process* process = &mc_model_checker->process(); int errors = 0; - int res_init; int hash_result = 0; 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 */ if (s1->enabled_processes != s2->enabled_processes) { - XBT_VERB("(%d - %d) Different enabled processes", num1, num2); - // return 1; ?? + XBT_VERB("(%d - %d) Different amount of enabled processes", num1, num2); + return 1; } - unsigned long i = 0; - size_t size_used1, size_used2; - int is_diff = 0; - /* Compare size of stacks */ - while (i < s1->stacks.size()) { - size_used1 = s1->stack_sizes[i]; - size_used2 = s2->stack_sizes[i]; + int is_diff = 0; + for (unsigned long i = 0; i < s1->stacks.size(); i++) { + size_t size_used1 = s1->stack_sizes[i]; + size_t 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 } - i++; } + if (is_diff) // do not proceed if there is any stacks that don't match + return 1; /* Init heap information used in heap comparison algorithm */ xbt_mheap_t heap1 = (xbt_mheap_t)s1->read_bytes( @@ -1686,8 +1664,7 @@ int snapshot_compare(int num1, simgrid::mc::Snapshot* s1, int num2, simgrid::mc: alloca(sizeof(struct mdesc)), sizeof(struct mdesc), remote(process->heap_address), simgrid::mc::ProcessIndexMissing, simgrid::mc::ReadOptions::lazy()); - res_init = state_comparator->initHeapInformation( - heap1, heap2, &s1->to_ignore, &s2->to_ignore); + int res_init = state_comparator->initHeapInformation(heap1, heap2, &s1->to_ignore, &s2->to_ignore); if (res_init == -1) { #ifdef MC_DEBUG @@ -1703,15 +1680,10 @@ 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; @@ -1736,7 +1708,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(); @@ -1758,12 +1729,9 @@ int snapshot_compare(int num1, simgrid::mc::Snapshot* s1, int num2, simgrid::mc: std::string const& name = region1->object_info()->file_name; /* Compare global variables */ - is_diff = - compare_global_variables(*state_comparator, - region1->object_info(), simgrid::mc::ProcessIndexDisabled, - region1, region2, s1, s2); + if (compare_global_variables(*state_comparator, region1->object_info(), simgrid::mc::ProcessIndexDisabled, region1, + region2, s1, s2)) { - if (is_diff != 0) { #ifdef MC_DEBUG XBT_DEBUG("(%d - %d) Different global variables in %s", num1, num2, name.c_str()); @@ -1790,7 +1758,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 }