X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/ecd057376de847d40e1e29e2bf33e95eae3f835f..2d7cf98366e8cf8ae17f5c5be0c3b030fc110307:/src/mc/compare.cpp diff --git a/src/mc/compare.cpp b/src/mc/compare.cpp index 849059b214..2c24b35b2c 100644 --- a/src/mc/compare.cpp +++ b/src/mc/compare.cpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2008-2022. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2008-2023. 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. */ @@ -8,6 +8,7 @@ #include "src/mc/mc_config.hpp" #include "src/mc/mc_private.hpp" #include "src/mc/sosp/Snapshot.hpp" +#include "xbt/ex.h" #include @@ -790,9 +791,9 @@ static bool heap_area_differ(const RemoteProcess& process, StateComparator& stat // If either block is not in the expected area of memory: if (((const char*)area1 < (const char*)state.std_heap_copy.heapbase) || - (block1 > (ssize_t)state.processStates[0].heapsize) || (block1 < 1) || + (block1 > (ssize_t)state.processStates[0].heapsize) || ((const char*)area2 < (const char*)state.std_heap_copy.heapbase) || - (block2 > (ssize_t)state.processStates[1].heapsize) || (block2 < 1)) { + (block2 > (ssize_t)state.processStates[1].heapsize)) { return true; } @@ -845,9 +846,7 @@ static bool heap_area_differ(const RemoteProcess& process, StateComparator& stat } if (type_size != -1 && 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")) { // FIXME: there is no struct s_smx_context anymore + type_size != (ssize_t)heapinfo2->busy_block.busy_size && type->name.empty()) { if (match_pairs) state.match_equals(previous); return false;