X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/5c12b10224870f6f78c90ae7d5747cd93a60f458..b923f24fcb86571011626426f577fe6322094bb3:/src/mc/mc_mmu.hpp diff --git a/src/mc/mc_mmu.hpp b/src/mc/mc_mmu.hpp index dae7a092b5..cd920ce34b 100644 --- a/src/mc/mc_mmu.hpp +++ b/src/mc/mc_mmu.hpp @@ -13,9 +13,9 @@ #define XBT_ALWAYS_INLINE inline __attribute__((always_inline)) #endif -/** Cache the size of a memory page for the current system. */ +/** Size of a memory page for the current system. */ extern "C" int xbt_pagesize; -/** Cache the number of bits of addresses inside a given page, log2(xbt_pagesize). */ +/** Number of bits of addresses inside a given page, log2(xbt_pagesize). */ extern "C" int xbt_pagebits; namespace simgrid { @@ -23,7 +23,7 @@ namespace mc { // TODO, do not depend on xbt_pagesize/xbt_pagebits but our own chunk size namespace mmu { -static int chunkSize() +static int chunk_size() { return xbt_pagesize; } @@ -33,7 +33,7 @@ static int chunkSize() * @param size Byte size * @return Number of memory pages */ -static XBT_ALWAYS_INLINE std::size_t chunkCount(std::size_t size) +static XBT_ALWAYS_INLINE std::size_t chunk_count(std::size_t size) { size_t page_count = size >> xbt_pagebits; if (size & (xbt_pagesize - 1)) @@ -47,7 +47,7 @@ static XBT_ALWAYS_INLINE std::pair split(std::uintp return {offset >> xbt_pagebits, offset & (xbt_pagesize - 1)}; } -/** Merge chunk number and remaining offset info a global offset */ +/** Merge chunk number and remaining offset into 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; @@ -58,7 +58,7 @@ static XBT_ALWAYS_INLINE std::uintptr_t join(std::pair> xbt_pagebits) == (b >> xbt_pagebits); }