X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/f734ec7475682eb90323e804cbcfddd7e4523992..0e4b1ccbbce41e237bdf8a43037e21a1cdac314d:/src/mc/mc_mmu.hpp diff --git a/src/mc/mc_mmu.hpp b/src/mc/mc_mmu.hpp index a6de7acebb..b220822584 100644 --- a/src/mc/mc_mmu.hpp +++ b/src/mc/mc_mmu.hpp @@ -7,6 +7,8 @@ #define SIMGRID_MC_MMU_HPP #include "xbt/misc.h" // xbt_pagesize... +#include +#include namespace simgrid { namespace mc { @@ -26,24 +28,21 @@ static int chunkSize() static XBT_ALWAYS_INLINE std::size_t chunkCount(std::size_t size) { size_t page_count = size >> xbt_pagebits; - if (size & (xbt_pagesize-1)) - page_count ++; + if (size & (xbt_pagesize - 1)) + page_count++; return page_count; } /** @brief Split into chunk number and remaining offset */ static XBT_ALWAYS_INLINE std::pair split(std::uintptr_t offset) { - return { - offset >> xbt_pagebits, - offset & (xbt_pagesize-1) - }; + return {offset >> xbt_pagebits, offset & (xbt_pagesize - 1)}; } /** Merge chunk number and remaining offset info a global offset */ static XBT_ALWAYS_INLINE std::uintptr_t join(std::size_t page, std::uintptr_t offset) { - return ((std::uintptr_t) page << xbt_pagebits) + offset; + return ((std::uintptr_t)page << xbt_pagebits) + offset; } static XBT_ALWAYS_INLINE std::uintptr_t join(std::pair value) @@ -55,7 +54,6 @@ static XBT_ALWAYS_INLINE bool sameChunk(std::uintptr_t a, std::uintptr_t b) { return (a >> xbt_pagebits) == (b >> xbt_pagebits); } - } } }