X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/8d51fbcc2374aec305440e6456aee54c0a2df5d3..5b20f19ea87a94925264a0c8313eea119dfcbc11:/src/mc/compare.cpp diff --git a/src/mc/compare.cpp b/src/mc/compare.cpp index efbd0efeab..8babd989c0 100644 --- a/src/mc/compare.cpp +++ b/src/mc/compare.cpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2008-2018. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2008-2019. 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. */ @@ -37,7 +37,7 @@ #include "src/mc/mc_forward.hpp" #include "src/mc/mc_private.hpp" #include "src/mc/mc_smx.hpp" -#include "src/mc/mc_snapshot.hpp" +#include "src/mc/sosp/mc_snapshot.hpp" XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_compare, xbt, "Logging specific to mc_compare in mc"); @@ -317,21 +317,12 @@ int mmalloc_compare_heap( simgrid::mc::RemoteClient* process = &mc_model_checker->process(); /* Start comparison */ - size_t i1; - size_t i2; - size_t j1; - size_t j2; - size_t k; - void* addr_block1; - void* addr_block2; - void* addr_frag1; - void* addr_frag2; int nb_diff1 = 0; int nb_diff2 = 0; - int equal; + bool equal; /* Check busy blocks */ - i1 = 1; + size_t i1 = 1; malloc_info heapinfo_temp1; malloc_info heapinfo_temp2; @@ -364,14 +355,14 @@ int mmalloc_compare_heap( abort(); } - addr_block1 = ((void*)(((ADDR2UINT(i1)) - 1) * BLOCKSIZE + (char*)state.std_heap_copy.heapbase)); + void* addr_block1 = ((void*)(((ADDR2UINT(i1)) - 1) * BLOCKSIZE + (char*)state.std_heap_copy.heapbase)); if (heapinfo1->type == MMALLOC_TYPE_UNFRAGMENTED) { /* Large block */ if (is_stack(addr_block1)) { - for (k = 0; k < heapinfo1->busy_block.size; k++) + for (size_t k = 0; k < heapinfo1->busy_block.size; k++) state.equals_to1_(i1 + k, 0) = HeapArea(i1, -1); - for (k = 0; k < heapinfo2->busy_block.size; k++) + for (size_t k = 0; k < heapinfo2->busy_block.size; k++) state.equals_to2_(i1 + k, 0) = HeapArea(i1, -1); i1 += heapinfo1->busy_block.size; continue; @@ -382,27 +373,27 @@ int mmalloc_compare_heap( continue; } - i2 = 1; - equal = 0; + size_t i2 = 1; + equal = false; /* Try first to associate to same block in the other heap */ if (heapinfo2->type == heapinfo1->type && state.equals_to2_(i1, 0).valid_ == 0) { - addr_block2 = (ADDR2UINT(i1) - 1) * BLOCKSIZE + (char*)state.std_heap_copy.heapbase; + void* addr_block2 = (ADDR2UINT(i1) - 1) * BLOCKSIZE + (char*)state.std_heap_copy.heapbase; int res_compare = compare_heap_area(state, simgrid::mc::ProcessIndexMissing, addr_block1, addr_block2, snapshot1, snapshot2, nullptr, nullptr, 0); if (res_compare != 1) { - for (k = 1; k < heapinfo2->busy_block.size; k++) + for (size_t k = 1; k < heapinfo2->busy_block.size; k++) state.equals_to2_(i1 + k, 0) = HeapArea(i1, -1); - for (k = 1; k < heapinfo1->busy_block.size; k++) + for (size_t k = 1; k < heapinfo1->busy_block.size; k++) state.equals_to1_(i1 + k, 0) = HeapArea(i1, -1); - equal = 1; + equal = true; i1 += heapinfo1->busy_block.size; } } while (i2 < state.heaplimit && not equal) { - addr_block2 = (ADDR2UINT(i2) - 1) * BLOCKSIZE + (char*)state.std_heap_copy.heapbase; + void* addr_block2 = (ADDR2UINT(i2) - 1) * BLOCKSIZE + (char*)state.std_heap_copy.heapbase; if (i2 == i1) { i2++; @@ -425,11 +416,11 @@ int mmalloc_compare_heap( snapshot1, snapshot2, nullptr, nullptr, 0); if (res_compare != 1) { - for (k = 1; k < heapinfo2b->busy_block.size; k++) + for (size_t k = 1; k < heapinfo2b->busy_block.size; k++) state.equals_to2_(i2 + k, 0) = HeapArea(i1, -1); - for (k = 1; k < heapinfo1->busy_block.size; k++) + for (size_t k = 1; k < heapinfo1->busy_block.size; k++) state.equals_to1_(i1 + k, 0) = HeapArea(i2, -1); - equal = 1; + equal = true; i1 += heapinfo1->busy_block.size; } @@ -444,7 +435,7 @@ int mmalloc_compare_heap( } else { /* Fragmented block */ - for (j1 = 0; j1 < (size_t) (BLOCKSIZE >> heapinfo1->type); j1++) { + for (size_t j1 = 0; j1 < (size_t)(BLOCKSIZE >> heapinfo1->type); j1++) { if (heapinfo1->busy_frag.frag_size[j1] == -1) /* Free fragment_ */ continue; @@ -452,22 +443,19 @@ int mmalloc_compare_heap( if (state.equals_to1_(i1, j1).valid_) continue; - addr_frag1 = (void*)((char*)addr_block1 + (j1 << heapinfo1->type)); + void* addr_frag1 = (void*)((char*)addr_block1 + (j1 << heapinfo1->type)); - i2 = 1; - equal = 0; + size_t i2 = 1; + equal = false; /* Try first to associate to same fragment_ in the other heap */ if (heapinfo2->type == heapinfo1->type && not state.equals_to2_(i1, j1).valid_) { - addr_block2 = (ADDR2UINT(i1) - 1) * BLOCKSIZE + - (char *) state.std_heap_copy.heapbase; - addr_frag2 = - (void *) ((char *) addr_block2 + - (j1 << heapinfo2->type)); + void* addr_block2 = (ADDR2UINT(i1) - 1) * BLOCKSIZE + (char*)state.std_heap_copy.heapbase; + void* addr_frag2 = (void*)((char*)addr_block2 + (j1 << heapinfo2->type)); int res_compare = compare_heap_area(state, simgrid::mc::ProcessIndexMissing, addr_frag1, addr_frag2, snapshot1, snapshot2, nullptr, nullptr, 0); if (res_compare != 1) - equal = 1; + equal = true; } while (i2 < state.heaplimit && not equal) { @@ -492,8 +480,7 @@ int mmalloc_compare_heap( abort(); } - for (j2 = 0; j2 < (size_t) (BLOCKSIZE >> heapinfo2b->type); - j2++) { + for (size_t j2 = 0; j2 < (size_t)(BLOCKSIZE >> heapinfo2b->type); j2++) { if (i2 == i1 && j2 == j1) continue; @@ -501,13 +488,13 @@ int mmalloc_compare_heap( if (state.equals_to2_(i2, j2).valid_) continue; - addr_block2 = (ADDR2UINT(i2) - 1) * BLOCKSIZE + (char*)state.std_heap_copy.heapbase; - addr_frag2 = (void*)((char*)addr_block2 + (j2 << heapinfo2b->type)); + void* addr_block2 = (ADDR2UINT(i2) - 1) * BLOCKSIZE + (char*)state.std_heap_copy.heapbase; + void* addr_frag2 = (void*)((char*)addr_block2 + (j2 << heapinfo2b->type)); int res_compare = compare_heap_area(state, simgrid::mc::ProcessIndexMissing, addr_frag1, addr_frag2, snapshot2, snapshot2, nullptr, nullptr, 0); if (res_compare != 1) { - equal = 1; + equal = true; break; } } @@ -529,10 +516,7 @@ int mmalloc_compare_heap( } /* All blocks/fragments are equal to another block/fragment_ ? */ - size_t i = 1; - size_t j = 0; - - for(i = 1; i < state.heaplimit; i++) { + for (size_t i = 1; i < state.heaplimit; i++) { const malloc_info* heapinfo1 = (const malloc_info*) MC_region_read( heap_region1, &heapinfo_temp1, &heapinfos1[i], sizeof(malloc_info)); @@ -544,7 +528,7 @@ int mmalloc_compare_heap( if (heapinfo1->type <= 0) continue; - for (j = 0; j < (size_t) (BLOCKSIZE >> heapinfo1->type); j++) + for (size_t j = 0; j < (size_t)(BLOCKSIZE >> heapinfo1->type); j++) if (i1 == state.heaplimit && heapinfo1->busy_frag.frag_size[j] > 0 && not state.equals_to1_(i, j).valid_) { XBT_DEBUG("Block %zu, Fragment %zu not found (size used = %zd)", i, j, heapinfo1->busy_frag.frag_size[j]); nb_diff1++; @@ -554,7 +538,7 @@ int mmalloc_compare_heap( if (i1 == state.heaplimit) XBT_DEBUG("Number of blocks/fragments not found in heap1: %d", nb_diff1); - for (i=1; i < state.heaplimit; i++) { + for (size_t i = 1; i < state.heaplimit; i++) { const malloc_info* heapinfo2 = (const malloc_info*) MC_region_read( heap_region2, &heapinfo_temp2, &heapinfos2[i], sizeof(malloc_info)); if (heapinfo2->type == MMALLOC_TYPE_UNFRAGMENTED && i1 == state.heaplimit && heapinfo2->busy_block.busy_size > 0 && @@ -567,7 +551,7 @@ int mmalloc_compare_heap( if (heapinfo2->type <= 0) continue; - for (j = 0; j < (size_t) (BLOCKSIZE >> heapinfo2->type); j++) + for (size_t j = 0; j < (size_t)(BLOCKSIZE >> heapinfo2->type); j++) if (i1 == state.heaplimit && heapinfo2->busy_frag.frag_size[j] > 0 && not state.equals_to2_(i, j).valid_) { XBT_DEBUG("Block %zu, Fragment %zu not found (size used = %zd)", i, j, heapinfo2->busy_frag.frag_size[j]); @@ -708,7 +692,6 @@ static int compare_heap_area_with_type( simgrid::mc::Type* subtype; simgrid::mc::Type* subsubtype; - int res; int elm_size; const void* addr_pointed1; const void* addr_pointed2; @@ -732,7 +715,6 @@ static int compare_heap_area_with_type( else return MC_snapshot_region_memcmp(real_area1, heap_region1, real_area2, heap_region2, type->byte_size) != 0; } - break; case DW_TAG_enumeration_type: if (area_size != -1 && type->byte_size != area_size) @@ -775,13 +757,12 @@ static int compare_heap_area_with_type( break; default: return 0; - break; } for (int i = 0; i < type->element_count; i++) { // TODO, add support for variable stride (DW_AT_byte_stride) - res = compare_heap_area_with_type(state, process_index, (char*)real_area1 + (i * elm_size), - (char*)real_area2 + (i * elm_size), snapshot1, snapshot2, previous, - type->subtype, subtype->byte_size, check_ignore, pointer_level); + int res = compare_heap_area_with_type(state, process_index, (char*)real_area1 + (i * elm_size), + (char*)real_area2 + (i * elm_size), snapshot1, snapshot2, previous, + type->subtype, subtype->byte_size, check_ignore, pointer_level); if (res == 1) return res; } @@ -809,6 +790,7 @@ static int compare_heap_area_with_type( for (size_t i = 0; i < (area_size / sizeof(void*)); i++) { addr_pointed1 = snapshot1->read(remote((void**)((char*)real_area1 + i * sizeof(void*))), process_index); addr_pointed2 = snapshot2->read(remote((void**)((char*)real_area2 + i * sizeof(void*))), process_index); + int res; if (addr_pointed1 > state.std_heap_copy.heapbase && addr_pointed1 < mc_snapshot_get_heap_end(snapshot1) && addr_pointed2 > state.std_heap_copy.heapbase && addr_pointed2 < mc_snapshot_get_heap_end(snapshot2)) res = compare_heap_area(state, process_index, addr_pointed1, addr_pointed2, snapshot1, snapshot2, previous, @@ -1238,6 +1220,7 @@ static int compare_areas_with_type(simgrid::mc::StateComparator& state, int res; do { + xbt_assert(type != nullptr); switch (type->type) { case DW_TAG_unspecified_type: return 1; @@ -1280,7 +1263,6 @@ static int compare_areas_with_type(simgrid::mc::StateComparator& state, break; default: return 0; - break; } for (i = 0; i < type->element_count; i++) { size_t off = i * elm_size; @@ -1335,7 +1317,6 @@ static int compare_areas_with_type(simgrid::mc::StateComparator& state, return (addr_pointed1 != addr_pointed2); } - break; } case DW_TAG_structure_type: case DW_TAG_class_type: @@ -1352,7 +1333,6 @@ static int compare_areas_with_type(simgrid::mc::StateComparator& state, break; case DW_TAG_subroutine_type: return -1; - break; default: XBT_VERB("Unknown case: %d", type->type); break; @@ -1382,12 +1362,9 @@ static int compare_global_variables( && process_count == r2->privatized_data().size()); // Compare the global variables separately for each simulates process: - for (size_t process_index = 0; process_index < process_count; process_index++) { - if (compare_global_variables(state, - object_info, process_index, - &r1->privatized_data()[process_index], - &r2->privatized_data()[process_index], - snapshot1, snapshot2)) + for (size_t i = 0; i < process_count; i++) { + if (compare_global_variables(state, object_info, i, &r1->privatized_data()[i], &r2->privatized_data()[i], + snapshot1, snapshot2)) return 1; } return 0; @@ -1487,7 +1464,7 @@ int snapshot_compare(int num1, simgrid::mc::Snapshot* s1, int num2, simgrid::mc: // TODO, make this a field of ModelChecker or something similar if (state_comparator == nullptr) - state_comparator = std::unique_ptr(new StateComparator()); + state_comparator.reset(new StateComparator()); else state_comparator->clear();