X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/fe0d61c5bb296dd96c800a7d84d437246fdb1fca..a92d7b716f51a53dea7f59db8524d4add713b910:/src/mc/PageStore.hpp diff --git a/src/mc/PageStore.hpp b/src/mc/PageStore.hpp index 4226ffd799..80332eaebc 100644 --- a/src/mc/PageStore.hpp +++ b/src/mc/PageStore.hpp @@ -13,7 +13,7 @@ #include #include -#include +#include "xbt/base.h" #include "src/mc/mc_mmu.h" #include "src/mc/mc_forward.hpp" @@ -136,7 +136,7 @@ public: // Methods /** @brief Get a page from its page number * - * @param Number of the memory page in the store + * @param pageno Number of the memory page in the store * @return Start of the page */ const void* get_page(std::size_t pageno) const; @@ -157,37 +157,33 @@ public: // Debug/test methods }; -inline __attribute__((always_inline)) -void PageStore::unref_page(std::size_t pageno) { +XBT_ALWAYS_INLINE void PageStore::unref_page(std::size_t pageno) +{ if ((--this->page_counts_[pageno]) == 0) this->remove_page(pageno); } -inline __attribute__((always_inline)) -void PageStore::ref_page(size_t pageno) +XBT_ALWAYS_INLINE void PageStore::ref_page(size_t pageno) { ++this->page_counts_[pageno]; } -inline __attribute__((always_inline)) -const void* PageStore::get_page(std::size_t pageno) const +XBT_ALWAYS_INLINE const void* PageStore::get_page(std::size_t pageno) const { return (void*) simgrid::mc::mmu::join(pageno, (std::uintptr_t) this->memory_); } -inline __attribute__((always_inline)) -std::size_t PageStore::get_ref(std::size_t pageno) +XBT_ALWAYS_INLINE std::size_t PageStore::get_ref(std::size_t pageno) { return this->page_counts_[pageno]; } -inline __attribute__((always_inline)) -std::size_t PageStore::size() { +XBT_ALWAYS_INLINE std::size_t PageStore::size() +{ return this->top_index_ - this->free_pages_.size(); } -inline __attribute__((always_inline)) -std::size_t PageStore::capacity() +XBT_ALWAYS_INLINE std::size_t PageStore::capacity() { return this->capacity_; }