[mc] Always inline mc_page_store_get_page (C version of page_store->get_page())

diff --git a/src/mc/mc_page_store.cpp b/src/mc/mc_page_store.cpp
index 85ef6a7..9d98c5e 100644 (file)
--- a/src/mc/mc_page_store.cpp
+++ b/src/mc/mc_page_store.cpp
@@ -163,11 +163,6 @@ size_t s_mc_pages_store::store_page(void* page)
 
 extern "C" {
 
-const void* mc_page_store_get_page(mc_pages_store_t page_store, size_t pageno)
-{
-  return page_store->get_page(pageno);
-}
-
 mc_pages_store_t mc_pages_store_new()
 {
   return new s_mc_pages_store_t(500);

diff --git a/src/mc/mc_page_store.h b/src/mc/mc_page_store.h
index 3caa885..de67f55 100644 (file)
--- a/src/mc/mc_page_store.h
+++ b/src/mc/mc_page_store.h
@@ -6,11 +6,13 @@
 
 #include <stdint.h>
 
+#ifdef __cplusplus
 #include <vector>
 
 #include <boost/utility.hpp>
 #include <boost/unordered_map.hpp>
 #include <boost/unordered_set.hpp>
+#endif
 
 #include <xbt.h>
 
@@ -20,6 +22,10 @@
 #ifndef MC_PAGE_SNAPSHOT_H
 #define MC_PAGE_SNAPSHOT_H
 
+struct s_mc_pages_store;
+
+#ifdef __cplusplus
+
 /** @brief Storage for snapshot memory pages
  *
  * The first (lower) layer of the per-page snapshot mechanism is a page
@@ -79,7 +85,10 @@ private: // Types
   typedef boost::unordered_map<hash_type, page_set_type> pages_map_type;
 
 private: // Fields:
-  /** First page */
+  /** First page
+   *
+   *  mc_page_store_get_page expects that this is the first field.
+   * */
   void* memory_;
   /** Number of available pages in virtual memory */
   size_t capacity_;
@@ -186,3 +195,14 @@ size_t s_mc_pages_store::capacity() {
 
 #endif
 
+/**
+ */
+static inline __attribute__((always_inline))
+const void* mc_page_store_get_page(mc_pages_store_t page_store, size_t pageno)
+{
+  // This is page_store->memory_:
+  void* memory = *(void**)page_store;
+  return mc_page_from_number(memory, pageno);
+}
+
+#endif

diff --git a/src/mc/mc_private.h b/src/mc/mc_private.h
index 9027f75..92aa3ac 100644 (file)
--- a/src/mc/mc_private.h
+++ b/src/mc/mc_private.h
@@ -146,7 +146,6 @@ void mc_softdirty_reset();
 
 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 __attribute__((always_inline))
 bool mc_snapshot_region_linear(mc_mem_region_t region) {

diff --git a/src/mc/mc_snapshot.c b/src/mc/mc_snapshot.c
index 33f670c..07c1007 100644 (file)
--- a/src/mc/mc_snapshot.c
+++ b/src/mc/mc_snapshot.c
@@ -8,6 +8,7 @@
 
 #include "mc_private.h"
 #include "mc_mmu.h"
+#include "mc_page_store.h"
 
 mc_mem_region_t mc_get_snapshot_region(void* addr, mc_snapshot_t snapshot)
 {