A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
prefix all macro defined in public simgrid_config.h with 'SIMGRID_'
[simgrid.git]
/
src
/
mc
/
mc_mmu.h
diff --git
a/src/mc/mc_mmu.h
b/src/mc/mc_mmu.h
index
eb6d337
..
9e2aaa5
100644
(file)
--- a/
src/mc/mc_mmu.h
+++ b/
src/mc/mc_mmu.h
@@
-31,8
+31,7
@@
static int chunkSize()
* @param size Byte size
* @return Number of memory pages
*/
* @param size Byte size
* @return Number of memory pages
*/
-static inline __attribute__ ((always_inline))
-std::size_t chunkCount(std::size_t size)
+static XBT_ALWAYS_INLINE std::size_t chunkCount(std::size_t size)
{
size_t page_count = size >> xbt_pagebits;
if (size & (xbt_pagesize-1))
{
size_t page_count = size >> xbt_pagebits;
if (size & (xbt_pagesize-1))
@@
-41,8
+40,7
@@
std::size_t chunkCount(std::size_t size)
}
/** @brief Split into chunk number and remaining offset */
}
/** @brief Split into chunk number and remaining offset */
-static inline __attribute__ ((always_inline))
-std::pair<std::size_t, std::uintptr_t> split(std::uintptr_t offset)
+static XBT_ALWAYS_INLINE std::pair<std::size_t, std::uintptr_t> split(std::uintptr_t offset)
{
return {
offset >> xbt_pagebits,
{
return {
offset >> xbt_pagebits,
@@
-51,20
+49,17
@@
std::pair<std::size_t, std::uintptr_t> split(std::uintptr_t offset)
}
/** Merge chunk number and remaining offset info a global offset */
}
/** Merge chunk number and remaining offset info a global offset */
-static inline __attribute__ ((always_inline))
-std::uintptr_t join(std::size_t page, std::uintptr_t 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 inline __attribute__ ((always_inline))
-std::uintptr_t join(std::pair<std::size_t,std::uintptr_t> value)
+static XBT_ALWAYS_INLINE std::uintptr_t join(std::pair<std::size_t, std::uintptr_t> value)
{
return join(value.first, value.second);
}
{
return join(value.first, value.second);
}
-static inline __attribute__ ((always_inline))
-bool sameChunk(std::uintptr_t a, std::uintptr_t b)
+static XBT_ALWAYS_INLINE bool sameChunk(std::uintptr_t a, std::uintptr_t b)
{
return (a >> xbt_pagebits) == (b >> xbt_pagebits);
}
{
return (a >> xbt_pagebits) == (b >> xbt_pagebits);
}