-/* Copyright (c) 2015-2021. 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. */
#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"
#include <cstring> // memcpy, memcmp
#include <unistd.h>
-namespace simgrid {
-namespace mc {
+namespace simgrid::mc {
/** @brief Compute a hash for the given memory page
*
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);
return pageno;
}
-} // namespace mc
-} // namespace simgrid
+} // namespace simgrid::mc