From 84183e4f4aa50f6220315835894bc0677c0ea64c Mon Sep 17 00:00:00 2001
From: Gabriel Corona <gabriel.corona@loria.fr>
Date: Mon, 23 Jun 2014 10:30:57 +0200
Subject: [PATCH] [mc] Move method definition out of class declaratio and force
 inline

---
 src/mc/mc_page_store.h | 58 +++++++++++++++++++++++++++---------------
 src/mc/mc_private.h    |  3 ++-
 2 files changed, 40 insertions(+), 21 deletions(-)

diff --git a/src/mc/mc_page_store.h b/src/mc/mc_page_store.h
index 092ad23347..3caa88519e 100644
--- a/src/mc/mc_page_store.h
+++ b/src/mc/mc_page_store.h
@@ -112,11 +112,7 @@ public: // Methods
    * it is added to the `free_pages_` list and removed from the `hash_index_`.
    *
    * */
-  void unref_page(size_t pageno) {
-    if ((--this->page_counts_[pageno]) == 0) {
-      this->remove_page(pageno);
-    }
-  }
+  void unref_page(size_t pageno);
 
   /** @brief Increment the refcount for a given page
    *
@@ -128,9 +124,7 @@ public: // Methods
    * changed since the previous cnapshot/restoration and we can avoid
    * hashing the page, comparing byte-per-byte to candidates.
    * */
-  void ref_page(size_t pageno) {
-    ++this->page_counts_[pageno];
-  }
+  void ref_page(size_t pageno);
 
   /** @brief Store a page in the page store */
   size_t store_page(void* page);
@@ -140,31 +134,55 @@ public: // Methods
    *  @param Number of the memory page in the store
    *  @return Start of the page
    */
-  const void* get_page(size_t pageno) const {
-    return mc_page_from_number(this->memory_, pageno);
-  }
+  const void* get_page(size_t pageno) const;
 
 public: // Debug/test methods
 
   /** @brief Get the number of references for a page */
-  size_t get_ref(size_t pageno) {
-    return this->page_counts_[pageno];
-  }
+  size_t get_ref(size_t pageno);
 
   /** @brief Get the number of used pages */
-  size_t size() {
-    return this->top_index_ - this->free_pages_.size();
-  }
+  size_t size();
 
   /** @brief Get the capacity of the page store
    *
    *  The capacity is expanded by a system call (mremap).
    * */
-  size_t capacity() {
-    return this->capacity_;
-  }
+  size_t capacity();
 
 };
 
+inline __attribute__((always_inline))
+void s_mc_pages_store::unref_page(size_t pageno) {
+  if ((--this->page_counts_[pageno]) == 0) {
+    this->remove_page(pageno);
+  }
+}
+
+inline __attribute__((always_inline))
+void s_mc_pages_store::ref_page(size_t pageno) {
+  ++this->page_counts_[pageno];
+}
+
+inline __attribute__((always_inline))
+const void* s_mc_pages_store::get_page(size_t pageno) const {
+  return mc_page_from_number(this->memory_, pageno);
+}
+
+inline __attribute__((always_inline))
+size_t s_mc_pages_store::get_ref(size_t pageno)  {
+  return this->page_counts_[pageno];
+}
+
+inline __attribute__((always_inline))
+size_t s_mc_pages_store::size() {
+  return this->top_index_ - this->free_pages_.size();
+}
+
+inline __attribute__((always_inline))
+size_t s_mc_pages_store::capacity() {
+  return this->capacity_;
+}
+
 #endif
 
diff --git a/src/mc/mc_private.h b/src/mc/mc_private.h
index 0a3883c3e9..9027f75acd 100644
--- a/src/mc/mc_private.h
+++ b/src/mc/mc_private.h
@@ -148,7 +148,8 @@ typedef struct s_mc_pages_store s_mc_pages_store_t, * mc_pages_store_t;
 mc_pages_store_t mc_pages_store_new();
 const void* mc_page_store_get_page(mc_pages_store_t page_store, size_t pageno);
 
-static inline bool mc_snapshot_region_linear(mc_mem_region_t region) {
+static inline __attribute__((always_inline))
+bool mc_snapshot_region_linear(mc_mem_region_t region) {
   return !region || !region->data;
 }
 
-- 
2.20.1