X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/72d32c4e88a57f4786f62fec48a1bfa454adbff9..c59c82ee01d89d9d0607bf526df5449bcf161472:/src/mc/sosp/PageStore.cpp diff --git a/src/mc/sosp/PageStore.cpp b/src/mc/sosp/PageStore.cpp index 5944652646..e2c46f400d 100644 --- a/src/mc/sosp/PageStore.cpp +++ b/src/mc/sosp/PageStore.cpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2015-2022. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2015-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. */ @@ -12,7 +12,7 @@ #include "xbt/log.h" #include "xbt/sysdep.h" -#include "src/include/xxhash.hpp" +#include "src/3rd-party/xxhash.hpp" #include "src/mc/mc_mmu.hpp" #include "src/mc/sosp/PageStore.hpp" @@ -71,7 +71,9 @@ void PageStore::resize(std::size_t size) MAP_PRIVATE | MAP_ANONYMOUS | MAP_POPULATE, -1, 0); xbt_assert(new_memory != MAP_FAILED, "Could not mremap snapshot pages."); // Check if expanding worked - if (new_memory != (char*)this->memory_ + old_bytesize) { + if (new_memory == (char*)this->memory_ + old_bytesize) { + new_memory = this->memory_; + } else { // New memory segment could not be put at the end of this->memory_, // so cancel this one and try to relocate everything and copy data munmap(new_memory, new_bytesize - old_bytesize);